Skip to content

Commit

Permalink
Merge origin/master into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Haruko Schmidt committed Jul 12, 2024
2 parents aa40c3f + 1f9b5d7 commit 1becf5a
Show file tree
Hide file tree
Showing 118 changed files with 115 additions and 411 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
used for board provider abstraction
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
columns
cards
moveCard: anSPBCard after: anotherSPBCard toColumn: anSPBColumn

self subclassResponsibility.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
columns
cards
moveCardToTop: aSPBCard toColumn: aSPBColumn

self subclassResponsibility.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "",
"commentStamp" : "L.L. 7/12/2024 22:15",
"instvars" : [
"user",
"repo" ],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
updating
toggleClosed

self subclassResponsibility.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
"removeLabelLocal:" : "lo 7/31/2022 17:04",
"title" : "lo 7/31/2022 16:06",
"toggleClosed" : "AH 5/25/2024 16:50",
"toggleIsHighlighted" : "AH 6/14/2024 13:19",
"updateDescription:" : "lo 7/31/2022 17:04",
"updateTitle:" : "lo 7/31/2022 17:04" } }
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ actionSubmit
| oldUsername areCredentialsNil |
areCredentialsNil := (self username isNil or: [self token isNil]).
areCredentialsNil
ifTrue: [^ self errorEmptyField].
ifTrue: [^ self errorEmptyField.].

SPBAuthenticator token: self token.
oldUsername := SPBAuthenticator username.
Expand All @@ -13,4 +13,4 @@ actionSubmit
(self checkUserValid)
ifTrue: [self changed: #close]
ifFalse: [SPBGithubAPI username: oldUsername.
^ self errorUserNotFound].
^ self errorUserNotFound.].
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"open" : "jh 7/31/2022 13:05" },
"instance" : {
"actionCancel" : "mcr 7/4/2022 00:36",
"actionSubmit" : "AH 7/12/2024 15:44",
"actionSubmit" : "L.L. 7/12/2024 21:18",
"buildButtons:" : "FP 6/13/2024 11:10",
"buildInputFields:" : "mcr 8/4/2022 00:18",
"buildInputPanel:" : "Haru 7/12/2024 20:08",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
username

^ Username
^ Username.
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ errorGarbageToken

UserDialogBoxMorph
inform: 'Not a valid token' title: 'Operation canceled'.
SPBAuthenticator token: nil.
self class token: nil.
^ Error signal.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ errorInvalidTokenScopes
UserDialogBoxMorph
inform: 'Invalid token or username or repository is private. Token has only public_repo scope'
title: 'Operation canceled'.
SPBAuthenticator token: nil.
self class token: nil.
^ Error signal.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ tryQueryRepo

| repo |
repo := self boardProvider getRepo.
^ (repo message = 'Not Found') not
^ (repo message = 'Not Found') not.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"newWith:" : "mcr 8/2/2022 17:38",
"token" : "FP 7/12/2024 12:50",
"token:" : "FP 7/12/2024 12:50",
"username" : "FP 7/12/2024 12:50",
"username" : "L.L. 7/12/2024 21:16",
"username:" : "FP 7/12/2024 12:50" },
"instance" : {
"authenticate" : "AH 7/12/2024 15:46",
Expand All @@ -13,13 +13,13 @@
"checkIfTokenValid" : "mcr 8/4/2022 02:23",
"detectInsufficientScopes:" : "mcr 8/4/2022 00:33",
"errorAuthenticationCanceled" : "mcr 8/2/2022 21:49",
"errorGarbageToken" : "FP 7/12/2024 13:00",
"errorInvalidTokenScopes" : "FP 7/12/2024 13:00",
"errorGarbageToken" : "L.L. 7/12/2024 21:40",
"errorInvalidTokenScopes" : "L.L. 7/12/2024 21:40",
"errorNoScopes" : "FP 7/12/2024 12:52",
"errorRepoNotFound" : "mcr 8/2/2022 21:50",
"getTokenScopes" : "mcr 8/4/2022 00:34",
"token" : "FP 7/12/2024 12:52",
"token:" : "FP 7/12/2024 12:52",
"tryQueryRepo" : "mcr 8/4/2022 01:12",
"tryQueryRepo" : "L.L. 7/12/2024 21:16",
"username" : "FP 7/12/2024 12:53",
"username:" : "FP 7/12/2024 12:53" } }
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ addColumnLocal: anSPBColumn

anSPBColumn
board: self;
boardProvider: self boardProvider;
changeProvider: self changeProvider.
boardProvider: self boardProvider.
self columns add: anSPBColumn.
self updateColumns.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
building
createColumns

self columns: self boardProvider queryColumns.
self columns
do: [:column | column changeProvider: self changeProvider].
self columns: self boardProvider queryColumns asOrderedCollection.
5 changes: 1 addition & 4 deletions Squello-Core.package/SPBBoard.class/instance/initialize.st
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ initialize
super initialize.
self isLocal: false.
self
boardProvider: SPBGithubBoardProvider new;
changeProvider: SPBGithubChangeProvider new.

self changeProvider api: self boardProvider api.
boardProvider: SPBGithubBoardProvider new.
4 changes: 1 addition & 3 deletions Squello-Core.package/SPBBoard.class/instance/loadProject..st
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ loadProject: aString

(aString includesSubstring: '/projects')
ifTrue: [self parseProjectFromUrl: aString]
ifFalse: [self chooseProjectFromUrl: aString].

self setUpChangeProvider.
ifFalse: [self chooseProjectFromUrl: aString].

This file was deleted.

11 changes: 4 additions & 7 deletions Squello-Core.package/SPBBoard.class/methodProperties.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"HeighAddCoulumnButton" : "Haru 7/12/2024 21:50",
"activeCard" : "mcr 8/1/2022 02:31",
"addColumn" : "Haru 7/12/2024 20:47",
"addColumnLocal:" : "lo 8/3/2022 12:34",
"addColumnLocal:" : "FP 7/12/2024 22:58",
"applyUserInterfaceTheme" : "Haru 7/12/2024 20:47",
"asJson" : "FP 7/4/2024 15:46",
"beginnColumnBody" : "Haru 7/12/2024 22:16",
Expand Down Expand Up @@ -50,14 +50,12 @@
"buildSidebarTitleSpecWith:" : "Haru 7/12/2024 23:12",
"buildWith:" : "Haru 7/12/2024 19:56",
"changeActiveCardTo:" : "AH 7/8/2024 11:24",
"changeProvider" : "lo 7/8/2022 14:00",
"changeProvider:" : "lo 7/8/2022 15:29",
"chooseProjectFrom:" : "Haru 7/12/2024 20:49",
"chooseProjectFromUrl:" : "Haru 7/12/2024 20:50",
"columnFromId:" : "Haru 7/12/2024 20:50",
"columns" : "tk 7/30/2022 21:38",
"columns:" : "tk 7/30/2022 21:38",
"createColumns" : "lo 8/1/2022 11:11",
"createColumns" : "FP 7/12/2024 22:58",
"createSidebar" : "lo 8/1/2022 11:11",
"endAddCardButton" : "Haru 7/12/2024 22:33",
"endAssigneeList" : "Haru 7/12/2024 23:11",
Expand All @@ -72,10 +70,10 @@
"errorNoProjects" : "mcr 8/2/2022 22:15",
"hasModelYellowButtonMenuItems" : "AH 7/12/2024 15:56",
"indexOfColumn:" : "lo 8/3/2022 12:57",
"initialize" : "FP 6/10/2024 14:43",
"initialize" : "FP 7/12/2024 23:00",
"isLocal" : "Haru 7/12/2024 20:50",
"isLocal:" : "FP 6/10/2024 14:43",
"loadProject:" : "FP 7/12/2024 12:38",
"loadProject:" : "FP 7/12/2024 22:59",
"makeLocal" : "FP 6/25/2024 14:19",
"makeLocal:" : "FP 6/25/2024 14:19",
"midOfSidebar" : "Haru 7/12/2024 22:49",
Expand All @@ -86,7 +84,6 @@
"rerenderColumns" : "lo 7/31/2022 16:42",
"resizeColumnArea" : "jh 8/3/2022 01:07",
"saveBoard" : "AH 7/12/2024 15:56",
"setUpChangeProvider" : "AH 7/12/2024 15:57",
"setupColumns" : "FP 6/17/2024 17:13",
"sidebar" : "mcr 8/1/2022 00:44",
"sidebar:" : "mcr 8/1/2022 00:44",
Expand Down
1 change: 0 additions & 1 deletion Squello-Core.package/SPBBoard.class/properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
"commentStamp" : "tk 8/1/2022 16:13",
"instvars" : [
"boardProvider",
"changeProvider",
"usedBuilder",
"columns",
"window",
Expand Down
1 change: 1 addition & 0 deletions Squello-Core.package/SPBBoardSaver.class/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
used for storing saved local boards
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoardSaver.class/properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" ],
"classvars" : [
],
"commentStamp" : "",
"commentStamp" : "L.L. 7/12/2024 22:16",
"instvars" : [
"boards" ],
"name" : "SPBBoardSaver",
Expand Down
1 change: 0 additions & 1 deletion Squello-Core.package/SPBCard.class/class/newFrom.with..st
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ newFrom: aJsonObject with: anSPBColumn
^ self new
cardId: (aJsonObject at: 'id');
boardProvider: anSPBColumn boardProvider;
changeProvider: anSPBColumn changeProvider;
setupMouseEvents;
buildCard: aJsonObject;
buildUI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ newFromLocal: aJsonObject with: anSPBColumn
^ self new
cardId: (aJsonObject at: 'id');
boardProvider: anSPBColumn boardProvider;
changeProvider: anSPBColumn changeProvider;
setupMouseEvents;
buildLocalCard: aJsonObject;
buildUI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ newWithTitle: aString body: anotherString id: anObject into: anSPBColumn
^ self new
cardId: anObject;
boardProvider: anSPBColumn boardProvider;
changeProvider: anSPBColumn changeProvider;
setupMouseEvents;
title: aString;
description: anotherString;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ updating-local
addAssigneeLocal: anSPBAssignee

(self assignees anySatisfy: [:assignee | assignee = anSPBAssignee])
ifTrue: [^ self].
ifTrue: [^ self.].

self assignees add: anSPBAssignee.
self updateAssigneeCount.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ updating-local
addLabelLocal: anSPBLabel

(self labels anySatisfy: [:label | label = anSPBLabel])
ifTrue: [^ self].
ifTrue: [^ self.].

self labels add: anSPBLabel.
self updateLabelIcons.

This file was deleted.

4 changes: 0 additions & 4 deletions Squello-Core.package/SPBCard.class/instance/changeProvider.st

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
updating-local
defaultTopLabelPosition

^ self labelBorderOffset @ (self position y + self titleModel extent y + self labelTitleOffset)
^ self labelBorderOffset @ (self position y + self titleModel extent y + self labelTitleOffset).
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ updating
toggleClosed

self isNote
ifTrue: [^ self].
ifTrue: [^ self.].
self isClosed: self isClosed not.
self boardProvider updateCard: self.
4 changes: 2 additions & 2 deletions Squello-Core.package/SPBCard.class/instance/update.with..st
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ update: aSymbol with: aDictionary

| label assignee |
aSymbol = #card
ifFalse: [^ self].
ifFalse: [^ self.].
(self id = (aDictionary at: 'id') or: [self issueId = (aDictionary at: 'id')])
ifFalse: [^ self].
ifFalse: [^ self.].

((aDictionary at: 'action') = #move)
ifTrue: [self moveCardWith: aDictionary].
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updateBalloonText

| text |
self assignees isEmpty
ifTrue: [self balloonText: nil. ^ self].
ifTrue: [self balloonText: nil. ^ self.].
text := 'Assignees:', Character cr.
self assignees
do: [:assignee | text := text, assignee asString, Character cr].
Expand Down
Loading

0 comments on commit 1becf5a

Please sign in to comment.