Merge pull request #199 from ba-st/198-extract-LoadingNotificationCom…

…mand

198 extract loading notification command

source/Willow-Core-Tests/CombinedWebInteractionInterpreterTest.class.st

@@ -458,10 +458,9 @@ CombinedWebInteractionInterpreterTest >> testRender [
 { #category : #'tests - Configuring - DOM' }
 CombinedWebInteractionInterpreterTest >> testRenderAll [
 
-	| interpreter html id |
+	| interpreter html |
 
 	interpreter := self combinedInterpreter.
-	id := '15'.
 
 	html := self
 		renderUsing: [ :canvas | 

source/Willow-Core-Tests/ServerResponseCommandTest.class.st

@@ -112,14 +112,14 @@ ServerResponseCommandTest >> testOnRespond [
 { #category : #'tests-accessing' }
 ServerResponseCommandTest >> testParameter [
 
-	| parameterObtained command html |
+	| parameterObtained command |
 
 	command := ServerResponseCommand
 		withBehaviorDeterminedBy: [ :request | parameterObtained := request parameter ]
 		conditionedBy: Optional unused
 		requiring: ( Optional containing: 'test complete' ).
 
-	html := self
+	self
 		renderUsing: [ :canvas | 
 			command priorityActions do: [ :action | action value: self value: 'canvas' ].
 			command modelLoadingInstructions appendTo: 'script' on: canvas

source/Willow-Core-Tests/WebInteractionInstructionsTest.class.st

@@ -3,7 +3,7 @@ A WebInteractionInstructionsTest is a test class for testing the behavior of Web
 "
 Class {
 	#name : #WebInteractionInstructionsTest,
-	#superclass : #TestCase,
+	#superclass : #BWRenderingTest,
 	#category : #'Willow-Core-Tests-WebInteraction'
 }
 
@@ -76,23 +76,52 @@ WebInteractionInstructionsTest >> testDirectingTo [
 
 	| instructions |
 
-	instructions := WebInteractionInstructions directingTo: [ :canvas | canvas asString ].
+	instructions := WebInteractionInstructions directingTo: [ :canvas | 'this will be returned' ].
 	self
 		deny: instructions isEmpty;
 		assert: instructions notEmpty.
 
-	self assertCollection: ( instructions statementsOn: 8 ) equals: ( Array with: '8' )
+	self
+		renderUsing: [ :canvas | 
+			self
+				assertCollection: ( instructions statementsOn: canvas )
+				equals: ( Array with: 'this will be returned' )
+			]
+]
+
+{ #category : #tests }
+WebInteractionInstructionsTest >> testDirectingToOrderedAt [
+
+	| instructions otherInstructions combinedInstructions |
+
+	instructions := WebInteractionInstructions directingTo: [ :canvas | 'then this one' ] orderedAt: 30.
+	otherInstructions := WebInteractionInstructions
+		directingTo: [ :canvas | 'first thins one' ]
+		orderedAt: 10.
+	combinedInstructions := instructions combinedWith: otherInstructions.
+	self
+		deny: combinedInstructions isEmpty;
+		assert: combinedInstructions notEmpty.
+
+	self
+		renderUsing: [ :canvas | 
+			self
+				assertCollection: ( combinedInstructions statementsOn: canvas )
+				equals: ( Array with: 'first thins one' with: 'then this one' )
+			]
 ]
 
 { #category : #tests }
 WebInteractionInstructionsTest >> testEmpty [
-|instructions|
-instructions  := WebInteractionInstructions empty.
-self assert: instructions isEmpty;
-deny: instructions notEmpty.
 
-self assert: (instructions statementsOn: self ) isEmpty
+	| instructions |
+
+	instructions := WebInteractionInstructions empty.
+	self
+		assert: instructions isEmpty;
+		deny: instructions notEmpty.
 
+	self renderUsing: [ :canvas | self assert: ( instructions statementsOn: canvas ) isEmpty ]
 ]
 
 { #category : #tests }
@@ -118,6 +147,11 @@ WebInteractionInstructionsTest >> testStatementsOn [
 
 	| instructions |
 
-	instructions := WebInteractionInstructions directingTo: [ :canvas | canvas asString ].
-	self assertCollection: ( instructions statementsOn: 8 ) equals: ( Array with: '8' )
+	instructions := WebInteractionInstructions directingTo: [ :canvas | 'this will be returned' ].
+	self
+		renderUsing: [ :canvas | 
+			self
+				assertCollection: ( instructions statementsOn: canvas )
+				equals: ( Array with: 'this will be returned' )
+			]
 ]

source/Willow-Core-Tests/WebInteractionInterpreterTest.class.st

@@ -55,6 +55,25 @@ WebInteractionInterpreterTest >> testAddCssClassToComponentsMatching [
 			'<input id="input-id1" type="text"/><script type="text/javascript">$("#input-id1").click(function(event){$(".aComponentByStyleName").addClass("willow")});</script>'
 ]
 
+{ #category : #'tests - Configuring' }
+WebInteractionInterpreterTest >> testAjaxCallsEvaluateTheBlock [
+
+	| interpreter evaluated |
+
+	interpreter := self clickInterpreter.
+	evaluated := false.
+	interpreter serverDo: [ evaluated := true ].
+	self
+		renderUsing: [ :canvas | 
+			| component |
+
+			component := canvas textInput.
+			interpreter applyTo: component on: canvas.
+			self executeAjaxCallbacksOn: canvas
+			].
+	self assert: evaluated
+]
+
 { #category : #'tests - evaluating' }
 WebInteractionInterpreterTest >> testApplyToOn [
 
@@ -405,7 +424,7 @@ WebInteractionInterpreterTest >> testRender [
 			textInput := canvas textInput.
 			textInput id: id.
 			container := ContainerWebView
-				wrapping: [ :containerCanvas | textInput value ]
+				wrapping: [ :containerCanvas | containerCanvas render: id ]
 				intoElementBuiltUsing: [ :theCanvas | theCanvas div ]
 				applying: [  ].
 			interpreter render: container.
@@ -416,7 +435,7 @@ WebInteractionInterpreterTest >> testRender [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><div id="container-id1"></div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["2",$(this).serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><div id="container-id1">15</div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["2",$(this).serialize()].join("&")})});</script>'
 ]
 
 { #category : #'tests - Configuring - DOM' }
@@ -434,7 +453,7 @@ WebInteractionInterpreterTest >> testRenderAll [
 			textInput := canvas textInput.
 			textInput id: id.
 			container := ContainerWebView
-				wrapping: [ :containerCanvas | textInput value ]
+				wrapping: [ :containerCanvas | containerCanvas render: id ]
 				intoElementBuiltUsing: [ :theCanvas | theCanvas div ]
 				applying: [  ].
 			anotherContainer := ContainerWebView
@@ -451,7 +470,36 @@ WebInteractionInterpreterTest >> testRenderAll [
 	self
 		assert: html
 		equals:
-			'<input id="15" type="text"/><div id="container-id1"></div><div id="container-id2"></div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&")})});</script>'
+			'<input id="15" type="text"/><div id="container-id1">15</div><div id="container-id2"></div><script type="text/javascript">$("#15").change(function(event){Willow.callServer({"type":"POST","url":"/","data":["3",$(this).serialize()].join("&")})});</script>'
+]
+
+{ #category : #'tests - Configuring - DOM' }
+WebInteractionInterpreterTest >> testRenderIsAddedLast [
+
+	| interpreter id |
+
+	interpreter := self changeInterpreter.
+	id := '15'.
+
+	self
+		renderUsing: [ :canvas | 
+			| textInput container |
+
+			textInput := canvas textInput.
+			textInput id: id.
+			container := ContainerWebView
+				wrapping: [ :containerCanvas | containerCanvas render: id ]
+				intoElementBuiltUsing: [ :theCanvas | theCanvas div ]
+				applying: [  ].
+			interpreter
+				render: container;
+				serverDo: [ id := 27 ].
+			canvas render: container.
+			interpreter applyTo: textInput on: canvas.
+			self executeAjaxCallbacksOn: canvas
+			].
+
+	self assert: self requestContext response contents equals: '$("#container-id1").html("27")'
 ]
 
 { #category : #'tests - Configuring - DOM' }

source/Willow-Core/CombinedWebInteractionInterpreter.class.st

@@ -148,15 +148,14 @@ CombinedWebInteractionInterpreter >> serializeWithHiddenInputs [
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> serverDo: aCallbackBlock [
 
-	self interpretersDo: [:interpreter | interpreter serverDo: aCallbackBlock]
+	self interpretersDo: [ :interpreter | interpreter serverDo: aCallbackBlock ]
 ]
 
 { #category : #'Configuring - DOM' }
 CombinedWebInteractionInterpreter >> setValueTo: aValueProvider thenTriggerChangeOf: anIdentifiedView [
 
 	self
-		interpretersDo:
-			[ :interpreter | interpreter setValueTo: aValueProvider thenTriggerChangeOf: anIdentifiedView ]
+		interpretersDo: [ :interpreter | interpreter setValueTo: aValueProvider thenTriggerChangeOf: anIdentifiedView ]
 ]
 
 { #category : #'Configuring - DOM' }
@@ -169,7 +168,7 @@ CombinedWebInteractionInterpreter >> setValueTo: aValueProvider withoutTriggerin
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> showLoadingNotificationStyledAsAll: classes [
 
-	self interpretersDo: [:interpreter | interpreter showLoadingNotificationStyledAsAll: classes]
+	self interpretersDo: [ :interpreter | interpreter showLoadingNotificationStyledAsAll: classes ]
 ]
 
 { #category : #'Configuring - Serialization' }
@@ -181,7 +180,7 @@ CombinedWebInteractionInterpreter >> submitForm: anIdentifiedForm [
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> submitFormStyledAs: aCssStyle [
 
-	self interpretersDo: [:interpreter | interpreter submitFormStyledAs: aCssStyle]
+	self interpretersDo: [ :interpreter | interpreter submitFormStyledAs: aCssStyle ]
 ]
 
 { #category : #'Configuring - DOM' }
@@ -209,15 +208,14 @@ CombinedWebInteractionInterpreter >> updateCssClasses: aCssClassConfigurationBlo
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> userAgentDo: aServerIndependentAction [
 
-	self interpretersDo: [:interpreter | interpreter userAgentDo: aServerIndependentAction]
+	self interpretersDo: [ :interpreter | interpreter userAgentDo: aServerIndependentAction ]
 ]
 
 { #category : #Configuring }
 CombinedWebInteractionInterpreter >> with: aParameter onlyWhen: aStringCondition serverDo: aCallbackBlock [
 
 	self
-		interpretersDo:
-			[ :interpreter | interpreter with: aParameter onlyWhen: aStringCondition serverDo: aCallbackBlock ]
+		interpretersDo: [ :interpreter | interpreter with: aParameter onlyWhen: aStringCondition serverDo: aCallbackBlock ]
 ]
 
 { #category : #Configuring }

source/Willow-Core/ComponentFocusingCommand.class.st

@@ -13,7 +13,7 @@ Class {
 { #category : #'instance creation' }
 ComponentFocusingCommand class >> findingComponentUsing: aComponentProvider [
 
-	^self new initializeFindingComponentUsing: aComponentProvider
+	^ self new initializeFindingComponentUsing: aComponentProvider
 ]
 
 { #category : #'instance creation' }
@@ -22,7 +22,7 @@ ComponentFocusingCommand class >> for: anIdentifiedView [
 	^ self findingComponentUsing: [ :aCanvas | aCanvas locate: anIdentifiedView ]
 ]
 
-{ #category : #'initialize-release' }
+{ #category : #initialization }
 ComponentFocusingCommand >> initializeFindingComponentUsing: aComponentProvider [
 
 	componentProvider := aComponentProvider
@@ -33,6 +33,7 @@ ComponentFocusingCommand >> modelLoadingInstructions [
 
 	^ WebInteractionInstructions
 		directingTo: [ :aCanvas | ( componentProvider value: aCanvas ) triggerFocus ]
+		orderedAt: 20
 ]
 
 { #category : #accessing }
@@ -44,7 +45,7 @@ ComponentFocusingCommand >> priorityActions [
 { #category : #testing }
 ComponentFocusingCommand >> requiresSerialization [
 
-	^false
+	^ false
 ]
 
 { #category : #accessing }

source/Willow-Core/ComponentRemovingCommand.class.st

@@ -25,7 +25,9 @@ ComponentRemovingCommand >> initializeFor: anIdentifiedView [
 { #category : #accessing }
 ComponentRemovingCommand >> modelLoadingInstructions [
 
-	^ WebInteractionInstructions directingTo: [ :aCanvas | ( aCanvas locate: identifiedView ) remove ]
+	^ WebInteractionInstructions
+		directingTo: [ :aCanvas | ( aCanvas locate: identifiedView ) remove ]
+		orderedAt: 20
 ]
 
 { #category : #accessing }

source/Willow-Core/ComponentValueSettingCommand.class.st

@@ -58,6 +58,7 @@ ComponentValueSettingCommand >> modelLoadingInstructions [
 			jQueryInstance value: valueProvider value.
 			triggeringAction cull: jQueryInstance
 			]
+		orderedAt: 20
 ]
 
 { #category : #accessing }

source/Willow-Core/DialogClosingCommand.class.st

@@ -45,6 +45,7 @@ DialogClosingCommand >> modelLoadingInstructions [
 				matching: dialogSupplier
 				on: aCanvas
 			]
+		orderedAt: 10
 ]
 
 { #category : #accessing }

source/Willow-Core/DialogOpeningCommand.class.st

@@ -28,6 +28,7 @@ DialogOpeningCommand >> modelLoadingInstructions [
 
 	^ WebInteractionInstructions
 		directingTo: [ :aCanvas | DialogOpener new open: dialogView on: aCanvas ]
+		orderedAt: 10
 ]
 
 { #category : #accessing }

source/Willow-Core/EventInterpreterDispatcher.class.st

@@ -2,7 +2,6 @@ Class {
 	#name : #EventInterpreterDispatcher,
 	#superclass : #EventInterpreterDispatcherBehavior,
 	#instVars : [
-		'interactionsByEvent',
 		'interpretersByEvent',
 		'defaultInterpreter'
 	],

source/Willow-Core/FormSubmitCommand.class.st

@@ -33,6 +33,7 @@ FormSubmitCommand >> modelLoadingInstructions [
 
 	^ WebInteractionInstructions
 		directingTo: [ :aCanvas | ( componentProvider value: aCanvas ) call: 'submit' ]
+		orderedAt: 10
 ]
 
 { #category : #accessing }