@sap/open.fe 1.98.0 → 1.99.0

package/packages/sap.fe.macros/src/sap/fe/macros/internal/CollectionField.metadata.ts

@@ -1,9 +1,3 @@
-/*!
- * SAP UI development toolkit for HTML5 (SAPUI5)
-        (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
- */
-
 import { MacroMetadata } from "sap/fe/macros";
 import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
 import { getDisplayMode } from "sap/fe/core/templating/UIFormatters";
@@ -20,11 +14,11 @@ import {
 } from "sap/fe/core/helpers/BindingExpression";
 import * as DataModelPathHelper from "sap/fe/core/templating/DataModelPathHelper";
 import { NavigationProperty, Property } from "@sap-ux/annotation-converter";
-import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 
 type MultiInputSettings = {
 	text: Expression<string> | BindingExpression<string>;
-	collection: BindingExpression<string>;
+	collectionBindingDisplay: BindingExpression<string>;
+	collectionBindingEdit: BindingExpression<string>;
 	key: Expression<string> | BindingExpression<string>;
 };
 /**
@@ -109,7 +103,19 @@ const CollectionField = MacroMetadata.extend("sap.fe.macros.internal.CollectionF
 			},
 			formatOptions: {
 				type: "object",
-				properties: {}
+				properties: {
+					/**
+					 * If set to 'true', SAP Fiori elements shows an empty indicator in display mode for the text and links
+					 */
+					showEmptyIndicator: {
+						type: "boolean",
+						defaultValue: false
+					},
+					displayOnly: {
+						type: "boolean",
+						defaultValue: false
+					}
+				}
 			},
 			/**
 			 * Mandatory context to the CollectionField
@@ -133,12 +139,16 @@ const CollectionField = MacroMetadata.extend("sap.fe.macros.internal.CollectionF
 		}
 		const bInsertable = DataModelPathHelper.isPathInsertable(oDataModelPath);
 		const bDeletable = DataModelPathHelper.isPathDeletable(oDataModelPath, undefined, true);
-		oProps.editMode = compileBinding(ifElse(and(bInsertable, bDeletable, UI.IsEditable), constant("Editable"), constant("Display")));
+		oProps.editMode =
+			oProps.formatOptions.displayOnly === "true"
+				? "Display"
+				: compileBinding(ifElse(and(bInsertable, bDeletable, UI.IsEditable), constant("Editable"), constant("Display")));
 		oProps.displayMode = getDisplayMode(oPropertyPath, oDataModelPath);
 
 		const multiInputSettings = CollectionField._getMultiInputSettings(oDataModelPath, oProps.formatOptions);
 		oProps.text = multiInputSettings.text;
-		oProps.collection = multiInputSettings.collection;
+		oProps.collection =
+			oProps.editMode === "Display" ? multiInputSettings.collectionBindingDisplay : multiInputSettings.collectionBindingEdit;
 		oProps.key = multiInputSettings.key;
 		return oProps;
 	},
@@ -146,9 +156,9 @@ const CollectionField = MacroMetadata.extend("sap.fe.macros.internal.CollectionF
 		oPropertyDataModelObjectPath: DataModelPathHelper.DataModelObjectPath,
 		formatOptions: FieldFormatOptions
 	): MultiInputSettings {
-		const { collectionPath, itemDataModelObjectPath } = CollectionField._getFirstCollectionPath(oPropertyDataModelObjectPath);
-		const collectionBinding =
-			"{path:'" + collectionPath + "',  parameters : { $$groupId : '$auto.Workers' } , templateShareable: false}";
+		const { collectionPath, itemDataModelObjectPath } = CollectionField._getPathStructure(oPropertyDataModelObjectPath);
+		const collectionBindingDisplay = `{path:'${collectionPath}', templateShareable: false}`;
+		const collectionBindingEdit = `{path:'${collectionPath}', parameters: {$$ownRequest : true}, templateShareable: false}`;
 
 		const oPropertyDefinition =
 			oPropertyDataModelObjectPath.targetObject.type === "PropertyPath"
@@ -165,12 +175,14 @@ const CollectionField = MacroMetadata.extend("sap.fe.macros.internal.CollectionF
 			: getValueBinding(itemDataModelObjectPath, formatOptions, true);
 		return {
 			text: textExpression,
-			collection: collectionBinding,
+			collectionBindingDisplay: collectionBindingDisplay,
+			collectionBindingEdit: collectionBindingEdit,
 			key: getValueBinding(itemDataModelObjectPath, formatOptions, true)
 		};
 	},
-	_getFirstCollectionPath: function(dataModelObjectPath: DataModelObjectPath): object {
-		let firstCollectionPath: string = "";
+	// Process the dataModelPath to find the collection and the relative DataModelPath for the item.
+	_getPathStructure: function(dataModelObjectPath: DataModelPathHelper.DataModelObjectPath): object {
+		let firstCollectionPath = "";
 
 		let currentEntitySet = dataModelObjectPath.contextLocation?.targetEntitySet
 			? dataModelObjectPath.contextLocation.targetEntitySet

package/packages/sap.fe.macros/src/sap/fe/macros/internal/DataPoint.fragment.xml

@@ -16,9 +16,7 @@
 	core:require="{MESSAGE: 'sap/base/strings/formatMessage' }"
 >
 	<template:with path="metaPath>Value" var="property">
-		<template:if
-			test="{= ${metaPath>Visualization} &amp;&amp; ${metaPath>Visualization/$EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Rating'}"
-		>
+		<template:if test="{= ${this>visualization} === 'Rating'}">
 			<template:then>
 				<template:if test="{this>formatOptions/showLabels}">
 					<Label
@@ -46,9 +44,7 @@
 					/>
 				</template:if>
 			</template:then>
-			<template:elseif
-				test="{= ${metaPath>Visualization} &amp;&amp; ${metaPath>Visualization/$EnumMember} === 'com.sap.vocabularies.UI.v1.VisualizationType/Progress'}"
-			>
+			<template:elseif test="{= ${this>visualization} === 'Progress'}">
 				<template:if test="{this>formatOptions/showLabels}">
 					<Label
 						unittest:id="HeaderProgressIndicatorTestTop"
@@ -73,61 +69,56 @@
 					/>
 				</template:if>
 			</template:elseif>
-			<template:else>
-				<template:if
-					test="{= ${this>formatOptions/dataPointStyle} === 'LinkWithQuickViewForm' || ${this>formatOptions/dataPointStyle} === 'LinkWrapper'}"
-				>
-					<template:then>
-						<template:with path="metaPath>" var="dataField">
-							<template:with path="metaPath>Value" var="property">
-								<template:with path="property>$Path" var="propertyPath">
-									<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>formatOptions/dataPointStyle}" type="XML" />
-								</template:with>
-							</template:with>
+			<template:elseif test="{= ${this>visualization} === 'LinkWithQuickViewForm' || ${this>visualization} === 'LinkWrapper'}">
+				<template:with path="metaPath>" var="dataField">
+					<template:with path="metaPath>Value" var="property">
+						<template:with path="property>$Path" var="propertyPath">
+							<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>visualization}" type="XML" />
 						</template:with>
+					</template:with>
+				</template:with>
+			</template:elseif>
+			<template:elseif test="{= ${this>formatOptions/defaultDataPointStyle} === 'ObjectNumber'}">
+				<template:if test="{property>$Path@Org.OData.Measures.V1.ISOCurrency}">
+					<template:then>
+						<ObjectNumber
+							unittest:id="ObjectNumberCurrencyTest"
+							id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectNumber-Field-display']) : undefined }"
+							state="{this>criticalityColorExpression}"
+							number="{this>objectStatusNumber}"
+							unit="{property>$Path@Org.OData.Measures.V1.ISOCurrency@@MODEL.value}"
+							visible="{this>visible}"
+							emphasized="false"
+							class="sapMObjectNumberLarge"
+							tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
+						/>
 					</template:then>
-					<template:elseif test="{= ${this>formatOptions/defaultDataPointStyle} === 'ObjectNumber'}">
-						<template:if test="{property>$Path@Org.OData.Measures.V1.ISOCurrency}">
-							<template:then>
-									<ObjectNumber
-									unittest:id="ObjectNumberCurrencyTest"
-									id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectNumber-Field-display']) : undefined }"
-									state="{this>criticalityColorExpression}"
-									number="{this>objectStatusText}"
-									visible="{= FieldTemplating.getVisibleExpression(${metaPath>@@UI.getDataModelObjectPath})}"
-									emphasized="false"
-									class="sapMObjectNumberLarge"
-									tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
-								/>
-							</template:then>
-							<template:else>
-								<ObjectNumber
-									unittest:id="ObjectNumberTest"
-									id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectNumber-Field-display']) : undefined }"
-									core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
-									state="{this>criticalityColorExpression}"
-									number="{this>objectStatusNumber}"
-									unit="{= ${property>$Path@Org.OData.Measures.V1.Unit} ? ${property>$Path@Org.OData.Measures.V1.Unit@@MODEL.value} : undefined }"
-									visible="{= FieldTemplating.getVisibleExpression(${metaPath>@@UI.getDataModelObjectPath})}"
-									emphasized="false"
-									class="sapMObjectNumberLarge"
-									tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
-								/>
-							</template:else>
-						</template:if>
-					</template:elseif>
 					<template:else>
-						<ObjectStatus
-							unittest:id="MacroDataPointObjectStatus"
-							id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectStatus-Field-display']) : undefined }"
-							core:require="{ FieldRuntime: 'sap/fe/macros/field/FieldRuntime' }"
-							icon="{this>iconExpression}"
-							tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
+						<ObjectNumber
+							unittest:id="ObjectNumberTest"
+							id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectNumber-Field-display']) : undefined }"
+							core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 							state="{this>criticalityColorExpression}"
-							text="{this>objectStatusText}"
+							number="{this>objectStatusNumber}"
+							unit="{= ${property>$Path@Org.OData.Measures.V1.Unit} ? ${property>$Path@Org.OData.Measures.V1.Unit@@MODEL.value} : undefined }"
+							visible="{this>visible}"
+							emphasized="false"
+							class="sapMObjectNumberLarge"
+							tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
 						/>
 					</template:else>
 				</template:if>
+			</template:elseif>
+			<template:else>
+				<ObjectStatus
+					unittest:id="MacroDataPointObjectStatus"
+					id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'ObjectStatus-Field-display']) : undefined }"
+					core:require="{ FieldRuntime: 'sap/fe/macros/field/FieldRuntime' }"
+					icon="{this>iconExpression}"
+					tooltip="{metaPath>@com.sap.vocabularies.Common.v1.QuickInfo@@MODEL.value}"
+					state="{this>criticalityColorExpression}"
+					text="{this>objectStatusText}"
+				/>
 			</template:else>
 		</template:if>
 	</template:with>

package/packages/sap.fe.macros/src/sap/fe/macros/internal/DataPoint.metadata-dbg.js

@@ -48,7 +48,7 @@ sap.ui.define(
 		 * @private
 		 * @experimental
 		 */
-		var DataPoint = MacroMetadata.extend("sap.fe.macros.internal.DataPoint", {
+		return MacroMetadata.extend("sap.fe.macros.internal.DataPoint", {
 			/**
 			 * Define macro stereotype for documentation
 			 */
@@ -120,7 +120,11 @@ sap.ui.define(
 							 */
 							defaultDataPointStyle: {
 								type: "string",
-								allowedValues: ["ObjectNumber", "ObjectStatus", "LinkWrapper", "LinkWithQuickViewForm"]
+								allowedValues: ["ObjectNumber", "ObjectStatus"]
+							},
+							displayMode: {
+								type: "string",
+								allowedValues: ["Value", "Description", "ValueDescription", "DescriptionValue"]
 							},
 							measureDisplayMode: {
 								type: "string",
@@ -141,37 +145,29 @@ sap.ui.define(
 
 			create: function(oProps, oControlConfiguration, mSettings) {
 				var oDataModelPath = MetaModelConverter.getInvolvedDataModelObjects(oProps.metaPath, oProps.contextPath);
+				oProps.visible = FieldTemplating.getVisibleExpression(oDataModelPath);
 				var oDataPointConverted = MetaModelConverter.convertMetaModelContext(oProps.metaPath);
 				var oAnnotations,
 					sExtraPath,
 					aSemObjExprToResolve = [];
 
 				if (oDataPointConverted && oDataPointConverted.Visualization === "UI.VisualizationType/Progress") {
-					oProps.displayValue = DatapointTemplating.progressIndicatorDisplayValue(oDataModelPath, oProps.formatOptions);
+					oProps.displayValue = DatapointTemplating.buildExpressionForProgressIndicatorDisplayValue(oDataModelPath);
 					oProps.percentValue = DatapointTemplating.buildExpressionForProgressIndicatorPercentValue(oDataModelPath);
 				} else {
-					oProps.objectStatusText = DatapointTemplating.buildFieldBindingExpression(
-						oDataModelPath,
-						oProps,
-						oProps.formatOptions,
-						false
-					);
-					oProps.objectStatusNumber = DatapointTemplating.buildFieldBindingExpression(
-						oDataModelPath,
-						oProps,
-						oProps.formatOptions,
-						true
-					);
+					oProps.objectStatusText = DatapointTemplating.buildFieldBindingExpression(oDataModelPath, oProps.formatOptions, false);
+					oProps.objectStatusNumber = DatapointTemplating.buildFieldBindingExpression(oDataModelPath, oProps.formatOptions, true);
 					oProps.iconExpression = CriticalityFormatters.buildExpressionForCriticalityIcon(oDataPointConverted, oDataModelPath);
 				}
 				if (!oProps.formatOptions) {
 					oProps.formatOptions = {};
 				}
-				oProps.formatOptions.dataPointStyle = FieldTemplating.getDataPointStyle(oDataModelPath);
-				if (
-					oProps.formatOptions.dataPointStyle === "LinkWithQuickViewForm" ||
-					oProps.formatOptions.dataPointStyle === "LinkWrapper"
-				) {
+				// we store the visualization to use it via {this>visualization} even if it is not a real property of the macro
+				oProps.visualization = DatapointTemplating.getVisualization(oDataModelPath, oProps.formatOptions.defaultDataPointStyle);
+				if (oProps.visualization === "LinkWithQuickViewForm" || oProps.visualization === "LinkWrapper") {
+					oProps.displayVisible = oProps.visible;
+					oProps.entitySet = oProps.contextPath;
+					oProps.semanticObject = "";
 					if (typeof oDataPointConverted.Value === "object") {
 						sExtraPath = oDataPointConverted.Value.path;
 						oAnnotations =
@@ -203,7 +199,5 @@ sap.ui.define(
 				return oProps;
 			}
 		});
-
-		return DataPoint;
 	}
 );

package/packages/sap.fe.macros/src/sap/fe/macros/internal/DataPoint.metadata.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["../MacroMetadata","sap/fe/macros/internal/helpers/DataPointTemplating","sap/fe/core/converters/MetaModelConverter","sap/fe/core/templating/CriticalityFormatters","sap/fe/macros/field/FieldTemplating","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/ui/model/json/JSONModel"],function(M,D,a,C,F,b,B,J){"use strict";var c=M.extend("sap.fe.macros.internal.DataPoint",{name:"DataPoint",namespace:"sap.fe.macros.internal",fragment:"sap.fe.macros.internal.DataPoint",metadata:{stereotype:"xmlmacro",properties:{idPrefix:{type:"string"},metaPath:{type:"sap.ui.model.Context",required:true,$kind:"Property"},ariaLabelledBy:{type:"string"},formatOptions:{type:"object",properties:{showLabels:{type:"boolean",defaultValue:"false"},iconSize:{type:"string",allowedValues:["1rem","1.375rem","2rem"]},defaultDataPointStyle:{type:"string",allowedValues:["ObjectNumber","ObjectStatus","LinkWrapper","LinkWithQuickViewForm"]},measureDisplayMode:{type:"string",allowedValues:["Hidden","ReadOnly"]}}},contextPath:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty"]}}},create:function(p,o,s){var d=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);var e=a.convertMetaModelContext(p.metaPath);var A,E,S=[];if(e&&e.Visualization==="UI.VisualizationType/Progress"){p.displayValue=D.progressIndicatorDisplayValue(d,p.formatOptions);p.percentValue=D.buildExpressionForProgressIndicatorPercentValue(d);}else{p.objectStatusText=D.buildFieldBindingExpression(d,p,p.formatOptions,false);p.objectStatusNumber=D.buildFieldBindingExpression(d,p,p.formatOptions,true);p.iconExpression=C.buildExpressionForCriticalityIcon(e,d);}if(!p.formatOptions){p.formatOptions={};}p.formatOptions.dataPointStyle=F.getDataPointStyle(d);if(p.formatOptions.dataPointStyle==="LinkWithQuickViewForm"||p.formatOptions.dataPointStyle==="LinkWrapper"){if(typeof e.Value==="object"){E=e.Value.path;A=e.Value.$target&&e.Value.$target.annotations&&e.Value.$target.annotations.Common;S=F.getSemanticObjectExpressionToResolve(A);}if(!!p.semanticObject&&p.semanticObject[0]==="{"){S.push({key:p.semanticObject.substr(1,p.semanticObject.length-2),value:p.semanticObject});}p.semanticObjects=F.getSemanticObjects(S);if(E&&E.length>0){d=b.enhanceDataModelPath(d,E);}if(d.targetObject){p.text=F.getTextBinding(d,p.formatOptions);}else{p.text="";}}p.criticalityColorExpression=C.buildExpressionForCriticalityColor(e,d);return p;}});return c;});
+sap.ui.define(["../MacroMetadata","sap/fe/macros/internal/helpers/DataPointTemplating","sap/fe/core/converters/MetaModelConverter","sap/fe/core/templating/CriticalityFormatters","sap/fe/macros/field/FieldTemplating","sap/fe/core/templating/DataModelPathHelper","sap/fe/core/helpers/BindingExpression","sap/ui/model/json/JSONModel"],function(M,D,a,C,F,b,B,J){"use strict";return M.extend("sap.fe.macros.internal.DataPoint",{name:"DataPoint",namespace:"sap.fe.macros.internal",fragment:"sap.fe.macros.internal.DataPoint",metadata:{stereotype:"xmlmacro",properties:{idPrefix:{type:"string"},metaPath:{type:"sap.ui.model.Context",required:true,$kind:"Property"},ariaLabelledBy:{type:"string"},formatOptions:{type:"object",properties:{showLabels:{type:"boolean",defaultValue:"false"},iconSize:{type:"string",allowedValues:["1rem","1.375rem","2rem"]},defaultDataPointStyle:{type:"string",allowedValues:["ObjectNumber","ObjectStatus"]},displayMode:{type:"string",allowedValues:["Value","Description","ValueDescription","DescriptionValue"]},measureDisplayMode:{type:"string",allowedValues:["Hidden","ReadOnly"]}}},contextPath:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty"]}}},create:function(p,c,s){var d=a.getInvolvedDataModelObjects(p.metaPath,p.contextPath);p.visible=F.getVisibleExpression(d);var o=a.convertMetaModelContext(p.metaPath);var A,e,S=[];if(o&&o.Visualization==="UI.VisualizationType/Progress"){p.displayValue=D.buildExpressionForProgressIndicatorDisplayValue(d);p.percentValue=D.buildExpressionForProgressIndicatorPercentValue(d);}else{p.objectStatusText=D.buildFieldBindingExpression(d,p.formatOptions,false);p.objectStatusNumber=D.buildFieldBindingExpression(d,p.formatOptions,true);p.iconExpression=C.buildExpressionForCriticalityIcon(o,d);}if(!p.formatOptions){p.formatOptions={};}p.visualization=D.getVisualization(d,p.formatOptions.defaultDataPointStyle);if(p.visualization==="LinkWithQuickViewForm"||p.visualization==="LinkWrapper"){p.displayVisible=p.visible;p.entitySet=p.contextPath;p.semanticObject="";if(typeof o.Value==="object"){e=o.Value.path;A=o.Value.$target&&o.Value.$target.annotations&&o.Value.$target.annotations.Common;S=F.getSemanticObjectExpressionToResolve(A);}if(!!p.semanticObject&&p.semanticObject[0]==="{"){S.push({key:p.semanticObject.substr(1,p.semanticObject.length-2),value:p.semanticObject});}p.semanticObjects=F.getSemanticObjects(S);if(e&&e.length>0){d=b.enhanceDataModelPath(d,e);}if(d.targetObject){p.text=F.getTextBinding(d,p.formatOptions);}else{p.text="";}}p.criticalityColorExpression=C.buildExpressionForCriticalityColor(o,d);return p;}});});

package/packages/sap.fe.macros/src/sap/fe/macros/internal/Field.fragment.xml

@@ -16,7 +16,7 @@
 			<macro:FieldAPI
 				change="{this>onChange}"
 				id="{= ${this>_apiId} ? ${this>_apiId} : (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field']) : undefined )}"
-				required="{= FIELD.getRequiredForDataField(${dataField>Value/$Path@@FIELD.fieldControl}, ${this>editMode}, ${dataField>@@FIELD.fieldControl})}"
+				required="{this>requiredExpression}"
 				editable="{this>editableExpression}"
 			>
 				<core:Fragment fragmentName="sap.fe.macros.internal.field.FieldContent" type="XML" />

package/packages/sap.fe.macros/src/sap/fe/macros/internal/Field.metadata-dbg.js

@@ -52,7 +52,7 @@ sap.ui.define(
 		 * @private
 		 * @experimental
 		 */
-		var Field = MacroMetadata.extend("sap.fe.macros.internal.Field", {
+		return MacroMetadata.extend("sap.fe.macros.internal.Field", {
 			/**
 			 * Name of the macro control.
 			 */
@@ -109,7 +109,7 @@ sap.ui.define(
 					entitySet: {
 						type: "sap.ui.model.Context",
 						required: true,
-						$kind: ["EntitySet", "NavigationProperty"]
+						$kind: ["EntitySet", "NavigationProperty", "EntityType"]
 					},
 
 					/**
@@ -215,6 +215,10 @@ sap.ui.define(
 					formatOptions: {
 						type: "object",
 						properties: {
+							isCurrencyAligned: {
+								type: "boolean",
+								defaultValue: false
+							},
 							/**
 							 * format value for Date fields, eg. long, medium, short
 							 */
@@ -424,6 +428,7 @@ sap.ui.define(
 					oDataModelPath
 				);
 				oProps.enabledExpression = UIFormatters.getEnabledExpression(oPropertyForFieldControl, oDataFieldConverted);
+				oProps.requiredExpression = UIFormatters.getRequiredExpression(oPropertyForFieldControl, oDataFieldConverted);
 				if (!oProps.formatOptions.displayMode) {
 					oProps.formatOptions.displayMode = UIFormatters.getDisplayMode(oPropertyPath, oDataModelPath, oProps.editModeAsObject);
 				}
@@ -466,7 +471,12 @@ sap.ui.define(
 				} else {
 					oProps.text = "";
 				}
-				oProps.valueBindingExpression = FieldTemplating.getValueBinding(oDataModelPath, oProps.formatOptions);
+				// we only consider the unit in the binding if we use an mdc field
+				oProps.valueBindingExpression = FieldTemplating.getValueBinding(
+					oDataModelPath,
+					oProps.formatOptions,
+					oProps.editStyle !== "InputWithValueHelp"
+				);
 				oProps.descriptionBindingExpression = FieldTemplating.getValueBinding(
 					oDataModelPath,
 					oProps.formatOptions,
@@ -485,7 +495,7 @@ sap.ui.define(
 					true
 				);
 				if (oDataModelPath.targetObject) {
-					oProps.unitBindingExpression = FieldTemplating.getUnitBinding(oDataModelPath, oProps.formatOptions);
+					oProps.unitBindingExpression = FieldTemplating.getUnitBinding(oDataModelPath);
 					oProps.textBindingExpression = FieldTemplating.getAssociatedTextBinding(oDataModelPath, oProps.formatOptions);
 				}
 				var oDataFieldObject = oProps.dataField.getObject();
@@ -523,6 +533,5 @@ sap.ui.define(
 				return oProps;
 			}
 		});
-		return Field;
 	}
 );

package/packages/sap.fe.macros/src/sap/fe/macros/internal/Field.metadata.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["../MacroMetadata","sap/fe/core/converters/MetaModelConverter","sap/fe/core/templating/UIFormatters","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/DataModelPathHelper","sap/fe/macros/field/FieldTemplating","sap/fe/core/TemplateModel","sap/ui/model/json/JSONModel","sap/fe/core/helpers/StableIdHelper"],function(M,a,U,B,D,F,T,J,S){"use strict";var b=M.extend("sap.fe.macros.internal.Field",{name:"Field",namespace:"sap.fe.macros.internal",fragment:"sap.fe.macros.internal.Field",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/internal/Field.designtime",properties:{idPrefix:{type:"string"},_apiId:{type:"string"},vhIdPrefix:{type:"string",defaultValue:"FieldValueHelp"},_vhFlexId:{type:"string",computed:true},entitySet:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty"]},entityType:{type:"sap.ui.model.Context",required:false,computed:true,$kind:["EntityType"]},navigateAfterAction:{type:"boolean",defaultValue:true},dataField:{type:"sap.ui.model.Context",required:true,$kind:"Property",$Type:["com.sap.vocabularies.UI.v1.DataField","com.sap.vocabularies.UI.v1.DataFieldWithUrl","com.sap.vocabularies.UI.v1.DataFieldForAnnotation","com.sap.vocabularies.UI.v1.DataFieldForAction","com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation","com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath","com.sap.vocabularies.UI.v1.DataPointType"]},semanticObjects:{type:"sap.ui.model.Context",required:false,computed:true},editMode:{type:"sap.ui.mdc.enum.EditMode"},wrap:{type:"boolean"},"class":{type:"string"},ariaLabelledBy:{type:"string"},textAlign:{type:"sap.ui.core.TextAlign"},editableExpression:{type:"string",computed:true},enabledExpression:{type:"string",computed:true},semanticObject:{type:"string",required:false},formatOptions:{type:"object",properties:{valueFormat:{type:"string"},textAlignMode:{type:"string",defaultValue:"Table",allowedValues:["Table","Form"]},displayMode:{type:"string",allowedValues:["Value","Description","ValueDescription","DescriptionValue"]},measureDisplayMode:{type:"string",allowedValues:["Hidden","ReadOnly"]},textLinesEdit:{type:"number",configurable:true},textMaxLines:{type:"number",configurable:true},textMaxCharactersDisplay:{type:"number",configurable:true},textExpandBehaviorDisplay:{type:"string",allowedValues:["InPlace","Popover"]},showEmptyIndicator:{type:"boolean",defaultValue:false},semanticKeyStyle:{type:"string",defaultValue:"",allowedValues:["ObjectIdentifier","Label",""]},hasDraftIndicator:{type:"boolean",defaultValue:false},showIconUrl:{type:"boolean",defaultValue:false},ignoreNavigationAvailable:{type:"boolean",defaultValue:false},isAnalytics:{type:"boolean",defaultValue:false},retrieveTextFromValueList:{type:"boolean",defaultValue:false}}}},events:{onChange:{type:"function"}}},create:function(p,c,s){var o=this.getOverrides(c,p.dataField.getPath());var d=a.convertMetaModelContext(p.dataField);var e=a.getInvolvedDataModelObjects(p.dataField,p.entitySet);var P=d;var E="";var A,f=[];if(d&&d.term==="com.sap.vocabularies.UI.v1.DataPoint"){d.$Type=d.$Type||"com.sap.vocabularies.UI.v1.DataPointType";}if(d&&d.$Type){switch(d.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataPointType":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":if(typeof d.Value==="object"){P=d.Value.$target;E=d.Value.path;A=d.Value.$target&&d.Value.$target.annotations&&d.Value.$target.annotations.Common;f=F.getSemanticObjectExpressionToResolve(A);}break;case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(d.Target.$target){switch(d.Target.$target.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataPointType":if(typeof d.Target.$target.Value==="object"){P=d.Target.$target.Value.$target;E=d.Target.$target.Value.path;}break;default:if(typeof d.Target==="object"){P=d.Target.$target;E=d.Target.path;}break;}}break;}}else if(d&&d._type==="Property"){A=d.annotations&&d.annotations.Common;f=F.getSemanticObjectExpressionToResolve(A);}if(!!p.semanticObject&&p.semanticObject[0]==="{"){f.push({key:p.semanticObject.substr(1,p.semanticObject.length-2),value:p.semanticObject});}p.visible=F.getVisibleExpression(e,p.formatOptions);if(E&&E.length>0){e=D.enhanceDataModelPath(e,E);}p.displayVisible=p.formatOptions.fieldMode==="nowrapper"?p.visible:undefined;p.dataSourcePath=D.getTargetObjectPath(e);var m=s.models.metaModel||s.models.entitySet;p.entityType=m.createBindingContext("/"+e.targetEntityType.fullyQualifiedName);var g=P&&P.Value?P.Value:P;if(p.editMode!==undefined&&p.editMode!==null){p.editModeAsObject=p.editMode;}else{var h=p.formatOptions.measureDisplayMode?p.formatOptions.measureDisplayMode==="ReadOnly":false;p.editModeAsObject=U.getEditMode(g,e,h,true,d);p.editMode=B.compileBinding(p.editModeAsObject);}p.editableExpression=U.getEditableExpression(g,d,e);p.enabledExpression=U.getEnabledExpression(g,d);if(!p.formatOptions.displayMode){p.formatOptions.displayMode=U.getDisplayMode(P,e,p.editModeAsObject);}p.formatOptions.textLinesEdit=o.textLinesEdit||(o.formatOptions&&o.formatOptions.textLinesEdit)||p.formatOptions.textLinesEdit||4;p.formatOptions.textMaxLines=o.textMaxLines||(o.formatOptions&&o.formatOptions.textMaxLines)||p.formatOptions.textMaxLines;if(p._flexId){p._apiId=p._flexId;p._flexId+="-content";p._vhFlexId=p._flexId+"_"+p.vhIdPrefix;}p.fieldWrapperId=p._flexId||(p.idPrefix?S.generate([p.idPrefix,"Field-content"]):undefined);if(s.models.viewData&&s.models.viewData.getProperty("/retrieveTextFromValueList")){p.formatOptions.retrieveTextFromValueList=F.isRetrieveTextFromValueListEnabled(P,p.formatOptions);}p.displayStyle=F.getDisplayStyle(P,d,e,p.formatOptions,p.semanticObject);p.editStyle=F.getEditStyle(P,d,p.formatOptions);var i=["Avatar","AmountWithCurrency","ObjectIdentifier"];if(p.displayStyle&&i.indexOf(p.fieldStyle)===-1&&e.targetObject){p.text=F.getTextBinding(e,p.formatOptions);}else{p.text="";}p.valueBindingExpression=F.getValueBinding(e,p.formatOptions);p.descriptionBindingExpression=F.getValueBinding(e,p.formatOptions,false,false,undefined,false,true);p.valueAsStringBindingExpression=F.getValueBinding(e,p.formatOptions,true,true,undefined,true);if(e.targetObject){p.unitBindingExpression=F.getUnitBinding(e,p.formatOptions);p.textBindingExpression=F.getAssociatedTextBinding(e,p.formatOptions);}var j=p.dataField.getObject();p.formatOptions.navigationAvailable=true;if(j&&j.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&j.NavigationAvailable!==undefined&&p.formatOptions.ignoreNavigationAvailable!=="true"){if(j.NavigationAvailable.$Path){p.formatOptions.navigationAvailable="{"+j.NavigationAvailable.$Path+"}";}else{p.formatOptions.navigationAvailable=j.NavigationAvailable;}}if(p.dataField.getObject("@sapui.name")&&p.dataField.getObject("@sapui.name").indexOf("com.sap.vocabularies.UI.v1.DataPoint")>-1){var k=p.dataField.getObject();k.$Type=k.$Type||"com.sap.vocabularies.UI.v1.DataPointType";p.dataField=new T(k,p.dataField.getModel()).createBindingContext("/");}p.semanticObjects=F.getSemanticObjects(f);p.addSituationsIndicator=e.targetEntityType.annotations.FE&&e.targetEntityType.annotations.FE.Situations;return p;}});return b;});
+sap.ui.define(["../MacroMetadata","sap/fe/core/converters/MetaModelConverter","sap/fe/core/templating/UIFormatters","sap/fe/core/helpers/BindingExpression","sap/fe/core/templating/DataModelPathHelper","sap/fe/macros/field/FieldTemplating","sap/fe/core/TemplateModel","sap/ui/model/json/JSONModel","sap/fe/core/helpers/StableIdHelper"],function(M,a,U,B,D,F,T,J,S){"use strict";return M.extend("sap.fe.macros.internal.Field",{name:"Field",namespace:"sap.fe.macros.internal",fragment:"sap.fe.macros.internal.Field",metadata:{stereotype:"xmlmacro",designtime:"sap/fe/macros/internal/Field.designtime",properties:{idPrefix:{type:"string"},_apiId:{type:"string"},vhIdPrefix:{type:"string",defaultValue:"FieldValueHelp"},_vhFlexId:{type:"string",computed:true},entitySet:{type:"sap.ui.model.Context",required:true,$kind:["EntitySet","NavigationProperty","EntityType"]},entityType:{type:"sap.ui.model.Context",required:false,computed:true,$kind:["EntityType"]},navigateAfterAction:{type:"boolean",defaultValue:true},dataField:{type:"sap.ui.model.Context",required:true,$kind:"Property",$Type:["com.sap.vocabularies.UI.v1.DataField","com.sap.vocabularies.UI.v1.DataFieldWithUrl","com.sap.vocabularies.UI.v1.DataFieldForAnnotation","com.sap.vocabularies.UI.v1.DataFieldForAction","com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation","com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath","com.sap.vocabularies.UI.v1.DataPointType"]},semanticObjects:{type:"sap.ui.model.Context",required:false,computed:true},editMode:{type:"sap.ui.mdc.enum.EditMode"},wrap:{type:"boolean"},"class":{type:"string"},ariaLabelledBy:{type:"string"},textAlign:{type:"sap.ui.core.TextAlign"},editableExpression:{type:"string",computed:true},enabledExpression:{type:"string",computed:true},semanticObject:{type:"string",required:false},formatOptions:{type:"object",properties:{isCurrencyAligned:{type:"boolean",defaultValue:false},valueFormat:{type:"string"},textAlignMode:{type:"string",defaultValue:"Table",allowedValues:["Table","Form"]},displayMode:{type:"string",allowedValues:["Value","Description","ValueDescription","DescriptionValue"]},measureDisplayMode:{type:"string",allowedValues:["Hidden","ReadOnly"]},textLinesEdit:{type:"number",configurable:true},textMaxLines:{type:"number",configurable:true},textMaxCharactersDisplay:{type:"number",configurable:true},textExpandBehaviorDisplay:{type:"string",allowedValues:["InPlace","Popover"]},showEmptyIndicator:{type:"boolean",defaultValue:false},semanticKeyStyle:{type:"string",defaultValue:"",allowedValues:["ObjectIdentifier","Label",""]},hasDraftIndicator:{type:"boolean",defaultValue:false},showIconUrl:{type:"boolean",defaultValue:false},ignoreNavigationAvailable:{type:"boolean",defaultValue:false},isAnalytics:{type:"boolean",defaultValue:false},retrieveTextFromValueList:{type:"boolean",defaultValue:false}}}},events:{onChange:{type:"function"}}},create:function(p,c,s){var o=this.getOverrides(c,p.dataField.getPath());var d=a.convertMetaModelContext(p.dataField);var b=a.getInvolvedDataModelObjects(p.dataField,p.entitySet);var P=d;var e="";var A,f=[];if(d&&d.term==="com.sap.vocabularies.UI.v1.DataPoint"){d.$Type=d.$Type||"com.sap.vocabularies.UI.v1.DataPointType";}if(d&&d.$Type){switch(d.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataPointType":case"com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":case"com.sap.vocabularies.UI.v1.DataFieldWithUrl":if(typeof d.Value==="object"){P=d.Value.$target;e=d.Value.path;A=d.Value.$target&&d.Value.$target.annotations&&d.Value.$target.annotations.Common;f=F.getSemanticObjectExpressionToResolve(A);}break;case"com.sap.vocabularies.UI.v1.DataFieldForAnnotation":if(d.Target.$target){switch(d.Target.$target.$Type){case"com.sap.vocabularies.UI.v1.DataField":case"com.sap.vocabularies.UI.v1.DataPointType":if(typeof d.Target.$target.Value==="object"){P=d.Target.$target.Value.$target;e=d.Target.$target.Value.path;}break;default:if(typeof d.Target==="object"){P=d.Target.$target;e=d.Target.path;}break;}}break;}}else if(d&&d._type==="Property"){A=d.annotations&&d.annotations.Common;f=F.getSemanticObjectExpressionToResolve(A);}if(!!p.semanticObject&&p.semanticObject[0]==="{"){f.push({key:p.semanticObject.substr(1,p.semanticObject.length-2),value:p.semanticObject});}p.visible=F.getVisibleExpression(b,p.formatOptions);if(e&&e.length>0){b=D.enhanceDataModelPath(b,e);}p.displayVisible=p.formatOptions.fieldMode==="nowrapper"?p.visible:undefined;p.dataSourcePath=D.getTargetObjectPath(b);var m=s.models.metaModel||s.models.entitySet;p.entityType=m.createBindingContext("/"+b.targetEntityType.fullyQualifiedName);var g=P&&P.Value?P.Value:P;if(p.editMode!==undefined&&p.editMode!==null){p.editModeAsObject=p.editMode;}else{var h=p.formatOptions.measureDisplayMode?p.formatOptions.measureDisplayMode==="ReadOnly":false;p.editModeAsObject=U.getEditMode(g,b,h,true,d);p.editMode=B.compileBinding(p.editModeAsObject);}p.editableExpression=U.getEditableExpression(g,d,b);p.enabledExpression=U.getEnabledExpression(g,d);p.requiredExpression=U.getRequiredExpression(g,d);if(!p.formatOptions.displayMode){p.formatOptions.displayMode=U.getDisplayMode(P,b,p.editModeAsObject);}p.formatOptions.textLinesEdit=o.textLinesEdit||(o.formatOptions&&o.formatOptions.textLinesEdit)||p.formatOptions.textLinesEdit||4;p.formatOptions.textMaxLines=o.textMaxLines||(o.formatOptions&&o.formatOptions.textMaxLines)||p.formatOptions.textMaxLines;if(p._flexId){p._apiId=p._flexId;p._flexId+="-content";p._vhFlexId=p._flexId+"_"+p.vhIdPrefix;}p.fieldWrapperId=p._flexId||(p.idPrefix?S.generate([p.idPrefix,"Field-content"]):undefined);if(s.models.viewData&&s.models.viewData.getProperty("/retrieveTextFromValueList")){p.formatOptions.retrieveTextFromValueList=F.isRetrieveTextFromValueListEnabled(P,p.formatOptions);}p.displayStyle=F.getDisplayStyle(P,d,b,p.formatOptions,p.semanticObject);p.editStyle=F.getEditStyle(P,d,p.formatOptions);var i=["Avatar","AmountWithCurrency","ObjectIdentifier"];if(p.displayStyle&&i.indexOf(p.fieldStyle)===-1&&b.targetObject){p.text=F.getTextBinding(b,p.formatOptions);}else{p.text="";}p.valueBindingExpression=F.getValueBinding(b,p.formatOptions,p.editStyle!=="InputWithValueHelp");p.descriptionBindingExpression=F.getValueBinding(b,p.formatOptions,false,false,undefined,false,true);p.valueAsStringBindingExpression=F.getValueBinding(b,p.formatOptions,true,true,undefined,true);if(b.targetObject){p.unitBindingExpression=F.getUnitBinding(b);p.textBindingExpression=F.getAssociatedTextBinding(b,p.formatOptions);}var j=p.dataField.getObject();p.formatOptions.navigationAvailable=true;if(j&&j.$Type==="com.sap.vocabularies.UI.v1.DataFieldForIntentBasedNavigation"&&j.NavigationAvailable!==undefined&&p.formatOptions.ignoreNavigationAvailable!=="true"){if(j.NavigationAvailable.$Path){p.formatOptions.navigationAvailable="{"+j.NavigationAvailable.$Path+"}";}else{p.formatOptions.navigationAvailable=j.NavigationAvailable;}}if(p.dataField.getObject("@sapui.name")&&p.dataField.getObject("@sapui.name").indexOf("com.sap.vocabularies.UI.v1.DataPoint")>-1){var k=p.dataField.getObject();k.$Type=k.$Type||"com.sap.vocabularies.UI.v1.DataPointType";p.dataField=new T(k,p.dataField.getModel()).createBindingContext("/");}p.semanticObjects=F.getSemanticObjects(f);p.addSituationsIndicator=b.targetEntityType.annotations.FE&&b.targetEntityType.annotations.FE.Situations;return p;}});});

package/packages/sap.fe.macros/src/sap/fe/macros/internal/FilterField.fragment.xml

@@ -26,7 +26,7 @@
 				delegate="{name: 'sap/fe/macros/FieldBaseDelegate'}"
 				label="{= ${property>@com.sap.vocabularies.Common.v1.Label} || ${property>@@FIELD.propertyName} }"
 				tooltip='{property>@com.sap.vocabularies.Common.v1.QuickInfo}'
-				dataType="{property>$Type}"
+				dataType="{path: 'property>$Type', formatter: 'FILTERFIELD.getDataType'}"
 				display="{property>@@FilterField.getDisplayProperty}"
 				maxConditions="{property>@@FILTERFIELD.maxConditions}"
 				fieldHelp="{parts : [{path: 'property>'}, {path: 'property>$Type'},{path: 'this>vhIdPrefix'},{path: 'property>@@Property.getRelativePropertyPath'},{path: 'valueHelpProperty>@@Property.getRelativePropertyPath'},{path: 'property>@com.sap.vocabularies.Common.v1.ValueListWithFixedValues'},{path: 'this>useSemanticDateRange'}], formatter: 'FIELD.getFieldHelpPropertyForFilterField'}"

package/packages/sap.fe.macros/src/sap/fe/macros/internal/SituationsIndicator-dbg.js

@@ -78,7 +78,8 @@ sap.ui.define(["sap/fe/macros/MacroMetadata", "sap/fe/macros/ResourceModel", "sa
         visible = greaterThan(numberOfSituations, 0);
       } else {
         // propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators
-        // TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&' (or the expression parser fails if && is used instead). Could be expressed as a simple expression binding.
+        // TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&'
+        // (or the expression parser fails if && is used instead). Could be expressed as a simple expression binding.
         visible = formatResult([numberOfSituations, bindingExpression("semanticKeyHasDraftIndicator", "internal"), oProps.propertyPath], formatters.isVisible);
       } // Button text: the number of situations if there are multiple, the empty string otherwise
 
@@ -93,4 +94,4 @@ sap.ui.define(["sap/fe/macros/MacroMetadata", "sap/fe/macros/ResourceModel", "sa
   });
   return SituationsIndicator;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["SituationsIndicator.ts"],"names":["SituationsIndicator","MacroMetadata","extend","name","namespace","metadata","stereotype","properties","entitySet","type","required","$kind","propertyPath","create","oProps","convertMetaModelContext","situations","entityType","annotations","FE","Situations","getTemplate","numberOfSituations","bindingExpression","path","visible","greaterThan","formatResult","formatters","isVisible","text","ifElse","tooltip","equal","ResourceModel","getText","onPress","fn","showPopover","ref","xml","compileBinding"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;;;;;;;;;;;AAwBA,MAAMA,mBAAmB,GAAGC,aAAa,CAACC,MAAd,CAAqB,4CAArB,EAAmE;AAC9F;AACD;AACA;AACCC,IAAAA,IAAI,EAAE,qBAJwF;;AAK9F;AACD;AACA;AACCC,IAAAA,SAAS,EAAE,wBARmF;;AAU9F;AACD;AACA;AACCC,IAAAA,QAAQ,EAAE;AACT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE,UAJH;;AAKT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE;AACXC,QAAAA,SAAS,EAAE;AACVC,UAAAA,IAAI,EAAE,sBADI;AAEVC,UAAAA,QAAQ,EAAE,IAFA;AAGVC,UAAAA,KAAK,EAAE;AAHG,SADA;AAOXC,QAAAA,YAAY,EAAE;AACbH,UAAAA,IAAI,EAAE,QADO;AAEbC,UAAAA,QAAQ,EAAE;AAFG;AAPH;AARH,KAboF;AAkC9FG,IAAAA,MAAM,EAAE,UAASC,MAAT,EAA6B;AAAA;;AACpC,UAAMN,SAAS,GAAGO,uBAAuB,CAACD,MAAM,CAACN,SAAR,CAAzC;AAEAM,MAAAA,MAAM,CAACE,UAAP,4BAAoBR,SAAS,CAACS,UAAV,CAAqBC,WAArB,CAAiCC,EAArD,0DAAoB,sBAAqCC,UAAzD;AAEA,aAAON,MAAP;AACA,KAxC6F;AA0C9FO,IAAAA,WA1C8F,YA0ClFP,MA1CkF,EA0C9D;AAC/B,UAAI,CAACA,MAAM,CAACE,UAAZ,EAAwB;AACvB;AACA,OAH8B,CAG7B;;;AAEF,UAAMM,kBAAkB,GAAGC,iBAAiB,WAAIT,MAAM,CAACE,UAAP,CAAkBQ,IAAtB,4BAA5C,CAL+B,CAO/B;;AACA,UAAIC,OAAJ;;AACA,UAAI,CAACX,MAAM,CAACF,YAAZ,EAA0B;AACzB;AACAa,QAAAA,OAAO,GAAGC,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAArB;AACA,OAHD,MAGO;AACN;AACA;AACAG,QAAAA,OAAO,GAAGE,YAAY,CACrB,CAACL,kBAAD,EAAqBC,iBAAiB,CAAC,8BAAD,EAAiC,UAAjC,CAAtC,EAAoFT,MAAM,CAACF,YAA3F,CADqB,EAErBgB,UAAU,CAACC,SAFU,CAAtB;AAIA,OAnB8B,CAqB/B;;;AACA,UAAMC,IAAI,GAAGC,MAAM,CAACL,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAAZ,EAAqCA,kBAArC,EAAyD,EAAzD,CAAnB,CAtB+B,CAwB/B;;AACA,UAAMU,OAAO,GAAGD,MAAM,CACrBE,KAAK,CAACX,kBAAD,EAAqB,CAArB,CADgB,EAErBY,aAAa,CAACC,OAAd,CAAsB,2BAAtB,CAFqB,EAGrBR,YAAY,CAAC,CAACO,aAAa,CAACC,OAAd,CAAsB,yBAAtB,CAAD,EAAmDb,kBAAnD,CAAD,EAAyEM,UAAU,CAACI,OAApF,CAHS,CAAtB,CAzB+B,CA+B/B;;AACA,UAAMI,OAAO,GAAGC,EAAE,CAACC,WAAD,EAAc,CAACC,GAAG,CAAC,aAAD,CAAJ,EAAqBA,GAAG,CAAC,QAAD,CAAxB,EAAoCzB,MAAM,CAACE,UAAP,CAAkBQ,IAAtD,CAAd,CAAlB;AAEA,aAAOgB,GAAP,waAKUC,cAAc,CAACX,IAAD,CALxB,EAMaW,cAAc,CAACT,OAAD,CAN3B,EAOaS,cAAc,CAAChB,OAAD,CAP3B,EAQWgB,cAAc,CAACL,OAAD,CARzB;AAUA;AAtF6F,GAAnE,CAA5B;SAyFepC,mB","sourceRoot":".","sourcesContent":["import { MacroMetadata, ResourceModel } from \"sap/fe/macros\";\nimport { Context } from \"sap/ui/model\";\nimport {\n\tbindingExpression,\n\tcompileBinding,\n\tequal,\n\tfn,\n\tformatResult,\n\tgreaterThan,\n\tifElse,\n\tref\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { xml } from \"sap/fe/macros/MacroRuntime\";\nimport { convertMetaModelContext } from \"sap/fe/core/converters/MetaModelConverter\";\nimport { NavigationProperty } from \"@sap-ux/annotation-converter\";\nimport { showPopover } from \"sap/fe/macros/internal/situations/Runtime\";\nimport { PathAnnotationExpression } from \"@sap-ux/vocabularies-types\";\nimport formatters from \"sap/fe/macros/internal/situations/Formatter\";\n\ntype PublicProperties = {\n\tentitySet: Context<any>;\n\tpropertyPath?: string;\n};\n\ntype Properties = PublicProperties & { situations: PathAnnotationExpression<NavigationProperty> | undefined };\n\nconst SituationsIndicator = MacroMetadata.extend(\"sap.fe.macros.internal.SituationsIndicator\", {\n\t/**\n\t * Name\n\t */\n\tname: \"SituationsIndicator\",\n\t/**\n\t * Namespace\n\t */\n\tnamespace: \"sap.fe.macros.internal\",\n\n\t/**\n\t * Metadata\n\t */\n\tmetadata: {\n\t\t/**\n\t\t * Define macro stereotype for documentation\n\t\t */\n\t\tstereotype: \"xmlmacro\",\n\t\t/**\n\t\t * Properties.\n\t\t */\n\t\tproperties: {\n\t\t\tentitySet: {\n\t\t\t\ttype: \"sap.ui.model.Context\",\n\t\t\t\trequired: true,\n\t\t\t\t$kind: \"EntitySet\"\n\t\t\t},\n\n\t\t\tpropertyPath: {\n\t\t\t\ttype: \"string\",\n\t\t\t\trequired: false\n\t\t\t}\n\t\t}\n\t},\n\tcreate: function(oProps: Properties) {\n\t\tconst entitySet = convertMetaModelContext(oProps.entitySet);\n\n\t\toProps.situations = entitySet.entityType.annotations.FE?.Situations;\n\n\t\treturn oProps;\n\t},\n\n\tgetTemplate(oProps: Properties) {\n\t\tif (!oProps.situations) {\n\t\t\treturn;\n\t\t} // do not provide a template if Situations are unsupported\n\n\t\tconst numberOfSituations = bindingExpression(`${oProps.situations.path}/SitnNumberOfInstances`);\n\n\t\t// Indicator visibility\n\t\tlet visible;\n\t\tif (!oProps.propertyPath) {\n\t\t\t// no propertyPath --> visibility depends on the number of situations only\n\t\t\tvisible = greaterThan(numberOfSituations, 0);\n\t\t} else {\n\t\t\t// propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators\n\t\t\t// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&' (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.\n\t\t\tvisible = formatResult(\n\t\t\t\t[numberOfSituations, bindingExpression(\"semanticKeyHasDraftIndicator\", \"internal\"), oProps.propertyPath],\n\t\t\t\tformatters.isVisible\n\t\t\t);\n\t\t}\n\n\t\t// Button text: the number of situations if there are multiple, the empty string otherwise\n\t\tconst text = ifElse(greaterThan(numberOfSituations, 1), numberOfSituations, \"\");\n\n\t\t// Button tooltip: \"There is one situation\" / \"There are <n> situations\"\n\t\tconst tooltip = ifElse(\n\t\t\tequal(numberOfSituations, 1),\n\t\t\tResourceModel.getText(\"situationsTooltipSingular\"),\n\t\t\tformatResult([ResourceModel.getText(\"situationsTooltipPlural\"), numberOfSituations], formatters.tooltip)\n\t\t);\n\n\t\t// 'press' handler\n\t\tconst onPress = fn(showPopover, [ref(\"$controller\"), ref(\"$event\"), oProps.situations.path]);\n\n\t\treturn xml`\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"${compileBinding(text)}\"\n\t\t\t\ttooltip=\"${compileBinding(tooltip)}\"\n\t\t\t\tvisible=\"${compileBinding(visible)}\"\n\t\t\t\tpress=\"${compileBinding(onPress)}\"\n\t\t\t/>`;\n\t}\n});\n\nexport default SituationsIndicator;\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["SituationsIndicator.ts"],"names":["SituationsIndicator","MacroMetadata","extend","name","namespace","metadata","stereotype","properties","entitySet","type","required","$kind","propertyPath","create","oProps","convertMetaModelContext","situations","entityType","annotations","FE","Situations","getTemplate","numberOfSituations","bindingExpression","path","visible","greaterThan","formatResult","formatters","isVisible","text","ifElse","tooltip","equal","ResourceModel","getText","onPress","fn","showPopover","ref","xml","compileBinding"],"mappings":";AAAA;AACA;AACA;;;;;;;;;;;;;;;;;;;;AAwBA,MAAMA,mBAAmB,GAAGC,aAAa,CAACC,MAAd,CAAqB,4CAArB,EAAmE;AAC9F;AACD;AACA;AACCC,IAAAA,IAAI,EAAE,qBAJwF;;AAK9F;AACD;AACA;AACCC,IAAAA,SAAS,EAAE,wBARmF;;AAU9F;AACD;AACA;AACCC,IAAAA,QAAQ,EAAE;AACT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE,UAJH;;AAKT;AACF;AACA;AACEC,MAAAA,UAAU,EAAE;AACXC,QAAAA,SAAS,EAAE;AACVC,UAAAA,IAAI,EAAE,sBADI;AAEVC,UAAAA,QAAQ,EAAE,IAFA;AAGVC,UAAAA,KAAK,EAAE;AAHG,SADA;AAOXC,QAAAA,YAAY,EAAE;AACbH,UAAAA,IAAI,EAAE,QADO;AAEbC,UAAAA,QAAQ,EAAE;AAFG;AAPH;AARH,KAboF;AAkC9FG,IAAAA,MAAM,EAAE,UAASC,MAAT,EAA6B;AAAA;;AACpC,UAAMN,SAAS,GAAGO,uBAAuB,CAACD,MAAM,CAACN,SAAR,CAAzC;AAEAM,MAAAA,MAAM,CAACE,UAAP,4BAAoBR,SAAS,CAACS,UAAV,CAAqBC,WAArB,CAAiCC,EAArD,0DAAoB,sBAAqCC,UAAzD;AAEA,aAAON,MAAP;AACA,KAxC6F;AA0C9FO,IAAAA,WA1C8F,YA0ClFP,MA1CkF,EA0C9D;AAC/B,UAAI,CAACA,MAAM,CAACE,UAAZ,EAAwB;AACvB;AACA,OAH8B,CAG7B;;;AAEF,UAAMM,kBAAkB,GAAGC,iBAAiB,WAAIT,MAAM,CAACE,UAAP,CAAkBQ,IAAtB,4BAA5C,CAL+B,CAO/B;;AACA,UAAIC,OAAJ;;AACA,UAAI,CAACX,MAAM,CAACF,YAAZ,EAA0B;AACzB;AACAa,QAAAA,OAAO,GAAGC,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAArB;AACA,OAHD,MAGO;AACN;AACA;AACA;AACAG,QAAAA,OAAO,GAAGE,YAAY,CACrB,CAACL,kBAAD,EAAqBC,iBAAiB,CAAC,8BAAD,EAAiC,UAAjC,CAAtC,EAAoFT,MAAM,CAACF,YAA3F,CADqB,EAErBgB,UAAU,CAACC,SAFU,CAAtB;AAIA,OApB8B,CAsB/B;;;AACA,UAAMC,IAAI,GAAGC,MAAM,CAACL,WAAW,CAACJ,kBAAD,EAAqB,CAArB,CAAZ,EAAqCA,kBAArC,EAAyD,EAAzD,CAAnB,CAvB+B,CAyB/B;;AACA,UAAMU,OAAO,GAAGD,MAAM,CACrBE,KAAK,CAACX,kBAAD,EAAqB,CAArB,CADgB,EAErBY,aAAa,CAACC,OAAd,CAAsB,2BAAtB,CAFqB,EAGrBR,YAAY,CAAC,CAACO,aAAa,CAACC,OAAd,CAAsB,yBAAtB,CAAD,EAAmDb,kBAAnD,CAAD,EAAyEM,UAAU,CAACI,OAApF,CAHS,CAAtB,CA1B+B,CAgC/B;;AACA,UAAMI,OAAO,GAAGC,EAAE,CAACC,WAAD,EAAc,CAACC,GAAG,CAAC,aAAD,CAAJ,EAAqBA,GAAG,CAAC,QAAD,CAAxB,EAAoCzB,MAAM,CAACE,UAAP,CAAkBQ,IAAtD,CAAd,CAAlB;AAEA,aAAOgB,GAAP,waAKUC,cAAc,CAACX,IAAD,CALxB,EAMaW,cAAc,CAACT,OAAD,CAN3B,EAOaS,cAAc,CAAChB,OAAD,CAP3B,EAQWgB,cAAc,CAACL,OAAD,CARzB;AAUA;AAvF6F,GAAnE,CAA5B;SA0FepC,mB","sourceRoot":".","sourcesContent":["import { MacroMetadata, ResourceModel } from \"sap/fe/macros\";\nimport Context from \"sap/ui/model/Context\";\nimport {\n\tbindingExpression,\n\tcompileBinding,\n\tequal,\n\tfn,\n\tformatResult,\n\tgreaterThan,\n\tifElse,\n\tref\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { xml } from \"sap/fe/macros/MacroRuntime\";\nimport { convertMetaModelContext } from \"sap/fe/core/converters/MetaModelConverter\";\nimport { NavigationProperty } from \"@sap-ux/annotation-converter\";\nimport { showPopover } from \"sap/fe/macros/internal/situations/Runtime\";\nimport { PathAnnotationExpression } from \"@sap-ux/vocabularies-types\";\nimport formatters from \"sap/fe/macros/internal/situations/Formatter\";\n\ntype PublicProperties = {\n\tentitySet: Context;\n\tpropertyPath?: string;\n};\n\ntype Properties = PublicProperties & { situations: PathAnnotationExpression<NavigationProperty> | undefined };\n\nconst SituationsIndicator = MacroMetadata.extend(\"sap.fe.macros.internal.SituationsIndicator\", {\n\t/**\n\t * Name\n\t */\n\tname: \"SituationsIndicator\",\n\t/**\n\t * Namespace\n\t */\n\tnamespace: \"sap.fe.macros.internal\",\n\n\t/**\n\t * Metadata\n\t */\n\tmetadata: {\n\t\t/**\n\t\t * Define macro stereotype for documentation\n\t\t */\n\t\tstereotype: \"xmlmacro\",\n\t\t/**\n\t\t * Properties.\n\t\t */\n\t\tproperties: {\n\t\t\tentitySet: {\n\t\t\t\ttype: \"sap.ui.model.Context\",\n\t\t\t\trequired: true,\n\t\t\t\t$kind: \"EntitySet\"\n\t\t\t},\n\n\t\t\tpropertyPath: {\n\t\t\t\ttype: \"string\",\n\t\t\t\trequired: false\n\t\t\t}\n\t\t}\n\t},\n\tcreate: function(oProps: Properties) {\n\t\tconst entitySet = convertMetaModelContext(oProps.entitySet);\n\n\t\toProps.situations = entitySet.entityType.annotations.FE?.Situations;\n\n\t\treturn oProps;\n\t},\n\n\tgetTemplate(oProps: Properties) {\n\t\tif (!oProps.situations) {\n\t\t\treturn;\n\t\t} // do not provide a template if Situations are unsupported\n\n\t\tconst numberOfSituations = bindingExpression(`${oProps.situations.path}/SitnNumberOfInstances`);\n\n\t\t// Indicator visibility\n\t\tlet visible;\n\t\tif (!oProps.propertyPath) {\n\t\t\t// no propertyPath --> visibility depends on the number of situations only\n\t\t\tvisible = greaterThan(numberOfSituations, 0);\n\t\t} else {\n\t\t\t// propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators\n\t\t\t// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&'\n\t\t\t// (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.\n\t\t\tvisible = formatResult(\n\t\t\t\t[numberOfSituations, bindingExpression(\"semanticKeyHasDraftIndicator\", \"internal\"), oProps.propertyPath],\n\t\t\t\tformatters.isVisible\n\t\t\t);\n\t\t}\n\n\t\t// Button text: the number of situations if there are multiple, the empty string otherwise\n\t\tconst text = ifElse(greaterThan(numberOfSituations, 1), numberOfSituations, \"\");\n\n\t\t// Button tooltip: \"There is one situation\" / \"There are <n> situations\"\n\t\tconst tooltip = ifElse(\n\t\t\tequal(numberOfSituations, 1),\n\t\t\tResourceModel.getText(\"situationsTooltipSingular\"),\n\t\t\tformatResult([ResourceModel.getText(\"situationsTooltipPlural\"), numberOfSituations], formatters.tooltip)\n\t\t);\n\n\t\t// 'press' handler\n\t\tconst onPress = fn(showPopover, [ref(\"$controller\"), ref(\"$event\"), oProps.situations.path]);\n\n\t\treturn xml`\n\t\t\t<Button xmlns=\"sap.m\" xmlns:core=\"sap.ui.core\" core:require=\"{rt: 'sap/fe/macros/internal/situations/Runtime'}\"\n\t\t\t\ttype=\"Attention\"\n\t\t\t\ticon=\"sap-icon://alert\"\n\t\t\t\tclass=\"sapUiTinyMarginBegin sapUiSizeCompact\"\n\t\t\t\ttext=\"${compileBinding(text)}\"\n\t\t\t\ttooltip=\"${compileBinding(tooltip)}\"\n\t\t\t\tvisible=\"${compileBinding(visible)}\"\n\t\t\t\tpress=\"${compileBinding(onPress)}\"\n\t\t\t/>`;\n\t}\n});\n\nexport default SituationsIndicator;\n"]}

package/packages/sap.fe.macros/src/sap/fe/macros/internal/SituationsIndicator.ts

@@ -1,5 +1,5 @@
 import { MacroMetadata, ResourceModel } from "sap/fe/macros";
-import { Context } from "sap/ui/model";
+import Context from "sap/ui/model/Context";
 import {
 	bindingExpression,
 	compileBinding,
@@ -18,7 +18,7 @@ import { PathAnnotationExpression } from "@sap-ux/vocabularies-types";
 import formatters from "sap/fe/macros/internal/situations/Formatter";
 
 type PublicProperties = {
-	entitySet: Context<any>;
+	entitySet: Context;
 	propertyPath?: string;
 };
 
@@ -80,7 +80,8 @@ const SituationsIndicator = MacroMetadata.extend("sap.fe.macros.internal.Situati
 			visible = greaterThan(numberOfSituations, 0);
 		} else {
 			// propertyPath --> visibility depends on the number of situations and on the semantic key used for showing indicators
-			// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&' (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.
+			// TODO: Using a formatter here because the 'xml' tagged template literal processing fails on '&&'
+			// (or the expression parser fails if &amp;&amp; is used instead). Could be expressed as a simple expression binding.
 			visible = formatResult(
 				[numberOfSituations, bindingExpression("semanticKeyHasDraftIndicator", "internal"), oProps.propertyPath],
 				formatters.isVisible

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/FieldStructure.fragment.xml

@@ -43,7 +43,7 @@
 						emptyIndicatorTrigger="{= FIELD.getEmptyIndicatorTrigger(${this>formatOptions/showEmptyIndicator},${this>valueBindingExpression}, ${this>text})}"
 						editMode="{this>editMode}"
 						visible="{this>visible}"
-						required="{= FIELD.getRequiredForDataField(${property>$Path@@FIELD.fieldControl}, ${this>editMode})}"
+						required="{this>requiredExpression}"
 						width="100%"
 						textAlign="{this>textAlign}"
 						class="{this>class}"

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/LinkWithQuickViewForm.fragment.xml

@@ -4,13 +4,15 @@
 	xmlns:core="sap.ui.core"
 	xmlns:macro="sap.fe.macros"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
+	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
 							FIELD: 'sap/fe/macros/field/FieldHelper'
 						 }"
 >
 	<Link
+		log:retrieveTextFormValueList="{this>formatOptions/retrieveTextFromValueList}"
+		text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFormValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
 		visible="{this>displayVisible}"
-		text="{this>text}"
 		wrapping="true"
 		core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 		press="FieldRuntime.pressLink"

package/packages/sap.fe.macros/src/sap/fe/macros/internal/field/displayStyle/LinkWrapper.fragment.xml

@@ -5,6 +5,7 @@
 	xmlns:control="sap.fe.core.controls"
 	xmlns:macro="sap.fe.macros"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
+	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	template:require="{
 							FIELD: 'sap/fe/macros/field/FieldHelper',
 							UI: 'sap/fe/core/templating/UIFormatters'
@@ -17,7 +18,8 @@
 	>
 		<control:contentTrue>
 			<Link
-				text="{this>text}"
+				log:retrieveTextFormValueList="{this>formatOptions/retrieveTextFromValueList}"
+				text="{= ${this>formatOptions/retrieveTextFromValueList} ? FIELD.retrieveTextFormValueList( ${this>entitySet}, ${propertyPath>}, ${this>formatOptions} ) : ${this>text} }"
 				wrapping="true"
 				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 				press="FieldRuntime.pressLink"