@sapui5/sap.fe.templates 1.96.4 → 1.99.0

package/src/sap/fe/templates/ListReport/overrides/ViewState.js

@@ -1,19 +1,39 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
 		"sap/fe/core/library",
 		"sap/fe/navigation/library",
 		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/ui/Device",
 		"sap/ui/mdc/enum/ConditionValidated",
+		"sap/fe/macros/DelegateUtil",
+		"sap/fe/core/helpers/ModelHelper",
+		"sap/fe/macros/filter/FilterUtils",
+		"sap/fe/core/templating/PropertyFormatters",
 		"sap/base/Log"
 	],
-	function(CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated, Log) {
+	function(
+		CoreLibrary,
+		NavLibrary,
+		CommonUtils,
+		KeepAliveHelper,
+		ControlVariantApplyAPI,
+		StateUtil,
+		Device,
+		ConditionValidated,
+		DelegateUtil,
+		ModelHelper,
+		FilterUtils,
+		PropertyFormatters,
+		Log
+	) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType,
@@ -21,6 +41,9 @@ sap.ui.define(
 			TemplateContentView = CoreLibrary.TemplateContentView,
 			InitialLoadMode = CoreLibrary.InitialLoadMode;
 
+		var FilterRestrictions = CommonUtils.FilterRestrictions,
+			CONDITION_PATH_TO_PROPERTY_PATH_REGEX = /\+|\*/g;
+
 		return {
 			applyInitialStateOnly: function() {
 				return true;
@@ -30,25 +53,39 @@ sap.ui.define(
 					oController = oView.getController(),
 					oFilterBar = oController._getFilterBarControl(),
 					aTables = oController._getControls("table");
-
-				oFilterBar.setSuspendSelection(true);
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(true);
+					aPromises.push(oFilterBar.initialized());
+				}
 				aTables.forEach(function(oTable) {
 					aPromises.push(oTable.initialized());
 				});
-				aPromises.push(oFilterBar.initialized());
 
 				delete this._bSearchTriggered;
 			},
 			onAfterStateApplied: function() {
-				var oView = this.getView(),
-					oController = oView.getController();
-				oController._getFilterBarControl().setSuspendSelection(false);
+				var oController = this.getView().getController();
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(false);
+				} else if (oController._isFilterBarHidden()) {
+					var oInternalModelContext = oController.getView().getBindingContext("internal"),
+						aControls = oController._getControls();
+					oInternalModelContext.setProperty("hasPendingFilters", false);
+					if (oController._isMultiMode()) {
+						oController._setCountsOutDated();
+						var sDisplayedControlId = oController._getCurrentControl().getId();
+						aControls.forEach(function(oControl) {
+							oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
+						});
+					}
+				}
 			},
 			adaptBindingRefreshControls: function(aControls) {
 				var oView = this.getView(),
 					oController = oView.getController(),
 					aViewControls = oController._getControls(),
-					aControlsToRefresh = CommonUtils.getControlsForRefresh(oView, aViewControls);
+					aControlsToRefresh = KeepAliveHelper.getControlsForRefresh(oView, aViewControls);
 
 				Array.prototype.push.apply(aControls, aControlsToRefresh);
 			},
@@ -58,14 +95,13 @@ sap.ui.define(
 					oViewData = oView.getViewData(),
 					bControlVM = oViewData.variantManagement === VariantManagement.Control;
 
-				if (oController._isMultiMode()) {
-					aStateControls.push(oController._getMultiModeControl());
-				}
-
 				var oFilterBarVM = this._getFilterBarVM(oView);
 				if (oFilterBarVM) {
 					aStateControls.push(oFilterBarVM);
 				}
+				if (oController._isMultiMode()) {
+					aStateControls.push(oController._getMultiModeControl());
+				}
 				oController._getControls("table").forEach(function(oTable) {
 					var oQuickFilter = oTable.getQuickFilter();
 					if (oQuickFilter) {
@@ -74,13 +110,17 @@ sap.ui.define(
 					if (bControlVM) {
 						aStateControls.push(oTable.getVariant());
 					}
+					aStateControls.push(oTable);
 				});
 
 				if (oController._hasMultiVisualizations()) {
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Chart));
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Table));
 				}
-				aStateControls.push(oController._getFilterBarControl());
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					aStateControls.push(oFilterBar);
+				}
 				aStateControls.push(oView.byId("fe::ListReport"));
 			},
 			retrieveAdditionalStates: function(mAdditionalStates) {
@@ -103,10 +143,13 @@ sap.ui.define(
 
 				if (oAdditionalStates) {
 					// explicit check for boolean values - 'undefined' should not alter the triggered search property
-					if (oAdditionalStates.dataLoaded === false) {
+					if (oAdditionalStates.dataLoaded === false && oFilterBar) {
+						// without this, the data is loaded on navigating back
 						oFilterBar._bSearchTriggered = false;
 					} else if (oAdditionalStates.dataLoaded === true) {
-						oController._getFilterBarControl().triggerSearch();
+						if (oFilterBar) {
+							oFilterBar.triggerSearch();
+						}
 						this._bSearchTriggered = true;
 					}
 					if (oController._hasMultiVisualizations()) {
@@ -142,18 +185,20 @@ sap.ui.define(
 								var bPreventInitialSearch = false;
 								var oFilterBarVM = that._getFilterBarVM(oView);
 								var oFilterBarControl = oController._getFilterBarControl();
-								if (
-									(oNavigationParameter.navigationType !== NavType.initial &&
-										oNavigationParameter.requiresStandardVariant) ||
-									(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
-									oController._shouldAutoTriggerSearch(oFilterBarVM)
-								) {
-									oFilterBarControl.triggerSearch();
-								} else {
-									bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+								if (oFilterBarControl) {
+									if (
+										(oNavigationParameter.navigationType !== NavType.initial &&
+											oNavigationParameter.requiresStandardVariant) ||
+										(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
+										oController._shouldAutoTriggerSearch(oFilterBarVM)
+									) {
+										oFilterBarControl.triggerSearch();
+									} else {
+										bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+									}
+									that._bSearchTriggered = !bPreventInitialSearch;
+									oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
 								}
-								that._bSearchTriggered = !bPreventInitialSearch;
-								oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
 							});
 						})
 						.catch(function() {
@@ -192,11 +237,13 @@ sap.ui.define(
 				} else if (oVariantIDs && sVariantManagement === "Control") {
 					if (oVariantIDs.sFilterBarVariantId) {
 						var oVM = oView.byId(oView.getContent()[0].data("filterBarVariantId"));
-						oVM.getVariants().forEach(function(oVariant) {
-							if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
-								aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
-							}
-						});
+						if (oVM) {
+							oVM.getVariants().forEach(function(oVariant) {
+								if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
+									aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
+								}
+							});
+						}
 					}
 					if (oVariantIDs.sTableVariantId) {
 						var oController = oView.getController(),
@@ -217,9 +264,12 @@ sap.ui.define(
 			},
 
 			_applyControlVariant: function(oVariant, sVariantID, bFilterVariantApplied) {
+				var sVariantReference = this._checkIfVariantIdIsAvailable(oVariant, sVariantID)
+					? sVariantID
+					: oVariant.getStandardVariantKey();
 				var oVM = ControlVariantApplyAPI.activateVariant({
 					element: oVariant,
-					variantReference: sVariantID
+					variantReference: sVariantReference
 				});
 				return oVM.then(function() {
 					return bFilterVariantApplied;
@@ -253,17 +303,16 @@ sap.ui.define(
 			},
 
 			_applySelectionVariant: function(oView, oNavigationParameter, bFilterVariantApplied) {
-				var oSelectionVariant = oNavigationParameter.selectionVariant,
+				var oFilterBar = oView.getController()._getFilterBarControl(),
+					oSelectionVariant = oNavigationParameter.selectionVariant,
 					oSelectionVariantDefaults = oNavigationParameter.selectionVariantDefaults;
-				if (!oSelectionVariant) {
+				if (!oFilterBar || !oSelectionVariant) {
 					return Promise.resolve();
 				}
-
 				var oConditions = {},
 					oMetaModel = oView.getModel().getMetaModel(),
 					oViewData = oView.getViewData(),
 					sContextPath = oViewData.contextPath || "/" + oViewData.entitySet,
-					oFilterBar = oView.byId(oView.getContent()[0].data("filterBarId")),
 					aMandatoryFilterFields = CommonUtils.getMandatoryFilterFields(oMetaModel, sContextPath),
 					oVariant,
 					bRequiresStandardVariant = oNavigationParameter.requiresStandardVariant;
@@ -304,10 +353,9 @@ sap.ui.define(
 				} else {
 					oPromise = Promise.resolve(true);
 				}
-
 				return oPromise.then(function(bClearFilterAndReplaceWithAppState) {
 					if (bClearFilterAndReplaceWithAppState) {
-						return that._fnClearFilterAndReplaceWithAppState(oFilterBar, oConditions);
+						return that._fnApplyConditions(oFilterBar, oConditions);
 					}
 				});
 			},
@@ -326,9 +374,35 @@ sap.ui.define(
 						}
 						delete oCondition.isEmpty;
 					};
+				var fnGetPropertyInfo = function(oFilterControl, sEntityTypePath) {
+					var sEntitySetPath = ModelHelper.getEntitySetPath(sEntityTypePath),
+						oMetaModel = oFilterControl.getModel().getMetaModel(),
+						oFR = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oMetaModel),
+						aNonFilterableProps = oFR[FilterRestrictions.NON_FILTERABLE_PROPERTIES],
+						mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntityTypePath),
+						aPropertyInfo = [];
+					Object.keys(mFilterFields).forEach(function(sFilterFieldKey) {
+						var oConvertedProperty = mFilterFields[sFilterFieldKey];
+						var sPropertyPath = oConvertedProperty.conditionPath.replace(CONDITION_PATH_TO_PROPERTY_PATH_REGEX, "");
+						if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
+							var sAnnotationPath = oConvertedProperty.annotationPath;
+							var oPropertyContext = oMetaModel.createBindingContext(sAnnotationPath);
+							aPropertyInfo.push({
+								path: oConvertedProperty.conditionPath,
+								hiddenFilter: oConvertedProperty.availability === "Hidden",
+								hasValueHelp: !sAnnotationPath
+									? false
+									: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext })
+							});
+							return;
+						}
+					});
+					return aPropertyInfo;
+				};
 				return oFilterBar.initialized().then(function() {
-					oFilterBar
-						.getPropertyInfoSet()
+					var sEntityTypePath = DelegateUtil.getCustomData(oFilterBar, "entityType");
+					var aPropertyInfo = fnGetPropertyInfo(oFilterBar, sEntityTypePath);
+					aPropertyInfo
 						.filter(function(oPropertyInfo) {
 							return oPropertyInfo.path !== "$editState" && oPropertyInfo.path !== "$search";
 						})
@@ -351,9 +425,6 @@ sap.ui.define(
 						});
 					return StateUtil.applyExternalState(oFilterBar, { filter: mFilter, items: aItems });
 				});
-			},
-			_fnClearFilterAndReplaceWithAppState: function(oFilterBar, oConditions) {
-				return this._fnApplyConditions(oFilterBar, {}).then(this._fnApplyConditions.bind(this, oFilterBar, oConditions));
 			}
 		};
 	}

package/src/sap/fe/templates/ListReport/view/fragments/CollectionVisualization.fragment.xml

@@ -10,6 +10,14 @@
 					<template:repeat list="{converterContext>views}" var="view">
 						<template:with path="view>primaryVisualization" var="presentationContext">
 							<template:repeat list="{presentationContext>visualizations}" var="visualizationDefinition">
+								<m:MessageStrip
+								text="{= '{path:\'internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '\', formatter: \'.formatters.setChartMessageStrip\'}'}"
+								type="Information"
+								showIcon="true"
+								showCloseButton="true"
+								class="sapUiSmallMargin"
+								visible="{= '{= (${internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '} || []).length>0 &amp;&amp; ${pageInternal>alpContentView} !== \'Table\'}' }"
+							/>
 								<core:Fragment fragmentName="sap.fe.templates.controls.{visualizationDefinition>type}" type="XML" />
 							</template:repeat>
 						</template:with>

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 
 sap.ui.define(
@@ -48,7 +49,7 @@ sap.ui.define(
 			 */
 			getSwitchToActiveVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -62,7 +63,7 @@ sap.ui.define(
 			 */
 			getSwitchToDraftVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( !(${ui>/editMode} === 'Editable') && !${ui>createMode} && ${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -465,7 +466,7 @@ sap.ui.define(
 						" ? true : false) }"
 					);
 				} else {
-					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? "true" : "false");
 				}
 			}
 		};

package/src/sap/fe/templates/ObjectPage/Component.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -15,6 +16,7 @@ sap.ui.define(
 		"use strict";
 
 		var VariantManagement = CoreLibrary.VariantManagement,
+			CreationMode = CoreLibrary.CreationMode,
 			ObjectPageComponent = TemplateComponent.extend("sap.fe.templates.ObjectPage.Component", {
 				metadata: {
 					properties: {
@@ -68,6 +70,12 @@ sap.ui.define(
 						prepareOnEdit: {
 							type: "boolean",
 							defaultValue: false
+						},
+						/**
+						 * Defines the properties which can be used for inbound Navigation
+						 */
+						inboundParameters: {
+							type: "object"
 						}
 					},
 					library: "sap.fe.templates",
@@ -80,31 +88,43 @@ sap.ui.define(
 
 				// TODO: this should be ideally be handled by the editflow/routing without the need to have this method in the
 				// object page - for now keep it here
-				createDeferredContext: function(sPath, bActionCreate) {
+				createDeferredContext: function(sPath, oListBinding, bActionCreate) {
 					if (!this.DeferredContextCreated) {
 						this.DeferredContextCreated = true;
-						var oListBinding,
-							that = this,
+						var that = this,
 							oParamters = {
 								"$$groupId": "$auto.Heroes",
 								"$$updateGroupId": "$auto"
 							};
-
-						oListBinding = new ODataListBinding(
-							this.getModel(),
-							sPath.replace("(...)", ""),
-							undefined,
-							undefined,
-							undefined,
-							oParamters
-						);
+						if (!oListBinding || oListBinding.isRelative() === false) {
+							oListBinding = new ODataListBinding(
+								this.getModel(),
+								sPath.replace("(...)", ""),
+								undefined,
+								undefined,
+								undefined,
+								oParamters
+							);
+						} else {
+							oListBinding.mParameters = oParamters;
+						}
+						var oStartUpParams =
+								this.oAppComponent &&
+								this.oAppComponent.getComponentData() &&
+								this.oAppComponent.getComponentData().startupParameters,
+							oInboundParameters = this.getViewData().inboundParameters,
+							createParams;
+						if (oStartUpParams && oStartUpParams.preferredMode && oStartUpParams.preferredMode[0].indexOf("create") !== -1) {
+							createParams = CommonUtils.getAdditionalParamsForCreate(oStartUpParams, oInboundParameters);
+						}
 
 						// for now wait until the view and the controller is created
 						that.getRootControl()
 							.getController()
 							.editFlow.createDocument(oListBinding, {
-								creationMode: "Sync",
-								createAction: bActionCreate
+								creationMode: CreationMode.Sync,
+								createAction: bActionCreate,
+								data: createParams
 							})
 							.finally(function() {
 								that.DeferredContextCreated = false;

package/src/sap/fe/templates/ObjectPage/ExtensionAPI.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2022 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,
@@ -105,6 +106,9 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 		 */
 		getSelectedContexts: function(sTableId) {
 			var oTable = this._view.byId(sTableId);
+			if (oTable && oTable.isA("sap.fe.macros.TableAPI")) {
+				oTable = oTable.getContent();
+			}
 			return (oTable && oTable.isA("sap.ui.mdc.Table") && oTable.getSelectedContexts()) || [];
 		},
 
@@ -122,6 +126,18 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 				oBlock = this._view.byId(sBlockID),
 				bBlockState = bShow === undefined ? !oBlock.getShowSideContent() : bShow;
 			oBlock.setShowSideContent(bBlockState);
+		},
+
+		/**
+		 * Gets the bound context of the current object page.
+		 *
+		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#getBindingContext
+		 * @returns {sap.ui.model.odata.v4.Context} Context bound to the object page
+		 *
+		 * @public
+		 */
+		getBindingContext: function() {
+			return this._view.getBindingContext();
 		}
 	});
 

package/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -79,107 +79,85 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<uxap:headerTitle>
-						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-							<uxap:expandedHeading>
+					<template:with path="converterContext>header" var="header">
+						<uxap:headerTitle>
+							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Heading" type="XML" />
+								<uxap:expandedContent>
 								<FlexBox>
-									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									</FlexBox>
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
-										/>
-									</template:with>
-								</FlexBox>
-							</uxap:expandedHeading>
-							<uxap:snappedHeading>
-								<FlexBox>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
-										/>
-									</template:with>
+									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+									<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+									</template:if>
 								</FlexBox>
-							</uxap:snappedHeading>
-							<uxap:expandedContent>
-							 <FlexBox>
-                            	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-              					  <Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            					  </template:if>
-			    			 </FlexBox>
-							</uxap:expandedContent>
-							<uxap:snappedContent>
-								<FlexBox>
-                            		<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-                						<Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            						</template:if>
-			    				</FlexBox>
-							</uxap:snappedContent>
-							<uxap:content>
-								<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
-									<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
-								</template:if>
-							</uxap:content>
-							<uxap:navigationActions>
-								<template:if test="{= ${viewData>/viewLevel} > 1}">
-									<macro:Paginator id="fe::Paginator" />
-								</template:if>
-								<!-- Flexible column layout menu-->
-								<template:if test="{= ${viewData>/fclEnabled} }">
-									<macro:FlexibleColumnLayoutActions />
-								</template:if>
-							</uxap:navigationActions>
-							<uxap:actions>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
-							</uxap:actions>
-							<uxap:breadcrumbs>
-								<Breadcrumbs
-									unittest:id="BreadcrumbsTest"
-									visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
-									modelContextChange="._setBreadcrumbLinks(${$source>/})"
-									id="fe::Breadcrumbs"
+								</uxap:expandedContent>
+								<uxap:snappedContent>
+									<FlexBox>
+										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+											<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+										</template:if>
+									</FlexBox>
+								</uxap:snappedContent>
+								<uxap:content>
+									<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
+										<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
+									</template:if>
+									<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+								</uxap:content>
+								<uxap:navigationActions>
+									<template:if test="{= ${viewData>/viewLevel} > 1}">
+										<macro:Paginator id="fe::Paginator" />
+									</template:if>
+									<!-- Flexible column layout menu-->
+									<template:if test="{= ${viewData>/fclEnabled} }">
+										<macro:FlexibleColumnLayoutActions />
+									</template:if>
+								</uxap:navigationActions>
+								<uxap:actions>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
+								</uxap:actions>
+								<uxap:breadcrumbs>
+									<Breadcrumbs
+										unittest:id="BreadcrumbsTest"
+										visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
+										modelContextChange="._setBreadcrumbLinks(${$source>/})"
+										id="fe::Breadcrumbs"
+									>
+									</Breadcrumbs>
+								</uxap:breadcrumbs>
+							</uxap:ObjectPageDynamicHeaderTitle>
+						</uxap:headerTitle>
+						<template:if test="{header>hasContent}">
+							<uxap:headerContent>
+								<FlexBox
+									id="fe::HeaderContentContainer"
+									unittest:id="FlexBoxTest"
+									dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
+									wrap="Wrap"
+									fitContainer="true"
+									alignItems="Stretch"
 								>
-								</Breadcrumbs>
-							</uxap:breadcrumbs>
-						</uxap:ObjectPageDynamicHeaderTitle>
-					</uxap:headerTitle>
-					<template:if test="{converterContext>header/hasContent}">
-						<uxap:headerContent>
-							<FlexBox
-								id="fe::HeaderContentContainer"
-								unittest:id="FlexBoxTest"
-								dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
-								wrap="Wrap"
-								fitContainer="true"
-								alignItems="Stretch"
-							>
-								<template:if test="{converterContext>header/avatar}">
-									<template:with path="converterContext>header/avatar" var="avatar">
-									<Avatar
+									<template:if test="{header>avatar}">
+										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-											src="{avatar>src}"
-											initials="{avatar>initials}"
-											fallbackIcon="{avatar>fallbackIcon}"
-											displayShape="{avatar>displayShape}"
+											src="{header>avatar/src}"
+											initials="{header>avatar/initials}"
+											fallbackIcon="{header>avatar/fallbackIcon}"
+											displayShape="{header>avatar/displayShape}"
 											displaySize="XL"
 										/>
-									</template:with>
-								</template:if>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
-							</FlexBox>
-						</uxap:headerContent>
-					</template:if>
+									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
+								</FlexBox>
+							</uxap:headerContent>
+						</template:if>
+					</template:with>
 				</template:if>
 				<uxap:sections>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Section" type="XML" />