@sapui5/sap.fe.templates 1.102.2 → 1.104.1

package/src/sap/fe/templates/ObjectPage/overrides/Share.ts

@@ -1,13 +1,13 @@
 import Log from "sap/base/Log";
-import Share from "sap/fe/core/controllerextensions/Share";
+import type Share from "sap/fe/core/controllerextensions/Share";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
-import ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
+import type ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
 import HashChanger from "sap/ui/core/routing/HashChanger";
 import Filter from "sap/ui/model/Filter";
 import FilterOperator from "sap/ui/model/FilterOperator";
 
-let bIsStickySupported: boolean;
+let bGlobalIsStickySupported: boolean;
 
 function createFilterToFetchActiveContext(mKeyValues: any, bIsActiveEntityDefined: any) {
 	const aKeys = Object.keys(mKeyValues);
@@ -28,15 +28,14 @@ function createFilterToFetchActiveContext(mKeyValues: any, bIsActiveEntityDefine
 		aFilters.push(oActiveFilter);
 	}
 
-	const oCombinedFilter = new Filter(aFilters as any, true);
-	return oCombinedFilter;
+	return new Filter(aFilters as any, true);
 }
 function getActiveContextPath(oController: any, sPageEntityName: any, oFilter: any) {
 	const oListBinding = oController
 		.getView()
 		.getBindingContext()
 		.getModel()
-		.bindList("/" + sPageEntityName, undefined, undefined, oFilter, { "$$groupId": "$auto.Heroes" });
+		.bindList(`/${sPageEntityName}`, undefined, undefined, oFilter, { "$$groupId": "$auto.Heroes" });
 	return oListBinding.requestContexts(0, 2).then(function (oContexts: any) {
 		if (oContexts && oContexts.length) {
 			return oContexts[0].getPath();
@@ -77,7 +76,7 @@ function getActiveContextInstances(oContext: any, oController: any, oEntitySet:
 			// Hence in such cases we get technical key and use them to fetch active context
 			if (sKeyAssignment.indexOf("=") === -1) {
 				const oMetaModel = oContext.getModel().getMetaModel();
-				const aTechnicalKeys = oMetaModel.getObject("/" + aPageHashArray.join("/") + "/$Type/$Key");
+				const aTechnicalKeys = oMetaModel.getObject(`/${aPageHashArray.join("/")}/$Type/$Key`);
 				sKeyValue = aParts[0];
 				sKey = aTechnicalKeys[0];
 				oPageMap[sPageHash.split("(")[0]]["bIsActiveEntityDefined"] = false;
@@ -100,11 +99,7 @@ function getActiveContextInstances(oContext: any, oController: any, oEntitySet:
 		const sPageEntitySetName = oPageEntitySet.$NavigationPropertyBinding && oPageEntitySet.$NavigationPropertyBinding[sNavigationPath];
 		if (sPageEntitySetName) {
 			oPageInfo.pageEntityName = oPageEntitySet.$NavigationPropertyBinding[sNavigationPath];
-			oPageEntitySet =
-				oContext
-					.getModel()
-					.getMetaModel()
-					.getObject("/" + sPageEntitySetName) || oEntitySet;
+			oPageEntitySet = oContext.getModel().getMetaModel().getObject(`/${sPageEntitySetName}`) || oEntitySet;
 		} else {
 			oPageInfo.pageEntityName = sNavigationPath;
 		}
@@ -123,9 +118,10 @@ function getActiveContextInstances(oContext: any, oController: any, oEntitySet:
 
 /**
  * Method to fetch active context path's.
- * @param {sap.ui.model.odata.v4.Context} oContext The Page Context
+ *
+ * @param oContext The Page Context
  * @param oController
- * @returns {Promise} Promise which is resolved once the active context's are fetched
+ * @returns Promise which is resolved once the active context's are fetched
  */
 function getActiveContextPaths(oContext: any, oController: any) {
 	const sCurrentHashNoParams = HashChanger.getInstance().getHash().split("?")[0];
@@ -133,10 +129,7 @@ function getActiveContextPaths(oContext: any, oController: any) {
 	if (sRootEntityName.indexOf("/") === 0) {
 		sRootEntityName = sRootEntityName.substring(1);
 	}
-	const oEntitySet = oContext
-		.getModel()
-		.getMetaModel()
-		.getObject("/" + sRootEntityName);
+	const oEntitySet = oContext.getModel().getMetaModel().getObject(`/${sRootEntityName}`);
 	const oPageContext = oContext;
 	const aActiveContextpromises = getActiveContextInstances(oContext, oController, oEntitySet);
 	if (aActiveContextpromises.length > 0) {
@@ -167,11 +160,7 @@ function getActiveContextPaths(oContext: any, oController: any) {
 					];
 					if (sNavigatioProperty) {
 						aActiveContextPaths.push(sActiveContextPath.replace(sEntitySetName, sNavigatioProperty));
-						oPageEntitySet =
-							oPageContext
-								.getModel()
-								.getMetaModel()
-								.getObject("/" + sEntitySetName) || oEntitySet;
+						oPageEntitySet = oPageContext.getModel().getMetaModel().getObject(`/${sEntitySetName}`) || oEntitySet;
 					} else {
 						aActiveContextPaths.push(sActiveContextPath);
 					}
@@ -191,7 +180,7 @@ function fetchActiveContextPaths(oContext: any, oController: any) {
 	if (oContext) {
 		const oModel = oContext.getModel();
 		const oMetaModel = oModel.getMetaModel();
-		bIsStickySupported = ModelHelper.isStickySessionSupported(oMetaModel);
+		bGlobalIsStickySupported = ModelHelper.isStickySessionSupported(oMetaModel);
 		let sRootEntityName = sCurrentHashNoParams && sCurrentHashNoParams.substr(0, sCurrentHashNoParams.indexOf("("));
 		if (sRootEntityName.indexOf("/") === 0) {
 			sRootEntityName = sRootEntityName.substring(1);
@@ -202,7 +191,7 @@ function fetchActiveContextPaths(oContext: any, oController: any) {
 	// 1. In case of draft enabled Object page where semantic key based URL is not possible(like semantic keys are not modeled in the entity set)
 	// 2. In case of draft enabled Sub Object Pages (where semantic bookmarking is not supported)
 	const oViewData = oController.getView().getViewData();
-	if (oContext && !bIsStickySupported && ((oViewData.viewLevel === 1 && !aSemanticKeys) || oViewData.viewLevel >= 2)) {
+	if (oContext && !bGlobalIsStickySupported && ((oViewData.viewLevel === 1 && !aSemanticKeys) || oViewData.viewLevel >= 2)) {
 		oPromise = getActiveContextPaths(oContext, oController);
 		return oPromise;
 	} else {
@@ -276,40 +265,39 @@ function getJamUrl(bIsEditMode: boolean, bIsStickySupported: any, aActiveContext
 }
 
 const ShareExtensionOverride = {
-	adaptShareMetadata: function (this: Share, oShareMetadata: any) {
-		const oContext = this.base.getView().getBindingContext(),
-			oUIModel = this.base.getView().getModel("ui"),
-			bIsEditable = oUIModel.getProperty("/isEditable");
-		return fetchActiveContextPaths(oContext, this.base.getView().getController()).then((aActiveContextPaths) => {
-			const oPageTitleInfo = (this.base.getView().getController() as ObjectPageController)._getPageTitleInformation();
+	adaptShareMetadata: async function (this: Share, oShareMetadata: any) {
+		const oContext = this.base.getView().getBindingContext();
+		const oUIModel = this.base.getView().getModel("ui");
+		const bIsEditable = oUIModel.getProperty("/isEditable");
 
-			return Promise.all([
-				getJamUrl(bIsEditable, bIsStickySupported, aActiveContextPaths),
-				getShareUrl(bIsEditable, bIsStickySupported, aActiveContextPaths),
+		try {
+			const aActiveContextPaths = await fetchActiveContextPaths(oContext, this.base.getView().getController());
+			const oPageTitleInfo = (this.base.getView().getController() as ObjectPageController)._getPageTitleInformation();
+			const oData = await Promise.all([
+				getJamUrl(bIsEditable, bGlobalIsStickySupported, aActiveContextPaths),
+				getShareUrl(bIsEditable, bGlobalIsStickySupported, aActiveContextPaths),
 				getShareEmailUrl()
-			])
-				.then(function (oData) {
-					let sTitle = oPageTitleInfo.title;
-					const sObjectSubtitle = oPageTitleInfo.subtitle ? oPageTitleInfo.subtitle.toString() : "";
-					if (sObjectSubtitle) {
-						sTitle = sTitle + " - " + sObjectSubtitle;
-					}
-					oShareMetadata.tile = {
-						title: oPageTitleInfo.title,
-						subtitle: sObjectSubtitle
-					};
-					oShareMetadata.email.title = sTitle;
-					oShareMetadata.title = sTitle;
-					oShareMetadata.jam.url = oData[0];
-					oShareMetadata.url = oData[1];
-					oShareMetadata.email.url = oData[2];
+			]);
 
-					return oShareMetadata;
-				})
-				.catch(function (error: any) {
-					Log.error(error);
-				});
-		});
+			let sTitle = oPageTitleInfo.title;
+			const sObjectSubtitle = oPageTitleInfo.subtitle ? oPageTitleInfo.subtitle.toString() : "";
+			if (sObjectSubtitle) {
+				sTitle = `${sTitle} - ${sObjectSubtitle}`;
+			}
+			oShareMetadata.tile = {
+				title: oPageTitleInfo.title,
+				subtitle: sObjectSubtitle
+			};
+			oShareMetadata.email.title = sTitle;
+			oShareMetadata.title = sTitle;
+			oShareMetadata.jam.url = oData[0];
+			oShareMetadata.url = oData[1];
+			oShareMetadata.email.url = oData[2];
+		} catch (error: any) {
+			Log.error(error);
+		}
+
+		return oShareMetadata;
 	}
 };
 

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

@@ -26,7 +26,7 @@ sap.ui.define(["sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/library"], fu
           break;
 
         default:
-          throw new Error("unhandled variant setting: " + oViewData.getVariantManagement());
+          throw new Error("unhandled variant setting: ".concat(oViewData.getVariantManagement()));
       }
 
       oController._findTables().forEach(function (oTable) {
@@ -72,4 +72,4 @@ sap.ui.define(["sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/library"], fu
   };
   return ViewStateExtensionOverride;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlZpZXdTdGF0ZS50cyJdLCJuYW1lcyI6WyJWYXJpYW50TWFuYWdlbWVudCIsIkNvcmVMaWJyYXJ5IiwiVmlld1N0YXRlRXh0ZW5zaW9uT3ZlcnJpZGUiLCJhcHBseUluaXRpYWxTdGF0ZU9ubHkiLCJhZGFwdFN0YXRlQ29udHJvbHMiLCJhU3RhdGVDb250cm9scyIsIm9WaWV3IiwiZ2V0VmlldyIsIm9Db250cm9sbGVyIiwiZ2V0Q29udHJvbGxlciIsIm9WaWV3RGF0YSIsImdldFZpZXdEYXRhIiwiYkNvbnRyb2xWTSIsInZhcmlhbnRNYW5hZ2VtZW50IiwiQ29udHJvbCIsIlBhZ2UiLCJOb25lIiwiRXJyb3IiLCJnZXRWYXJpYW50TWFuYWdlbWVudCIsIl9maW5kVGFibGVzIiwiZm9yRWFjaCIsIm9UYWJsZSIsIm9RdWlja0ZpbHRlciIsImdldFF1aWNrRmlsdGVyIiwicHVzaCIsImdldFZhcmlhbnQiLCJieUlkIiwiYWRhcHRCaW5kaW5nUmVmcmVzaENvbnRyb2xzIiwiYUNvbnRyb2xzIiwic1JlZnJlc2hTdHJhdGVneSIsIktlZXBBbGl2ZUhlbHBlciIsImdldFZpZXdSZWZyZXNoSW5mbyIsImFDb250cm9sc1RvUmVmcmVzaCIsIm9PYmplY3RQYWdlQ29udHJvbCIsIl9nZXRPYmplY3RQYWdlTGF5b3V0Q29udHJvbCIsImFWaWV3Q29udHJvbHMiLCJjb25jYXQiLCJnZXRDb250cm9sc0ZvclJlZnJlc2giLCJyZWR1Y2UiLCJhUHJldkNvbnRyb2xzIiwib0NvbnRyb2wiLCJpbmRleE9mIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBSUEsTUFBTUEsaUJBQWlCLEdBQUdDLFdBQVcsQ0FBQ0QsaUJBQXRDO0FBRUEsTUFBTUUsMEJBQTBCLEdBQUc7QUFDbENDLElBQUFBLHFCQUFxQixFQUFFLFlBQVk7QUFDbEMsYUFBTyxLQUFQO0FBQ0EsS0FIaUM7QUFJbENDLElBQUFBLGtCQUFrQixFQUFFLFVBQTJCQyxjQUEzQixFQUFnRDtBQUNuRSxVQUFNQyxLQUFLLEdBQUcsS0FBS0MsT0FBTCxFQUFkO0FBQUEsVUFDQ0MsV0FBVyxHQUFHRixLQUFLLENBQUNHLGFBQU4sRUFEZjtBQUFBLFVBRUNDLFNBQVMsR0FBR0osS0FBSyxDQUFDSyxXQUFOLEVBRmI7QUFHQSxVQUFJQyxVQUFVLEdBQUcsS0FBakI7O0FBRUEsY0FBUUYsU0FBUyxDQUFDRyxpQkFBbEI7QUFDQyxhQUFLYixpQkFBaUIsQ0FBQ2MsT0FBdkI7QUFDQ0YsVUFBQUEsVUFBVSxHQUFHLElBQWI7QUFDQTs7QUFDRCxhQUFLWixpQkFBaUIsQ0FBQ2UsSUFBdkI7QUFDQSxhQUFLZixpQkFBaUIsQ0FBQ2dCLElBQXZCO0FBQ0M7O0FBQ0Q7QUFDQyxnQkFBTSxJQUFJQyxLQUFKLENBQVUsZ0NBQWdDUCxTQUFTLENBQUNRLG9CQUFWLEVBQTFDLENBQU47QUFSRjs7QUFXQ1YsTUFBQUEsV0FBRCxDQUFzQ1csV0FBdEMsR0FBb0RDLE9BQXBELENBQTRELFVBQVVDLE1BQVYsRUFBdUI7QUFDbEYsWUFBTUMsWUFBWSxHQUFHRCxNQUFNLENBQUNFLGNBQVAsRUFBckI7O0FBQ0EsWUFBSUQsWUFBSixFQUFrQjtBQUNqQmpCLFVBQUFBLGNBQWMsQ0FBQ21CLElBQWYsQ0FBb0JGLFlBQXBCO0FBQ0E7O0FBQ0QsWUFBSVYsVUFBSixFQUFnQjtBQUNmUCxVQUFBQSxjQUFjLENBQUNtQixJQUFmLENBQW9CSCxNQUFNLENBQUNJLFVBQVAsRUFBcEI7QUFDQTtBQUNELE9BUkQ7O0FBVUFwQixNQUFBQSxjQUFjLENBQUNtQixJQUFmLENBQW9CbEIsS0FBSyxDQUFDb0IsSUFBTixDQUFXLGdCQUFYLENBQXBCO0FBQ0EsS0FoQ2lDO0FBaUNsQ0MsSUFBQUEsMkJBQTJCLEVBQUUsVUFBMkJDLFNBQTNCLEVBQTJDO0FBQ3ZFLFVBQU10QixLQUFLLEdBQUcsS0FBS0MsT0FBTCxFQUFkO0FBQUEsVUFDQ3NCLGdCQUFnQixHQUFHQyxlQUFlLENBQUNDLGtCQUFoQixDQUFtQ3pCLEtBQW5DLENBRHBCO0FBQUEsVUFFQ0UsV0FBVyxHQUFHRixLQUFLLENBQUNHLGFBQU4sRUFGZjtBQUdBLFVBQUl1QixrQkFBNkIsR0FBRyxFQUFwQzs7QUFFQSxVQUFJSCxnQkFBSixFQUFzQjtBQUNyQixZQUFNSSxrQkFBa0IsR0FBSXpCLFdBQUQsQ0FBc0MwQiwyQkFBdEMsRUFBM0I7O0FBQ0FGLFFBQUFBLGtCQUFrQixDQUFDUixJQUFuQixDQUF3QlMsa0JBQXhCO0FBQ0E7O0FBQ0QsVUFBSUosZ0JBQWdCLEtBQUsscUJBQXpCLEVBQWdEO0FBQy9DLFlBQU1NLGFBQWEsR0FBSTNCLFdBQUQsQ0FBc0NXLFdBQXRDLEVBQXRCOztBQUNBYSxRQUFBQSxrQkFBa0IsR0FBR0Esa0JBQWtCLENBQUNJLE1BQW5CLENBQTBCTixlQUFlLENBQUNPLHFCQUFoQixDQUFzQy9CLEtBQXRDLEVBQTZDNkIsYUFBN0MsS0FBK0QsRUFBekYsQ0FBckI7QUFDQTs7QUFDRCxhQUFPSCxrQkFBa0IsQ0FBQ00sTUFBbkIsQ0FBMEIsVUFBVUMsYUFBVixFQUE4QkMsUUFBOUIsRUFBNkM7QUFDN0UsWUFBSUQsYUFBYSxDQUFDRSxPQUFkLENBQXNCRCxRQUF0QixNQUFvQyxDQUFDLENBQXpDLEVBQTRDO0FBQzNDRCxVQUFBQSxhQUFhLENBQUNmLElBQWQsQ0FBbUJnQixRQUFuQjtBQUNBOztBQUNELGVBQU9ELGFBQVA7QUFDQSxPQUxNLEVBS0pYLFNBTEksQ0FBUDtBQU1BO0FBckRpQyxHQUFuQztTQXdEZTFCLDBCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVmlld1N0YXRlIGZyb20gXCJzYXAvZmUvY29yZS9jb250cm9sbGVyZXh0ZW5zaW9ucy9WaWV3U3RhdGVcIjtcbmltcG9ydCBLZWVwQWxpdmVIZWxwZXIgZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvS2VlcEFsaXZlSGVscGVyXCI7XG5pbXBvcnQgQ29yZUxpYnJhcnkgZnJvbSBcInNhcC9mZS9jb3JlL2xpYnJhcnlcIjtcbmltcG9ydCBPYmplY3RQYWdlQ29udHJvbGxlciBmcm9tIFwic2FwL2ZlL3RlbXBsYXRlcy9PYmplY3RQYWdlL09iamVjdFBhZ2VDb250cm9sbGVyLmNvbnRyb2xsZXJcIjtcbmltcG9ydCBDb250cm9sIGZyb20gXCJzYXAvdWkvY29yZS9Db250cm9sXCI7XG5cbmNvbnN0IFZhcmlhbnRNYW5hZ2VtZW50ID0gQ29yZUxpYnJhcnkuVmFyaWFudE1hbmFnZW1lbnQ7XG5cbmNvbnN0IFZpZXdTdGF0ZUV4dGVuc2lvbk92ZXJyaWRlID0ge1xuXHRhcHBseUluaXRpYWxTdGF0ZU9ubHk6IGZ1bmN0aW9uICgpIHtcblx0XHRyZXR1cm4gZmFsc2U7XG5cdH0sXG5cdGFkYXB0U3RhdGVDb250cm9sczogZnVuY3Rpb24gKHRoaXM6IFZpZXdTdGF0ZSwgYVN0YXRlQ29udHJvbHM6IGFueSkge1xuXHRcdGNvbnN0IG9WaWV3ID0gdGhpcy5nZXRWaWV3KCksXG5cdFx0XHRvQ29udHJvbGxlciA9IG9WaWV3LmdldENvbnRyb2xsZXIoKSxcblx0XHRcdG9WaWV3RGF0YSA9IG9WaWV3LmdldFZpZXdEYXRhKCkgYXMgYW55O1xuXHRcdGxldCBiQ29udHJvbFZNID0gZmFsc2U7XG5cblx0XHRzd2l0Y2ggKG9WaWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCkge1xuXHRcdFx0Y2FzZSBWYXJpYW50TWFuYWdlbWVudC5Db250cm9sOlxuXHRcdFx0XHRiQ29udHJvbFZNID0gdHJ1ZTtcblx0XHRcdFx0YnJlYWs7XG5cdFx0XHRjYXNlIFZhcmlhbnRNYW5hZ2VtZW50LlBhZ2U6XG5cdFx0XHRjYXNlIFZhcmlhbnRNYW5hZ2VtZW50Lk5vbmU6XG5cdFx0XHRcdGJyZWFrO1xuXHRcdFx0ZGVmYXVsdDpcblx0XHRcdFx0dGhyb3cgbmV3IEVycm9yKFwidW5oYW5kbGVkIHZhcmlhbnQgc2V0dGluZzogXCIgKyBvVmlld0RhdGEuZ2V0VmFyaWFudE1hbmFnZW1lbnQoKSk7XG5cdFx0fVxuXG5cdFx0KG9Db250cm9sbGVyIGFzIE9iamVjdFBhZ2VDb250cm9sbGVyKS5fZmluZFRhYmxlcygpLmZvckVhY2goZnVuY3Rpb24gKG9UYWJsZTogYW55KSB7XG5cdFx0XHRjb25zdCBvUXVpY2tGaWx0ZXIgPSBvVGFibGUuZ2V0UXVpY2tGaWx0ZXIoKTtcblx0XHRcdGlmIChvUXVpY2tGaWx0ZXIpIHtcblx0XHRcdFx0YVN0YXRlQ29udHJvbHMucHVzaChvUXVpY2tGaWx0ZXIpO1xuXHRcdFx0fVxuXHRcdFx0aWYgKGJDb250cm9sVk0pIHtcblx0XHRcdFx0YVN0YXRlQ29udHJvbHMucHVzaChvVGFibGUuZ2V0VmFyaWFudCgpKTtcblx0XHRcdH1cblx0XHR9KTtcblxuXHRcdGFTdGF0ZUNvbnRyb2xzLnB1c2gob1ZpZXcuYnlJZChcImZlOjpPYmplY3RQYWdlXCIpKTtcblx0fSxcblx0YWRhcHRCaW5kaW5nUmVmcmVzaENvbnRyb2xzOiBmdW5jdGlvbiAodGhpczogVmlld1N0YXRlLCBhQ29udHJvbHM6IGFueSkge1xuXHRcdGNvbnN0IG9WaWV3ID0gdGhpcy5nZXRWaWV3KCksXG5cdFx0XHRzUmVmcmVzaFN0cmF0ZWd5ID0gS2VlcEFsaXZlSGVscGVyLmdldFZpZXdSZWZyZXNoSW5mbyhvVmlldyksXG5cdFx0XHRvQ29udHJvbGxlciA9IG9WaWV3LmdldENvbnRyb2xsZXIoKTtcblx0XHRsZXQgYUNvbnRyb2xzVG9SZWZyZXNoOiBDb250cm9sW10gPSBbXTtcblxuXHRcdGlmIChzUmVmcmVzaFN0cmF0ZWd5KSB7XG5cdFx0XHRjb25zdCBvT2JqZWN0UGFnZUNvbnRyb2wgPSAob0NvbnRyb2xsZXIgYXMgT2JqZWN0UGFnZUNvbnRyb2xsZXIpLl9nZXRPYmplY3RQYWdlTGF5b3V0Q29udHJvbCgpO1xuXHRcdFx0YUNvbnRyb2xzVG9SZWZyZXNoLnB1c2gob09iamVjdFBhZ2VDb250cm9sKTtcblx0XHR9XG5cdFx0aWYgKHNSZWZyZXNoU3RyYXRlZ3kgIT09IFwiaW5jbHVkaW5nRGVwZW5kZW50c1wiKSB7XG5cdFx0XHRjb25zdCBhVmlld0NvbnRyb2xzID0gKG9Db250cm9sbGVyIGFzIE9iamVjdFBhZ2VDb250cm9sbGVyKS5fZmluZFRhYmxlcygpO1xuXHRcdFx0YUNvbnRyb2xzVG9SZWZyZXNoID0gYUNvbnRyb2xzVG9SZWZyZXNoLmNvbmNhdChLZWVwQWxpdmVIZWxwZXIuZ2V0Q29udHJvbHNGb3JSZWZyZXNoKG9WaWV3LCBhVmlld0NvbnRyb2xzKSB8fCBbXSk7XG5cdFx0fVxuXHRcdHJldHVybiBhQ29udHJvbHNUb1JlZnJlc2gucmVkdWNlKGZ1bmN0aW9uIChhUHJldkNvbnRyb2xzOiBhbnksIG9Db250cm9sOiBhbnkpIHtcblx0XHRcdGlmIChhUHJldkNvbnRyb2xzLmluZGV4T2Yob0NvbnRyb2wpID09PSAtMSkge1xuXHRcdFx0XHRhUHJldkNvbnRyb2xzLnB1c2gob0NvbnRyb2wpO1xuXHRcdFx0fVxuXHRcdFx0cmV0dXJuIGFQcmV2Q29udHJvbHM7XG5cdFx0fSwgYUNvbnRyb2xzKTtcblx0fVxufTtcblxuZXhwb3J0IGRlZmF1bHQgVmlld1N0YXRlRXh0ZW5zaW9uT3ZlcnJpZGU7XG4iXX0=
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlZpZXdTdGF0ZS50cyJdLCJuYW1lcyI6WyJWYXJpYW50TWFuYWdlbWVudCIsIkNvcmVMaWJyYXJ5IiwiVmlld1N0YXRlRXh0ZW5zaW9uT3ZlcnJpZGUiLCJhcHBseUluaXRpYWxTdGF0ZU9ubHkiLCJhZGFwdFN0YXRlQ29udHJvbHMiLCJhU3RhdGVDb250cm9scyIsIm9WaWV3IiwiZ2V0VmlldyIsIm9Db250cm9sbGVyIiwiZ2V0Q29udHJvbGxlciIsIm9WaWV3RGF0YSIsImdldFZpZXdEYXRhIiwiYkNvbnRyb2xWTSIsInZhcmlhbnRNYW5hZ2VtZW50IiwiQ29udHJvbCIsIlBhZ2UiLCJOb25lIiwiRXJyb3IiLCJnZXRWYXJpYW50TWFuYWdlbWVudCIsIl9maW5kVGFibGVzIiwiZm9yRWFjaCIsIm9UYWJsZSIsIm9RdWlja0ZpbHRlciIsImdldFF1aWNrRmlsdGVyIiwicHVzaCIsImdldFZhcmlhbnQiLCJieUlkIiwiYWRhcHRCaW5kaW5nUmVmcmVzaENvbnRyb2xzIiwiYUNvbnRyb2xzIiwic1JlZnJlc2hTdHJhdGVneSIsIktlZXBBbGl2ZUhlbHBlciIsImdldFZpZXdSZWZyZXNoSW5mbyIsImFDb250cm9sc1RvUmVmcmVzaCIsIm9PYmplY3RQYWdlQ29udHJvbCIsIl9nZXRPYmplY3RQYWdlTGF5b3V0Q29udHJvbCIsImFWaWV3Q29udHJvbHMiLCJjb25jYXQiLCJnZXRDb250cm9sc0ZvclJlZnJlc2giLCJyZWR1Y2UiLCJhUHJldkNvbnRyb2xzIiwib0NvbnRyb2wiLCJpbmRleE9mIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBSUEsTUFBTUEsaUJBQWlCLEdBQUdDLFdBQVcsQ0FBQ0QsaUJBQXRDO0FBRUEsTUFBTUUsMEJBQTBCLEdBQUc7QUFDbENDLElBQUFBLHFCQUFxQixFQUFFLFlBQVk7QUFDbEMsYUFBTyxLQUFQO0FBQ0EsS0FIaUM7QUFJbENDLElBQUFBLGtCQUFrQixFQUFFLFVBQTJCQyxjQUEzQixFQUFnRDtBQUNuRSxVQUFNQyxLQUFLLEdBQUcsS0FBS0MsT0FBTCxFQUFkO0FBQUEsVUFDQ0MsV0FBVyxHQUFHRixLQUFLLENBQUNHLGFBQU4sRUFEZjtBQUFBLFVBRUNDLFNBQVMsR0FBR0osS0FBSyxDQUFDSyxXQUFOLEVBRmI7QUFHQSxVQUFJQyxVQUFVLEdBQUcsS0FBakI7O0FBRUEsY0FBUUYsU0FBUyxDQUFDRyxpQkFBbEI7QUFDQyxhQUFLYixpQkFBaUIsQ0FBQ2MsT0FBdkI7QUFDQ0YsVUFBQUEsVUFBVSxHQUFHLElBQWI7QUFDQTs7QUFDRCxhQUFLWixpQkFBaUIsQ0FBQ2UsSUFBdkI7QUFDQSxhQUFLZixpQkFBaUIsQ0FBQ2dCLElBQXZCO0FBQ0M7O0FBQ0Q7QUFDQyxnQkFBTSxJQUFJQyxLQUFKLHNDQUF3Q1AsU0FBUyxDQUFDUSxvQkFBVixFQUF4QyxFQUFOO0FBUkY7O0FBV0NWLE1BQUFBLFdBQUQsQ0FBc0NXLFdBQXRDLEdBQW9EQyxPQUFwRCxDQUE0RCxVQUFVQyxNQUFWLEVBQXVCO0FBQ2xGLFlBQU1DLFlBQVksR0FBR0QsTUFBTSxDQUFDRSxjQUFQLEVBQXJCOztBQUNBLFlBQUlELFlBQUosRUFBa0I7QUFDakJqQixVQUFBQSxjQUFjLENBQUNtQixJQUFmLENBQW9CRixZQUFwQjtBQUNBOztBQUNELFlBQUlWLFVBQUosRUFBZ0I7QUFDZlAsVUFBQUEsY0FBYyxDQUFDbUIsSUFBZixDQUFvQkgsTUFBTSxDQUFDSSxVQUFQLEVBQXBCO0FBQ0E7QUFDRCxPQVJEOztBQVVBcEIsTUFBQUEsY0FBYyxDQUFDbUIsSUFBZixDQUFvQmxCLEtBQUssQ0FBQ29CLElBQU4sQ0FBVyxnQkFBWCxDQUFwQjtBQUNBLEtBaENpQztBQWlDbENDLElBQUFBLDJCQUEyQixFQUFFLFVBQTJCQyxTQUEzQixFQUEyQztBQUN2RSxVQUFNdEIsS0FBSyxHQUFHLEtBQUtDLE9BQUwsRUFBZDtBQUFBLFVBQ0NzQixnQkFBZ0IsR0FBR0MsZUFBZSxDQUFDQyxrQkFBaEIsQ0FBbUN6QixLQUFuQyxDQURwQjtBQUFBLFVBRUNFLFdBQVcsR0FBR0YsS0FBSyxDQUFDRyxhQUFOLEVBRmY7QUFHQSxVQUFJdUIsa0JBQTZCLEdBQUcsRUFBcEM7O0FBRUEsVUFBSUgsZ0JBQUosRUFBc0I7QUFDckIsWUFBTUksa0JBQWtCLEdBQUl6QixXQUFELENBQXNDMEIsMkJBQXRDLEVBQTNCOztBQUNBRixRQUFBQSxrQkFBa0IsQ0FBQ1IsSUFBbkIsQ0FBd0JTLGtCQUF4QjtBQUNBOztBQUNELFVBQUlKLGdCQUFnQixLQUFLLHFCQUF6QixFQUFnRDtBQUMvQyxZQUFNTSxhQUFhLEdBQUkzQixXQUFELENBQXNDVyxXQUF0QyxFQUF0Qjs7QUFDQWEsUUFBQUEsa0JBQWtCLEdBQUdBLGtCQUFrQixDQUFDSSxNQUFuQixDQUEwQk4sZUFBZSxDQUFDTyxxQkFBaEIsQ0FBc0MvQixLQUF0QyxFQUE2QzZCLGFBQTdDLEtBQStELEVBQXpGLENBQXJCO0FBQ0E7O0FBQ0QsYUFBT0gsa0JBQWtCLENBQUNNLE1BQW5CLENBQTBCLFVBQVVDLGFBQVYsRUFBOEJDLFFBQTlCLEVBQTZDO0FBQzdFLFlBQUlELGFBQWEsQ0FBQ0UsT0FBZCxDQUFzQkQsUUFBdEIsTUFBb0MsQ0FBQyxDQUF6QyxFQUE0QztBQUMzQ0QsVUFBQUEsYUFBYSxDQUFDZixJQUFkLENBQW1CZ0IsUUFBbkI7QUFDQTs7QUFDRCxlQUFPRCxhQUFQO0FBQ0EsT0FMTSxFQUtKWCxTQUxJLENBQVA7QUFNQTtBQXJEaUMsR0FBbkM7U0F3RGUxQiwwQiIsInNvdXJjZVJvb3QiOiIuIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHR5cGUgVmlld1N0YXRlIGZyb20gXCJzYXAvZmUvY29yZS9jb250cm9sbGVyZXh0ZW5zaW9ucy9WaWV3U3RhdGVcIjtcbmltcG9ydCBLZWVwQWxpdmVIZWxwZXIgZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvS2VlcEFsaXZlSGVscGVyXCI7XG5pbXBvcnQgQ29yZUxpYnJhcnkgZnJvbSBcInNhcC9mZS9jb3JlL2xpYnJhcnlcIjtcbmltcG9ydCB0eXBlIE9iamVjdFBhZ2VDb250cm9sbGVyIGZyb20gXCJzYXAvZmUvdGVtcGxhdGVzL09iamVjdFBhZ2UvT2JqZWN0UGFnZUNvbnRyb2xsZXIuY29udHJvbGxlclwiO1xuaW1wb3J0IHR5cGUgQ29udHJvbCBmcm9tIFwic2FwL3VpL2NvcmUvQ29udHJvbFwiO1xuXG5jb25zdCBWYXJpYW50TWFuYWdlbWVudCA9IENvcmVMaWJyYXJ5LlZhcmlhbnRNYW5hZ2VtZW50O1xuXG5jb25zdCBWaWV3U3RhdGVFeHRlbnNpb25PdmVycmlkZSA9IHtcblx0YXBwbHlJbml0aWFsU3RhdGVPbmx5OiBmdW5jdGlvbiAoKSB7XG5cdFx0cmV0dXJuIGZhbHNlO1xuXHR9LFxuXHRhZGFwdFN0YXRlQ29udHJvbHM6IGZ1bmN0aW9uICh0aGlzOiBWaWV3U3RhdGUsIGFTdGF0ZUNvbnRyb2xzOiBhbnkpIHtcblx0XHRjb25zdCBvVmlldyA9IHRoaXMuZ2V0VmlldygpLFxuXHRcdFx0b0NvbnRyb2xsZXIgPSBvVmlldy5nZXRDb250cm9sbGVyKCksXG5cdFx0XHRvVmlld0RhdGEgPSBvVmlldy5nZXRWaWV3RGF0YSgpIGFzIGFueTtcblx0XHRsZXQgYkNvbnRyb2xWTSA9IGZhbHNlO1xuXG5cdFx0c3dpdGNoIChvVmlld0RhdGEudmFyaWFudE1hbmFnZW1lbnQpIHtcblx0XHRcdGNhc2UgVmFyaWFudE1hbmFnZW1lbnQuQ29udHJvbDpcblx0XHRcdFx0YkNvbnRyb2xWTSA9IHRydWU7XG5cdFx0XHRcdGJyZWFrO1xuXHRcdFx0Y2FzZSBWYXJpYW50TWFuYWdlbWVudC5QYWdlOlxuXHRcdFx0Y2FzZSBWYXJpYW50TWFuYWdlbWVudC5Ob25lOlxuXHRcdFx0XHRicmVhaztcblx0XHRcdGRlZmF1bHQ6XG5cdFx0XHRcdHRocm93IG5ldyBFcnJvcihgdW5oYW5kbGVkIHZhcmlhbnQgc2V0dGluZzogJHtvVmlld0RhdGEuZ2V0VmFyaWFudE1hbmFnZW1lbnQoKX1gKTtcblx0XHR9XG5cblx0XHQob0NvbnRyb2xsZXIgYXMgT2JqZWN0UGFnZUNvbnRyb2xsZXIpLl9maW5kVGFibGVzKCkuZm9yRWFjaChmdW5jdGlvbiAob1RhYmxlOiBhbnkpIHtcblx0XHRcdGNvbnN0IG9RdWlja0ZpbHRlciA9IG9UYWJsZS5nZXRRdWlja0ZpbHRlcigpO1xuXHRcdFx0aWYgKG9RdWlja0ZpbHRlcikge1xuXHRcdFx0XHRhU3RhdGVDb250cm9scy5wdXNoKG9RdWlja0ZpbHRlcik7XG5cdFx0XHR9XG5cdFx0XHRpZiAoYkNvbnRyb2xWTSkge1xuXHRcdFx0XHRhU3RhdGVDb250cm9scy5wdXNoKG9UYWJsZS5nZXRWYXJpYW50KCkpO1xuXHRcdFx0fVxuXHRcdH0pO1xuXG5cdFx0YVN0YXRlQ29udHJvbHMucHVzaChvVmlldy5ieUlkKFwiZmU6Ok9iamVjdFBhZ2VcIikpO1xuXHR9LFxuXHRhZGFwdEJpbmRpbmdSZWZyZXNoQ29udHJvbHM6IGZ1bmN0aW9uICh0aGlzOiBWaWV3U3RhdGUsIGFDb250cm9sczogYW55KSB7XG5cdFx0Y29uc3Qgb1ZpZXcgPSB0aGlzLmdldFZpZXcoKSxcblx0XHRcdHNSZWZyZXNoU3RyYXRlZ3kgPSBLZWVwQWxpdmVIZWxwZXIuZ2V0Vmlld1JlZnJlc2hJbmZvKG9WaWV3KSxcblx0XHRcdG9Db250cm9sbGVyID0gb1ZpZXcuZ2V0Q29udHJvbGxlcigpO1xuXHRcdGxldCBhQ29udHJvbHNUb1JlZnJlc2g6IENvbnRyb2xbXSA9IFtdO1xuXG5cdFx0aWYgKHNSZWZyZXNoU3RyYXRlZ3kpIHtcblx0XHRcdGNvbnN0IG9PYmplY3RQYWdlQ29udHJvbCA9IChvQ29udHJvbGxlciBhcyBPYmplY3RQYWdlQ29udHJvbGxlcikuX2dldE9iamVjdFBhZ2VMYXlvdXRDb250cm9sKCk7XG5cdFx0XHRhQ29udHJvbHNUb1JlZnJlc2gucHVzaChvT2JqZWN0UGFnZUNvbnRyb2wpO1xuXHRcdH1cblx0XHRpZiAoc1JlZnJlc2hTdHJhdGVneSAhPT0gXCJpbmNsdWRpbmdEZXBlbmRlbnRzXCIpIHtcblx0XHRcdGNvbnN0IGFWaWV3Q29udHJvbHMgPSAob0NvbnRyb2xsZXIgYXMgT2JqZWN0UGFnZUNvbnRyb2xsZXIpLl9maW5kVGFibGVzKCk7XG5cdFx0XHRhQ29udHJvbHNUb1JlZnJlc2ggPSBhQ29udHJvbHNUb1JlZnJlc2guY29uY2F0KEtlZXBBbGl2ZUhlbHBlci5nZXRDb250cm9sc0ZvclJlZnJlc2gob1ZpZXcsIGFWaWV3Q29udHJvbHMpIHx8IFtdKTtcblx0XHR9XG5cdFx0cmV0dXJuIGFDb250cm9sc1RvUmVmcmVzaC5yZWR1Y2UoZnVuY3Rpb24gKGFQcmV2Q29udHJvbHM6IGFueSwgb0NvbnRyb2w6IGFueSkge1xuXHRcdFx0aWYgKGFQcmV2Q29udHJvbHMuaW5kZXhPZihvQ29udHJvbCkgPT09IC0xKSB7XG5cdFx0XHRcdGFQcmV2Q29udHJvbHMucHVzaChvQ29udHJvbCk7XG5cdFx0XHR9XG5cdFx0XHRyZXR1cm4gYVByZXZDb250cm9scztcblx0XHR9LCBhQ29udHJvbHMpO1xuXHR9XG59O1xuXG5leHBvcnQgZGVmYXVsdCBWaWV3U3RhdGVFeHRlbnNpb25PdmVycmlkZTtcbiJdfQ==

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.ts

@@ -1,8 +1,8 @@
-import ViewState from "sap/fe/core/controllerextensions/ViewState";
+import type ViewState from "sap/fe/core/controllerextensions/ViewState";
 import KeepAliveHelper from "sap/fe/core/helpers/KeepAliveHelper";
 import CoreLibrary from "sap/fe/core/library";
-import ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
-import Control from "sap/ui/core/Control";
+import type ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
+import type Control from "sap/ui/core/Control";
 
 const VariantManagement = CoreLibrary.VariantManagement;
 
@@ -24,7 +24,7 @@ const ViewStateExtensionOverride = {
 			case VariantManagement.None:
 				break;
 			default:
-				throw new Error("unhandled variant setting: " + oViewData.getVariantManagement());
+				throw new Error(`unhandled variant setting: ${oViewData.getVariantManagement()}`);
 		}
 
 		(oController as ObjectPageController)._findTables().forEach(function (oTable: any) {

package/src/sap/fe/templates/ObjectPage/view/fragments/Actions.fragment.xml

@@ -5,6 +5,7 @@
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
 	xmlns:macro="sap.fe.macros.internal"
+	xmlns:components="sap.fe.templates.ObjectPage.components"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
 		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
@@ -19,15 +20,7 @@
 		<template:repeat list="{converterContext>header/actions}" var="headerAction">
 			<template:if test="{= ${headerAction>type} === 'DraftActions' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
 				<template:then>
-					<Button
-						id="fe::StandardAction::SwitchDraftAndActiveObject"
-						text="{= ( !(${ui>/editMode} === 'Editable') &amp;&amp; !${ui>createMode} &amp;&amp; ${HasDraftEntity} ) ? ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_SAVED_VERSION_BUT} : ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_DRAFT_BUT} }"
-						visible="{= OP.getSwitchDraftAndActiveVisibility(${entitySet>@}) }"
-						icon="sap-icon://navigation-down-arrow"
-						iconFirst="false"
-						type="Transparent"
-						press="._showSwitchDraftAndActivePopover($event)"
-					/>
+					<components:DraftHandlerButton contextPath="{entitySet>}" id="fe::StandardAction::SwitchDraftAndActiveObject" />
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
 					<ToolbarSpacer />
 				</template:then>
@@ -122,7 +115,7 @@
 						unittest:id="DeleteActionTest"
 						id="fe::StandardAction::Delete"
 						type="Default"
-						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_DELETE}"
+						text="{sap.fe.i18n>C_COMMON_DELETE}"
 						visible="{headerAction>visible}"
 						enabled="{headerAction>enabled}"
 						press="cmd:DeleteObject"

package/src/sap/fe/templates/ObjectPage/view/fragments/EditableHeaderFacet.fragment.xml

@@ -27,7 +27,7 @@
 		id="fe::EditableHeaderForm"
 		editable="true"
 		class="sapUxAPObjectPageSubSectionAlignContent"
-		formdata:navigationPath="{= FORM.getNavigationPath(${entitySet>}) }"
+		formdata:navigationPath="{= COMMON.getNavigationPath(${entitySet>}) }"
 		formdata:entitySet="{entitySet>@sapui.name}"
 	>
 		<f:layout>
@@ -37,9 +37,11 @@
 			<f:FormContainer
 				unittest:id="HeaderInfoFormContainerTest"
 				id="fe::EditableHeaderForm::EditableHeaderInfo"
-				title="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}"
 				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@@FIELD.fieldControl}) }"
 			>
+				<f:title>
+					<core:Title level="H4" text="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}" />
+				</f:title>
 				<f:dependents>
 					<macro:ValueHelp
 						idPrefix="fe::EditableHeaderForm::EditableHeaderTitle::FieldValueHelp"
@@ -111,8 +113,10 @@
 															id="{= ${formContainer>id} ? ID.generate(['fe', 'HeaderFacet', 'FormContainer', ${formContainer>id} ]) : undefined }"
 															designtimeSettings="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/fe/macros/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 															title="{facet>@@MODEL.label}"
+															titleLevel="H4"
 															displayMode="Edit"
-															entitySet="{targetEntitySet>}"
+															contextPath="{targetEntitySet>}"
+															metaPath="{formContainer>annotationPath}"
 															navigationPath="{= MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) ? MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) : ''}"
 															dataFieldCollection="{formContainer>formElements}"
 															visible="{subSection>visible}"
@@ -124,8 +128,10 @@
 														id="{= ${formContainer>id} ? ID.generate(['fe', 'HeaderFacet', 'FormContainer', ${formContainer>id} ]) : undefined }"
 														designtimeSettings="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/fe/macros/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 														title="{facet>@@MODEL.label}"
+														titleLevel="H4"
 														displayMode="Edit"
-														entitySet="{entitySet>}"
+														contextPath="{entitySet>}"
+														metaPath="{formContainer>annotationPath}"
 														dataFieldCollection="{formContainer>formElements}"
 														visible="{subSection>visible}"
 													/>
@@ -137,10 +143,14 @@
 								<template:else>
 									<f:FormContainer
 										id="{= ${subSection>id} ? ID.generate([${subSection>id}, 'CustomFormContainer', ${subSection>}]) : undefined }"
-										title="{subSection>title}"
 										visible="{subSection>visible}"
 										dt:designtime="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/ui/layout/designtime/form/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 									>
+										<template:if test="{subSection>title}">
+											<f:title>
+												<core:Title level="H4" text="{subSection>title}" />
+											</f:title>
+										</template:if>
 										<f:formElements>
 											<fpm:CustomFragment
 												id="{= ${subSection>id} ? ID.generate([${subSection>id}, 'CustomFragment', ${subSection>}]) : undefined }"

package/src/sap/fe/templates/ObjectPage/view/fragments/FooterContent.fragment.xml

@@ -35,7 +35,7 @@
 			test="{= ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot} || ${entitySet>@com.sap.vocabularies.Common.v1.DraftNode}
 			 					|| COMMON.isDraftParentEntityForContainment(${entitySet>$ContainsTarget}, undefined, ${converterContext>}) }"
 		>
-			<DraftIndicator state="{ui>/draftStatus}" />
+			<DraftIndicator state="{ui>/draftStatus}" visible="{ui>/isEditable}" />
 		</template:if>
 		<template:if test="{converterContext>footerActions}">
 			<template:repeat list="{converterContext>footerActions}" var="footerAction">

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacet.fragment.xml

@@ -56,20 +56,7 @@
 				</template:with>
 			</template:elseif>
 			<template:elseif test="{= ${converterHeaderFacet>targetAnnotationType} === 'Contact'}">
-				<template:with path="headerFacet>Target/$AnnotationPath" var="collection" helper="MODEL.resolve$Path">
-					<template:with path="collection>" var="collection" helper="COMMON.getNavigationContext">
-						<VBox id="{= ID.generate(['fe', 'HeaderFacet', 'Contact', { Facet: ${headerFacet>} }]) }" displayInline="true">
-							<template:if test="{headerFacet>@@MODEL.label}">
-								<Title text="{headerFacet>@@MODEL.label}" class="sapUiSmallMarginBottom" />
-							</template:if>
-							<template:with path="headerFacet>Target/$AnnotationPath" var="contact">
-								<template:with path="headerFacet>Target/$AnnotationPath@@COMMON.getMetaPath" var="contactPath">
-									<macro:Contact contact="{contact>}" visible="true" />
-								</template:with>
-							</template:with>
-						</VBox>
-					</template:with>
-				</template:with>
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ObjectPageHeaderContact" type="XML" />
 			</template:elseif>
 			<template:elseif test="{= ${converterHeaderFacet>targetAnnotationType} === 'Address'}">
 				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.ObjectPageHeaderAddress" type="XML" />

package/src/sap/fe/templates/ObjectPage/view/fragments/HeadingTitle.fragment.xml

@@ -13,6 +13,7 @@
 		<Title
 			text="{= OP.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
 			wrapping="true"
+			level="H2"
 		/>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderAddress.fragment.xml

@@ -13,8 +13,13 @@
 >
 	<template:with path="headerFacet>Target/$AnnotationPath/" var="addressPath">
 		<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
-			<Title text="{headerFacet>Label}" />
-			<Text unittest:id="ObjectPageHeaderAddressTest" renderWhitespace="true" class="sapMLabel" text="{addressPath>label@@MODEL.format}" />
+			<Title level="H3" text="{headerFacet>Label}" />
+			<Text
+				unittest:id="ObjectPageHeaderAddressTest"
+				renderWhitespace="true"
+				class="sapMLabel"
+				text="{addressPath>label@@MODEL.format}"
+			/>
 		</VBox>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderContact.fragment.xml

@@ -0,0 +1,26 @@
+<core:FragmentDefinition
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:macro="sap.fe.macros"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+	<template:with path="headerFacet>Target/$AnnotationPath" var="collection" helper="MODEL.resolve$Path">
+		<template:with path="collection>" var="collection" helper="COMMON.getNavigationContext">
+			<VBox id="{= ID.generate(['fe', 'HeaderFacet', 'Contact', { Facet: ${headerFacet>} }]) }" displayInline="true">
+				<template:if test="{headerFacet>@@MODEL.label}">
+					<Title level="H3" text="{headerFacet>@@MODEL.label}" class="sapUiSmallMarginBottom" />
+				</template:if>
+				<template:with path="headerFacet>Target/$AnnotationPath" var="contact">
+					<template:with path="headerFacet>Target/$AnnotationPath@@COMMON.getMetaPath" var="contactPath">
+						<macro:Contact contact="{contact>}" visible="true" />
+					</template:with>
+				</template:with>
+			</VBox>
+		</template:with>
+	</template:with>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/ObjectPageHeaderForm.fragment.xml

@@ -13,7 +13,7 @@
 >
 	<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
 		<template:if test="{converterHeaderFacet>headerFormData/label}">
-			<Title text="{converterHeaderFacet>headerFormData/label}" class="sapUiSmallMarginBottom" />
+			<Title level="H3" text="{converterHeaderFacet>headerFormData/label}" class="sapUiSmallMarginBottom" />
 		</template:if>
 		<template:if test="{= OP.doesFieldGroupContainOnlyOneMultiLineDataField(${converterHeaderFacet>headerFormData/formElements})}">
 			<template:then>

package/src/sap/fe/templates/ObjectPage/view/fragments/Section.fragment.xml

@@ -26,11 +26,12 @@
 				dt:designtime="not-adaptable-visibility"
 				id="{headerSection>id}"
 				title="{headerSection>title}"
+				titleLevel="H3"
 				visible="{headerSection>visible}"
 				titleUppercase="false"
 			>
 				<uxap:subSections>
-					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection" title="{headerSection>title}">
+					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection" title="{headerSection>title}" titleLevel="H4">
 						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.EditableHeaderFacet" type="XML" />
 					</uxap:ObjectPageSubSection>
 				</uxap:subSections>
@@ -43,6 +44,7 @@
 				dt:designtime="not-adaptable-visibility"
 				id="{section>id}"
 				title="{section>title}"
+				titleLevel="H3"
 				showTitle="{section>showTitle}"
 				titleUppercase="false"
 				visible="{section>visible}"
@@ -53,6 +55,7 @@
 							dt:designtime="not-adaptable-visibility"
 							id="{subSection>id}"
 							title="{subSection>title}"
+							titleLevel="H4"
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>

package/src/sap/fe/templates/ObjectPage/view/fragments/SectionContent.fragment.xml

@@ -103,7 +103,7 @@
 						<!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
 						<uxap:moreBlocks>
 							<template:if test="{= ${subSection>level} === 2}">
-								<Title text="{subSection>title}" />
+								<Title level="{= ${section>subSections}.length > 1 ? 'H5' : 'H4'}" text="{subSection>title}" />
 							</template:if>
 							<opcontrol:SubSectionBlock>
 								<opcontrol:content>
@@ -144,7 +144,11 @@
 			<template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
 				<uxap:blocks>
 					<template:if test="{= ${subSection>level} === 2}">
-						<Title text="{subSection>title}" visible="{subSection>titleVisible}" />
+						<Title
+							level="{= ${section>subSections}.length > 1 ? 'H5' : 'H4'}"
+							text="{subSection>title}"
+							visible="{subSection>titleVisible}"
+						/>
 					</template:if>
 					<opcontrol:SubSectionBlock visible="{subSection>visible}">
 						<opcontrol:content>

package/src/sap/fe/templates/ObjectPage/view/fragments/SectionFormContent.fragment.xml

@@ -15,5 +15,6 @@
 		partOfPreview="true"
 		formContainers="{subSection>formDefinition/formContainers}"
 		isVisible="{subSection>formDefinition/isVisible}"
+		titleLevel="{= ${section>subSections}.length > 1 ? 'H5' : 'H4'}"
 	/>
 </core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/SectionMoreFormContent.fragment.xml

@@ -15,5 +15,6 @@
 		partOfPreview="false"
 		formContainers="{subSection>formDefinition/formContainers}"
 		isVisible="{subSection>formDefinition/isVisible}"
+		titleLevel="{= ${section>subSections}.length > 1 ? (${subSection>level} === 2 ? 'H6': 'H5') : (${subSection>level} === 2 ? 'H5': 'H4')}"
 	/>
 </core:FragmentDefinition>