From 835efc125f0f5471d939d43026a62f0cb8d13f90 Mon Sep 17 00:00:00 2001 From: Jannik Huschka Date: Wed, 3 Aug 2022 01:13:29 +0200 Subject: [PATCH] destroyed card builder --- .../instance/resizeColumnArea.st | 1 + .../SPBBoard.class/instance/setupColumns.st | 3 +-- .../SPBBoard.class/methodProperties.json | 4 ++-- .../class/buildFromRemote.into..st | 7 ++++++ .../SPBCard.class/class/buildNew.into..st | 9 ++++++++ .../SPBCard.class/class/newFrom.with..st | 12 ++++++++++ .../instance/buildContent..st | 8 +++---- .../SPBCard.class/instance/buildUI.st | 10 +++++++++ .../SPBCard.class/instance/setCardColumn..st | 6 +++++ .../instance/setCardColumnAtTop..st | 6 +++++ .../instance/setupMouseEvents.st | 5 +++++ .../SPBCard.class/methodProperties.json | 10 ++++++++- .../SPBCardBuilder.class/README.md | 1 - .../instance/boardProvider..st | 4 ---- .../instance/boardProvider.st | 4 ---- .../instance/buildCardWith..st | 9 -------- .../instance/buildFromRemote.into..st | 9 -------- .../instance/buildLabels..st | 4 ---- .../instance/buildNew.atTop..st | 6 ----- .../instance/buildNew.into..st | 6 ----- .../instance/buildNew.with..st | 9 -------- .../SPBCardBuilder.class/instance/buildUI.st | 10 --------- .../SPBCardBuilder.class/instance/card..st | 4 ---- .../SPBCardBuilder.class/instance/card.st | 4 ---- .../instance/changeProvider..st | 4 ---- .../instance/changeProvider.st | 4 ---- .../instance/setCardColumn..st | 7 ------ .../instance/setCardColumnAtTop..st | 7 ------ .../instance/setCardID..st | 4 ---- .../instance/setupMouseEvents.st | 5 ----- .../methodProperties.json | 22 ------------------- .../SPBCardBuilder.class/properties.json | 16 -------------- .../SPBColumn.class/instance/addCard.st | 2 +- .../instance/boardProvider..st | 3 +-- .../SPBColumn.class/instance/buildCards.st | 6 ----- .../instance/buildSingleCard..st | 2 +- .../SPBColumn.class/instance/cardBuilder..st | 4 ---- .../SPBColumn.class/instance/cardBuilder.st | 4 ---- .../instance/changeProvider..st | 3 +-- .../instance/fetchAndBuildCards.st | 5 +++++ .../SPBColumn.class/instance/fetchCards.st | 4 ---- .../SPBColumn.class/instance/initialize.st | 5 ----- .../SPBColumn.class/methodProperties.json | 14 +++++------- .../SPBColumn.class/properties.json | 1 - .../instance/queryCardsForColumn..st | 3 ++- .../methodProperties.json | 2 +- .../SPBCardBuilderTests.class/README.md | 0 .../instance/setUp.st | 8 ------- .../instance/tearDown.st | 5 ----- .../instance/testBuildContent.st | 13 ----------- .../instance/testBuildFromRemote.st | 13 ----------- .../instance/testNewInto.st | 12 ---------- .../methodProperties.json | 9 -------- .../SPBCardBuilderTests.class/properties.json | 16 -------------- 54 files changed, 89 insertions(+), 265 deletions(-) create mode 100644 Squello-Core.package/SPBCard.class/class/buildFromRemote.into..st create mode 100644 Squello-Core.package/SPBCard.class/class/buildNew.into..st create mode 100644 Squello-Core.package/SPBCard.class/class/newFrom.with..st rename Squello-Core.package/{SPBCardBuilder.class => SPBCard.class}/instance/buildContent..st (59%) create mode 100644 Squello-Core.package/SPBCard.class/instance/buildUI.st create mode 100644 Squello-Core.package/SPBCard.class/instance/setCardColumn..st create mode 100644 Squello-Core.package/SPBCard.class/instance/setCardColumnAtTop..st create mode 100644 Squello-Core.package/SPBCard.class/instance/setupMouseEvents.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/README.md delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/boardProvider..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/boardProvider.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildCardWith..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildFromRemote.into..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildLabels..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildNew.atTop..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildNew.into..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildNew.with..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/buildUI.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/card..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/card.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/changeProvider..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/changeProvider.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/setCardColumn..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/setCardColumnAtTop..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/setCardID..st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/instance/setupMouseEvents.st delete mode 100644 Squello-Core.package/SPBCardBuilder.class/methodProperties.json delete mode 100644 Squello-Core.package/SPBCardBuilder.class/properties.json delete mode 100644 Squello-Core.package/SPBColumn.class/instance/buildCards.st delete mode 100644 Squello-Core.package/SPBColumn.class/instance/cardBuilder..st delete mode 100644 Squello-Core.package/SPBColumn.class/instance/cardBuilder.st create mode 100644 Squello-Core.package/SPBColumn.class/instance/fetchAndBuildCards.st delete mode 100644 Squello-Core.package/SPBColumn.class/instance/fetchCards.st delete mode 100644 Squello-Core.package/SPBColumn.class/instance/initialize.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/README.md delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/instance/setUp.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/instance/tearDown.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildContent.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildFromRemote.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/instance/testNewInto.st delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/methodProperties.json delete mode 100644 Squello-Tests.package/SPBCardBuilderTests.class/properties.json diff --git a/Squello-Core.package/SPBBoard.class/instance/resizeColumnArea.st b/Squello-Core.package/SPBBoard.class/instance/resizeColumnArea.st index e15e748f..7effdeb1 100644 --- a/Squello-Core.package/SPBBoard.class/instance/resizeColumnArea.st +++ b/Squello-Core.package/SPBBoard.class/instance/resizeColumnArea.st @@ -10,5 +10,6 @@ resizeColumnArea (self usedBuilder widgetAt: widgetName) minimumHeight: newMinHeight. column minimumHeight: newMinHeight * 0.85; + alignCards; resizeBottomDetection; resizeToFitCards]. \ No newline at end of file diff --git a/Squello-Core.package/SPBBoard.class/instance/setupColumns.st b/Squello-Core.package/SPBBoard.class/instance/setupColumns.st index a6deb7f5..c2bc7226 100644 --- a/Squello-Core.package/SPBBoard.class/instance/setupColumns.st +++ b/Squello-Core.package/SPBBoard.class/instance/setupColumns.st @@ -5,8 +5,7 @@ setupColumns do: [:column | column pasteup: (self usedBuilder widgetAt: column id). column initializeIndicator; - fetchCards; - buildCards; + fetchAndBuildCards; board: self; resizeToFitCards; initializeBottomDetection]. \ No newline at end of file diff --git a/Squello-Core.package/SPBBoard.class/methodProperties.json b/Squello-Core.package/SPBBoard.class/methodProperties.json index b21d4cc6..e9d68936 100644 --- a/Squello-Core.package/SPBBoard.class/methodProperties.json +++ b/Squello-Core.package/SPBBoard.class/methodProperties.json @@ -52,8 +52,8 @@ "parseRepoFromUrl:" : "mcr 8/2/2022 21:15", "removeColumn:" : "lo 8/1/2022 14:09", "rerenderColumns" : "lo 7/31/2022 16:42", - "resizeColumnArea" : "lo 8/1/2022 11:12", - "setupColumns" : "mcr 8/1/2022 01:26", + "resizeColumnArea" : "jh 8/3/2022 01:07", + "setupColumns" : "jh 8/3/2022 00:48", "sidebar" : "mcr 8/1/2022 00:44", "sidebar:" : "mcr 8/1/2022 00:44", "update:with:" : "mcr 8/1/2022 01:27", diff --git a/Squello-Core.package/SPBCard.class/class/buildFromRemote.into..st b/Squello-Core.package/SPBCard.class/class/buildFromRemote.into..st new file mode 100644 index 00000000..cba30c3a --- /dev/null +++ b/Squello-Core.package/SPBCard.class/class/buildFromRemote.into..st @@ -0,0 +1,7 @@ +accessing +buildFromRemote: aJsonObject into: anSPBColumn + + | instance | + instance := self newFrom: aJsonObject with: anSPBColumn. + instance setCardColumn: anSPBColumn. + ^ instance. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/class/buildNew.into..st b/Squello-Core.package/SPBCard.class/class/buildNew.into..st new file mode 100644 index 00000000..85ea57b1 --- /dev/null +++ b/Squello-Core.package/SPBCard.class/class/buildNew.into..st @@ -0,0 +1,9 @@ +accessing +buildNew: aDictionary into: anSPBColumn + + | instance cardJson boardProvider | + boardProvider := anSPBColumn boardProvider. + cardJson := boardProvider createCard: aDictionary into: anSPBColumn. + instance := self newFrom: cardJson with: anSPBColumn. + instance setCardColumnAtTop: anSPBColumn. + ^ instance. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/class/newFrom.with..st b/Squello-Core.package/SPBCard.class/class/newFrom.with..st new file mode 100644 index 00000000..84459023 --- /dev/null +++ b/Squello-Core.package/SPBCard.class/class/newFrom.with..st @@ -0,0 +1,12 @@ +accessing +newFrom: aJsonObject with: anSPBColumn + + ^ self new + id: (aJsonObject at: 'id'); + boardProvider: anSPBColumn boardProvider; + changeProvider: anSPBColumn changeProvider; + setupMouseEvents; + buildContent: (aJsonObject at: 'content_url'); + buildUI; + openInWorld; + yourself. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildContent..st b/Squello-Core.package/SPBCard.class/instance/buildContent..st similarity index 59% rename from Squello-Core.package/SPBCardBuilder.class/instance/buildContent..st rename to Squello-Core.package/SPBCard.class/instance/buildContent..st index 141c359a..77dec9fa 100644 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildContent..st +++ b/Squello-Core.package/SPBCard.class/instance/buildContent..st @@ -1,12 +1,12 @@ -building +accessing buildContent: aString | contentJson | contentJson := self boardProvider queryCardContent: aString. - self card + self title: (contentJson at: 'title'); description: (contentJson at: 'body'); issueId: (contentJson at: 'number'); assignees: ((contentJson at: 'assignees') collect: - [:assigne | SPBAssignee newFrom: assigne]) asOrderedCollection; - labels: (self buildLabels: (contentJson at: 'labels')). \ No newline at end of file + [:assignee | SPBAssignee newFrom: assignee]) asOrderedCollection; + labels: ((contentJson at: 'labels') collect: [:label | SPBLabel newFrom: label]) asOrderedCollection. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/instance/buildUI.st b/Squello-Core.package/SPBCard.class/instance/buildUI.st new file mode 100644 index 00000000..14ea9ecc --- /dev/null +++ b/Squello-Core.package/SPBCard.class/instance/buildUI.st @@ -0,0 +1,10 @@ +accessing +buildUI + + self titleModel contents: self title. + self + updateAssigneeCount; + updateLabelIcons; + setCardHeight. + self assigneeModel position: self position + self extent - self assigneeOffset. + self resizeIndicatorFields. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/instance/setCardColumn..st b/Squello-Core.package/SPBCard.class/instance/setCardColumn..st new file mode 100644 index 00000000..207070f4 --- /dev/null +++ b/Squello-Core.package/SPBCard.class/instance/setCardColumn..st @@ -0,0 +1,6 @@ +accessing +setCardColumn: anSPBColumn + + self column: anSPBColumn. + anSPBColumn addCard: self. + anSPBColumn pasteup addMorph: self. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/instance/setCardColumnAtTop..st b/Squello-Core.package/SPBCard.class/instance/setCardColumnAtTop..st new file mode 100644 index 00000000..b0a61b70 --- /dev/null +++ b/Squello-Core.package/SPBCard.class/instance/setCardColumnAtTop..st @@ -0,0 +1,6 @@ +accessing +setCardColumnAtTop: anSPBColumn + + self column: anSPBColumn. + anSPBColumn addCardToTop: self. + anSPBColumn pasteup addMorph: self. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/instance/setupMouseEvents.st b/Squello-Core.package/SPBCard.class/instance/setupMouseEvents.st new file mode 100644 index 00000000..c5efdda7 --- /dev/null +++ b/Squello-Core.package/SPBCard.class/instance/setupMouseEvents.st @@ -0,0 +1,5 @@ +accessing +setupMouseEvents + + self on: #click send: #becomeActiveCard to: self. + self on: #startDrag send: #startDragging to: self. \ No newline at end of file diff --git a/Squello-Core.package/SPBCard.class/methodProperties.json b/Squello-Core.package/SPBCard.class/methodProperties.json index 5db92ec9..c24578a1 100644 --- a/Squello-Core.package/SPBCard.class/methodProperties.json +++ b/Squello-Core.package/SPBCard.class/methodProperties.json @@ -1,7 +1,10 @@ { "class" : { + "buildFromRemote:into:" : "jh 8/3/2022 00:35", + "buildNew:into:" : "jh 8/3/2022 00:33", "defaultCardExtent" : "lo 8/1/2022 12:18", - "indicatorCardEdgeOffset" : "lo 8/1/2022 12:23" }, + "indicatorCardEdgeOffset" : "lo 8/1/2022 12:23", + "newFrom:with:" : "jh 8/3/2022 00:53" }, "instance" : { "=" : "lo 7/31/2022 18:14", "addAssignee:" : "lo 7/31/2022 16:22", @@ -18,9 +21,11 @@ "boardProvider" : "jh 7/29/2022 12:46", "boardProvider:" : "lo 7/31/2022 16:30", "buildAssignee" : "tk 8/2/2022 23:27", + "buildContent:" : "jh 8/3/2022 00:17", "buildIndicatorDetection" : "tk 8/2/2022 23:23", "buildIndicatorDetectionHalf" : "lo 8/1/2022 11:37", "buildTitle" : "tk 8/2/2022 23:24", + "buildUI" : "jh 8/3/2022 00:19", "cardIndicatorExtent" : "lo 8/1/2022 11:52", "changeProvider" : "lo 7/8/2022 15:38", "changeProvider:" : "jh 7/9/2022 10:18", @@ -52,7 +57,10 @@ "removeLabelLocal:" : "lo 7/31/2022 16:40", "resizeCard" : "tk 8/2/2022 23:27", "resizeIndicatorFields" : "tk 8/2/2022 23:23", + "setCardColumn:" : "jh 8/3/2022 00:34", + "setCardColumnAtTop:" : "jh 8/3/2022 00:33", "setCardHeight" : "tk 8/2/2022 23:28", + "setupMouseEvents" : "jh 8/3/2022 00:20", "startDragging" : "tk 7/30/2022 21:53", "title" : "lo 7/31/2022 16:09", "title:" : "mcr 5/21/2022 20:52", diff --git a/Squello-Core.package/SPBCardBuilder.class/README.md b/Squello-Core.package/SPBCardBuilder.class/README.md deleted file mode 100644 index 33a049a1..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/README.md +++ /dev/null @@ -1 +0,0 @@ -Used for building all SPBCards into SPBColumns which are in the SPBBoard \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider..st b/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider..st deleted file mode 100644 index f8952212..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boardProvider: aProvider - - boardProvider := aProvider. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider.st b/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider.st deleted file mode 100644 index 88fd99a6..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/boardProvider.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -boardProvider - - ^ boardProvider. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildCardWith..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildCardWith..st deleted file mode 100644 index 144024cc..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildCardWith..st +++ /dev/null @@ -1,9 +0,0 @@ -building -buildCardWith: anJsonObject - - self - card: SPBCard new; - setCardID: (anJsonObject at: 'id'); - setupMouseEvents; - buildContent: (anJsonObject at: 'content_url'); - buildUI. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildFromRemote.into..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildFromRemote.into..st deleted file mode 100644 index a458529c..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildFromRemote.into..st +++ /dev/null @@ -1,9 +0,0 @@ -building -buildFromRemote: aJsonObject into: anSPBColumn - - self buildCardWith: aJsonObject. - self card boardProvider: self boardProvider. - self card changeProvider: self changeProvider. - self card openInWorld. - self setCardColumn: anSPBColumn. - ^ self card. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildLabels..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildLabels..st deleted file mode 100644 index 209ce575..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildLabels..st +++ /dev/null @@ -1,4 +0,0 @@ -building -buildLabels: aJsonObject - - ^ (aJsonObject collect: [:label | SPBLabel newFrom: label]) asOrderedCollection. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.atTop..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.atTop..st deleted file mode 100644 index f30d0b4c..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.atTop..st +++ /dev/null @@ -1,6 +0,0 @@ -building -buildNew: aDictionary atTop: anSPBColumn - - self buildNew: aDictionary with: anSPBColumn. - self setCardColumnAtTop: anSPBColumn. - ^ self card. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.into..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.into..st deleted file mode 100644 index ac05ccdd..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.into..st +++ /dev/null @@ -1,6 +0,0 @@ -building -buildNew: aDictionary into: anSPBColumn - - self buildNew: aDictionary with: anSPBColumn. - self setCardColumn: anSPBColumn. - ^ self card. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.with..st b/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.with..st deleted file mode 100644 index d6f4d7ed..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildNew.with..st +++ /dev/null @@ -1,9 +0,0 @@ -building -buildNew: aDictionary with: anSPBColumn - - | cardJson | - cardJson := self boardProvider createCard: aDictionary into: anSPBColumn. - self buildCardWith: cardJson. - self card boardProvider: self boardProvider. - self card changeProvider: self changeProvider. - self card openInWorld. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/buildUI.st b/Squello-Core.package/SPBCardBuilder.class/instance/buildUI.st deleted file mode 100644 index ddfed304..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/buildUI.st +++ /dev/null @@ -1,10 +0,0 @@ -building -buildUI - - self card titleModel contents: self card title. - self card - updateAssigneeCount; - updateLabelIcons; - setCardHeight. - self card assigneeModel position: self card position + self card extent - self card assigneeOffset. - self card resizeIndicatorFields. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/card..st b/Squello-Core.package/SPBCardBuilder.class/instance/card..st deleted file mode 100644 index e8ca7ed8..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/card..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -card: anSPBCard - - card := anSPBCard. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/card.st b/Squello-Core.package/SPBCardBuilder.class/instance/card.st deleted file mode 100644 index 2a4e8e6a..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/card.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -card - - ^ card. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider..st b/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider..st deleted file mode 100644 index 27a85d88..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -changeProvider: aProvider - - changeProvider := aProvider \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider.st b/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider.st deleted file mode 100644 index b967ebed..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/changeProvider.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -changeProvider - - ^ changeProvider. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumn..st b/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumn..st deleted file mode 100644 index a9321984..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumn..st +++ /dev/null @@ -1,7 +0,0 @@ -setters -setCardColumn: anSPBColumn - - self card column: anSPBColumn. - anSPBColumn addCard: self card. - anSPBColumn pasteup addMorph: self card. - \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumnAtTop..st b/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumnAtTop..st deleted file mode 100644 index c28488d1..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/setCardColumnAtTop..st +++ /dev/null @@ -1,7 +0,0 @@ -setters -setCardColumnAtTop: anSPBColumn - - self card column: anSPBColumn. - anSPBColumn addCardToTop: self card. - anSPBColumn pasteup addMorph: self card. - \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/setCardID..st b/Squello-Core.package/SPBCardBuilder.class/instance/setCardID..st deleted file mode 100644 index b0f0a788..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/setCardID..st +++ /dev/null @@ -1,4 +0,0 @@ -setters -setCardID: aNumber - - self card id: aNumber. \ No newline at end of file diff --git a/Squello-Core.package/SPBCardBuilder.class/instance/setupMouseEvents.st b/Squello-Core.package/SPBCardBuilder.class/instance/setupMouseEvents.st deleted file mode 100644 index d7b9fc77..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/instance/setupMouseEvents.st +++ /dev/null @@ -1,5 +0,0 @@ -building -setupMouseEvents - - self card on: #click send: #becomeActiveCard to: self card. - self card on: #startDrag send: #startDragging to: self card. diff --git a/Squello-Core.package/SPBCardBuilder.class/methodProperties.json b/Squello-Core.package/SPBCardBuilder.class/methodProperties.json deleted file mode 100644 index 7e7bfc78..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/methodProperties.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "boardProvider" : "jh 7/29/2022 12:47", - "boardProvider:" : "tk 8/2/2022 23:44", - "buildCardWith:" : "lo 8/1/2022 14:18", - "buildContent:" : "tk 8/2/2022 23:33", - "buildFromRemote:into:" : "tk 7/30/2022 22:13", - "buildLabels:" : "tk 8/2/2022 23:34", - "buildNew:atTop:" : "tk 7/30/2022 22:13", - "buildNew:into:" : "tk 7/30/2022 22:13", - "buildNew:with:" : "tk 7/30/2022 22:13", - "buildUI" : "tk 8/2/2022 23:27", - "card" : "mcr 5/19/2022 09:30", - "card:" : "LW 7/14/2022 11:02", - "changeProvider" : "jh 7/31/2022 13:04", - "changeProvider:" : "tk 8/2/2022 23:44", - "setCardColumn:" : "tk 7/30/2022 21:55", - "setCardColumnAtTop:" : "tk 7/30/2022 21:55", - "setCardID:" : "mcr 5/28/2022 02:19", - "setupMouseEvents" : "mcr 7/5/2022 21:17" } } diff --git a/Squello-Core.package/SPBCardBuilder.class/properties.json b/Squello-Core.package/SPBCardBuilder.class/properties.json deleted file mode 100644 index 9915620e..00000000 --- a/Squello-Core.package/SPBCardBuilder.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "Squello-Core", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "tk 8/1/2022 16:14", - "instvars" : [ - "card", - "boardProvider", - "changeProvider" ], - "name" : "SPBCardBuilder", - "pools" : [ - ], - "super" : "Object", - "type" : "normal" } diff --git a/Squello-Core.package/SPBColumn.class/instance/addCard.st b/Squello-Core.package/SPBColumn.class/instance/addCard.st index a92a8e29..beef170a 100644 --- a/Squello-Core.package/SPBColumn.class/instance/addCard.st +++ b/Squello-Core.package/SPBColumn.class/instance/addCard.st @@ -6,6 +6,6 @@ addCard cardTitle = '' ifTrue: [^ self]. content := Dictionary newFrom: {'title' -> cardTitle . 'body' -> ''}. - self cardBuilder buildNew: content atTop: self. + SPBCard buildNew: content into: self. self alignCards. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/instance/boardProvider..st b/Squello-Core.package/SPBColumn.class/instance/boardProvider..st index a1f3b119..9b8e8703 100644 --- a/Squello-Core.package/SPBColumn.class/instance/boardProvider..st +++ b/Squello-Core.package/SPBColumn.class/instance/boardProvider..st @@ -1,5 +1,4 @@ accessing boardProvider: anSPBGithubBoardProvider - boardProvider := anSPBGithubBoardProvider. - self cardBuilder boardProvider: anSPBGithubBoardProvider. \ No newline at end of file + boardProvider := anSPBGithubBoardProvider. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/instance/buildCards.st b/Squello-Core.package/SPBColumn.class/instance/buildCards.st deleted file mode 100644 index dfdd2bc7..00000000 --- a/Squello-Core.package/SPBColumn.class/instance/buildCards.st +++ /dev/null @@ -1,6 +0,0 @@ -creation -buildCards - - self jsonCards - withIndexDo: [:each :index | self cardBuilder buildFromRemote: each into: self]. - self alignCards. diff --git a/Squello-Core.package/SPBColumn.class/instance/buildSingleCard..st b/Squello-Core.package/SPBColumn.class/instance/buildSingleCard..st index 07f3606e..7971c50c 100644 --- a/Squello-Core.package/SPBColumn.class/instance/buildSingleCard..st +++ b/Squello-Core.package/SPBColumn.class/instance/buildSingleCard..st @@ -2,7 +2,7 @@ creation buildSingleCard: aJsonObject | card | - card := self cardBuilder buildFromRemote: aJsonObject into: self. + card := SPBCard buildFromRemote: aJsonObject into: self. self cards remove: card. (aJsonObject at: 'card') ifNil: [self cards addFirst: card. self alignCards. ^ self]. diff --git a/Squello-Core.package/SPBColumn.class/instance/cardBuilder..st b/Squello-Core.package/SPBColumn.class/instance/cardBuilder..st deleted file mode 100644 index 642c6cd0..00000000 --- a/Squello-Core.package/SPBColumn.class/instance/cardBuilder..st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -cardBuilder: anSPBCardBuilder - - cardBuilder := anSPBCardBuilder. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/instance/cardBuilder.st b/Squello-Core.package/SPBColumn.class/instance/cardBuilder.st deleted file mode 100644 index 8513e24f..00000000 --- a/Squello-Core.package/SPBColumn.class/instance/cardBuilder.st +++ /dev/null @@ -1,4 +0,0 @@ -accessing -cardBuilder - - ^ cardBuilder. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/instance/changeProvider..st b/Squello-Core.package/SPBColumn.class/instance/changeProvider..st index 7be705c9..4bfdd01b 100644 --- a/Squello-Core.package/SPBColumn.class/instance/changeProvider..st +++ b/Squello-Core.package/SPBColumn.class/instance/changeProvider..st @@ -2,5 +2,4 @@ accessing changeProvider: anSPBGithubChangeProvider changeProvider := anSPBGithubChangeProvider. - changeProvider addDependent: self. - self cardBuilder changeProvider: anSPBGithubChangeProvider. \ No newline at end of file + changeProvider addDependent: self. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/instance/fetchAndBuildCards.st b/Squello-Core.package/SPBColumn.class/instance/fetchAndBuildCards.st new file mode 100644 index 00000000..1ab57b7e --- /dev/null +++ b/Squello-Core.package/SPBColumn.class/instance/fetchAndBuildCards.st @@ -0,0 +1,5 @@ +creation +fetchAndBuildCards + + (self boardProvider queryCardsForColumn: self) asOrderedCollection + do: [:cardJson | SPBCard buildFromRemote: cardJson into: self]. diff --git a/Squello-Core.package/SPBColumn.class/instance/fetchCards.st b/Squello-Core.package/SPBColumn.class/instance/fetchCards.st deleted file mode 100644 index 5fe8b3d4..00000000 --- a/Squello-Core.package/SPBColumn.class/instance/fetchCards.st +++ /dev/null @@ -1,4 +0,0 @@ -creation -fetchCards - - self jsonCards: (self boardProvider queryCardsForColumn: self) asOrderedCollection. diff --git a/Squello-Core.package/SPBColumn.class/instance/initialize.st b/Squello-Core.package/SPBColumn.class/instance/initialize.st deleted file mode 100644 index 500afd5c..00000000 --- a/Squello-Core.package/SPBColumn.class/instance/initialize.st +++ /dev/null @@ -1,5 +0,0 @@ -accessing -initialize - - super initialize. - self cardBuilder: SPBCardBuilder new. \ No newline at end of file diff --git a/Squello-Core.package/SPBColumn.class/methodProperties.json b/Squello-Core.package/SPBColumn.class/methodProperties.json index 3370e206..31d90107 100644 --- a/Squello-Core.package/SPBColumn.class/methodProperties.json +++ b/Squello-Core.package/SPBColumn.class/methodProperties.json @@ -5,7 +5,7 @@ "instance" : { "=" : "jh 7/31/2022 13:04", "activeCard" : "mcr 8/1/2022 02:30", - "addCard" : "jh 7/31/2022 13:15", + "addCard" : "jh 8/3/2022 00:46", "addCard:" : "jh 7/29/2022 12:56", "addCardToTop:" : "jh 7/29/2022 12:56", "addIndicatorAt:" : "lo 8/1/2022 12:20", @@ -15,14 +15,11 @@ "board" : "lo 5/26/2022 23:42", "board:" : "jh 7/29/2022 12:56", "boardProvider" : "jh 7/29/2022 12:47", - "boardProvider:" : "jh 7/31/2022 13:11", + "boardProvider:" : "jh 8/3/2022 01:09", "borderOffset" : "lo 8/1/2022 12:12", "bottomDetection" : "lo 8/1/2022 14:18", "bottomDetection:" : "jh 7/29/2022 12:57", - "buildCards" : "jh 7/31/2022 13:12", - "buildSingleCard:" : "jh 7/31/2022 13:13", - "cardBuilder" : "jh 7/31/2022 13:07", - "cardBuilder:" : "jh 7/31/2022 13:07", + "buildSingleCard:" : "jh 8/3/2022 00:48", "cardDropped:Event:" : "jh 7/29/2022 12:57", "cardPositions" : "mcr 7/19/2022 19:44", "cardPositions:" : "mcr 7/19/2022 19:36", @@ -32,12 +29,12 @@ "changeColumnRemoteFor:" : "tk 7/30/2022 21:57", "changeIndexOfColumn:" : "lo 8/1/2022 11:04", "changeProvider" : "lo 7/8/2022 14:29", - "changeProvider:" : "jh 7/31/2022 13:11", + "changeProvider:" : "jh 8/3/2022 01:09", "changeRemoteIndexOfColumn:" : "tk 7/30/2022 22:01", "defaultMinimumHeight" : "LW 7/14/2022 11:13", "defaultWidth" : "LW 7/14/2022 11:18", "deleteCard:" : "jh 7/9/2022 18:05", - "fetchCards" : "tk 7/30/2022 22:01", + "fetchAndBuildCards" : "jh 8/3/2022 00:52", "fetchSingleCard:" : "jh 7/29/2022 11:39", "hash" : "LW 7/14/2022 11:12", "hideIndicator" : "NTK 7/30/2022 12:15", @@ -45,7 +42,6 @@ "id:" : "jh 6/3/2022 20:41", "indicator" : "lo 8/1/2022 12:27", "indicator:" : "lo 8/1/2022 12:26", - "initialize" : "jh 7/31/2022 13:09", "initializeBottomDetection" : "mcr 7/19/2022 13:18", "initializeIndicator" : "lo 8/1/2022 12:27", "isColumn" : "lo 8/1/2022 14:49", diff --git a/Squello-Core.package/SPBColumn.class/properties.json b/Squello-Core.package/SPBColumn.class/properties.json index 1557506d..c729edbc 100644 --- a/Squello-Core.package/SPBColumn.class/properties.json +++ b/Squello-Core.package/SPBColumn.class/properties.json @@ -10,7 +10,6 @@ "title", "boardProvider", "cards", - "cardBuilder", "pasteup", "board", "jsonCards", diff --git a/Squello-Core.package/SPBGithubBoardProvider.class/instance/queryCardsForColumn..st b/Squello-Core.package/SPBGithubBoardProvider.class/instance/queryCardsForColumn..st index 42b2b97d..3a41c740 100644 --- a/Squello-Core.package/SPBGithubBoardProvider.class/instance/queryCardsForColumn..st +++ b/Squello-Core.package/SPBGithubBoardProvider.class/instance/queryCardsForColumn..st @@ -1,4 +1,5 @@ cards queryCardsForColumn: anSPBColumn - ^ self api queryCards: anSPBColumn id. \ No newline at end of file + ^ (self api queryCards: anSPBColumn id) + "collect: [:cardJson | SPBCard newFrom: cardJson]". \ No newline at end of file diff --git a/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json b/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json index 82e411a4..da89da9b 100644 --- a/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json +++ b/Squello-Core.package/SPBGithubBoardProvider.class/methodProperties.json @@ -27,7 +27,7 @@ "projectId:" : "lo 7/13/2022 20:18", "queryCard:" : "jh 7/10/2022 12:50", "queryCardContent:" : "mcr 5/28/2022 02:30", - "queryCardsForColumn:" : "tk 7/30/2022 22:01", + "queryCardsForColumn:" : "jh 8/3/2022 00:41", "queryColumns" : "tk 7/30/2022 22:22", "renameColumn:to:" : "tk 7/30/2022 22:22", "repo" : "mcr 5/22/2022 01:01", diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/README.md b/Squello-Tests.package/SPBCardBuilderTests.class/README.md deleted file mode 100644 index e69de29b..00000000 diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/instance/setUp.st b/Squello-Tests.package/SPBCardBuilderTests.class/instance/setUp.st deleted file mode 100644 index 47c66cf8..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/instance/setUp.st +++ /dev/null @@ -1,8 +0,0 @@ -running -setUp - - builder := SPBCardBuilder new. - provider := SPBMockGithubBoardProvider new. - changeProvider := SPBGithubChangeProvider new. - builder boardProvider: provider. - builder changeProvider: changeProvider. \ No newline at end of file diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/instance/tearDown.st b/Squello-Tests.package/SPBCardBuilderTests.class/instance/tearDown.st deleted file mode 100644 index d09a999a..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/instance/tearDown.st +++ /dev/null @@ -1,5 +0,0 @@ -running -tearDown - - builder := nil. - provider := nil. \ No newline at end of file diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildContent.st b/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildContent.st deleted file mode 100644 index 1a2875fa..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildContent.st +++ /dev/null @@ -1,13 +0,0 @@ -tests -testBuildContent - - | remote card | - remote := 'https://api.github.com/repos/test/test/issues/3'. - builder card: SPBCard new. - builder buildContent: remote. - card := builder card. - - self assert: 'Found a bug' equals: card title. - self assert: 3 equals: card issueId. - self assert: '' equals: card description. - \ No newline at end of file diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildFromRemote.st b/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildFromRemote.st deleted file mode 100644 index 6ba0a193..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testBuildFromRemote.st +++ /dev/null @@ -1,13 +0,0 @@ -tests -testBuildFromRemote - - | cards card | - cards := Json readFrom: (ReadStream on: '{"url":"https://api.github.com/projects/columns/cards/82245819","project_url":"https://api.github.com/projects/14427987","id":82245819,"node_id":"PRC_lALOHRXsAc4A3CdTzgTm-Ls","note":null,"archived":false,"creator":{"login":"test1","id":73845255,"node_id":"MDQ6VXNlcjczODQ1MjU1","avatar_url":"https://avatars.githubusercontent.com/u/73845255?u=b4d067c1d4522ea689464609ad03d6fb7d653292&v=4","gravatar_id":"","url":"https://api.github.com/users/test1","html_url":"https://github.com/test1","followers_url":"https://api.github.com/users/test1/followers","following_url":"https://api.github.com/users/test1/following{/other_user}","gists_url":"https://api.github.com/users/test1/gists{/gist_id}","starred_url":"https://api.github.com/users/test1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/test1/subscriptions","organizations_url":"https://api.github.com/users/test1/orgs","repos_url":"https://api.github.com/users/test1/repos","events_url":"https://api.github.com/users/test1/events{/privacy}","received_events_url":"https://api.github.com/users/test1/received_events","type":"User","site_admin":false},"created_at":"2022-05-22T00:11:26Z","updated_at":"2022-05-22T12:03:14Z","column_url":"https://api.github.com/projects/columns/18615917","content_url":"https://api.github.com/repos/test/test/issues/3"}'). - - builder buildFromRemote: cards into: ((SPBColumn new) pasteup: PasteUpMorph new). - card := builder card. - - self assert: 'Found a bug' equals: card title. - self assert: 3 equals: card issueId. - self assert: '' equals: card description. - \ No newline at end of file diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testNewInto.st b/Squello-Tests.package/SPBCardBuilderTests.class/instance/testNewInto.st deleted file mode 100644 index 10ab4a0c..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/instance/testNewInto.st +++ /dev/null @@ -1,12 +0,0 @@ -tests -testNewInto - - | dictionary card | - dictionary := Dictionary newFrom: {'title' -> 'Found a bug'}. - builder buildNew: dictionary into: ((SPBColumn new) pasteup: PasteUpMorph new). - card := builder card. - - self assert: 'Found a bug' equals: card title. - self assert: 3 equals: card issueId. - self assert: '' equals: card description. - \ No newline at end of file diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/methodProperties.json b/Squello-Tests.package/SPBCardBuilderTests.class/methodProperties.json deleted file mode 100644 index 2e76cfea..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/methodProperties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "class" : { - }, - "instance" : { - "setUp" : "jh 7/29/2022 12:45", - "tearDown" : "lo 5/22/2022 16:09", - "testBuildContent" : "NTK 7/23/2022 10:58", - "testBuildFromRemote" : "tk 7/30/2022 23:31", - "testNewInto" : "tk 7/30/2022 23:32" } } diff --git a/Squello-Tests.package/SPBCardBuilderTests.class/properties.json b/Squello-Tests.package/SPBCardBuilderTests.class/properties.json deleted file mode 100644 index 9122b404..00000000 --- a/Squello-Tests.package/SPBCardBuilderTests.class/properties.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "category" : "Squello-Tests", - "classinstvars" : [ - ], - "classvars" : [ - ], - "commentStamp" : "", - "instvars" : [ - "builder", - "provider", - "changeProvider" ], - "name" : "SPBCardBuilderTests", - "pools" : [ - ], - "super" : "TestCase", - "type" : "normal" }