From 9dd5b8cf0a2a377287d87e52eabcb7b0cd32227a Mon Sep 17 00:00:00 2001
From: anquetil <nicolas.anquetil@inria.fr>
Date: Fri, 3 Jan 2025 12:15:07 +0100
Subject: [PATCH 1/2] Many changes: refactorings, renaming (including of
 classes), new setting, new saving option

---
 ...class.st => MiModelReportBrowser.class.st} | 108 ++++++++-------
 ...l.class.st => MiModelReportModel.class.st} | 123 +++++++++++-------
 .../MiReportHTMLExportCommand.class.st        |   4 +-
 .../MiReportPDFExportCommand.class.st         |   6 +-
 4 files changed, 141 insertions(+), 100 deletions(-)
 rename src/MooseIDE-Core-Reporter/{MiModelReporter.class.st => MiModelReportBrowser.class.st} (53%)
 rename src/MooseIDE-Core-Reporter/{MiModelReporterModel.class.st => MiModelReportModel.class.st} (70%)

diff --git a/src/MooseIDE-Core-Reporter/MiModelReporter.class.st b/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
similarity index 53%
rename from src/MooseIDE-Core-Reporter/MiModelReporter.class.st
rename to src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
index a74b711f..26ecc9ee 100644
--- a/src/MooseIDE-Core-Reporter/MiModelReporter.class.st
+++ b/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
@@ -1,11 +1,11 @@
 "
-Generates a statistical report on key features of a Moose model
+Generates a statistical report on key features of a `MooseModel`
 The report is generated in markdown and can be edited manually before being exported
 
-Accepted entities: A mooseModel
+Accepted entities: Any `MooseEntity` in a `MooseModel`
 "
 Class {
-	#name : #MiModelReporter,
+	#name : #MiModelReportBrowser,
 	#superclass : #MiAbstractBrowser,
 	#instVars : [
 		'mainPresenter',
@@ -18,61 +18,83 @@ Class {
 }
 
 { #category : #'world menu' }
-MiModelReporter class >> menuCommandOn: aBuilder [
+MiModelReportBrowser class >> menuCommandOn: aBuilder [
 
 	<worldMenu>
 	^ self buildMenuItemIn: aBuilder
 ]
 
 { #category : #'world menu' }
-MiModelReporter class >> menuItem [
+MiModelReportBrowser class >> menuItem [
 
-	^#ModelReporter
+	^#ModelReport
 ]
 
 { #category : #'world menu' }
-MiModelReporter class >> menuPriority [
+MiModelReportBrowser class >> menuPriority [
 
 	^ self menuMetaToolsPriority + 1
 ]
 
 { #category : #'world menu' }
-MiModelReporter class >> newModel [
+MiModelReportBrowser class >> newModel [
 
-	^ MiModelReporterModel new
+	^ MiModelReportModel new
 ]
 
 { #category : #'world menu' }
-MiModelReporter class >> open [
+MiModelReportBrowser class >> open [
 	<script>
 	^ super open
 ]
 
 { #category : #'world menu' }
-MiModelReporter class >> title [
-	^ 'Model Reporter'
+MiModelReportBrowser class >> title [
+	^ 'Model Report'
+]
+
+{ #category : #initialization }
+MiModelReportBrowser >> btnToolbarRefresh [
+
+	^ SpToolbarButtonPresenter new
+		  icon: (self iconNamed: #smallUpdate);
+		  help: 'Regenerate report';
+		  action: [ specModel updateReport ];
+		  yourself
+]
+
+{ #category : #initialization }
+MiModelReportBrowser >> btnToolbarSave [
+
+	^ SpToolbarButtonPresenter new
+		  icon: (self iconNamed: #save);
+		  help: 'Save raw report';
+		  action: [ specModel saveRawReport: self rawReport ];
+		  yourself
 ]
 
 { #category : #testing }
-MiModelReporter >> canFollowEntity: anObject [
+MiModelReportBrowser >> canFollowEntity: anObject [
+	"note: MooseModel-s have a #mooseModel also so the test accepts
+	 any MooseModel or entity within a MooseModel"
 
-	^anObject ifNil: [ false ] ifNotNil: [ anObject isMooseModel ]
+	^anObject isMooseObject and: [ anObject mooseModel isNotEmpty ]
 ]
 
 { #category : #testing }
-MiModelReporter >> canPropagate [
+MiModelReportBrowser >> canPropagate [
 
 	^ false
 ]
 
 { #category : #testing }
-MiModelReporter >> canTagEntities [
+MiModelReportBrowser >> canTagEntities [
 
 	^ false
 ]
 
 { #category : #layout }
-MiModelReporter >> defaultLayout [
+MiModelReportBrowser >> defaultLayout [
 
 	^ SpBoxLayout newVertical
 		  add: #toolbar expand: false ;
@@ -81,37 +103,40 @@ MiModelReporter >> defaultLayout [
 ]
 
 { #category : #actions }
-MiModelReporter >> exportReportToHTML [
+MiModelReportBrowser >> exportReportToHTML [
 
 	specModel exportReportToHTML: self rawReport
 ]
 
 { #category : #actions }
-MiModelReporter >> exportReportToPDF [
+MiModelReportBrowser >> exportReportToPDF [
 
 	specModel exportReportToPDF: self rawReport
 ]
 
 { #category : #actions }
-MiModelReporter >> followEntity: anEntity [
+MiModelReportBrowser >> followEntity: anEntity [
 
 	super followEntity: anEntity.
 	specModel followEntity: anEntity
 ]
 
 { #category : #actions }
-MiModelReporter >> generatedReport: report [
+MiModelReportBrowser >> generatedReport: report [
+
+	tabMicrodown text: report.
 
-	tabMicrodown text: report
+	(mainPresenter selectedPage activePresenter = tabPreview)
+		ifTrue: [ self showingTab: mainPresenter selectedPage ]
 ]
 
 { #category : #accessing }
-MiModelReporter >> hasSettings [
+MiModelReportBrowser >> hasSettings [
 	^ true
 ]
 
 { #category : #initialization }
-MiModelReporter >> initializeMainPresenter [
+MiModelReportBrowser >> initializeMainPresenter [
 
 	tabMicrodown := SpTextPresenter new
 		whenTextChangedDo: [ rebuildPreview := true ].
@@ -126,52 +151,45 @@ MiModelReporter >> initializeMainPresenter [
 ]
 
 { #category : #initialization }
-MiModelReporter >> initializePresenters [
+MiModelReportBrowser >> initializePresenters [
 
 	toolbar := self newToolbar
+		addItem: self btnToolbarSave;
 		fillWith: (MiReportExportCommand asCommandGroupWith: self);
 		beIcons;
-		addItem: self refreshToolbarButton;
+		addItem: self btnToolbarRefresh;
 		yourself.
 
 	self initializeMainPresenter
 ]
 
 { #category : #initialization }
-MiModelReporter >> initializeToolbar [
+MiModelReportBrowser >> initializeToolbar [
 
 	toolbar := self newToolbar
-		           fillWith:
-			           (MiReportExportCommand asCommandGroupWith: self);
-		           beIcons;
-		           addItem: self refreshToolbarButton;
-		           yourself
+		beIcons ;
+
+		addItem: self btnToolbarSave ;
+		fillWith: (MiReportExportCommand asCommandGroupWith: self) ;
+		addItem: self btnToolbarRefresh ;
+
+		yourself
 ]
 
 { #category : #accessing }
-MiModelReporter >> miSelectedItem [
+MiModelReportBrowser >> miSelectedItem [
 
 	^#()
 ]
 
 { #category : #accessing }
-MiModelReporter >> rawReport [
+MiModelReportBrowser >> rawReport [
 
 	^ tabMicrodown text
 ]
 
-{ #category : #initialization }
-MiModelReporter >> refreshToolbarButton [
-
-	^ SpToolbarButtonPresenter new
-		  icon: (self iconNamed: #smallUpdate);
-		  help: 'Reset report';
-		  action: [ specModel updateReport ];
-		  yourself
-]
-
 { #category : #actions }
-MiModelReporter >> showingTab: newTab [
+MiModelReportBrowser >> showingTab: newTab [
 
 	(newTab activePresenter = tabPreview and: [ rebuildPreview ])
 		ifFalse: [ ^ self ].
diff --git a/src/MooseIDE-Core-Reporter/MiModelReporterModel.class.st b/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
similarity index 70%
rename from src/MooseIDE-Core-Reporter/MiModelReporterModel.class.st
rename to src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
index 905b63a0..905600b0 100644
--- a/src/MooseIDE-Core-Reporter/MiModelReporterModel.class.st
+++ b/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
@@ -1,10 +1,10 @@
 "
-The spec model for the MiModelReporter
+The spec model for the `MiModelReport`
 
 Responsible for actually generating the report
 "
 Class {
-	#name : #MiModelReporterModel,
+	#name : #MiModelReportModel,
 	#superclass : #MiAbstractModel,
 	#instVars : [
 		'mooseModel',
@@ -15,7 +15,7 @@ Class {
 }
 
 { #category : #microdown }
-MiModelReporterModel >> bulletList: aCollection [
+MiModelReportModel >> bulletList: aCollection [
 
 	aCollection do: [ :line |
 		report
@@ -27,20 +27,20 @@ MiModelReporterModel >> bulletList: aCollection [
 ]
 
 { #category : #document }
-MiModelReporterModel >> classMembersStats: columns [
+MiModelReportModel >> classMembersStats: columns [
 
 	self stats: columns compute: [ :c | c numberOfAttributes ] description: 'ATTRIBUTES'.
 	self stats: columns compute: [ :c | c numberOfMethods ]    description: 'METHODS'
 ]
 
 { #category : #settings }
-MiModelReporterModel >> complexMethodLimit [
+MiModelReportModel >> complexMethodLimit [
 
 	^ settings getItemValue: #complexMethodSetting
 ]
 
 { #category : #document }
-MiModelReporterModel >> document [
+MiModelReportModel >> document [
 		
 	self title: ('Dashboard : '  , mooseModel name).
 
@@ -51,12 +51,18 @@ MiModelReporterModel >> document [
 ]
 
 { #category : #accessing }
-MiModelReporterModel >> entities [
+MiModelReportModel >> entities [
 	^mooseModel
 ]
 
+{ #category : #settings }
+MiModelReportModel >> excessiveAPIMethodLimit [
+
+	^ settings getItemValue: #excessiveAPIMethodLimit
+]
+
 { #category : #'api - export' }
-MiModelReporterModel >> exportReportToHTML: microdownText [
+MiModelReportModel >> exportReportToHTML: microdownText [
 
 	(mooseModel name , '-report.html') asFileReference writeStreamDo: [ :stream |
 		stream nextPutAll: (MicHTMLVisitor asHTMLString: microdownText)
@@ -64,27 +70,27 @@ MiModelReporterModel >> exportReportToHTML: microdownText [
 ]
 
 { #category : #'api - export' }
-MiModelReporterModel >> exportReportToPDF: microdownText [
+MiModelReportModel >> exportReportToPDF: microdownText [
 
 	self inform: 'PDF export not implemented yet, sorry'
 ]
 
 { #category : #'private - formatting' }
-MiModelReporterModel >> floatAsString: aFloat [
+MiModelReportModel >> floatAsString: aFloat [
 
 	^(aFloat asFloat round: 1) asString
 
 ]
 
 { #category : #accessing }
-MiModelReporterModel >> followEntity: aMooseModel [
+MiModelReportModel >> followEntity: aMooseEntity [
 
-	mooseModel := aMooseModel.
+	mooseModel := (aMooseEntity isMooseModel ifTrue: [ aMooseEntity ] ifFalse: [ aMooseEntity mooseModel ]).
 	self updateReport
 ]
 
 { #category : #'private - formatting' }
-MiModelReporterModel >> formatCollection: collection value: valueBlock [
+MiModelReportModel >> formatCollection: collection value: valueBlock [
 
 	^collection
 		ifEmpty: [ 'n/a' ]
@@ -92,14 +98,14 @@ MiModelReporterModel >> formatCollection: collection value: valueBlock [
 ]
 
 { #category : #'private - formatting' }
-MiModelReporterModel >> fullyQualifiedName: anEntity [
+MiModelReportModel >> fullyQualifiedName: anEntity [
 
 	^anEntity mooseName copyReplaceAll: '::' with: '.' 
 
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> headerBlock: level header: aString [
+MiModelReportModel >> headerBlock: level header: aString [
 
 	level timesRepeat: [ report << '#' ].
 	report
@@ -109,7 +115,7 @@ MiModelReporterModel >> headerBlock: level header: aString [
 ]
 
 { #category : #initialization }
-MiModelReporterModel >> initializeSettings [ 
+MiModelReportModel >> initializeSettings [ 
 
 	settings := super initializeSettings.
 	settings
@@ -139,19 +145,25 @@ MiModelReporterModel >> initializeSettings [
 			label: 'Complex method' ;
 			help: 'Above this cyclomatic complexity, a method is considered complex' ;
 		yourself)
-		named: #complexMethodSetting.
+		named: #complexMethodSetting ;
 
+		addItem: (MiTextSettingItem integerSetting
+			setValue: 5 ;
+			label: 'excessive API method' ;
+			help: 'Above this number of parameters, a method is considered to have an excessive API' ;
+		yourself)
+		named: #excessiveAPIMethodLimit.
 
 ]
 
 { #category : #settings }
-MiModelReporterModel >> largeClassLimit [
+MiModelReportModel >> largeClassLimit [
 
 	^ settings getItemValue: #largeClassSetting
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> line: aString [
+MiModelReportModel >> line: aString [
 
 	report
 		<< aString ;
@@ -160,19 +172,19 @@ MiModelReporterModel >> line: aString [
 ]
 
 { #category : #settings }
-MiModelReporterModel >> longClassLimit [
+MiModelReportModel >> longClassLimit [
 
 	^ settings getItemValue: #longClassSetting
 ]
 
 { #category : #settings }
-MiModelReporterModel >> longMethodLimit [
+MiModelReportModel >> longMethodLimit [
 
 	^ settings getItemValue: #longMethodSetting
 ]
 
 { #category : #document }
-MiModelReporterModel >> methodMembersStats: columns [
+MiModelReportModel >> methodMembersStats: columns [
 
 	self stats: columns compute: [ :m | m numberOfParameters ] description: 'PARAMETERS'.
 	self stats: columns compute: [ :m | m numberOfLinesOfCode ]    description: 'LINES OF CODE'.
@@ -180,26 +192,34 @@ MiModelReporterModel >> methodMembersStats: columns [
 ]
 
 { #category : #accessing }
-MiModelReporterModel >> miSelectedItem [
+MiModelReportModel >> miSelectedItem [
 
 	^#()
 ]
 
 { #category : #'private - formatting' }
-MiModelReporterModel >> numericValue: text value: number [
+MiModelReportModel >> numericValue: text value: number [
 
 	^text , ': ' , number asString
 		
 ]
 
 { #category : #accessing }
-MiModelReporterModel >> reportDOM [
+MiModelReportModel >> reportDOM [
 
 	^ report
 ]
 
+{ #category : #'api - export' }
+MiModelReportModel >> saveRawReport: microdownText [
+
+	(mooseModel name , '-report.md') asFileReference writeStreamDo: [ :stream |
+		stream nextPutAll: microdownText
+	]
+]
+
 { #category : #document }
-MiModelReporterModel >> sectionClasses [
+MiModelReportModel >> sectionClasses [
 
 	| allClasses largeClasses longClasses |
 
@@ -225,20 +245,20 @@ MiModelReporterModel >> sectionClasses [
 ]
 
 { #category : #document }
-MiModelReporterModel >> sectionMethods [
+MiModelReportModel >> sectionMethods [
 
-	| allMethods longMethods complexMethods |
+	| allMethods longMethods complexMethods excessiveAPIMethods |
 
 	allMethods := OrderedCollection withAll: mooseModel allModelMethods.
-	longMethods := allMethods select: [ :c | c numberOfLinesOfCode > self longMethodLimit ].
-	complexMethods := allMethods select: [ :c | c cyclomaticComplexity > self complexMethodLimit ].
-
+	longMethods := allMethods select: [ :m | m numberOfLinesOfCode > self longMethodLimit ].
+	complexMethods := allMethods select: [ :m | m cyclomaticComplexity > self complexMethodLimit ].
+	excessiveAPIMethods := allMethods select: [ :m | m numberOfParameters > self excessiveAPIMethodLimit ].
 	self subtitle: 'Methods'.
 
 	"Stats table"
-	self tableHeader: { '' . 'All' . 'Long' . 'Complex' }.
-	self statLine: { allMethods size asString . longMethods size asString . complexMethods size asString } description: 'number'.
-	self methodMembersStats: { allMethods . longMethods . complexMethods }.
+	self tableHeader: { '' . 'All' . 'Long' . 'Complex' . 'Excessive API'}.
+	self statLine: { allMethods size asString . longMethods size asString . complexMethods size asString . excessiveAPIMethods size asString } description: 'number'.
+	self methodMembersStats: { allMethods . longMethods . complexMethods . excessiveAPIMethods }.
 	self line: ''.
 
 	"Lists of entities"
@@ -247,11 +267,14 @@ MiModelReporterModel >> sectionMethods [
 		description: 'Long methods (> ' , self longMethodLimit asString , ' LOC)'.
 	self
 		subSectionSpecialList: complexMethods
-		description: 'Complex methods (cyclomatic complexity > ' , self complexMethodLimit asString , ')'
+		description: 'Complex methods (cyclomatic complexity > ' , self complexMethodLimit asString , ')'.
+	self
+		subSectionSpecialList: excessiveAPIMethods
+		description: 'Excessive API methods (> ' , self excessiveAPIMethodLimit asString , ' parameters)'
 ]
 
 { #category : #document }
-MiModelReporterModel >> sectionMethodsStats: methods [
+MiModelReportModel >> sectionMethodsStats: methods [
 
 	self stats: (methods collect: [ :c | c numberOfParameters ]) description: 'parameters'.
 	self stats: (methods collect: [ :c | c numberOfLinesOfCode ]) description: 'lines of code'.
@@ -260,7 +283,7 @@ MiModelReporterModel >> sectionMethodsStats: methods [
 ]
 
 { #category : #document }
-MiModelReporterModel >> sectionPackages [
+MiModelReportModel >> sectionPackages [
 	| number allClasses |
 
 	self subtitle: 'Packages'.
@@ -281,25 +304,25 @@ MiModelReporterModel >> sectionPackages [
 ]
 
 { #category : #settings }
-MiModelReporterModel >> settings [
+MiModelReportModel >> settings [
 
 	^settings
 ]
 
 { #category : #settings }
-MiModelReporterModel >> settingsChanged: aBoolean [
+MiModelReportModel >> settingsChanged: aBoolean [
 
-	aBoolean ifTrue: [ self updateReport ]
+	aBoolean ifTrue: [ self updateReport ].
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> statLine: columns	description: aString [
+MiModelReportModel >> statLine: columns	description: aString [
 
 	self tableLine: { aString } , columns
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> stats: columns compute: valueBlock description: aString [
+MiModelReportModel >> stats: columns compute: valueBlock description: aString [
 	"columns is a collection of collections of entities (eg. {allClasses, largeClasses, longClasses})
 	 valueBlock takes one entity of these collections and compute a number form it (eg. numberOfAttributes)
 	 From this, we display 3 lines: mean value, median value, max value for each column"
@@ -321,7 +344,7 @@ MiModelReporterModel >> stats: columns compute: valueBlock description: aString
 ]
 
 { #category : #document }
-MiModelReporterModel >> subSectionSpecialList: collection description: aString [
+MiModelReportModel >> subSectionSpecialList: collection description: aString [
 
 	self subsubtitle: aString.
 
@@ -333,7 +356,7 @@ MiModelReporterModel >> subSectionSpecialList: collection description: aString [
 ]
 
 { #category : #document }
-MiModelReporterModel >> subSectionSpecialMethods: selectionBlock description: aString [
+MiModelReportModel >> subSectionSpecialMethods: selectionBlock description: aString [
 
 	| methods |
 	self subsubtitle: aString.
@@ -349,21 +372,21 @@ MiModelReporterModel >> subSectionSpecialMethods: selectionBlock description: aS
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> subsubtitle: aString [
+MiModelReportModel >> subsubtitle: aString [
 
 	^self headerBlock: 3 header: aString.
 
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> subtitle: aString [
+MiModelReportModel >> subtitle: aString [
 
 	^self headerBlock: 2 header: aString.
 
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> tableHeader: aCollection [
+MiModelReportModel >> tableHeader: aCollection [
 
 	self tableLine: aCollection.
 	report
@@ -372,7 +395,7 @@ MiModelReporterModel >> tableHeader: aCollection [
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> tableLine: aCollection [
+MiModelReportModel >> tableLine: aCollection [
 
 	aCollection do: [ :item |
 		report
@@ -386,14 +409,14 @@ MiModelReporterModel >> tableLine: aCollection [
 ]
 
 { #category : #microdown }
-MiModelReporterModel >> title: aString [
+MiModelReportModel >> title: aString [
 
 	^self headerBlock: 1 header: aString.
 
 ]
 
 { #category : #running }
-MiModelReporterModel >> updateReport [
+MiModelReportModel >> updateReport [
 
 	report := String new writeStream .
 	self document.
diff --git a/src/MooseIDE-Core-Reporter/MiReportHTMLExportCommand.class.st b/src/MooseIDE-Core-Reporter/MiReportHTMLExportCommand.class.st
index 37303e9f..ae1356c6 100644
--- a/src/MooseIDE-Core-Reporter/MiReportHTMLExportCommand.class.st
+++ b/src/MooseIDE-Core-Reporter/MiReportHTMLExportCommand.class.st
@@ -21,7 +21,7 @@ MiReportHTMLExportCommand class >> defaultName [
 ]
 
 { #category : #export }
-MiReportHTMLExportCommand >> exportReport: reporterBrowserModel [
+MiReportHTMLExportCommand >> exportReport: reporterBrowser [
 
-	reporterBrowserModel exportReportToHTML
+	reporterBrowser exportReportToHTML
 ]
diff --git a/src/MooseIDE-Core-Reporter/MiReportPDFExportCommand.class.st b/src/MooseIDE-Core-Reporter/MiReportPDFExportCommand.class.st
index b91889f8..c0412a15 100644
--- a/src/MooseIDE-Core-Reporter/MiReportPDFExportCommand.class.st
+++ b/src/MooseIDE-Core-Reporter/MiReportPDFExportCommand.class.st
@@ -20,8 +20,8 @@ MiReportPDFExportCommand class >> defaultName [
 	^ 'Export to PDF'
 ]
 
-{ #category : #'as yet unclassified' }
-MiReportPDFExportCommand >> exportReport: reporterBrowserModel [
+{ #category : #export }
+MiReportPDFExportCommand >> exportReport: reporterBrowser [
 
-	reporterBrowserModel exportReportToPDF
+	reporterBrowser exportReportToPDF
 ]

From e161526c4a20586bc6e10c9a8c2b1f7a7f82a026 Mon Sep 17 00:00:00 2001
From: anquetil <nicolas.anquetil@inria.fr>
Date: Fri, 3 Jan 2025 13:36:49 +0100
Subject: [PATCH 2/2] Added a save-raw-report button/command

---
 .../MiModelReportBrowser.class.st             | 31 ++++++------------
 .../MiModelReportModel.class.st               | 16 +++++++---
 .../MiReportExportCommand.class.st            | 12 +------
 .../MiReportSaveCommand.class.st              | 32 +++++++++++++++++++
 4 files changed, 54 insertions(+), 37 deletions(-)
 create mode 100644 src/MooseIDE-Core-Reporter/MiReportSaveCommand.class.st

diff --git a/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st b/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
index 26ecc9ee..7d3c827b 100644
--- a/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
+++ b/src/MooseIDE-Core-Reporter/MiModelReportBrowser.class.st
@@ -63,16 +63,6 @@ MiModelReportBrowser >> btnToolbarRefresh [
 		  yourself
 ]
 
-{ #category : #initialization }
-MiModelReportBrowser >> btnToolbarSave [
-
-	^ SpToolbarButtonPresenter new
-		  icon: (self iconNamed: #save);
-		  help: 'Save raw report';
-		  action: [ specModel saveRawReport: self rawReport ];
-		  yourself
-]
-
 { #category : #testing }
 MiModelReportBrowser >> canFollowEntity: anObject [
 	"note: MooseModel-s have a #mooseModel also so the test accepts
@@ -153,13 +143,7 @@ MiModelReportBrowser >> initializeMainPresenter [
 { #category : #initialization }
 MiModelReportBrowser >> initializePresenters [
 
-	toolbar := self newToolbar
-		addItem: self btnToolbarSave;
-		fillWith: (MiReportExportCommand asCommandGroupWith: self);
-		beIcons;
-		addItem: self btnToolbarRefresh;
-		yourself.
-
+	self initializeToolbar.
 	self initializeMainPresenter
 ]
 
@@ -167,11 +151,10 @@ MiModelReportBrowser >> initializePresenters [
 MiModelReportBrowser >> initializeToolbar [
 
 	toolbar := self newToolbar
-		beIcons ;
+		beIcons;
 
-		addItem: self btnToolbarSave ;
-		fillWith: (MiReportExportCommand asCommandGroupWith: self) ;
-		addItem: self btnToolbarRefresh ;
+		fillWith: (MiReportExportCommand asCommandGroupWith: self);
+		addItem: self btnToolbarRefresh;
 
 		yourself
 ]
@@ -188,6 +171,12 @@ MiModelReportBrowser >> rawReport [
 	^ tabMicrodown text
 ]
 
+{ #category : #initialization }
+MiModelReportBrowser >> saveRawReport [
+
+	specModel saveRawReport: self rawReport
+]
+
 { #category : #actions }
 MiModelReportBrowser >> showingTab: newTab [
 
diff --git a/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st b/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
index 905600b0..ab4837b1 100644
--- a/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
+++ b/src/MooseIDE-Core-Reporter/MiModelReportModel.class.st
@@ -64,15 +64,18 @@ MiModelReportModel >> excessiveAPIMethodLimit [
 { #category : #'api - export' }
 MiModelReportModel >> exportReportToHTML: microdownText [
 
-	(mooseModel name , '-report.html') asFileReference writeStreamDo: [ :stream |
+	| filename |
+	filename := mooseModel name , '-report.html'.
+	filename asFileReference writeStreamDo: [ :stream |
 		stream nextPutAll: (MicHTMLVisitor asHTMLString: microdownText)
-	]
+	].
+	browser inform: filename , ' generated', String cr , '(in Pharo image directory)'
 ]
 
 { #category : #'api - export' }
 MiModelReportModel >> exportReportToPDF: microdownText [
 
-	self inform: 'PDF export not implemented yet, sorry'
+	browser inform: 'PDF export not implemented yet, sorry'
 ]
 
 { #category : #'private - formatting' }
@@ -213,9 +216,12 @@ MiModelReportModel >> reportDOM [
 { #category : #'api - export' }
 MiModelReportModel >> saveRawReport: microdownText [
 
-	(mooseModel name , '-report.md') asFileReference writeStreamDo: [ :stream |
+	| filename |
+	filename := mooseModel name , '-report.md'.
+	filename asFileReference writeStreamDo: [ :stream |
 		stream nextPutAll: microdownText
-	]
+	].
+	browser inform: filename , ' saved', String cr , '(in Pharo image directory)'
 ]
 
 { #category : #document }
diff --git a/src/MooseIDE-Core-Reporter/MiReportExportCommand.class.st b/src/MooseIDE-Core-Reporter/MiReportExportCommand.class.st
index 0c6d67ff..27198d4f 100644
--- a/src/MooseIDE-Core-Reporter/MiReportExportCommand.class.st
+++ b/src/MooseIDE-Core-Reporter/MiReportExportCommand.class.st
@@ -28,19 +28,9 @@ MiReportExportCommand class >> asCommandGroupWith: aPresenter [
 	^ exportCommandGroup
 ]
 
-{ #category : #testing }
-MiReportExportCommand class >> defaultDescription [
-	^ 'Export this report'
-]
-
-{ #category : #testing }
-MiReportExportCommand class >> defaultName [
-	^ 'Export'
-]
-
 { #category : #testing }
 MiReportExportCommand class >> isAbstract [
-	^ self = MiImportCommand
+	^ self = MiReportExportCommand
 ]
 
 { #category : #executing }
diff --git a/src/MooseIDE-Core-Reporter/MiReportSaveCommand.class.st b/src/MooseIDE-Core-Reporter/MiReportSaveCommand.class.st
new file mode 100644
index 00000000..e58d798d
--- /dev/null
+++ b/src/MooseIDE-Core-Reporter/MiReportSaveCommand.class.st
@@ -0,0 +1,32 @@
+"
+I am a command to save the raw microdown report in MiModelReport
+
+Not really an subclass of `MiReportExportCommand` but it is easier to add to the toolbar that way
+"
+Class {
+	#name : #MiReportSaveCommand,
+	#superclass : #MiReportExportCommand,
+	#category : #'MooseIDE-Core-Reporter'
+}
+
+{ #category : #default }
+MiReportSaveCommand class >> defaultDescription [
+	^ 'Save this report in raw (microdown) format'
+]
+
+{ #category : #default }
+MiReportSaveCommand class >> defaultIconName [
+
+	^ #save
+]
+
+{ #category : #default }
+MiReportSaveCommand class >> defaultName [
+	^ 'Save raw report'
+]
+
+{ #category : #export }
+MiReportSaveCommand >> exportReport: reporterBrowser [
+
+	reporterBrowser saveRawReport
+]