@sapui5/sap.fe.templates 1.94.0 → 1.96.3

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

@@ -1,8 +1,8 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
-sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
+sap.ui.define(["sap/fe/core/CommonUtils", "sap/fe/macros/filter/FilterUtils"], function(CommonUtils, FilterUtils) {
 	"use strict";
 	return {
 		adaptNavigationContext: function(oSelectionVariant, oTargetInfo) {
@@ -28,6 +28,10 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
 					sRootPath,
 					aParameters
 				);
+				var oFilterBar = oController._getFilterBarControl();
+				var oFilterInfo = FilterUtils.getFilterInfo(oFilterBar, {
+					targetControl: oController._getTable()
+				}).filters;
 				var oInternalModelContext = oView.getBindingContext("internal");
 				var mTabs = oInternalModelContext.getProperty("tabs");
 				// Do we need to exclude Fields (mutli tables mode)?
@@ -40,7 +44,7 @@ sap.ui.define(["sap/fe/core/CommonUtils"], function(CommonUtils) {
 					}
 				}
 				// TODO: move this also into the intent based navigation controller extension
-				CommonUtils.addExternalStateFiltersToSelectionVariant(oSelectionVariant, oFilterBarConditions, oTargetInfo);
+				CommonUtils.addExternalStateFiltersToSelectionVariant(oSelectionVariant, oFilterBarConditions, oTargetInfo, oFilterInfo);
 				delete oTargetInfo.propertiesWithoutConflict;
 			}
 		},

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	["sap/fe/core/helpers/SemanticDateOperators", "sap/ui/core/routing/HashChanger", "sap/fe/core/CommonUtils", "sap/base/Log"],
@@ -52,11 +52,19 @@ sap.ui.define(
 		}
 
 		function getShareUrl() {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
-			return sShareUrl;
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
+			} else {
+				return Promise.resolve(document.URL);
+			}
 		}
 
 		function getSaveAsTileServiceUrl(oController) {
@@ -99,22 +107,29 @@ sap.ui.define(
 		return {
 			adaptShareMetadata: function(oShareMetadata) {
 				var that = this;
-				return Promise.resolve(getJamUrl()).then(function(sJamUrl) {
-					var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
-					var oMetadata = oAppComponent.getMetadata();
-					var oUIManifest = oMetadata.getManifestEntry("sap.ui");
-					var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
-					var oAppManifest = oMetadata.getManifestEntry("sap.app");
-					var sTitle = (oAppManifest && oAppManifest.title) || "";
-					// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
-					oShareMetadata.tile = {
-						icon: sIcon,
-						title: sTitle,
-						queryUrl: getSaveAsTileServiceUrl(that.base)
-					};
-					oShareMetadata.title = document.title;
-					oShareMetadata.url = getShareUrl();
-					oShareMetadata.jam.url = sJamUrl;
+				Promise.resolve(getJamUrl())
+					.then(function(sJamUrl) {
+						var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
+						var oMetadata = oAppComponent.getMetadata();
+						var oUIManifest = oMetadata.getManifestEntry("sap.ui");
+						var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
+						var oAppManifest = oMetadata.getManifestEntry("sap.app");
+						var sTitle = (oAppManifest && oAppManifest.title) || "";
+						// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
+						oShareMetadata.tile = {
+							icon: sIcon,
+							title: sTitle,
+							queryUrl: getSaveAsTileServiceUrl(that.base)
+						};
+						oShareMetadata.title = document.title;
+						oShareMetadata.jam.url = sJamUrl;
+					})
+					.catch(function(error) {
+						Log.error(error);
+					});
+
+				return Promise.resolve(getShareUrl()).then(function(sFLPUrl) {
+					oShareMetadata.url = sFLPUrl;
 					return oShareMetadata;
 				});
 			}

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -10,9 +10,10 @@ sap.ui.define(
 		"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/ui/Device",
-		"sap/ui/mdc/enum/ConditionValidated"
+		"sap/ui/mdc/enum/ConditionValidated",
+		"sap/base/Log"
 	],
-	function(CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated) {
+	function(CoreLibrary, NavLibrary, CommonUtils, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated, Log) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType,
@@ -28,7 +29,7 @@ sap.ui.define(
 				var oView = this.getView(),
 					oController = oView.getController(),
 					oFilterBar = oController._getFilterBarControl(),
-					aTables = oController._getTables();
+					aTables = oController._getControls("table");
 
 				oFilterBar.setSuspendSelection(true);
 				aTables.forEach(function(oTable) {
@@ -43,6 +44,14 @@ sap.ui.define(
 					oController = oView.getController();
 				oController._getFilterBarControl().setSuspendSelection(false);
 			},
+			adaptBindingRefreshControls: function(aControls) {
+				var oView = this.getView(),
+					oController = oView.getController(),
+					aViewControls = oController._getControls(),
+					aControlsToRefresh = CommonUtils.getControlsForRefresh(oView, aViewControls);
+
+				Array.prototype.push.apply(aControls, aControlsToRefresh);
+			},
 			adaptStateControls: function(aStateControls) {
 				var oView = this.getView(),
 					oController = oView.getController(),
@@ -57,7 +66,7 @@ sap.ui.define(
 				if (oFilterBarVM) {
 					aStateControls.push(oFilterBarVM);
 				}
-				oController._getTables().forEach(function(oTable) {
+				oController._getControls("table").forEach(function(oTable) {
 					var oQuickFilter = oTable.getQuickFilter();
 					if (oQuickFilter) {
 						aStateControls.push(oQuickFilter);
@@ -113,28 +122,109 @@ sap.ui.define(
 			},
 			applyNavigationParameters: function(oNavigationParameter, aResults) {
 				var oView = this.getView(),
+					that = this,
+					oController = oView.getController(),
+					oComponent = oController.getOwnerComponent(),
+					oAppComponent = sap.ui.core.Component.getOwnerComponentFor(oComponent),
+					oComponentData = oAppComponent.getComponentData(),
+					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
+					oVariantPromise = that.handleVariantIdPassedViaURLParams(oStartupParameters),
+					bFilterVariantApplied;
+				oVariantPromise
+					.then(function(aVariants) {
+						if (aVariants && aVariants.length > 0) {
+							if (aVariants[0] === true || aVariants[1] === true) {
+								bFilterVariantApplied = true;
+							}
+						}
+						var oRes = that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
+							var oController = oView.getController();
+							var oDynamicPage = oView.byId("fe::ListReport");
+							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);
+							}
+							that._bSearchTriggered = !bPreventInitialSearch;
+							oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
+						});
+						aResults.push(oRes);
+					})
+					.catch(function() {
+						Log.error("Variant ID cannot be applied");
+					});
+			},
+
+			handleVariantIdPassedViaURLParams: function(oUrlParams) {
+				var aPageVariantId = oUrlParams["sap-ui-fe-variant-id"],
+					aFilterBarVariantId = oUrlParams["sap-ui-fe-filterbar-variant-id"],
+					aTableVariantId = oUrlParams["sap-ui-fe-table-variant-id"],
+					oVariant;
+				if (aPageVariantId || aFilterBarVariantId || aTableVariantId) {
+					oVariant = {
+						sPageVariantId: aPageVariantId && aPageVariantId[0],
+						sFilterBarVariantId: aFilterBarVariantId && aFilterBarVariantId[0],
+						sTableVariantId: aTableVariantId && aTableVariantId[0]
+					};
+				}
+				return this._handleControlVariantId(oVariant);
+			},
+
+			_handleControlVariantId: function(oVariantIDs) {
+				var oView = this.getView(),
+					aPromises = [],
 					that = this;
-				var oRes = this._applySelectionVariant(oView, oNavigationParameter).then(function() {
-					var oController = oView.getController();
-					var oDynamicPage = oView.byId("fe::ListReport");
-					var bPreventInitialSearch = false;
-					var oFilterBarVM = that._getFilterBarVM(oView);
-					var oFilterBarControl = oController._getFilterBarControl();
-					if (
-						oNavigationParameter.navigationType !== NavType.initial ||
-						(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
-						oController._shouldAutoTriggerSearch(oFilterBarVM)
-					) {
-						oFilterBarControl.triggerSearch();
-					} else {
-						bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+				var sVariantManagement = oView.getViewData().variantManagement;
+				if (oVariantIDs && oVariantIDs.sPageVariantId && sVariantManagement === "Page") {
+					var oVM = oView.byId("fe::PageVariantManagement");
+					oVM.getVariants().forEach(function(oVariant) {
+						if (oVariant.key === oVariantIDs.sPageVariantId) {
+							aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sPageVariantId, true));
+						}
+					});
+				} 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));
+							}
+						});
 					}
-					that._bSearchTriggered = !bPreventInitialSearch;
-					oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
-				});
-				aResults.push(oRes);
+					if (oVariantIDs.sTableVariantId) {
+						var oController = oView.getController(),
+							aTables = oController._getControls("table");
+						aTables.forEach(function(oTable) {
+							var oTableVariant = oTable.getVariant();
+							if (oTable && oTableVariant) {
+								oTableVariant.getVariants().forEach(function(oVariant) {
+									if (oVariant.key === oVariantIDs.sTableVariantId) {
+										aPromises.push(that._applyControlVariant(oTableVariant, oVariantIDs.sTableVariantId));
+									}
+								});
+							}
+						});
+					}
+				}
+				return Promise.all(aPromises);
 			},
 
+			_applyControlVariant: function(oVariant, sVariantID, bFilterVariantApplied) {
+				var oVM = ControlVariantApplyAPI.activateVariant({
+					element: oVariant,
+					variantReference: sVariantID
+				});
+				return oVM.then(function() {
+					return bFilterVariantApplied;
+				});
+			},
 			/************************************* private helper *****************************************/
 
 			_getFilterBarVM: function(oView) {
@@ -162,7 +252,7 @@ sap.ui.define(
 				return !oCurrentVariant.executeOnSelect;
 			},
 
-			_applySelectionVariant: function(oView, oNavigationParameter) {
+			_applySelectionVariant: function(oView, oNavigationParameter, bFilterVariantApplied) {
 				var oSelectionVariant = oNavigationParameter.selectionVariant,
 					oSelectionVariantDefaults = oNavigationParameter.selectionVariantDefaults;
 				if (!oSelectionVariant) {
@@ -178,6 +268,9 @@ sap.ui.define(
 					oVariant,
 					bRequiresStandardVariant = oNavigationParameter.requiresStandardVariant;
 
+				if (bFilterVariantApplied) {
+					oConditions = oFilterBar.getConditions();
+				}
 				CommonUtils.addDefaultDisplayCurrency(aMandatoryFilterFields, oSelectionVariant, oSelectionVariantDefaults);
 				CommonUtils.addSelectionVariantToConditions(oSelectionVariant, oConditions, oMetaModel, sContextPath);
 				switch (oViewData.variantManagement) {
@@ -191,13 +284,13 @@ sap.ui.define(
 					default:
 						break;
 				}
-				return this._activateSelectionVariant(oFilterBar, oConditions, oVariant, bRequiresStandardVariant);
+				return this._activateSelectionVariant(oFilterBar, oConditions, oVariant, bRequiresStandardVariant, bFilterVariantApplied);
 			},
-			_activateSelectionVariant: function(oFilterBar, oConditions, oVariant, bRequiresStandardVariant) {
+			_activateSelectionVariant: function(oFilterBar, oConditions, oVariant, bRequiresStandardVariant, bFilterVariantApplied) {
 				var that = this,
 					oPromise;
 
-				if (oVariant) {
+				if (oVariant && !bFilterVariantApplied) {
 					var oVariantKey = bRequiresStandardVariant ? oVariant.getStandardVariantKey() : oVariant.getDefaultVariantKey();
 					if (oVariantKey === null) {
 						oVariantKey = oVariant.getId();
@@ -247,6 +340,10 @@ sap.ui.define(
 								}
 								if (oPropertyInfo.hasValueHelp) {
 									mFilter[oPropertyInfo.path].forEach(fnAdjustValueHelpCondition);
+								} else {
+									mFilter[oPropertyInfo.path].forEach(function(oCondition) {
+										oCondition.validated = ConditionValidated.NotValidated;
+									});
 								}
 							} else {
 								mFilter[oPropertyInfo.path] = [];

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

@@ -19,7 +19,7 @@
 					<template:with path="view>presentation" var="presentationContext">
 						<IconTabFilter
 						text="{view>title}"
-						key="{= ${view>tableControlId} || ${view>customTabId} }"
+						key="{= ${view>tableControlId} || ${view>customTabId} || ${view>chartControlId}}"
 						customData:selectionVariant="{view>selectionVariantPath}"
 					>
 							<content>
@@ -29,12 +29,12 @@
 									</template:then>
 									<template:else>
 										<MessageStrip
-										text="{= '{parts: [{path: \'internal>tabs/ignoredFields/' + ${view>tableControlId} + '\'}, {path: \'\', value: \'' + ${view>title} + '\' }], formatter: \'.formatters.setTabMessageStrip\'}' }"
+										text="{= '{parts: [{path: \'internal>tabs/ignoredFields/' + (${view>tableControlId} || ${view>chartControlId}) + '\'}, {path: \'\', value: \'' + ${view>title} + '\' }], formatter: \'.formatters.setTabMessageStrip\'}' }"
 										type="Information"
 										showIcon="true"
 										showCloseButton="true"
 										class="sapUiSmallMargin"
-										visible="{= '{= (${internal>tabs/ignoredFields/' + ${view>tableControlId} + '} || []).length>0 }' }"
+										visible="{= '{= (${internal>tabs/ignoredFields/' +(${view>tableControlId} || ${view>chartControlId}) + '} || []).length>0 }' }"
 									>
 										</MessageStrip>
 										<core:Fragment fragmentName="sap.fe.templates.ListReport.view.fragments.CollectionVisualization" type="XML" />

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 sap.ui.define(
@@ -331,8 +331,8 @@ sap.ui.define(
 			 */
 			getPressExpressionForDelete: function(sEntitySetName) {
 				var sDeletableContexts = "${$view>/getBindingContext}",
-					sTitle = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getItems/0/getText}",
-					sDescription = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getItems/1/getText}";
+					sTitle = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",
+					sDescription = "${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";
 				var oParams = {
 					title: sTitle,
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
@@ -359,7 +359,7 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
@@ -392,7 +392,7 @@ sap.ui.define(
 					entitySetName: CommonHelper.addSingleQuotes(sEntitySetName),
 					invocationGrouping: CommonHelper.addSingleQuotes(sInvocationGroup),
 					model: "${$source>/}.getModel()",
-					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label),
+					label: CommonHelper.addSingleQuotes(oDataField && oDataField.Label, true),
 					isNavigable: oHeaderAction && oHeaderAction.isNavigable,
 					defaultValuesExtensionFunction:
 						oHeaderAction && oHeaderAction.defaultValuesExtensionFunction
@@ -447,6 +447,26 @@ sap.ui.define(
 						return undefined;
 					}
 				}
+			},
+			isSubSectionTitleVisible: function(sSubSectionvisible, sSubSectiontitle, sSubSectionshowTitle) {
+				if (sSubSectionvisible.indexOf("{=") === 0) {
+					// Dynamic expression
+					var sExpressionResult = sSubSectionvisible.substring(
+						sSubSectionvisible.indexOf("{=") + 2,
+						sSubSectionvisible.lastIndexOf("}")
+					);
+					return (
+						"{= (" +
+						sExpressionResult +
+						") && ('" +
+						sSubSectiontitle +
+						"' !=='undefined') && (" +
+						sSubSectionshowTitle +
+						" ? true : false) }"
+					);
+				} else {
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+				}
 			}
 		};
 

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -68,12 +68,6 @@ sap.ui.define(
 						prepareOnEdit: {
 							type: "boolean",
 							defaultValue: false
-						},
-						/**
-						 * Temporary fix to avoid activating all bindings when a message doesn't have a controlId at first
-						 */
-						_disableLazyLoadingForMessages: {
-							type: "boolean"
 						}
 					},
 					library: "sap.fe.templates",

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

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,

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

@@ -14,7 +14,9 @@
 	template:require="{
 				MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 				OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
-				CONTACT: 'sap/fe/macros/ContactHelper'
+				CONTACT: 'sap/fe/macros/ContactHelper',
+				OPTemplating: 'sap/fe/templates/ObjectPage/templating/ObjectPageTemplating',
+				UI: 'sap/fe/core/templating/UIFormatters'
 			}"
 >
 	<template:with path="entitySet>./" var="entityType">
@@ -28,7 +30,7 @@
 				customdata:showRelatedApps="{viewData>/showRelatedApps}"
 				customdata:ObjectPageTitle="{headerInfo>TypeName}"
 				customdata:ObjectPageSubtitle="{headerInfo>Title/Value@@MODEL.value}"
-				showHeaderContent="{= ${viewData>/editableHeaderContent} === false ? true : '{= !(${ui>/editMode} === \'Editable\') }' }"
+				showHeaderContent="{converterContext>header/showContent}"
 				showFooter="true"
 				busy="{ui>/busy}"
 				busyIndicatorDelay="0"
@@ -45,8 +47,8 @@
 					<control:CommandExecution execute="_executeTabShortCut" command="PreviousTab" />
 					<control:CommandExecution
 						execute="._editDocument(${$view>/getBindingContext})"
-						enabled="{= OP.getEditCommandExecutionEnabled(${converterContext>headerActions}) }"
-						visible="{= OP.getEditCommandExecutionVisible(${converterContext>headerActions}) }"
+						enabled="{= OP.getEditCommandExecutionEnabled(${converterContext>header/actions}) }"
+						visible="{= OP.getEditCommandExecutionVisible(${converterContext>header/actions}) }"
 						command="Edit"
 					/>
 					<control:CommandExecution
@@ -61,8 +63,8 @@
 					/>
 					<control:CommandExecution
 						execute="{= OP.getPressExpressionForDelete(${entitySet>@sapui.name}) }"
-						visible="{= OP.getDeleteCommandExecutionVisible(${converterContext>headerActions}) }"
-						enabled="{= OP.getDeleteCommandExecutionEnabled(${converterContext>headerActions}) }"
+						visible="{= OP.getDeleteCommandExecutionVisible(${converterContext>header/actions}) }"
+						enabled="{= OP.getDeleteCommandExecutionEnabled(${converterContext>header/actions}) }"
 						command="DeleteObject"
 					/>
 					<control:CommandExecution
@@ -76,23 +78,53 @@
 						command="Cancel"
 					/>
 				</uxap:dependents>
-				<template:if test="{converterContext>showHeader}">
+				<template:if test="{converterContext>header/visible}">
 					<uxap:headerTitle>
 						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
 							<uxap:expandedHeading>
 								<FlexBox>
-									<FlexBox visible="{= ${viewData>/editableHeaderContent} ? '{= (${ui>/editMode} === \'Editable\') }' : false}">
+									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
 										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
 									</FlexBox>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.TitleAndSubtitle" 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>
 								</FlexBox>
 							</uxap:expandedHeading>
 							<uxap:snappedHeading>
 								<FlexBox>
 									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.TitleAndSubtitle" 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>
 								</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>}" />
@@ -100,12 +132,7 @@
 							</uxap:content>
 							<uxap:navigationActions>
 								<template:if test="{= ${viewData>/viewLevel} > 1}">
-									<fe:Paginator
-										id="fe::Paginator"
-										width="auto"
-										navigate="._routing.navigateToContext(${$parameters>context} , { callExtension: true, oEvent: ${$parameters>oEvent} })"
-									>
-									</fe:Paginator>
+									<macro:Paginator id="fe::Paginator" />
 								</template:if>
 								<!-- Flexible column layout menu-->
 								<template:if test="{= ${viewData>/fclEnabled} }">
@@ -126,51 +153,33 @@
 							</uxap:breadcrumbs>
 						</uxap:ObjectPageDynamicHeaderTitle>
 					</uxap:headerTitle>
-					<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="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/ImageUrl}">
-								<template:then>
-									<Avatar
-										unittest:id="AvatarImageUrlTest"
-										class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-										src="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/ImageUrl@@MODEL.value}"
-										initials="{= CONTACT.getAvatarInitials(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Initials@@MODEL.format})}"
-										fallbackIcon="{= ${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/TypeImageUrl} !== undefined ? ${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/TypeImageUrl} : (${entityType>./@com.sap.vocabularies.Common.v1.IsNaturalPerson} ? 'sap-icon://person-placeholder' : 'sap-icon://product') }"
-										displayShape="{= ${entityType>./@com.sap.vocabularies.Common.v1.IsNaturalPerson} ? 'Circle' : 'Square'}"
-										displaySize="XL"
-									/>
-								</template:then>
-								<template:elseif test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/TypeImageUrl}">
+					<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
-										unittest:id="AvatarTypeImageUrlTest"
-										class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-										src="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/TypeImageUrl@@MODEL.value}"
-										initials="{= CONTACT.getAvatarInitials(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Initials@@MODEL.format})}"
-										fallbackIcon="{= ${entityType>./@com.sap.vocabularies.Common.v1.IsNaturalPerson} ? 'sap-icon://person-placeholder' : 'sap-icon://product'}"
-										displayShape="{= ${entityType>./@com.sap.vocabularies.Common.v1.IsNaturalPerson} ? 'Circle' : 'Square'}"
-										displaySize="XL"
-									/>
-								</template:elseif>
-								<template:elseif test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Initials}">
-									<Avatar
-										unittest:id="AvatarTypeInitialsTest"
-										class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-										initials="{= CONTACT.getAvatarInitials(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Initials@@MODEL.format})}"
-										displayShape="{= ${entityType>./@com.sap.vocabularies.Common.v1.IsNaturalPerson} ? 'Circle' : 'Square'}"
-										displaySize="XL"
-									/>
-								</template:elseif>
-							</template:if>
-							<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
-						</FlexBox>
-					</uxap:headerContent>
+											unittest:id="AvatarOPHeaderContent"
+											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
+											src="{avatar>src}"
+											initials="{avatar>initials}"
+											fallbackIcon="{avatar>fallbackIcon}"
+											displayShape="{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>
 				<uxap:sections>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Section" type="XML" />