From e31c4239e2cfcceb271ab8f0c979964430ed2db9 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:36:10 +0200
Subject: [PATCH 1/4] Write test for #190

---
 src/Molecule-IDE-Tests/MolWorldTest.class.st | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Molecule-IDE-Tests/MolWorldTest.class.st b/src/Molecule-IDE-Tests/MolWorldTest.class.st
index c69b6f2b..54ed0561 100644
--- a/src/Molecule-IDE-Tests/MolWorldTest.class.st
+++ b/src/Molecule-IDE-Tests/MolWorldTest.class.st
@@ -4,6 +4,12 @@ Class {
 	#category : #'Molecule-IDE-Tests-Cases'
 }
 
+{ #category : #tests }
+MolWorldTest >> testOpenDefineComponentDialog [
+
+	MolWorld openDefineComponentDialog
+]
+
 { #category : #tests }
 MolWorldTest >> testWorldMenu [
 	| menuElements moleculeMenuEntry libraryMenu |

From 6f27f5057dfc95f9dc13c9830dac3a9387bd50f1 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:08:31 +0200
Subject: [PATCH 2/4] Fix #190 and add better message in the contextual menu of
 define component

---
 src/Molecule-IDE-Tests/MolWorldTest.class.st |  4 +-
 src/Molecule-IDE/MolWorld.class.st           | 44 +++++++++++++++-----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/Molecule-IDE-Tests/MolWorldTest.class.st b/src/Molecule-IDE-Tests/MolWorldTest.class.st
index 54ed0561..e32f245e 100644
--- a/src/Molecule-IDE-Tests/MolWorldTest.class.st
+++ b/src/Molecule-IDE-Tests/MolWorldTest.class.st
@@ -7,7 +7,9 @@ Class {
 { #category : #tests }
 MolWorldTest >> testOpenDefineComponentDialog [
 
-	MolWorld openDefineComponentDialog
+	| dialog |
+	dialog := MolWorld openDefineComponentDialog.
+	self assert: dialog notNil.
 ]
 
 { #category : #tests }
diff --git a/src/Molecule-IDE/MolWorld.class.st b/src/Molecule-IDE/MolWorld.class.st
index dc9029e3..5d627195 100644
--- a/src/Molecule-IDE/MolWorld.class.st
+++ b/src/Molecule-IDE/MolWorld.class.st
@@ -7,13 +7,38 @@ Class {
 	#category : #'Molecule-IDE-Menus'
 }
 
+{ #category : #scripts }
+MolWorld class >> answerComponentToDefine [
+
+	<script>
+	| retValue dialogWindow |
+	dialogWindow := self openDefineComponentDialog ifNil:[ ^ self ].
+	retValue := dialogWindow openModal.
+	^ retValue answer
+]
+
+{ #category : #'private - pharo11 remove' }
+MolWorld class >> classSearchIn: classes [
+
+	self flag:'labordep: #190 this method come from MCSearchFacade. Need to replace it by a Spec2 utils'.
+
+	^ ListDialogWindow new
+		  getList: [ :r | classes select: [ :e | r search: e name ] ];
+		  displayBlock: [ :e | e name ];
+		  title: 'Class search' translated;
+		  yourself
+]
+
 { #category : #scripts }
 MolWorld class >> defineAComponent [
 
 	<script>
 	| component |
-	component := self openDefineComponentDialog.
-	component ifNotNil: [ :e | MolComponentFactory defineComponent: e ]
+	component := self answerComponentToDefine.
+	component ifNotNil: [ :e | 
+		MolComponentFactory defineComponent: e.
+		MolUtils showInformation: ('Define component: ', component printString).
+	]
 ]
 
 { #category : #actions }
@@ -171,18 +196,17 @@ MolWorld class >> menu60ReportBugOn: aBuilder [
 		action: [WebBrowser openOn: 'https://github.com/OpenSmock/Molecule/issues/new']
 ]
 
-{ #category : #scripts }
+{ #category : #private }
 MolWorld class >> openDefineComponentDialog [
-
-	<script>
-	| searchClass list retValue |
+	| dialogWindow list |
+	
 	list := SystemNavigation default allClasses select: [ :c | 
 		        c isTrait not and: [ 
 			        (c allSuperclasses includes: Object) and: [ c isComponentClass ] ] ].
-	searchClass := MCSearchFacade classSearchIn: list.
-	searchClass title: 'Select the Molecule Component to define'.
-	retValue := searchClass openModal.
-	^ retValue answer
+	
+	dialogWindow := self classSearchIn: list.
+	dialogWindow title: 'Select the Molecule Component to define'.
+	^ dialogWindow 
 ]
 
 { #category : #'menu - tools' }

From f5f8c972284ca195dedc04267e04c8700edb1be2 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:08:44 +0200
Subject: [PATCH 3/4] Refactoring


From 32f8fd8927ed617ca6afa7dc44178a1d99543074 Mon Sep 17 00:00:00 2001
From: Pierre Laborde <49183340+labordep@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:08:53 +0200
Subject: [PATCH 4/4] Refactoring

---
 src/Molecule-IDE/MolDefineComponentCmdCommand.class.st | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st b/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
index 4b0259af..ce23d7ff 100644
--- a/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
+++ b/src/Molecule-IDE/MolDefineComponentCmdCommand.class.st
@@ -28,9 +28,9 @@ MolDefineComponentCmdCommand >> description [
 	^'Define this component: force to generate methods from contract definition'
 ]
 
-{ #category : #accessing }
+{ #category : #execution }
 MolDefineComponentCmdCommand >> execute [
-	| componentsToDefine nbOfDefinedComponents |
+	| componentsToDefine nbOfDefinedComponents text |
 	
 	componentsToDefine := self selectedComponentClasses.
 	componentsToDefine do:[ :c | MolComponentFactory defineComponent: c ].
@@ -38,5 +38,9 @@ MolDefineComponentCmdCommand >> execute [
 	nbOfDefinedComponents := componentsToDefine size.
 	self executionResult: nbOfDefinedComponents.
 	
-	self inform: nbOfDefinedComponents asString, ' component', (nbOfDefinedComponents > 1 ifTrue:['s'] ifFalse:['']) ,' defined'.
+	text := nbOfDefinedComponents = 1 
+		ifTrue:[ 'Define component: ', componentsToDefine first printString ] 
+		ifFalse:[ nbOfDefinedComponents asString, ' component', (nbOfDefinedComponents > 1 ifTrue:['s'] ifFalse:['']) ,' defined' ].
+	
+	MolUtils showInformation: text.
 ]