@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/test/sap/fe/macros/jest/__snapshots__/SimpleFieldMacro.spec.ts.snap

@@ -5,6 +5,7 @@ exports[`MacroField - check control templating for ListReport / field with nowra
   <!-- There is a default data field therefore we jump to it and run the same logic again -->
   <Text
     xmlns=\\"sap.m\\"
+    visible=\\"true\\"
     text=\\"{parts:[{value: 'formatWithBrackets'},{path:'propWithTextText', targetType : 'any'},{path:'propWithText', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}], formatter: 'sap.fe.core.formatters.ValueFormatter'}\\"
   />
 </root>
@@ -13,28 +14,12 @@ exports[`MacroField - check control templating for ListReport / field with nowra
 
 exports[`MacroField - check control templating for ListReport / field with nowrapper when there is a nowrapper for a field and analytics is true  1`] = `
 "<root>
-  <macro:FieldAPI
-    xmlns:macro=\\"sap.fe.macros\\"
-    required=\\"false\\"
-    editable=\\"{ui&gt;/isEditable}\\"
-  >
-    <!-- There is a default data field therefore we jump to it and run the same logic again -->
-    <control:FieldWrapper
-      xmlns:control=\\"sap.fe.core.controls\\"
-      emptyIndicatorTrigger=\\"inactive\\"
-      editMode=\\"Display\\"
-      visible=\\"{= (%{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0)}\\"
-      required=\\"false\\"
-      width=\\"100%\\"
-    >
-      <control:contentDisplay>
-        <Text
-          xmlns=\\"sap.m\\"
-          text=\\"{parts:[{value: 'formatWithBrackets'},{path:'propWithTextText', targetType : 'any'},{path:'propWithText', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}], formatter: 'sap.fe.core.formatters.ValueFormatter'}\\"
-        />
-      </control:contentDisplay>
-    </control:FieldWrapper>
-  </macro:FieldAPI>
+  <!-- There is a default data field therefore we jump to it and run the same logic again -->
+  <Text
+    xmlns=\\"sap.m\\"
+    visible=\\"{= %{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0}\\"
+    text=\\"{parts:[{value: 'formatWithBrackets'},{path:'propWithTextText', targetType : 'any'},{path:'propWithText', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}], formatter: 'sap.fe.core.formatters.ValueFormatter'}\\"
+  />
 </root>
 "
 `;
@@ -85,7 +70,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
+          text=\\"{path: 'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -97,14 +82,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:id=\\"MacroInput\\"
           xmlns:ns3=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
           ns3:sourcePath=\\"/Items/headerDate\\"
-          value=\\"{path:'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
+          value=\\"{path: 'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -131,7 +116,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          text=\\"{path: 'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -143,14 +128,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/usageCounter\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          value=\\"{path: 'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"{= %{ui&gt;/isEditable} ? 'End' : 'Begin'}\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -177,7 +162,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -189,14 +174,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/name\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -224,7 +209,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'isDigitSequence', type: 'sap.ui.model.odata.type.String', constraints: {isDigitSequence: true}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'isDigitSequence', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {isDigitSequence: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -236,14 +221,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/isDigitSequence\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'isDigitSequence', type: 'sap.ui.model.odata.type.String', constraints: {isDigitSequence: true}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'isDigitSequence', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {isDigitSequence: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -270,7 +255,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
+          text=\\"{path: 'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -282,14 +267,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:id=\\"MacroInput\\"
           xmlns:ns3=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
           ns3:sourcePath=\\"/Items/headerDate\\"
-          value=\\"{path:'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
+          value=\\"{path: 'headerDate', type: 'sap.ui.model.odata.type.Date'}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -316,7 +301,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'usageProgress', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 4}}\\"
+          text=\\"{path: 'usageProgress', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 4}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -328,14 +313,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/usageProgress\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'usageProgress', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 4}}\\"
+          value=\\"{path: 'usageProgress', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 4}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -362,7 +347,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'usageCoefficient', type: 'sap.ui.model.odata.type.Double', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          text=\\"{path: 'usageCoefficient', type: 'sap.ui.model.odata.type.Double', formatOptions: {parseAsString: false, emptyString: ''}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -374,14 +359,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/usageCoefficient\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'usageCoefficient', type: 'sap.ui.model.odata.type.Double', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          value=\\"{path: 'usageCoefficient', type: 'sap.ui.model.odata.type.Double', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -408,7 +393,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          text=\\"{path: 'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -420,14 +405,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/usageCounter\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          value=\\"{path: 'usageCounter', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -457,8 +442,8 @@ exports[`MacroField - check control templating for basic types and input alignme
           <!-- We use % to prevent ODataBinding automatically formatting the stringValue as a number-->
           <u:Currency
             xmlns:u=\\"sap.ui.unified\\"
-            stringValue=\\"{path:'amount1', targetType: 'any'}\\"
-            currency=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+            stringValue=\\"{path: 'amount1', targetType: 'any'}\\"
+            currency=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
             useSymbol=\\"false\\"
             maxPrecision=\\"3\\"
           />
@@ -479,8 +464,8 @@ exports[`MacroField - check control templating for basic types and input alignme
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -488,13 +473,13 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns3:sourcePath=\\"/Items/amount1\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"true\\"
         />
       </control:contentEdit>
@@ -532,7 +517,7 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns1:sourcePath=\\"/Items/quantityWithStaticUnit\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'quantityWithStaticUnit', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          value=\\"{path: 'quantityWithStaticUnit', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"100%\\"
           fieldWidth=\\"70%\\"
           description=\\"mass-gram\\"
@@ -540,8 +525,8 @@ exports[`MacroField - check control templating for basic types and input alignme
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -586,8 +571,8 @@ exports[`MacroField - check control templating for basic types and input alignme
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -595,13 +580,13 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns3:sourcePath=\\"/Items/quantity1\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"true\\"
         />
       </control:contentEdit>
@@ -647,8 +632,8 @@ exports[`MacroField - check control templating for basic types and input alignme
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -656,13 +641,13 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns3:sourcePath=\\"/Items/quantity2\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit2', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit2', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"false\\"
         />
       </control:contentEdit>
@@ -690,7 +675,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'usageStartTime', type: 'sap.ui.model.odata.type.TimeOfDay'}\\"
+          text=\\"{path: 'usageStartTime', type: 'sap.ui.model.odata.type.TimeOfDay'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -702,14 +687,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:id=\\"MacroInput\\"
           xmlns:ns3=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
           ns3:sourcePath=\\"/Items/usageStartTime\\"
-          value=\\"{path:'usageStartTime', type: 'sap.ui.model.odata.type.TimeOfDay'}\\"
+          value=\\"{path: 'usageStartTime', type: 'sap.ui.model.odata.type.TimeOfDay'}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -736,7 +721,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'creationDate', type: 'sap.ui.model.odata.type.DateTimeOffset', constraints: {precision: 7}}\\"
+          text=\\"{path: 'creationDate', type: 'sap.ui.model.odata.type.DateTimeOffset', constraints: {precision: 7}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -748,14 +733,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:id=\\"MacroInput\\"
           xmlns:ns3=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
           ns3:sourcePath=\\"/Items/creationDate\\"
-          value=\\"{path:'creationDate', type: 'sap.ui.model.odata.type.DateTimeOffset', constraints: {precision: 7}}\\"
+          value=\\"{path: 'creationDate', type: 'sap.ui.model.odata.type.DateTimeOffset', constraints: {precision: 7}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -782,7 +767,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
+          text=\\"{path: 'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -794,11 +779,11 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/preferredItem\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          selected=\\"{path:'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
+          selected=\\"{path: 'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           select=\\"FieldRuntime.handleChange($controller, $event)\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -825,7 +810,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -837,14 +822,14 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns2:sourcePath=\\"/Items/name\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -862,7 +847,7 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
-      emptyIndicatorTrigger=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+      emptyIndicatorTrigger=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
       editMode=\\"{= %{ui&gt;/isEditable} ? 'Editable' : 'Display'}\\"
       visible=\\"true\\"
       required=\\"false\\"
@@ -871,7 +856,7 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -883,14 +868,14 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
           ns2:sourcePath=\\"/Items/name\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -930,14 +915,14 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
           ns2:sourcePath=\\"/Items/propWithText\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -964,7 +949,7 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -976,14 +961,14 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
           ns2:sourcePath=\\"/Items/name\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1014,7 +999,7 @@ exports[`MacroField - dataField annotation-  criticality  1`] = `
           ns1:id=\\"MacroDataFieldObjectStatus\\"
           icon=\\"{= (%{usageCounter} === 'UI.CriticalityType/Negative' || %{usageCounter} === 1 || %{usageCounter} === '1') ? 'sap-icon://message-error' : ((%{usageCounter} === 'UI.CriticalityType/Critical' || %{usageCounter} === 2 || %{usageCounter} === '2') ? 'sap-icon://message-warning' : ((%{usageCounter} === 'UI.CriticalityType/Positive' || %{usageCounter} === 3 || %{usageCounter} === '3') ? 'sap-icon://message-success' : ((%{usageCounter} === 'UI.CriticalityType/Information' || %{usageCounter} === 5 || %{usageCounter} === '5') ? 'sap-icon://message-information' : '')))}\\"
           state=\\"{= (%{usageCounter} === 'UI.CriticalityType/Negative' || %{usageCounter} === 1 || %{usageCounter} === '1') ? 'Error' : ((%{usageCounter} === 'UI.CriticalityType/Critical' || %{usageCounter} === 2 || %{usageCounter} === '2') ? 'Warning' : ((%{usageCounter} === 'UI.CriticalityType/Positive' || %{usageCounter} === 3 || %{usageCounter} === '3') ? 'Success' : ((%{usageCounter} === 'UI.CriticalityType/Information' || %{usageCounter} === 5 || %{usageCounter} === '5') ? 'Indication05' : 'None')))}\\"
-          text=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1026,14 +1011,14 @@ exports[`MacroField - dataField annotation-  criticality  1`] = `
           ns3:sourcePath=\\"/Items/name\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'name', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1061,7 +1046,7 @@ exports[`MacroField - when it uses directly a property -  Boolean property 1`] =
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
+          text=\\"{path: 'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1073,11 +1058,11 @@ exports[`MacroField - when it uses directly a property -  Boolean property 1`] =
           ns2:sourcePath=\\"/Items/preferredItem\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          selected=\\"{path:'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
+          selected=\\"{path: 'preferredItem', type: 'sap.ui.model.odata.type.Boolean'}\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           select=\\"FieldRuntime.handleChange($controller, $event)\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1117,14 +1102,14 @@ exports[`MacroField - when it uses directly a property -  Property with text arr
           ns2:sourcePath=\\"/Items/propWithText\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1152,7 +1137,7 @@ exports[`MacroField - when it uses directly a property -  Property with text arr
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1164,14 +1149,14 @@ exports[`MacroField - when it uses directly a property -  Property with text arr
           ns2:sourcePath=\\"/Items/propWithText\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'propWithText', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1250,6 +1235,9 @@ exports[`MacroField - with annotations on the dataField's Value property (except
         />
       </control:contentDisplay>
       <control:contentEdit>
+        <HBox xmlns=\\"sap.m\\" visible=\\"false\\">
+          <BusyIndicator />
+        </HBox>
         <HBox
           xmlns=\\"sap.m\\"
           alignItems=\\"Center\\"
@@ -1279,19 +1267,22 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               sendXHR=\\"true\\"
               useMultipart=\\"false\\"
               sameFilenameAllowed=\\"true\\"
+              typeMissmatch=\\"FIELDRUNTIME.handleTypeMissmatch\\"
+              fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
               uploadOnChange=\\"false\\"
-              uploadAborted=\\"FIELDRUNTIME.handleUploadAborted\\"
-              uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '')\\"
+              uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
               uploadUrl=\\"{imageURLStream}\\"
               httpRequestMethod=\\"Put\\"
-              change=\\"FIELDRUNTIME.uploadStream\\"
+              change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
             />
             <Button
               icon=\\"sap-icon://sys-cancel\\"
               type=\\"Transparent\\"
-              press=\\"FIELDRUNTIME.removeStream($event, 'imageURLStream')\\"
+              press=\\"FIELDRUNTIME.removeStream($event, 'imageURLStream', $controller)\\"
               tooltip=\\"Delete file\\"
               visible=\\"{ui&gt;/isEditable}\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
             />
           </HBox>
         </HBox>
@@ -1346,7 +1337,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
       <control:contentDisplay>
         <ExpandableText
           xmlns=\\"sap.m\\"
-          text=\\"{path:'multiline', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'multiline', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           overflowMode=\\"Popover\\"
           maxCharacters=\\"50\\"
         />
@@ -1360,7 +1351,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns2:id=\\"MacroInput\\"
           xmlns:ns3=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
           ns3:sourcePath=\\"/Items/multiline\\"
-          value=\\"{path:'multiline', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'multiline', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           required=\\"false\\"
           rows=\\"31\\"
           growing=\\"true\\"
@@ -1369,7 +1360,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1399,8 +1390,8 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           <!-- We use % to prevent ODataBinding automatically formatting the stringValue as a number-->
           <u:Currency
             xmlns:u=\\"sap.ui.unified\\"
-            stringValue=\\"{path:'amount1', targetType: 'any'}\\"
-            currency=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+            stringValue=\\"{path: 'amount1', targetType: 'any'}\\"
+            currency=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
             useSymbol=\\"false\\"
             maxPrecision=\\"3\\"
           />
@@ -1421,8 +1412,8 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -1430,13 +1421,13 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns3:sourcePath=\\"/Items/amount1\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"true\\"
         />
       </control:contentEdit>
@@ -1457,7 +1448,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
       xmlns:control=\\"sap.fe.core.controls\\"
       emptyIndicatorTrigger=\\"inactive\\"
       editMode=\\"{= %{ui&gt;/isEditable} ? 'Editable' : 'Display'}\\"
-      visible=\\"{= (%{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0)}\\"
+      visible=\\"{= %{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0}\\"
       required=\\"false\\"
       width=\\"100%\\"
     >
@@ -1465,13 +1456,13 @@ exports[`MacroField - with annotations on the dataField's Value property (except
         <control:FormElementWrapper formDoNotAdjustWidth=\\"true\\">
           <!-- if Analytical Table -->
           <control:ConditionalWrapper
-            condition=\\"{= (!!%{unit1} || %{@$ui5.node.isTotal} !== true)}\\"
+            condition=\\"{= !!%{unit1} || %{@$ui5.node.isTotal} !== true}\\"
           >
             <control:contentTrue>
               <u:Currency
                 xmlns:u=\\"sap.ui.unified\\"
-                stringValue=\\"{path:'amount1', targetType: 'any'}\\"
-                currency=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+                stringValue=\\"{path: 'amount1', targetType: 'any'}\\"
+                currency=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
                 useSymbol=\\"false\\"
                 maxPrecision=\\"3\\"
               />
@@ -1502,8 +1493,8 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -1511,13 +1502,13 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns3:sourcePath=\\"/Items/amount1\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"true\\"
         />
       </control:contentEdit>
@@ -1538,13 +1529,13 @@ exports[`MacroField - with annotations on the dataField's Value property (except
       xmlns:control=\\"sap.fe.core.controls\\"
       emptyIndicatorTrigger=\\"inactive\\"
       editMode=\\"{= %{ui&gt;/isEditable} ? 'Editable' : 'Display'}\\"
-      visible=\\"{= (%{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0)}\\"
+      visible=\\"{= %{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0}\\"
       required=\\"false\\"
       width=\\"100%\\"
     >
       <control:contentDisplay>
         <control:ConditionalWrapper
-          condition=\\"{= (!!%{unit1} || %{@$ui5.node.isTotal} !== true)}\\"
+          condition=\\"{= !!%{unit1} || %{@$ui5.node.isTotal} !== true}\\"
         >
           <control:contentTrue>
             <Text
@@ -1572,8 +1563,8 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
         <Input
           xmlns=\\"sap.m\\"
@@ -1581,13 +1572,13 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns3:sourcePath=\\"/Items/quantity1\\"
           xmlns:ns4=\\"sap.ui.core\\"
           ns4:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
-          textAlign=\\"End\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
           visible=\\"true\\"
         />
       </control:contentEdit>
@@ -1615,7 +1606,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
       <control:contentDisplay>
         <Link
           xmlns=\\"sap.m\\"
-          text=\\"{path:'phoneNumber', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'phoneNumber', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           href=\\"tel:{path:'phoneNumber',type:'sap.ui.model.odata.type.String',formatOptions:{'parseKeepsEmptyString':true}}\\"
         />
       </control:contentDisplay>
@@ -1628,14 +1619,14 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns2:sourcePath=\\"/Items/phoneNumber\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'phoneNumber', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'phoneNumber', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1662,7 +1653,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
       <control:contentDisplay>
         <Link
           xmlns=\\"sap.m\\"
-          text=\\"{path:'emailAddress', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'emailAddress', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           href=\\"mailto:{path:'emailAddress',type:'sap.ui.model.odata.type.String',formatOptions:{'parseKeepsEmptyString':true}}\\"
         />
       </control:contentDisplay>
@@ -1675,14 +1666,14 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns2:sourcePath=\\"/Items/emailAddress\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'emailAddress', type: 'sap.fe.core.type.Email'}\\"
+          value=\\"{path: 'emailAddress', type: 'sap.fe.core.type.Email'}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1691,6 +1682,126 @@ exports[`MacroField - with annotations on the dataField's Value property (except
 "
 `;
 
+exports[`MacroField - with annotations on the dataField's Value property (except semantic)  Stream with mime type and file size restrictions 1`] = `
+"<root>
+  <macro:FieldAPI
+    xmlns:macro=\\"sap.fe.macros\\"
+    required=\\"false\\"
+    editable=\\"{ui&gt;/isEditable}\\"
+  >
+    <control:FieldWrapper
+      xmlns:control=\\"sap.fe.core.controls\\"
+      emptyIndicatorTrigger=\\"inactive\\"
+      editMode=\\"{= %{ui&gt;/isEditable} ? 'Editable' : 'Display'}\\"
+      visible=\\"true\\"
+      required=\\"false\\"
+      width=\\"100%\\"
+    >
+      <control:contentDisplay>
+        <HBox
+          xmlns=\\"sap.m\\"
+          xmlns:ns1=\\"sap.ui.core\\"
+          ns1:require=\\"{FIELDRUNTIME: 'sap/fe/macros/field/FieldRuntime'}\\"
+        >
+          <HBox
+            alignItems=\\"Center\\"
+            visible=\\"{= %{streamWithTypeAndSizeRestriction@odata.mediaContentType} !== null }\\"
+          >
+            <ns1:Icon
+              src=\\"{= FIELDRUNTIME.getIconForMimeType(%{streamWithTypeAndSizeRestriction@odata.mediaContentType})}\\"
+              class=\\"sapUiSmallMarginEnd\\"
+            />
+            <Link
+              text=\\"Open File\\"
+              target=\\"_blank\\"
+              href=\\"{streamWithTypeAndSizeRestriction}\\"
+            />
+          </HBox>
+          <Text
+            emptyIndicatorMode=\\"On\\"
+            text=\\"\\"
+            visible=\\"{= %{streamWithTypeAndSizeRestriction@odata.mediaContentType} === null }\\"
+          />
+        </HBox>
+      </control:contentDisplay>
+      <control:contentEdit>
+        <HBox xmlns=\\"sap.m\\" visible=\\"false\\">
+          <BusyIndicator />
+        </HBox>
+        <HBox
+          xmlns=\\"sap.m\\"
+          alignItems=\\"Center\\"
+          width=\\"100%\\"
+          justifyContent=\\"SpaceBetween\\"
+          wrap=\\"Wrap\\"
+          xmlns:ns2=\\"sap.ui.core\\"
+          ns2:require=\\"{FIELDRUNTIME: 'sap/fe/macros/field/FieldRuntime'}\\"
+        >
+          <HBox
+            ns2:require=\\"{FIELDRUNTIME: 'sap/fe/macros/field/FieldRuntime'}\\"
+          >
+            <HBox
+              alignItems=\\"Center\\"
+              visible=\\"{= %{streamWithTypeAndSizeRestriction@odata.mediaContentType} !== null }\\"
+            >
+              <ns2:Icon
+                src=\\"{= FIELDRUNTIME.getIconForMimeType(%{streamWithTypeAndSizeRestriction@odata.mediaContentType})}\\"
+                class=\\"sapUiSmallMarginEnd\\"
+              />
+              <Link
+                text=\\"Open File\\"
+                target=\\"_blank\\"
+                href=\\"{streamWithTypeAndSizeRestriction}\\"
+              />
+            </HBox>
+            <Text
+              emptyIndicatorMode=\\"On\\"
+              text=\\"\\"
+              visible=\\"{= %{streamWithTypeAndSizeRestriction@odata.mediaContentType} === null }\\"
+            />
+          </HBox>
+          <HBox alignItems=\\"Center\\">
+            <u:FileUploader
+              xmlns:u=\\"sap.ui.unified\\"
+              name=\\"FEV4FileUpload\\"
+              visible=\\"{ui&gt;/isEditable}\\"
+              buttonOnly=\\"true\\"
+              iconOnly=\\"true\\"
+              multiple=\\"false\\"
+              tooltip=\\"Upload file\\"
+              icon=\\"sap-icon://upload\\"
+              style=\\"Transparent\\"
+              sendXHR=\\"true\\"
+              useMultipart=\\"false\\"
+              sameFilenameAllowed=\\"true\\"
+              mimeType=\\"{=odata.collection(['text/plain'])}\\"
+              typeMissmatch=\\"FIELDRUNTIME.handleTypeMissmatch\\"
+              maximumFileSize=\\"0.000977\\"
+              fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
+              uploadOnChange=\\"false\\"
+              uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
+              uploadUrl=\\"{streamWithTypeAndSizeRestriction}\\"
+              httpRequestMethod=\\"Put\\"
+              change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
+            />
+            <Button
+              icon=\\"sap-icon://sys-cancel\\"
+              type=\\"Transparent\\"
+              press=\\"FIELDRUNTIME.removeStream($event, 'streamWithTypeAndSizeRestriction', $controller)\\"
+              tooltip=\\"Delete file\\"
+              visible=\\"{ui&gt;/isEditable}\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
+            />
+          </HBox>
+        </HBox>
+      </control:contentEdit>
+    </control:FieldWrapper>
+  </macro:FieldAPI>
+</root>
+"
+`;
+
 exports[`MacroField - with annotations on the dataField's Value property (except semantic)  StreamNoImage renders Icon, Link and FileUploader  1`] = `
 "<root>
   <macro:FieldAPI
@@ -1730,6 +1841,9 @@ exports[`MacroField - with annotations on the dataField's Value property (except
         </HBox>
       </control:contentDisplay>
       <control:contentEdit>
+        <HBox xmlns=\\"sap.m\\" visible=\\"false\\">
+          <BusyIndicator />
+        </HBox>
         <HBox
           xmlns=\\"sap.m\\"
           alignItems=\\"Center\\"
@@ -1772,19 +1886,22 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               sendXHR=\\"true\\"
               useMultipart=\\"false\\"
               sameFilenameAllowed=\\"true\\"
+              typeMissmatch=\\"FIELDRUNTIME.handleTypeMissmatch\\"
+              fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
               uploadOnChange=\\"false\\"
-              uploadAborted=\\"FIELDRUNTIME.handleUploadAborted\\"
-              uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '')\\"
+              uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
               uploadUrl=\\"{streamNoImage}\\"
               httpRequestMethod=\\"Put\\"
-              change=\\"FIELDRUNTIME.uploadStream\\"
+              change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
             />
             <Button
               icon=\\"sap-icon://sys-cancel\\"
               type=\\"Transparent\\"
-              press=\\"FIELDRUNTIME.removeStream($event, 'streamNoImage')\\"
+              press=\\"FIELDRUNTIME.removeStream($event, 'streamNoImage', $controller)\\"
               tooltip=\\"Delete file\\"
               visible=\\"{ui&gt;/isEditable}\\"
+              validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
             />
           </HBox>
         </HBox>
@@ -1800,7 +1917,7 @@ exports[`MacroField Test the ReadOnly property  On both properties - Dynamic Val
   <macro:FieldAPI
     xmlns:macro=\\"sap.fe.macros\\"
     required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
-    editable=\\"{= (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{ui&gt;/isEditable})}\\"
+    editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{ui&gt;/isEditable}}\\"
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -1813,7 +1930,7 @@ exports[`MacroField Test the ReadOnly property  On both properties - Dynamic Val
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'PostalCode', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'PostalCode', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1825,14 +1942,14 @@ exports[`MacroField Test the ReadOnly property  On both properties - Dynamic Val
           ns2:sourcePath=\\"/Items/PostalCode\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'PostalCode', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'PostalCode', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
           width=\\"100%\\"
-          editable=\\"{= (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{ui&gt;/isEditable})}\\"
-          enabled=\\"{= (%{fieldReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== 0)}\\"
+          editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{ui&gt;/isEditable}}\\"
+          enabled=\\"{= %{fieldReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== 0}\\"
           required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1859,7 +1976,7 @@ exports[`MacroField Test the ReadOnly property  On both properties - Static valu
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1871,14 +1988,14 @@ exports[`MacroField Test the ReadOnly property  On both properties - Static valu
           ns2:sourcePath=\\"/Items/PostalCodeStatic\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1901,7 +2018,7 @@ exports[`MacroField Test the ReadOnly property  On both properties - Static valu
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
         />
       </control:contentDisplay>
     </control:FieldWrapper>
@@ -1915,7 +2032,7 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Dyna
   <macro:FieldAPI
     xmlns:macro=\\"sap.fe.macros\\"
     required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
-    editable=\\"{= (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable})}\\"
+    editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable}}\\"
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -1928,7 +2045,7 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Dyna
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'PostalCode', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'PostalCode', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1940,14 +2057,14 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Dyna
           ns2:sourcePath=\\"/Items/PostalCode\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'PostalCode', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'PostalCode', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
           width=\\"100%\\"
-          editable=\\"{= (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable})}\\"
+          editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === 0) ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable}}\\"
           enabled=\\"{= %{fieldReadOnly} !== 0}\\"
           required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -1974,7 +2091,7 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Stat
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -1986,14 +2103,14 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Stat
           ns2:sourcePath=\\"/Items/PostalCodeStatic\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', constraints: {maxLength: 10}, formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'PostalCodeStatic', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}, constraints: {maxLength: 10}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -2007,7 +2124,7 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Dyn
   <macro:FieldAPI
     xmlns:macro=\\"sap.fe.macros\\"
     required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
-    editable=\\"{= (%{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0)}\\"
+    editable=\\"{= %{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0}\\"
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
@@ -2020,7 +2137,7 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Dyn
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -2032,14 +2149,14 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Dyn
           ns2:sourcePath=\\"/Items/unit1\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
-          editable=\\"{= (%{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0)}\\"
+          editable=\\"{= %{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0}\\"
           enabled=\\"{= %{fieldReadOnly} !== 0}\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>
@@ -2066,7 +2183,7 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Sta
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          text=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -2078,14 +2195,14 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Sta
           ns2:sourcePath=\\"/Items/unit1\\"
           xmlns:ns3=\\"sap.ui.core\\"
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{path:'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
+          value=\\"{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}}\\"
           width=\\"100%\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
-          validateFieldGroup=\\".sideEffects.handleFieldGroupChange($event)\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
         />
       </control:contentEdit>
     </control:FieldWrapper>