From 9b65bac64e5b77cf31669daf09ed2e76d50e3036 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Fri, 7 Oct 2022 16:59:57 -0500 Subject: [PATCH] Modifying baseline and error pane for importer in lepiter database. --- .../BaselineOfMiniDocs.class.st | 4 +- src/MiniDocs/LeDatabase.extension.st | 38 ++----------------- 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st index 88dbf9d..9fc57a8 100644 --- a/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st +++ b/src/BaselineOfMiniDocs/BaselineOfMiniDocs.class.st @@ -13,11 +13,11 @@ BaselineOfMiniDocs >> baseline: spec [ "Dependencies" spec baseline: 'Mustache' with: [ spec repository: 'github://noha/mustache']. - self xmlParserHTML: spec. + "self xmlParserHTML: spec." "Packages" spec package: 'MiniDocs' - with: [ spec requires: #('Mustache' 'XMLParserHTML') ] + with: [ spec requires: #('Mustache' "'XMLParserHTML'") ] ]. spec diff --git a/src/MiniDocs/LeDatabase.extension.st b/src/MiniDocs/LeDatabase.extension.st index 3687f4d..e76e193 100644 --- a/src/MiniDocs/LeDatabase.extension.st +++ b/src/MiniDocs/LeDatabase.extension.st @@ -28,7 +28,7 @@ LeDatabase >> addPageFromMarkdeep: markdeepDocTree [ ifTrue: [ | existingPage | existingPage := self pages detect: [ :pageTemp | pageTemp includesSnippetUid: snippet uid ]. - ^ self importErrorMessage: existingPage. ] + ^ self errorCardFor: (self importErrorMessage: existingPage) ] ifFalse: [ snippet database: self. self registerSnippet: snippet ] ]. @@ -41,7 +41,8 @@ LeDatabase >> addPageFromMarkdeepUrl: aString [ | page | page := self detectLocalPageForRemote: aString. - page ifNotNil: [ :arg | ^ self importErrorMessage: page ]. + page ifNotNil: [ :arg | self errorCardFor: (self importErrorMessage: page). + ^ self ]. ^ self addPageFromMarkdeep: (self docTreeForLink: aString) ] @@ -63,34 +64,6 @@ LeDatabase >> docTreeForLink: aString [ { #category : #'*MiniDocs' } LeDatabase >> gtViewErrorDetailsOn: aView [ - | keepButton overwriteButton backupButton errorMessage | - keepButton := BrButton new - aptitude: BrGlamorousButtonWithIconAndLabelAptitude; - beTinySize; - label: 'Keep existing page'; - icon: BrGlamorousVectorIcons cancel; - action: [ :aButton | ]; - margin: (BlInsets left: 10). - overwriteButton := BrButton new - aptitude: BrGlamorousButtonWithIconAndLabelAptitude; - beTinySize; - label: 'Overwrite page'; - icon: BrGlamorousVectorIcons edit; - action: [ :aButton | ]; - margin: (BlInsets left: 10). - backupButton := BrButton new - aptitude: BrGlamorousButtonWithIconAndLabelAptitude; - beTinySize; - label: 'BackUp page'; - icon: BrGlamorousVectorIcons changes; - action: [ :aButton | ]; - margin: (BlInsets left: 10). - - errorMessage := BrEditor new - aptitude: BrGlamorousRegularEditorAptitude new "+ aModeLook;"; - text: String loremIpsum; - vFitContent. - ^ aView explicit title: 'Errors' translated; priority: 5; @@ -103,10 +76,7 @@ LeDatabase >> gtViewErrorDetailsOn: aView [ c horizontal matchParent ]; padding: (BlInsets all: 10). container - addChild: errorMessage; - addChild: keepButton; - addChild: overwriteButton; - addChild: backupButton + addChildren: (self errorCardFor: String loremIpsum) "container addChild: self asCardElement "]. ]