Merge pull request #18 from badetitou/innerHTML-widget-representation

a specific widget can have a specirfic representation
badetitou · Mar 23, 2023 · b32c7b5 · b32c7b5
2 parents 1d16a4f + 023abe1
commit b32c7b5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/src/Casino-Model-CoreWeb-Exporter/CSNModelExporterAngularBLMaterial.class.st b/src/Casino-Model-CoreWeb-Exporter/CSNModelExporterAngularBLMaterial.class.st
@@ -129,7 +129,7 @@ CSNModelExporterAngularBLMaterial >> generateHTMLSourceCodeForBusinessPage: aBLP
 		currentWriteStream
 			<< '</mat-tab-group>';
 			<< String crlf ].
-	self generateInnerHtmlOf: aBLPageMetier
+	self generateRootHtmlOf: aBLPageMetier
 ]
 
 { #category : #visiting }

diff --git a/src/Casino-Model-Exporter-Angular/CSNExporterAngularConfiguration.class.st b/src/Casino-Model-Exporter-Angular/CSNExporterAngularConfiguration.class.st
@@ -9,10 +9,14 @@ Class {
 
 { #category : #initialization }
 CSNExporterAngularConfiguration >> angularRepresentationOf: aCSNWidget [
-	aCSNWidget class withAllSuperclasses
-		do: [:class | mapping
-				at: class
-				ifPresent: [ :widgetRepresentation | ^ widgetRepresentation ] ].
+
+	mapping
+		at: aCSNWidget
+		ifPresent: [ :widgetRepresentation | ^ widgetRepresentation ].
+	aCSNWidget class withAllSuperclasses do: [ :class | 
+		mapping
+			at: class
+			ifPresent: [ :widgetRepresentation | ^ widgetRepresentation ] ].
 	^ WidgetRepresentation new
 ]
 

diff --git a/src/Casino-Model-Exporter-Angular/CSNModelExporterAngular.class.st b/src/Casino-Model-Exporter-Angular/CSNModelExporterAngular.class.st
@@ -156,7 +156,7 @@ CSNModelExporterAngular >> generateAsSubComponent: aCSNWidget [
 	(exporter currentPath / aCSNWidget getHTMLName) asFileReference 
 		writeStreamDo: [ :aWriteStream | 
 			exporter currentWriteStream: aWriteStream.
-			exporter generateInnerHtmlOf: aCSNWidget ].
+			exporter generateRootHtmlOf: aCSNWidget ].
 
 	(exporter currentPath / aCSNWidget getTSName) asFileReference 
 		writeStreamDo: [ :aWriteStream | 
@@ -219,7 +219,7 @@ CSNModelExporterAngular >> generateHTMLSourceCodeForBusinessPage: aBLPageMetier
 		currentWriteStream
 			<< '</bl-tabs>';
 			<< String crlf ].
-	self generateInnerHtmlOf: aBLPageMetier
+	self generateRootHtmlOf: aBLPageMetier
 ]
 
 { #category : #'generate - model' }
@@ -277,17 +277,9 @@ CSNModelExporterAngular >> generateHTMLSourceCodeForPage: aBLPhase [
 ]
 
 { #category : #generate }
-CSNModelExporterAngular >> generateInnerHtmlOf: aCSNWidget [
+CSNModelExporterAngular >> generateInnerHTMLOf: aCSNWidget [
 
 	| angularRepresentation |
-	self
-		<< '<form [formGroup]="';
-		<<< aCSNWidget id uncapitalized;
-		<<< 'Form';
-		<<< '">';
-		indentPlus;
-		crlf.
-
 	aCSNWidget layout ifNotNil: [ 
 		angularRepresentation := self angularRepresentationOf: aCSNWidget.
 		angularRepresentation exportHeaderOf: aCSNWidget with: self.
@@ -299,11 +291,7 @@ CSNModelExporterAngular >> generateInnerHtmlOf: aCSNWidget [
 		reject: [ :widget | widget isPageMetier ]
 		thenDo: [ :widget | 
 			self visit: widget.
-			currentWriteStream << String crlf ].
-
-	self
-		indentMinus;
-		<< '</form>'
+			currentWriteStream << String crlf ]
 ]
 
 { #category : #'generate - model' }
@@ -567,6 +555,22 @@ export class ';
 		<< String crlf
 ]
 
+{ #category : #generate }
+CSNModelExporterAngular >> generateRootHtmlOf: aCSNWidget [
+
+	self
+		<< '<form [formGroup]="';
+		<<< aCSNWidget id uncapitalized;
+		<<< 'Form';
+		<<< '">';
+		indentPlus;
+		crlf.
+	self generateInnerHTMLOf: aCSNWidget.
+	self
+		indentMinus;
+		<< '</form>'
+]
+
 { #category : #'generate - model' }
 CSNModelExporterAngular >> generateRouteSourceCodeForModel: aModel [