@sap/open.fe 1.98.0 → 1.99.0

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

@@ -6,7 +6,7 @@ exports[`MacroField - check control templating for ListReport / field with nowra
   <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'}\\"
+    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>
 "
@@ -18,7 +18,7 @@ exports[`MacroField - check control templating for ListReport / field with nowra
   <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'}\\"
+    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>
 "
@@ -43,7 +43,7 @@ exports[`MacroField - check control templating for ListReport / field with nowra
       <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'}\\"
+          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>
@@ -443,7 +443,7 @@ exports[`MacroField - check control templating for basic types and input alignme
           <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}}\\"
+            currency=\\"{unit1}\\"
             useSymbol=\\"false\\"
             maxPrecision=\\"3\\"
           />
@@ -456,7 +456,7 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns1:sourcePath=\\"/Items/amount1\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'amount1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestCurrencyCodes',targetType:'any'}],type:'sap.ui.model.odata.type.Currency', formatOptions: {parseAsString: false, emptyString: '', showMeasure: false}}\\"
+          value=\\"{path: 'amount1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"70%\\"
           fieldWidth=\\"100%\\"
           description=\\"\\"
@@ -473,7 +473,7 @@ 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=\\"{unit1}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -507,7 +507,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{mode:'TwoWay', parts:[{path:'quantityWithStaticUnit', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{value: 'mass-gram'},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          text=\\"{mode:'TwoWay', parts:[{path: 'quantityWithStaticUnit', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{value: 'mass-gram'},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -520,7 +520,7 @@ exports[`MacroField - check control templating for basic types and input alignme
           value=\\"{path: 'quantityWithStaticUnit', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"100%\\"
           fieldWidth=\\"70%\\"
-          description=\\"mass-gram\\"
+          description=\\"grams\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
@@ -553,7 +553,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{mode:'TwoWay', parts:[{path:'quantity1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          text=\\"{mode:'TwoWay', parts:[{path: 'quantity1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -563,7 +563,7 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns1:sourcePath=\\"/Items/quantity1\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'quantity1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: '', showMeasure: false}}\\"
+          value=\\"{path: 'quantity1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"70%\\"
           fieldWidth=\\"100%\\"
           description=\\"\\"
@@ -580,7 +580,7 @@ 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=\\"{unit1}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -614,7 +614,7 @@ exports[`MacroField - check control templating for basic types and input alignme
       <control:contentDisplay>
         <Text
           xmlns=\\"sap.m\\"
-          text=\\"{mode:'TwoWay', parts:[{path:'quantity2', type : 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}},{path:'unit2', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}\\"
+          text=\\"{mode:'TwoWay', parts:[{path: 'quantity2', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}},{path: 'unit2', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit'}\\"
         />
       </control:contentDisplay>
       <control:contentEdit>
@@ -624,10 +624,10 @@ exports[`MacroField - check control templating for basic types and input alignme
           ns1:sourcePath=\\"/Items/quantity2\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'quantity2', type : 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}},{path:'unit2', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {showMeasure: false}}\\"
+          value=\\"{path: 'quantity2', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}}\\"
           width=\\"100%\\"
           fieldWidth=\\"70%\\"
-          description=\\"{mode:'TwoWay', parts:[{path:'quantity2', type : 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}},{path:'unit2', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {showNumber: false}}\\"
+          description=\\"{mode:'TwoWay', parts:[{path: 'quantity2', type: 'sap.ui.model.odata.type.Decimal', constraints: {scale: 2, precision: 10}},{path: 'unit2', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {showNumber: false}}\\"
           editable=\\"{ui&gt;/isEditable}\\"
           enabled=\\"true\\"
           required=\\"false\\"
@@ -641,7 +641,7 @@ 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=\\"{unit2}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -894,7 +894,7 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
     <!-- 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=\\"{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'}\\"
+      emptyIndicatorTrigger=\\"{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'}\\"
       editMode=\\"{= %{ui&gt;/isEditable} ? 'Editable' : 'Display'}\\"
       visible=\\"true\\"
       required=\\"false\\"
@@ -903,7 +903,7 @@ exports[`MacroField - check control templating for empty placeHolder trigger-  w
       <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'}\\"
+          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:contentEdit>
@@ -1090,7 +1090,7 @@ exports[`MacroField - when it uses directly a property -  Property with text arr
       <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'}\\"
+          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:contentEdit>
@@ -1271,7 +1271,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
               uploadOnChange=\\"false\\"
               uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
-              uploadUrl=\\"{imageURLStream}\\"
+              uploadUrl=\\"{path:'imageURLStream',type:'sap.ui.model.odata.type.Stream'}\\"
               httpRequestMethod=\\"Put\\"
               change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
               validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
@@ -1391,7 +1391,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           <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}}\\"
+            currency=\\"{unit1}\\"
             useSymbol=\\"false\\"
             maxPrecision=\\"3\\"
           />
@@ -1404,7 +1404,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns1:sourcePath=\\"/Items/amount1\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'amount1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestCurrencyCodes',targetType:'any'}],type:'sap.ui.model.odata.type.Currency', formatOptions: {parseAsString: false, emptyString: '', showMeasure: false}}\\"
+          value=\\"{path: 'amount1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"70%\\"
           fieldWidth=\\"100%\\"
           description=\\"\\"
@@ -1421,7 +1421,81 @@ 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=\\"{unit1}\\"
+          width=\\"30%\\"
+          editable=\\"true\\"
+          enabled=\\"true\\"
+          change=\\"FieldRuntime.handleChange($controller, $event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
+          visible=\\"true\\"
+        />
+      </control:contentEdit>
+    </control:FieldWrapper>
+  </macro:FieldAPI>
+</root>
+"
+`;
+
+exports[`MacroField - with annotations on the dataField's Value property (except semantic)  Simple DataField on a Quantity with currency property and a Criticality for Analytics 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=\\"{= %{@$ui5.node.isExpanded} !== true || %{@$ui5.node.level} === 0}\\"
+      required=\\"false\\"
+      width=\\"100%\\"
+    >
+      <control:contentDisplay>
+        <control:ConditionalWrapper
+          condition=\\"{= !!%{unit1} || %{@$ui5.node.isTotal} !== true}\\"
+        >
+          <control:contentTrue>
+            <ObjectStatus
+              xmlns=\\"sap.m\\"
+              xmlns:ns1=\\"http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/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=\\"{mode:'TwoWay', parts:[{path: 'amount1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestCurrencyCodes',targetType:'any'}],type:'sap.ui.model.odata.type.Currency', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+            />
+          </control:contentTrue>
+          <control:contentFalse>
+            <ObjectStatus xmlns=\\"sap.m\\" text=\\"*\\" />
+          </control:contentFalse>
+        </control:ConditionalWrapper>
+      </control:contentDisplay>
+      <control:contentEdit>
+        <Input
+          xmlns=\\"sap.m\\"
+          xmlns:ns2=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
+          ns2:sourcePath=\\"/Items/amount1\\"
+          xmlns:ns3=\\"sap.ui.core\\"
+          ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
+          value=\\"{path: 'amount1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+          width=\\"70%\\"
+          fieldWidth=\\"100%\\"
+          description=\\"\\"
+          editable=\\"{ui&gt;/isEditable}\\"
+          enabled=\\"true\\"
+          required=\\"false\\"
+          change=\\"FieldRuntime.handleChange($controller, $event)\\"
+          textAlign=\\"Right\\"
+          validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
+        />
+        <Input
+          xmlns=\\"sap.m\\"
+          xmlns:ns4=\\"http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1\\"
+          ns4:sourcePath=\\"/Items/amount1\\"
+          xmlns:ns5=\\"sap.ui.core\\"
+          ns5:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
+          value=\\"{unit1}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -1462,7 +1536,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               <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}}\\"
+                currency=\\"{unit1}\\"
                 useSymbol=\\"false\\"
                 maxPrecision=\\"3\\"
               />
@@ -1485,7 +1559,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns1:sourcePath=\\"/Items/amount1\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'amount1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestCurrencyCodes',targetType:'any'}],type:'sap.ui.model.odata.type.Currency', formatOptions: {parseAsString: false, emptyString: '', showMeasure: false}}\\"
+          value=\\"{path: 'amount1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"70%\\"
           fieldWidth=\\"100%\\"
           description=\\"\\"
@@ -1502,7 +1576,7 @@ 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=\\"{unit1}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -1540,7 +1614,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           <control:contentTrue>
             <Text
               xmlns=\\"sap.m\\"
-              text=\\"{mode:'TwoWay', parts:[{path:'quantity1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
+              text=\\"{mode:'TwoWay', parts:[{path: 'quantity1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path: 'unit1', type: 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: ''}}\\"
             />
           </control:contentTrue>
           <control:contentFalse>
@@ -1555,7 +1629,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
           ns1:sourcePath=\\"/Items/quantity1\\"
           xmlns:ns2=\\"sap.ui.core\\"
           ns2:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
-          value=\\"{mode:'TwoWay', parts:[{path:'quantity1', type : 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}},{path:'unit1', type : 'sap.ui.model.odata.type.String', formatOptions: {parseKeepsEmptyString: true}},{mode:'OneTime',path:'/##@@requestUnitsOfMeasure',targetType:'any'}],type:'sap.ui.model.odata.type.Unit', formatOptions: {parseAsString: false, emptyString: '', showMeasure: false}}\\"
+          value=\\"{path: 'quantity1', type: 'sap.ui.model.odata.type.Int64', formatOptions: {parseAsString: false, emptyString: ''}}\\"
           width=\\"70%\\"
           fieldWidth=\\"100%\\"
           description=\\"\\"
@@ -1572,7 +1646,7 @@ 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=\\"{unit1}\\"
           width=\\"30%\\"
           editable=\\"true\\"
           enabled=\\"true\\"
@@ -1780,7 +1854,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
               uploadOnChange=\\"false\\"
               uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
-              uploadUrl=\\"{streamWithTypeAndSizeRestriction}\\"
+              uploadUrl=\\"{path:'streamWithTypeAndSizeRestriction',type:'sap.ui.model.odata.type.Stream'}\\"
               httpRequestMethod=\\"Put\\"
               change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
               validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
@@ -1890,7 +1964,7 @@ exports[`MacroField - with annotations on the dataField's Value property (except
               fileSizeExceed=\\"FIELDRUNTIME.handleFileSizeExceed\\"
               uploadOnChange=\\"false\\"
               uploadComplete=\\"FIELDRUNTIME.handleUploadComplete($event, '', $controller)\\"
-              uploadUrl=\\"{streamNoImage}\\"
+              uploadUrl=\\"{path:'streamNoImage',type:'sap.ui.model.odata.type.Stream'}\\"
               httpRequestMethod=\\"Put\\"
               change=\\"FIELDRUNTIME.uploadStream($controller, $event)\\"
               validateFieldGroup=\\"FIELDRUNTIME.onValidateFieldGroup($controller, $event)\\"
@@ -1916,15 +1990,15 @@ exports[`MacroField Test the ReadOnly property  On both properties - Dynamic Val
 "<root>
   <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}}\\"
+    required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7' || %{anotherReadOnly} === 7 || %{anotherReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
+    editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== '1' &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== '0' &amp;&amp; %{ui&gt;/isEditable}}\\"
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
       emptyIndicatorTrigger=\\"inactive\\"
-      editMode=\\"{= (%{fieldReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== 0) ? ((((%{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 || %{anotherReadOnly} === 1) &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
+      editMode=\\"{= (%{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== '0') ? ((((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== '1' &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== '0' &amp;&amp; %{ui&gt;/isEditable}) ? 'Editable' : (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{anotherReadOnly} === 1 || %{anotherReadOnly} === '1') &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
       visible=\\"true\\"
-      required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
+      required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7' || %{anotherReadOnly} === 7 || %{anotherReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
       width=\\"100%\\"
     >
       <control:contentDisplay>
@@ -1944,9 +2018,9 @@ exports[`MacroField Test the ReadOnly property  On both properties - Dynamic Val
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
           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}\\"
-          required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
+          editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{anotherReadOnly} !== 1 &amp;&amp; %{anotherReadOnly} !== '1' &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== '0' &amp;&amp; %{ui&gt;/isEditable}}\\"
+          enabled=\\"{= %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{anotherReadOnly} !== 0 &amp;&amp; %{anotherReadOnly} !== '0'}\\"
+          required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7' || %{anotherReadOnly} === 7 || %{anotherReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
           validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
@@ -2031,15 +2105,15 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Dyna
 "<root>
   <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}}\\"
+    required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
+    editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &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\\"
       emptyIndicatorTrigger=\\"inactive\\"
-      editMode=\\"{= %{fieldReadOnly} !== 0 ? ((((%{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 &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
+      editMode=\\"{= (%{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0') ? ((((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable}) ? 'Editable' : (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1') &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
       visible=\\"true\\"
-      required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
+      required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
       width=\\"100%\\"
     >
       <control:contentDisplay>
@@ -2059,9 +2133,9 @@ exports[`MacroField Test the ReadOnly property  On the DataField property - Dyna
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
           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}}\\"
-          enabled=\\"{= %{fieldReadOnly} !== 0}\\"
-          required=\\"{= %{fieldReadOnly} === 7 &amp;&amp; %{ui&gt;/editMode} === 'Editable'}\\"
+          editable=\\"{= ((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1' || %{fieldReadOnly} === 0 || %{fieldReadOnly} === '0') ? (%{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0' &amp;&amp; %{@$ui5.context.isTransient} === true) : %{ui&gt;/isEditable}) &amp;&amp; %{ui&gt;/isEditable}}\\"
+          enabled=\\"{= %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0'}\\"
+          required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
           validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"
@@ -2123,15 +2197,15 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Dyn
 "<root>
   <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}\\"
+    required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
+    editable=\\"{= %{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0'}\\"
   >
     <control:FieldWrapper
       xmlns:control=\\"sap.fe.core.controls\\"
       emptyIndicatorTrigger=\\"inactive\\"
-      editMode=\\"{= %{fieldReadOnly} !== 0 ? ((%{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== 0) ? 'Editable' : ((%{fieldReadOnly} === 1 &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
+      editMode=\\"{= (%{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0') ? ((%{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0') ? 'Editable' : (((%{fieldReadOnly} === 1 || %{fieldReadOnly} === '1') &amp;&amp; %{ui&gt;/isEditable}) ? 'ReadOnly' : 'Display')) : (%{ui&gt;/isEditable} ? 'Disabled' : 'Display')}\\"
       visible=\\"true\\"
-      required=\\"false\\"
+      required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
       width=\\"100%\\"
     >
       <control:contentDisplay>
@@ -2151,9 +2225,9 @@ exports[`MacroField Test the ReadOnly property  On the annotation property - Dyn
           ns3:require=\\"{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}\\"
           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}\\"
-          enabled=\\"{= %{fieldReadOnly} !== 0}\\"
-          required=\\"false\\"
+          editable=\\"{= %{ui&gt;/isEditable} &amp;&amp; %{fieldReadOnly} !== 1 &amp;&amp; %{fieldReadOnly} !== '1' &amp;&amp; %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0'}\\"
+          enabled=\\"{= %{fieldReadOnly} !== 0 &amp;&amp; %{fieldReadOnly} !== '0'}\\"
+          required=\\"{= (%{fieldReadOnly} === 7 || %{fieldReadOnly} === '7') &amp;&amp; %{ui&gt;/isEditable}}\\"
           change=\\"FieldRuntime.handleChange($controller, $event)\\"
           textAlign=\\"Begin\\"
           validateFieldGroup=\\"FieldRuntime.onValidateFieldGroup($controller, $event)\\"