@sap/open.fe 1.97.0 → 1.98.0

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

@@ -0,0 +1,116 @@
+import { MacroMetadata, ResourceModel } from "sap/fe/macros";
+import { Context } from "sap/ui/model";
+import {
+	bindingExpression,
+	compileBinding,
+	equal,
+	fn,
+	formatResult,
+	greaterThan,
+	ifElse,
+	ref
+} from "sap/fe/core/helpers/BindingExpression";
+import { xml } from "sap/fe/macros/MacroRuntime";
+import { convertMetaModelContext } from "sap/fe/core/converters/MetaModelConverter";
+import { NavigationProperty } from "@sap-ux/annotation-converter";
+import { showPopover } from "sap/fe/macros/internal/situations/Runtime";
+import { PathAnnotationExpression } from "@sap-ux/vocabularies-types";
+import formatters from "sap/fe/macros/internal/situations/Formatter";
+
+type PublicProperties = {
+	entitySet: Context<any>;
+	propertyPath?: string;
+};
+
+type Properties = PublicProperties & { situations: PathAnnotationExpression<NavigationProperty> | undefined };
+
+const SituationsIndicator = MacroMetadata.extend("sap.fe.macros.internal.SituationsIndicator", {
+	/**
+	 * Name
+	 */
+	name: "SituationsIndicator",
+	/**
+	 * Namespace
+	 */
+	namespace: "sap.fe.macros.internal",
+
+	/**
+	 * Metadata
+	 */
+	metadata: {
+		/**
+		 * Define macro stereotype for documentation
+		 */
+		stereotype: "xmlmacro",
+		/**
+		 * Properties.
+		 */
+		properties: {
+			entitySet: {
+				type: "sap.ui.model.Context",
+				required: true,
+				$kind: "EntitySet"
+			},
+
+			propertyPath: {
+				type: "string",
+				required: false
+			}
+		}
+	},
+	create: function(oProps: Properties) {
+		const entitySet = convertMetaModelContext(oProps.entitySet);
+
+		oProps.situations = entitySet.entityType.annotations.FE?.Situations;
+
+		return oProps;
+	},
+
+	getTemplate(oProps: Properties) {
+		if (!oProps.situations) {
+			return;
+		} // do not provide a template if Situations are unsupported
+
+		const numberOfSituations = bindingExpression(`${oProps.situations.path}/SitnNumberOfInstances`);
+
+		// Indicator visibility
+		let visible;
+		if (!oProps.propertyPath) {
+			// no propertyPath --> visibility depends on the number of situations only
+			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.
+			visible = formatResult(
+				[numberOfSituations, bindingExpression("semanticKeyHasDraftIndicator", "internal"), oProps.propertyPath],
+				formatters.isVisible
+			);
+		}
+
+		// Button text: the number of situations if there are multiple, the empty string otherwise
+		const text = ifElse(greaterThan(numberOfSituations, 1), numberOfSituations, "");
+
+		// Button tooltip: "There is one situation" / "There are <n> situations"
+		const tooltip = ifElse(
+			equal(numberOfSituations, 1),
+			ResourceModel.getText("situationsTooltipSingular"),
+			formatResult([ResourceModel.getText("situationsTooltipPlural"), numberOfSituations], formatters.tooltip)
+		);
+
+		// 'press' handler
+		const onPress = fn(showPopover, [ref("$controller"), ref("$event"), oProps.situations.path]);
+
+		return xml`
+			<Button xmlns="sap.m" xmlns:core="sap.ui.core" core:require="{rt: 'sap/fe/macros/internal/situations/Runtime'}"
+				type="Attention"
+				icon="sap-icon://alert"
+				class="sapUiTinyMarginBegin sapUiSizeCompact"
+				text="${compileBinding(text)}"
+				tooltip="${compileBinding(tooltip)}"
+				visible="${compileBinding(visible)}"
+				press="${compileBinding(onPress)}"
+			/>`;
+	}
+});
+
+export default SituationsIndicator;

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

@@ -46,23 +46,15 @@ sap.ui.define(["sap/ui/mdc/field/MultiValueFieldDelegate", "sap/fe/core/CommonUt
 				var oCondition = aConditions[i];
 				if (!aOldKeys.includes(oCondition.values[0])) {
 					var oItem = {};
-					if (sKeyPath) {
-						var iIndex = sKeyPath.indexOf("/");
-						if (iIndex >= 0) {
-							// we do not manage retrievng the key path via a 1:1
-							var sPropertyPath = sKeyPath.substr(iIndex + 1);
-							sKeyPath = sKeyPath.substr(0, iIndex);
-							var oKey = {};
-							oKey[sPropertyPath] = oCondition.values[0];
-							oItem[sKeyPath] = oKey;
-						} else {
-							oItem[sKeyPath] = oCondition.values[0];
+					if (sKeyPath && sKeyPath.indexOf("/") === -1) {
+						// we do not manage to create on a sub entity of the 1:n navigation
+						oItem[sKeyPath] = oCondition.values[0];
+
+						if (sDescriptionPath && sDescriptionPath.indexOf("/") === -1 && sDescriptionPath !== sKeyPath) {
+							oItem[sDescriptionPath] = oCondition.values[1];
 						}
+						aDataToAdd.push(oItem);
 					}
-					if (sDescriptionPath && sDescriptionPath !== sKeyPath) {
-						oItem[sDescriptionPath] = oCondition.values[1];
-					}
-					aDataToAdd.push(oItem);
 				}
 			}
 			if (aDataToAdd.length) {

package/packages/sap.fe.macros/src/sap/fe/macros/internal/collectionField/MultiValueFieldDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/field/MultiValueFieldDelegate","sap/fe/core/CommonUtils"],function(M,C){"use strict";var a=Object.assign({},M);a.updateItems=function(p,c,o){var l=o.getBinding("items");if(l.isA("sap.ui.model.odata.v4.ODataListBinding")){var b=o.getBindingInfo("items");var t=b.template;var k=t.getBindingInfo("key");var d=t.getBindingInfo("description");var K=k&&k.parts[0].path;var D=d&&d.parts&&d.parts[0]&&d.parts[0].path;var e=l.getCurrentContexts();var i=0;var f=[];var g=C.getTargetView(o).getController();var n=c.map(function(j){return j.values[0];});var O=e.map(function(s){return s.getProperty(K);});var m=[];for(i=0;i<e.length;i++){var h=e[i];if(!n.includes(h.getProperty(K))){m.push(g._editFlow.deleteDocumentTransaction(h,{noDialog:true}));}}for(i=0;i<c.length;i++){var j=c[i];if(!O.includes(j.values[0])){var I={};if(K){var q=K.indexOf("/");if(q>=0){var P=K.substr(q+1);K=K.substr(0,q);var r={};r[P]=j.values[0];I[K]=r;}else{I[K]=j.values[0];}}if(D&&D!==K){I[D]=j.values[1];}f.push(I);}}if(f.length){m.push(g._editFlow.createMultipleDocuments(l,f,true));}return Promise.all(m);}};return a;});
+sap.ui.define(["sap/ui/mdc/field/MultiValueFieldDelegate","sap/fe/core/CommonUtils"],function(M,C){"use strict";var a=Object.assign({},M);a.updateItems=function(p,c,o){var l=o.getBinding("items");if(l.isA("sap.ui.model.odata.v4.ODataListBinding")){var b=o.getBindingInfo("items");var t=b.template;var k=t.getBindingInfo("key");var d=t.getBindingInfo("description");var K=k&&k.parts[0].path;var D=d&&d.parts&&d.parts[0]&&d.parts[0].path;var e=l.getCurrentContexts();var i=0;var f=[];var g=C.getTargetView(o).getController();var n=c.map(function(j){return j.values[0];});var O=e.map(function(q){return q.getProperty(K);});var m=[];for(i=0;i<e.length;i++){var h=e[i];if(!n.includes(h.getProperty(K))){m.push(g._editFlow.deleteDocumentTransaction(h,{noDialog:true}));}}for(i=0;i<c.length;i++){var j=c[i];if(!O.includes(j.values[0])){var I={};if(K&&K.indexOf("/")===-1){I[K]=j.values[0];if(D&&D.indexOf("/")===-1&&D!==K){I[D]=j.values[1];}f.push(I);}}}if(f.length){m.push(g._editFlow.createMultipleDocuments(l,f,true));}return Promise.all(m);}};return a;});

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

@@ -32,21 +32,20 @@
 			<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>displayStyle}" type="XML" />
 		</template:then>
 		<template:else>
-			
-			<template:if
-				test="{= !(${this>formatOptions/isAnalytics}) &amp;&amp; (${this>formatOptions/fieldMode} === 'nowrapper') &amp;&amp; (${this>editMode}==='Display') &amp;&amp; (${this>visible} === 'true') }"
-			>
+
+			<template:if test="{= (${this>formatOptions/fieldMode} === 'nowrapper') &amp;&amp; (${this>editMode}==='Display') }">
 				<template:then>
 					<core:Fragment fragmentName="sap.fe.macros.internal.field.displayStyle.{this>displayStyle}" type="XML" />
 				</template:then>
 				<template:else>
 					<control:FieldWrapper
-						id="{= ${this>_flexId} || (${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field-content']) : undefined) }"
+						id="{this>fieldWrapperId}"
 						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})}"
 						width="100%"
+						textAlign="{this>textAlign}"
 						class="{this>class}"
 					>
 						<control:contentDisplay>

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

@@ -13,7 +13,10 @@
 		<!-- if Analytical Table -->
 		<template:if test="{this>formatOptions/isAnalytics}">
 			<template:then>
-				<control:ConditionalWrapper condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}">
+				<control:ConditionalWrapper
+					visible="{this>displayVisible}"
+					condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}"
+				>
 					<control:contentTrue>
 						<u:Currency
 							stringValue="{this>valueAsStringBindingExpression}"
@@ -30,6 +33,7 @@
 			<template:else>
 				<!-- We use % to prevent ODataBinding automatically formatting the stringValue as a number-->
 				<u:Currency
+					visible="{this>displayVisible}"
 					stringValue="{this>valueAsStringBindingExpression}"
 					currency="{this>unitBindingExpression}"
 					useSymbol="false"

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

@@ -13,7 +13,10 @@
 >
 	<template:if test="{= ${this>formatOptions/isAnalytics} &amp;&amp; ${property>@@Property.hasUnitOrCurrency} }">
 		<template:then>
-			<control:ConditionalWrapper condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}">
+			<control:ConditionalWrapper
+				visible="{this>displayVisible}"
+				condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}"
+			>
 				<control:contentTrue>
 					<internalMacro:DataPoint
 						idPrefix="{= ${this>idPrefix} }"
@@ -33,6 +36,7 @@
 		<template:else>
 			<internalMacro:DataPoint
 				idPrefix="{= ${this>idPrefix} }"
+				visible="{this>displayVisible}"
 				ariaLabelledBy="{= ${this>ariaLabelledBy} }"
 				_flexId="{= ${this>_flexId} }"
 				metaPath="{dataPoint>}"

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

@@ -11,6 +11,7 @@
 	}"
 >
 	<ExpandableText
+		visible="{this>displayVisible}"
 		text="{this>text}"
 		overflowMode="{this>formatOptions/textExpandBehaviorDisplay}"
 		maxCharacters="{this>formatOptions/textMaxCharactersDisplay}"

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

@@ -12,11 +12,11 @@
 	>
 
 		<template:then>
-			<Avatar src="{property>@@MODEL.value}" displaySize="S" class="sapUiSmallMarginEnd" displayShape="Square" />
+			<Avatar visible="{this>displayVisible}" src="{property>@@MODEL.value}" displaySize="S" class="sapUiSmallMarginEnd" displayShape="Square" />
 		</template:then>
 
 		<template:else>
-			<HBox core:require="{FIELDRUNTIME: 'sap/fe/macros/field/FieldRuntime'}">
+			<HBox core:require="{FIELDRUNTIME: 'sap/fe/macros/field/FieldRuntime'}" visible="{this>displayVisible}">
 				<HBox alignItems="Center" visible="{= FIELD.getIsMediaContentTypeNullExpr(${propertyPath>}, '!==') }">
 					<core:Icon src="{= FIELD.getPathForIconSource(${propertyPath>})}" class="sapUiSmallMarginEnd" />
 					<Link

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

@@ -16,6 +16,7 @@
 		<template:then>
 			<control:ConditionalWrapper
 				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+				visible="{this>displayVisible}"
 				condition="{= FIELD.hasSemanticObjectTargets(${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}, ${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
 			>
 				<control:contentTrue>
@@ -25,14 +26,14 @@
 						core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 						press="FieldRuntime.pressLink"
 						ariaLabelledBy="{this>ariaLabelledBy}"
-						modelContextChange="FieldRuntime.LinkModelContextChange"
+						modelContextChange="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) ? 'FieldRuntime.LinkModelContextChange' : null }"
 					>
 						<customData>
-<!--							<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">-->
+							<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
 								<template:repeat list="{semanticObjects>}" var="semanticObject">
 									<core:CustomData key="{semanticObject>key}" value="{semanticObject>value}" />
 								</template:repeat>
-<!--							</template:if>-->
+							</template:if>
 						</customData>
 						<dependents>
 							<macro:QuickViewForm
@@ -56,6 +57,7 @@
 		<template:else>
 			<Label
 				unittest:id="MacroDataFieldLabel"
+				visible="{this>displayVisible}"
 				text="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
 				design="Bold"
 			/>

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

@@ -10,19 +10,27 @@
 		<template:then>
 			<Link
 				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+				visible="{this>displayVisible}"
 				text="{this>text}"
 				press="{= 'FieldRuntime.onDataFieldWithNavigationPath(${$source>/}, $controller, \'' + ${dataField>Target/$NavigationPropertyPath} + '\')' }"
 				ariaLabelledBy="{this>ariaLabelledBy}"
 			/>
 		</template:then>
 		<template:elseif test="{property>$Path@com.sap.vocabularies.Communication.v1.IsEmailAddress}">
-			<Link text="{this>text}" href="mailto:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
+			<Link visible="{this>displayVisible}" text="{this>text}" href="mailto:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
 		</template:elseif>
 		<template:elseif test="{property>$Path@com.sap.vocabularies.Communication.v1.IsPhoneNumber}">
-			<Link text="{this>text}" href="tel:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
+			<Link visible="{this>displayVisible}" text="{this>text}" href="tel:{property>@@MODEL.format}" ariaLabelledBy="{this>ariaLabelledBy}" />
 		</template:elseif>
 		<template:else>
-			<Link text="{this>text}" href="{dataField>Url@@MODEL.value}" wrapping="true" target="_blank" ariaLabelledBy="{this>ariaLabelledBy}" />
+			<Link
+				visible="{this>displayVisible}"
+				text="{this>text}"
+				href="{dataField>Url@@MODEL.value}"
+				wrapping="true"
+				target="_blank"
+				ariaLabelledBy="{this>ariaLabelledBy}"
+			/>
 		</template:else>
 	</template:if>
 

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

@@ -9,6 +9,7 @@
 						 }"
 >
 	<Link
+		visible="{this>displayVisible}"
 		text="{this>text}"
 		wrapping="true"
 		core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"

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

@@ -12,6 +12,7 @@
 >
 	<control:ConditionalWrapper
 		core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+		visible="{this>displayVisible}"
 		condition="{= FIELD.hasSemanticObjectTargets(${property>$Path@com.sap.vocabularies.Common.v1.SemanticObject}, ${property>$Path@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
 	>
 		<control:contentTrue>
@@ -21,14 +22,14 @@
 				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
 				press="FieldRuntime.pressLink"
 				ariaLabelledBy="{this>ariaLabelledBy}"
-				modelContextChange="FieldRuntime.LinkModelContextChange"
+				modelContextChange="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) ? 'FieldRuntime.LinkModelContextChange' : null }"
 			>
 				<customData>
-<!--					<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}, ${this>}) }">-->
+					<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
 						<template:repeat list="{semanticObjects>}" var="semanticObject">
 							<core:CustomData key="{semanticObject>key}" value="{semanticObject>value}" />
 						</template:repeat>
-<!--					</template:if>-->
+					</template:if>
 				</customData>
 				<dependents>
 					<template:if test="{property>@@FIELD.getNavigationEntity}">
@@ -50,7 +51,7 @@
 			</Link>
 		</control:contentTrue>
 		<control:contentFalse>
-			<Text text="{this>text}" />
+			<Text visible="{this>displayVisible}" text="{this>text}" />
 		</control:contentFalse>
 	</control:ConditionalWrapper>
 </core:FragmentDefinition>

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

@@ -0,0 +1,48 @@
+<!--
+    /**
+     * This fragment renders a DataField
+     * @param entitySet: The context to the entitySet
+     * @param dataField: The context to the dataField
+     * @param property: The context to the property path
+	 * @param wrap: Defines whether wrapping is allowed for a field
+	 * wrap Boolean: Sets either 'true' or 'false'
+	 * Incoming from Field.fragment.xml
+ 	 * 	 @param idPrefix: The prefix for the ID (default setting: 'F')
+ 	 * 	 @param vhIdPrefix: The prefix for the ID of the value help (default setting: 'FieldValueHelp')
+     * @returns
+     */
+-->
+<core:FragmentDefinition
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:control="sap.fe.core.controls"
+	xmlns:mdc="sap.ui.mdc"
+	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
+	xmlns:macro="sap.fe.macros"
+	template:require="{
+							FIELD: 'sap/fe/macros/field/FieldHelper',
+							ID: 'sap/fe/core/helpers/StableIdHelper',
+							UI: 'sap/fe/core/templating/UIFormatters',
+							ValueHelpTemplating: 'sap/fe/macros/internal/valuehelp/ValueHelpTemplating',
+							Property: 'sap/fe/core/templating/PropertyFormatters'
+	}"
+>
+<!-- Use mdcField in case of has value help and display format require a description but text annotation is not on the property defined therefore on Entity level -->
+		<mdc:Field
+		unittest:id="MacroDataField"
+		id="{= ${this>idPrefix} ? ID.generate([${this>idPrefix}, 'Field-display']) : undefined }"
+		visible="{this>displayVisible}"
+		log:sourcePath="{this>dataSourcePath}"
+		value="{this>valueBindingExpression}"
+		editMode="Display"
+		width="100%"
+		display="{= UI.getFieldDisplay(${property>@@UI.getConverterContext}, ${this>formatOptions/displayMode}, ${this>editModeAsObject})}"
+		fieldHelp="{= ${valueHelpProperty>@@Property.hasValueHelp} ? ValueHelpTemplating.generateID(${this>_vhFlexId},${this>vhIdPrefix},${property>@@Property.getRelativePropertyPath},${valueHelpProperty>@@Property.getRelativePropertyPath}) : undefined}"
+		textAlign="{parts: [{path:'dataField>'}, {path:'this>formatOptions'}, {path:'property>@@FIELD.getPropertyCollection'}, {path:'this>editModeAsObject'}, {path:'property>@@UI.getConverterContext'}], formatter:'FIELD.getTypeAlignment'}"
+		ariaLabelledBy="{this>ariaLabelledBy}"
+	>
+	</mdc:Field>
+
+</core:FragmentDefinition>

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

@@ -3,6 +3,7 @@
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
+	xmlns:control="sap.fe.core.controls"
 	xmlns:macro="sap.fe.macros"
 	template:require="{
 							FIELD: 'sap/fe/macros/field/FieldHelper',
@@ -10,28 +11,149 @@
 							UI: 'sap/fe/core/templating/UIFormatters'
 						 }"
 >
-	<template:if test="{propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}">
+	<template:if test="{this>addSituationsIndicator}">
 		<template:then>
-			<ObjectIdentifier
-				title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
-				text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
-				core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
-				titleActive="{= FIELD.hasSemanticObjectTargets(${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}, ${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
-				titlePress="FieldRuntime.pressLink"
-				unittest:id="MacroDataFieldObjectIdentifier"
-				ariaLabelledBy="{this>ariaLabelledBy}"
-			>
-				<dependents>
-					<macro:QuickViewForm propertypath="{property>$Path}" dataField="{dataField>}" semanticObject="{this>semanticObject}" />
-				</dependents>
-			</ObjectIdentifier>
+			<HBox alignItems="Center" width="100%">
+			<template:if test="{propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}">
+				<template:then>
+					<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
+						<template:then>
+							<control:ConditionalWrapper
+									core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+									visible="{this>displayVisible}"
+									condition="{= FIELD.hasSemanticObjectTargets(${property>$Path@com.sap.vocabularies.Common.v1.SemanticObject}, ${property>$Path@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
+								>
+								<control:contentTrue>
+									<ObjectIdentifier
+											title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+											text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+											core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+											titleActive="true"
+											titlePress="FieldRuntime.pressLink"
+											unittest:id="MacroDataFieldObjectIdentifier"
+											ariaLabelledBy="{this>ariaLabelledBy}"
+											modelContextChange="{= 'FieldRuntime.LinkModelContextChange($event, \'' + ${propertyPath>} + '\')'}"
+										>
+										<customData>
+											<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
+												<template:repeat list="{semanticObjects>}" var="semanticObject">
+													<core:CustomData key="{semanticObject>key}" value="{semanticObject>value}" />
+												</template:repeat>
+											</template:if>
+										</customData>
+										<dependents>
+											<macro:QuickViewForm propertypath="{property>$Path}" dataField="{dataField>}" semanticObject="{this>semanticObject}" />
+										</dependents>
+									</ObjectIdentifier>
+								</control:contentTrue>
+								<control:contentFalse>
+									<ObjectIdentifier
+											title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+											text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+										/>
+								</control:contentFalse>
+							</control:ConditionalWrapper>
+						</template:then>
+						<template:else>
+							<ObjectIdentifier
+									visible="{this>displayVisible}"
+									title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+									text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+									core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+									titleActive="{= FIELD.hasSemanticObjectTargets(${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}, ${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
+									titlePress="FieldRuntime.pressLink"
+									unittest:id="MacroDataFieldObjectIdentifier"
+									ariaLabelledBy="{this>ariaLabelledBy}"
+								>
+								<dependents>
+									<macro:QuickViewForm propertypath="{property>$Path}" dataField="{dataField>}" semanticObject="{this>semanticObject}" />
+								</dependents>
+							</ObjectIdentifier>
+						</template:else>
+			</template:if>
+			</template:then>
+			<template:else>
+				<ObjectIdentifier
+							visible="{this>displayVisible}"
+							title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+							text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+						/>
+				</template:else>
+		</template:if>
+
+		<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" propertyPath="{property>$Path}" />
+		</HBox>
 		</template:then>
 		<template:else>
-			<ObjectIdentifier
-				title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
-				text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
-			/>
+
+		<template:if test="{propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}">
+			<template:then>
+				<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
+					<template:then>
+						<control:ConditionalWrapper
+								visible="{this>displayVisible}"
+								core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+								condition="{= FIELD.hasSemanticObjectTargets(${property>$Path@com.sap.vocabularies.Common.v1.SemanticObject}, ${property>$Path@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
+							>
+							<control:contentTrue>
+								<ObjectIdentifier
+										title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+										text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+										core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+										titleActive="true"
+										titlePress="FieldRuntime.pressLink"
+										unittest:id="MacroDataFieldObjectIdentifier"
+										ariaLabelledBy="{this>ariaLabelledBy}"
+										modelContextChange="{= 'FieldRuntime.LinkModelContextChange($event, \'' + ${propertyPath>} + '\')'}"
+									>
+									<customData>
+										<template:if test="{= FIELD.hasSemanticObjectsWithPath(${semanticObjects>}) }">
+											<template:repeat list="{semanticObjects>}" var="semanticObject">
+												<core:CustomData key="{semanticObject>key}" value="{semanticObject>value}" />
+											</template:repeat>
+										</template:if>
+									</customData>
+									<dependents>
+										<macro:QuickViewForm propertypath="{property>$Path}" dataField="{dataField>}" semanticObject="{this>semanticObject}" />
+									</dependents>
+								</ObjectIdentifier>
+							</control:contentTrue>
+							<control:contentFalse>
+								<ObjectIdentifier
+										title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+										text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+									/>
+							</control:contentFalse>
+						</control:ConditionalWrapper>
+					</template:then>
+					<template:else>
+						<ObjectIdentifier
+								visible="{this>displayVisible}"
+								title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+								text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+								core:require="{FieldRuntime: 'sap/fe/macros/field/FieldRuntime'}"
+								titleActive="{= FIELD.hasSemanticObjectTargets(${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObject}, ${propertyPath>@com.sap.vocabularies.Common.v1.SemanticObjectUnavailableActions}, ${property>@@UI.getConverterContext} , ${property>@@UI.getDataModelObjectPath} ) }"
+								titlePress="FieldRuntime.pressLink"
+								unittest:id="MacroDataFieldObjectIdentifier"
+								ariaLabelledBy="{this>ariaLabelledBy}"
+							>
+							<dependents>
+								<macro:QuickViewForm propertypath="{property>$Path}" dataField="{dataField>}" semanticObject="{this>semanticObject}" />
+							</dependents>
+						</ObjectIdentifier>
+					</template:else>
+				</template:if>
+			</template:then>
+			<template:else>
+				<ObjectIdentifier
+						visible="{this>displayVisible}"
+						title="{= FIELD.getLabelTextForDataField(${entitySet>@}, ${propertyPath>@}, ${propertyPath>@@FIELD.buildExpressionForTextValue}, ${property>@@FIELD.semanticKeyFormat}, ${dataField>@sapui.name}, ${this>formatOptions/semanticKeyStyle}) }"
+						text="{= FIELD.getObjectIdentifierText(${propertyPath>@com.sap.vocabularies.Common.v1.Text}, ${propertyPath>@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement}, ${property>@@MODEL.value}, ${dataField>@sapui.name})}"
+					/>
+			</template:else>
+		</template:if>
 		</template:else>
 	</template:if>
 
+
 </core:FragmentDefinition>

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

@@ -9,6 +9,7 @@
 >
 	<ObjectStatus
 		unittest:id="MacroDataFieldObjectStatus"
+		visible="{this>displayVisible}"
 		icon="{= CRIT.buildExpressionForCriticalityIcon(${dataField>@@UI.getDataModelObjectPath})}"
 		state="{= CRIT.buildExpressionForCriticalityColor(${dataField>@@UI.getDataModelObjectPath})}"
 		text="{this>text}"

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

@@ -10,7 +10,7 @@
 >
 	<template:if test="{= ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot} }">
 		<template:then>
-			<control:FormElementWrapper>
+			<control:FormElementWrapper visible="{this>displayVisible}">
 				<VBox>
 					<template:if test="{= ${this>formatOptions/semanticKeyStyle} === 'ObjectIdentifier' }">
 						<template:then>

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

@@ -12,10 +12,13 @@
 >
 	<template:if test="{= (${property>$Path/$Type} === 'Edm.String') &amp;&amp;	${property>$Path@com.sap.vocabularies.UI.v1.MultiLineText} }">
 		<template:then>
-			<Text text="{this>text}" width="100%" />
+			<Text visible="{this>displayVisible}" text="{this>text}" width="100%" />
 		</template:then>
 		<template:elseif test="{= ${this>formatOptions/isAnalytics} &amp;&amp; ${property>@@Property.hasUnitOrCurrency} }">
-				<control:ConditionalWrapper condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}">
+				<control:ConditionalWrapper
+				visible="{this>displayVisible}"
+				condition="{= UI.hasValidAnalyticalCurrencyOrUnit(${property>$Path@@UI.getDataModelObjectPath})}"
+			>
 					<control:contentTrue>
 						<Text text="{this>text}" />
 					</control:contentTrue>
@@ -25,7 +28,7 @@
 				</control:ConditionalWrapper>
 		</template:elseif>
 		<template:else>
-			<Text text="{this>text}" />
+			<Text visible="{this>displayVisible}" text="{this>text}" />
 		</template:else>
 	</template:if>