@sapui5/sap.fe.templates 1.93.3 → 1.97.0

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

@@ -294,13 +294,13 @@ sap.ui.define(
 						var oPageTitleInfo = oData[0];
 						var sJamUrl = oData[1];
 						var sTitle = oPageTitleInfo.title;
-						var sObjectSubtitle = oPageTitleInfo.subtitle;
+						var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
 						if (sObjectSubtitle) {
 							sTitle = sTitle + " - " + sObjectSubtitle;
 						}
 						oShareMetadata.tile = {
 							title: oPageTitleInfo.title,
-							subtitle: oPageTitleInfo.subtitle
+							subtitle: oPageTitleInfo.subtitle.toString()
 						};
 						oShareMetadata.email.title = sTitle;
 						oShareMetadata.title = sTitle;

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

@@ -2,7 +2,7 @@
  * SAPUI5
  * (c) Copyright 2009-2021 SAP SE. All rights reserved.
  */
-sap.ui.define(["sap/fe/core/library"], function(CoreLibrary) {
+sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], function(CoreLibrary, KeepAliveHelper) {
 	"use strict";
 
 	var VariantManagement = CoreLibrary.VariantManagement;
@@ -39,6 +39,47 @@ sap.ui.define(["sap/fe/core/library"], function(CoreLibrary) {
 			});
 
 			aStateControls.push(oView.byId("fe::ObjectPage"));
+		},
+		adaptControlStateHandler: function(oControl, aControlHandler) {
+			if (oControl.isA("sap.ui.fl.variants.VariantManagement")) {
+				aControlHandler.push({
+					retrieve: function(oVM) {
+						return {
+							"variantId": oVM.getCurrentVariantKey()
+						};
+					},
+					apply: function(oVM, oControlState) {
+						if (
+							oControlState &&
+							oControlState.variantId !== undefined &&
+							!(oControlState.variantId === oVM.getId() && oVM.getModified() === false)
+						) {
+							oVM.setModified(true);
+						}
+					}
+				});
+			}
+		},
+		adaptBindingRefreshControls: function(aControls) {
+			var oView = this.getView(),
+				sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),
+				oController = oView.getController(),
+				aControlsToRefresh = [];
+
+			if (sRefreshStrategy) {
+				var oObjectPageControl = oController._getObjectPageLayoutControl();
+				aControlsToRefresh.push(oObjectPageControl);
+			}
+			if (sRefreshStrategy !== "includingDependents") {
+				var aViewControls = oController._findTables();
+				aControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);
+			}
+			return aControlsToRefresh.reduce(function(aPrevControls, oControl) {
+				if (aPrevControls.indexOf(oControl) === -1) {
+					aPrevControls.push(oControl);
+				}
+				return aPrevControls;
+			}, aControls);
 		}
 	};
 });

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.js

@@ -9,6 +9,7 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
   var isStickySessionSupported = EntitySetHelper.isStickySessionSupported;
   var formatValueRecursively = FieldTemplating.formatValueRecursively;
   var addTextArrangementToBindingExpression = FieldTemplating.addTextArrangementToBindingExpression;
+  var Entity = BindingHelper.Entity;
   var Draft = BindingHelper.Draft;
   var UI = BindingHelper.UI;
   var compileBinding = BindingExpression.compileBinding;
@@ -35,32 +36,33 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
 
   /**
    * Compute the title for the object page.
-   *
    * @param oHeaderInfo The @UI.HeaderInfo annotation content
    * @param oViewData The view data object we're currently on
    * @param fullContextPath The full context path used to reach that object page
+   * @param oDraftRoot
    * @returns The binding expression for the object page title
    */
-  var getExpressionForTitle = function (oHeaderInfo, oViewData, fullContextPath) {
-    var _ref, _ref2, _ref3, _ref3$Value, _ref3$Value$$target, _ref3$Value$$target$a, _ref3$Value$$target$a2, _ref3$Value$$target$a3, _ref3$Value$$target$a4, _ref3$Value$$target$a5;
+  var getExpressionForTitle = function (oHeaderInfo, oViewData, fullContextPath, oDraftRoot) {
+    var _oHeaderInfo$Title, _oHeaderInfo$Title2, _oHeaderInfo$Title3, _oHeaderInfo$Title3$V, _oHeaderInfo$Title3$V2, _oHeaderInfo$Title3$V3, _oHeaderInfo$Title3$V4, _oHeaderInfo$Title3$V5, _oHeaderInfo$Title3$V6, _oHeaderInfo$Title3$V7;
 
-    var titleNoHeaderInfo = CommonUtils.getTranslatedText("T_NEW_OBJECT", oViewData.resourceBundle, null, oViewData.entitySet);
-    var titleWithHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE", oViewData.resourceBundle, null, oViewData.entitySet);
-    var oEmptyHeaderInfoTitle = (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === undefined || (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === "" || ((_ref = oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === null || _ref === void 0 ? void 0 : _ref.Value) === "";
+    var titleNoHeaderInfo = CommonUtils.getTranslatedText("T_NEW_OBJECT", oViewData.resourceBundle, undefined, oViewData.entitySet);
+    var titleWithHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE", oViewData.resourceBundle, undefined, oViewData.entitySet);
+    var oEmptyHeaderInfoTitle = (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === undefined || (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === "" || (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title = oHeaderInfo.Title) === null || _oHeaderInfo$Title === void 0 ? void 0 : _oHeaderInfo$Title.Value) === "";
     var titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle ? CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle) : "";
-    var titleValueExpression = annotationExpression((_ref2 = oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === null || _ref2 === void 0 ? void 0 : _ref2.Value);
+    var titleValueExpression = annotationExpression(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title2 = oHeaderInfo.Title) === null || _oHeaderInfo$Title2 === void 0 ? void 0 : _oHeaderInfo$Title2.Value);
 
-    if ((_ref3 = oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Title) === null || _ref3 === void 0 ? void 0 : (_ref3$Value = _ref3.Value) === null || _ref3$Value === void 0 ? void 0 : (_ref3$Value$$target = _ref3$Value.$target) === null || _ref3$Value$$target === void 0 ? void 0 : (_ref3$Value$$target$a = _ref3$Value$$target.annotations) === null || _ref3$Value$$target$a === void 0 ? void 0 : (_ref3$Value$$target$a2 = _ref3$Value$$target$a.Common) === null || _ref3$Value$$target$a2 === void 0 ? void 0 : (_ref3$Value$$target$a3 = _ref3$Value$$target$a2.Text) === null || _ref3$Value$$target$a3 === void 0 ? void 0 : (_ref3$Value$$target$a4 = _ref3$Value$$target$a3.annotations) === null || _ref3$Value$$target$a4 === void 0 ? void 0 : (_ref3$Value$$target$a5 = _ref3$Value$$target$a4.UI) === null || _ref3$Value$$target$a5 === void 0 ? void 0 : _ref3$Value$$target$a5.TextArrangement) {
+    if (oHeaderInfo !== null && oHeaderInfo !== void 0 && (_oHeaderInfo$Title3 = oHeaderInfo.Title) !== null && _oHeaderInfo$Title3 !== void 0 && (_oHeaderInfo$Title3$V = _oHeaderInfo$Title3.Value) !== null && _oHeaderInfo$Title3$V !== void 0 && (_oHeaderInfo$Title3$V2 = _oHeaderInfo$Title3$V.$target) !== null && _oHeaderInfo$Title3$V2 !== void 0 && (_oHeaderInfo$Title3$V3 = _oHeaderInfo$Title3$V2.annotations) !== null && _oHeaderInfo$Title3$V3 !== void 0 && (_oHeaderInfo$Title3$V4 = _oHeaderInfo$Title3$V3.Common) !== null && _oHeaderInfo$Title3$V4 !== void 0 && (_oHeaderInfo$Title3$V5 = _oHeaderInfo$Title3$V4.Text) !== null && _oHeaderInfo$Title3$V5 !== void 0 && (_oHeaderInfo$Title3$V6 = _oHeaderInfo$Title3$V5.annotations) !== null && _oHeaderInfo$Title3$V6 !== void 0 && (_oHeaderInfo$Title3$V7 = _oHeaderInfo$Title3$V6.UI) !== null && _oHeaderInfo$Title3$V7 !== void 0 && _oHeaderInfo$Title3$V7.TextArrangement) {
       // In case an explicit text arrangement was set we make use of it in the description as well
       titleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);
     }
 
     titleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath); // If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'
 
-    var createModeTitle = (oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.TypeName) ? concat(titleWithHeaderInfo, " ", annotationExpression(oHeaderInfo.TypeName.toString())) : titleNoHeaderInfo;
+    var createModeTitle = oHeaderInfo !== null && oHeaderInfo !== void 0 && oHeaderInfo.TypeName ? concat(titleWithHeaderInfo, ": ", annotationExpression(oHeaderInfo.TypeName.toString())) : titleNoHeaderInfo;
+    var activeExpression = oDraftRoot ? Entity.IsActive : true;
     return compileBinding(ifElse( // If Create Mode && Empty expression
     and(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)), createModeTitle, // Otherwise show the default expression
-    ifElse(titleValueExpression && isEmpty(titleValueExpression), titleForActiveHeaderNoHeaderInfo, titleValueExpression)));
+    ifElse(and(activeExpression, titleValueExpression && isEmpty(titleValueExpression)), titleForActiveHeaderNoHeaderInfo, titleValueExpression)));
   };
   /**
    * Retrieves the expression for the description of an object page.
@@ -74,11 +76,11 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
   _exports.getExpressionForTitle = getExpressionForTitle;
 
   var getExpressionForDescription = function (oHeaderInfo, fullContextPath) {
-    var _ref4, _ref5, _ref5$Value, _ref5$Value$$target, _ref5$Value$$target$a, _ref5$Value$$target$a2, _ref5$Value$$target$a3, _ref5$Value$$target$a4, _ref5$Value$$target$a5;
+    var _oHeaderInfo$Descript, _oHeaderInfo$Descript2, _oHeaderInfo$Descript3, _oHeaderInfo$Descript4, _oHeaderInfo$Descript5, _oHeaderInfo$Descript6, _oHeaderInfo$Descript7, _oHeaderInfo$Descript8, _oHeaderInfo$Descript9;
 
-    var bindingExpression = annotationExpression((_ref4 = oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Description) === null || _ref4 === void 0 ? void 0 : _ref4.Value);
+    var bindingExpression = annotationExpression(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Descript = oHeaderInfo.Description) === null || _oHeaderInfo$Descript === void 0 ? void 0 : _oHeaderInfo$Descript.Value);
 
-    if ((_ref5 = oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : oHeaderInfo.Description) === null || _ref5 === void 0 ? void 0 : (_ref5$Value = _ref5.Value) === null || _ref5$Value === void 0 ? void 0 : (_ref5$Value$$target = _ref5$Value.$target) === null || _ref5$Value$$target === void 0 ? void 0 : (_ref5$Value$$target$a = _ref5$Value$$target.annotations) === null || _ref5$Value$$target$a === void 0 ? void 0 : (_ref5$Value$$target$a2 = _ref5$Value$$target$a.Common) === null || _ref5$Value$$target$a2 === void 0 ? void 0 : (_ref5$Value$$target$a3 = _ref5$Value$$target$a2.Text) === null || _ref5$Value$$target$a3 === void 0 ? void 0 : (_ref5$Value$$target$a4 = _ref5$Value$$target$a3.annotations) === null || _ref5$Value$$target$a4 === void 0 ? void 0 : (_ref5$Value$$target$a5 = _ref5$Value$$target$a4.UI) === null || _ref5$Value$$target$a5 === void 0 ? void 0 : _ref5$Value$$target$a5.TextArrangement) {
+    if (oHeaderInfo !== null && oHeaderInfo !== void 0 && (_oHeaderInfo$Descript2 = oHeaderInfo.Description) !== null && _oHeaderInfo$Descript2 !== void 0 && (_oHeaderInfo$Descript3 = _oHeaderInfo$Descript2.Value) !== null && _oHeaderInfo$Descript3 !== void 0 && (_oHeaderInfo$Descript4 = _oHeaderInfo$Descript3.$target) !== null && _oHeaderInfo$Descript4 !== void 0 && (_oHeaderInfo$Descript5 = _oHeaderInfo$Descript4.annotations) !== null && _oHeaderInfo$Descript5 !== void 0 && (_oHeaderInfo$Descript6 = _oHeaderInfo$Descript5.Common) !== null && _oHeaderInfo$Descript6 !== void 0 && (_oHeaderInfo$Descript7 = _oHeaderInfo$Descript6.Text) !== null && _oHeaderInfo$Descript7 !== void 0 && (_oHeaderInfo$Descript8 = _oHeaderInfo$Descript7.annotations) !== null && _oHeaderInfo$Descript8 !== void 0 && (_oHeaderInfo$Descript9 = _oHeaderInfo$Descript8.UI) !== null && _oHeaderInfo$Descript9 !== void 0 && _oHeaderInfo$Descript9.TextArrangement) {
       // In case an explicit text arrangement was set we make use of it in the description as well
       bindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);
     }
@@ -115,4 +117,4 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
   _exports.getExpressionForSaveButton = getExpressionForSaveButton;
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","entitySet","titleWithHeaderInfo","oEmptyHeaderInfoTitle","Title","undefined","Value","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":"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","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport { CommonUtils, ViewData } from \"sap/fe/core\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, null, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tnull,\n\t\toViewData.entitySet\n\t);\n\n\tconst oEmptyHeaderInfoTitle =\n\t\toHeaderInfo?.Title === undefined || oHeaderInfo?.Title === \"\" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === \"\";\n\n\tconst titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle\n\t\t? CommonUtils.getTranslatedText(\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\", oViewData.resourceBundle)\n\t\t: \"\";\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \" \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(titleValueExpression && isEmpty(titleValueExpression), titleForActiveHeaderNoHeaderInfo, titleValueExpression)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ObjectPageTemplating.ts"],"names":["getExpressionForTitle","oHeaderInfo","oViewData","fullContextPath","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","oEmptyHeaderInfoTitle","Title","Value","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","$target","annotations","Common","Text","UI","TextArrangement","addTextArrangementToBindingExpression","formatValueRecursively","createModeTitle","TypeName","concat","toString","activeExpression","Entity","IsActive","compileBinding","ifElse","and","IsCreateMode","isEmpty","getExpressionForDescription","bindingExpression","Description","getExpressionForSaveButton","saveButtonText","createButtonText","saveExpression","isStickySessionSupported","startingEntitySet","IsCreateModeSticky","Draft","IsNewObject"],"mappings":"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","sourceRoot":".","sourcesContent":["// Formatters for the Object Page\nimport {\n\tand,\n\tifElse,\n\tisEmpty,\n\tconcat,\n\tannotationExpression,\n\tcompileBinding,\n\tBindingExpression\n} from \"sap/fe/core/helpers/BindingExpression\";\nimport { UI, Draft, Entity } from \"sap/fe/core/converters/helpers/BindingHelper\";\nimport { CommonUtils } from \"sap/fe/core\";\nimport { HeaderInfoType } from \"@sap-ux/vocabularies-types\";\nimport { DataModelObjectPath } from \"sap/fe/core/templating/DataModelPathHelper\";\nimport { addTextArrangementToBindingExpression, formatValueRecursively } from \"sap/fe/macros/field/FieldTemplating\";\nimport { DataFieldTypes } from \"@sap-ux/vocabularies-types/dist/generated/UI\";\nimport { isStickySessionSupported } from \"sap/fe/core/templating/EntitySetHelper\";\nimport { ResourceBundle } from \"sap/base/i18n\";\n\ntype ViewData = {\n\tresourceBundle: ResourceBundle;\n\tentitySet: string;\n};\n\n//```mermaid\n// graph TD\n// A[Object Page Title] -->|Get DataField Value| C{Evaluate Create Mode}\n// C -->|In Create Mode| D{Is DataField Value empty}\n// D -->|Yes| F{Is there a TypeName}\n// F -->|Yes| G[Is there an custom title]\n// G -->|Yes| G1[Show the custom title + 'TypeName']\n// G -->|No| G2[Display the default title 'New + TypeName']\n// F -->|No| H[Is there a custom title]\n// H -->|Yes| I[Show the custom title]\n// H -->|No| J[Show the default 'Unamned Object']\n// D -->|No| E\n// C -->|Not in create mode| E[Show DataField Value]\n// ```\n/**\n * Compute the title for the object page.\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param oViewData The view data object we're currently on\n * @param fullContextPath The full context path used to reach that object page\n * @param oDraftRoot\n * @returns The binding expression for the object page title\n */\nexport const getExpressionForTitle = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\toViewData: ViewData,\n\tfullContextPath: DataModelObjectPath,\n\toDraftRoot: Object | undefined\n): BindingExpression<string> {\n\tconst titleNoHeaderInfo = CommonUtils.getTranslatedText(\"T_NEW_OBJECT\", oViewData.resourceBundle, undefined, oViewData.entitySet);\n\n\tconst titleWithHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE\",\n\t\toViewData.resourceBundle,\n\t\tundefined,\n\t\toViewData.entitySet\n\t);\n\n\tconst oEmptyHeaderInfoTitle =\n\t\toHeaderInfo?.Title === undefined || oHeaderInfo?.Title === \"\" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === \"\";\n\n\tconst titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle\n\t\t? CommonUtils.getTranslatedText(\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\", oViewData.resourceBundle)\n\t\t: \"\";\n\n\tlet titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\ttitleValueExpression = addTextArrangementToBindingExpression(titleValueExpression, fullContextPath);\n\t}\n\n\ttitleValueExpression = formatValueRecursively(titleValueExpression, fullContextPath);\n\n\t// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'\n\tconst createModeTitle = oHeaderInfo?.TypeName\n\t\t? concat(titleWithHeaderInfo, \": \", annotationExpression(oHeaderInfo.TypeName.toString()))\n\t\t: titleNoHeaderInfo;\n\tconst activeExpression = oDraftRoot ? Entity.IsActive : true;\n\n\treturn compileBinding(\n\t\tifElse(\n\t\t\t// If Create Mode && Empty expression\n\t\t\tand(UI.IsCreateMode, titleValueExpression && isEmpty(titleValueExpression)),\n\n\t\t\tcreateModeTitle,\n\t\t\t// Otherwise show the default expression\n\t\t\tifElse(\n\t\t\t\tand(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),\n\t\t\t\ttitleForActiveHeaderNoHeaderInfo,\n\t\t\t\ttitleValueExpression\n\t\t\t)\n\t\t)\n\t);\n};\n\n/**\n * Retrieves the expression for the description of an object page.\n *\n * @param oHeaderInfo The @UI.HeaderInfo annotation content\n * @param fullContextPath The full context path used to reach that object page\n * @returns The binding expression for the object page description\n */\nexport const getExpressionForDescription = function(\n\toHeaderInfo: HeaderInfoType | undefined,\n\tfullContextPath: DataModelObjectPath\n): BindingExpression<string> {\n\tlet bindingExpression = annotationExpression((oHeaderInfo?.Description as DataFieldTypes)?.Value);\n\tif ((oHeaderInfo?.Description as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {\n\t\t// In case an explicit text arrangement was set we make use of it in the description as well\n\t\tbindingExpression = addTextArrangementToBindingExpression(bindingExpression, fullContextPath);\n\t}\n\n\treturn compileBinding(formatValueRecursively(bindingExpression, fullContextPath));\n};\n\n/**\n * Return the expression for the save button.\n *\n * @param oViewData The current view data\n * @param fullContextPath The path used up until here\n * @returns The binding expression that shows the right save button text\n */\nexport const getExpressionForSaveButton = function(oViewData: ViewData, fullContextPath: DataModelObjectPath): BindingExpression<string> {\n\tconst saveButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_SAVE\", oViewData.resourceBundle);\n\tconst createButtonText = CommonUtils.getTranslatedText(\"T_OP_OBJECT_PAGE_CREATE\", oViewData.resourceBundle);\n\tlet saveExpression;\n\tif (isStickySessionSupported(fullContextPath.startingEntitySet)) {\n\t\t// If we're in sticky mode AND the ui is in create mode, show Create, else show Save\n\t\tsaveExpression = ifElse(UI.IsCreateModeSticky, createButtonText, saveButtonText);\n\t} else {\n\t\t// If we're in draft AND the draft is a new object (!IsActiveEntity && !HasActiveEntity), show create, else show save\n\t\tsaveExpression = ifElse(Draft.IsNewObject, createButtonText, saveButtonText);\n\t}\n\treturn compileBinding(saveExpression);\n};\n"]}

package/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.ts

@@ -8,13 +8,19 @@ import {
 	compileBinding,
 	BindingExpression
 } from "sap/fe/core/helpers/BindingExpression";
-import { UI, Draft } from "sap/fe/core/converters/helpers/BindingHelper";
-import { CommonUtils, ViewData } from "sap/fe/core";
+import { UI, Draft, Entity } from "sap/fe/core/converters/helpers/BindingHelper";
+import { CommonUtils } from "sap/fe/core";
 import { HeaderInfoType } from "@sap-ux/vocabularies-types";
 import { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import { addTextArrangementToBindingExpression, formatValueRecursively } from "sap/fe/macros/field/FieldTemplating";
 import { DataFieldTypes } from "@sap-ux/vocabularies-types/dist/generated/UI";
 import { isStickySessionSupported } from "sap/fe/core/templating/EntitySetHelper";
+import { ResourceBundle } from "sap/base/i18n";
+
+type ViewData = {
+	resourceBundle: ResourceBundle;
+	entitySet: string;
+};
 
 //```mermaid
 // graph TD
@@ -32,23 +38,24 @@ import { isStickySessionSupported } from "sap/fe/core/templating/EntitySetHelper
 // ```
 /**
  * Compute the title for the object page.
- *
  * @param oHeaderInfo The @UI.HeaderInfo annotation content
  * @param oViewData The view data object we're currently on
  * @param fullContextPath The full context path used to reach that object page
+ * @param oDraftRoot
  * @returns The binding expression for the object page title
  */
 export const getExpressionForTitle = function(
 	oHeaderInfo: HeaderInfoType | undefined,
 	oViewData: ViewData,
-	fullContextPath: DataModelObjectPath
+	fullContextPath: DataModelObjectPath,
+	oDraftRoot: Object | undefined
 ): BindingExpression<string> {
-	const titleNoHeaderInfo = CommonUtils.getTranslatedText("T_NEW_OBJECT", oViewData.resourceBundle, null, oViewData.entitySet);
+	const titleNoHeaderInfo = CommonUtils.getTranslatedText("T_NEW_OBJECT", oViewData.resourceBundle, undefined, oViewData.entitySet);
 
 	const titleWithHeaderInfo = CommonUtils.getTranslatedText(
 		"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE",
 		oViewData.resourceBundle,
-		null,
+		undefined,
 		oViewData.entitySet
 	);
 
@@ -69,8 +76,9 @@ export const getExpressionForTitle = function(
 
 	// If there is a TypeName defined, show the default title 'New + TypeName', otherwise show the custom title or the default 'New object'
 	const createModeTitle = oHeaderInfo?.TypeName
-		? concat(titleWithHeaderInfo, " ", annotationExpression(oHeaderInfo.TypeName.toString()))
+		? concat(titleWithHeaderInfo, ": ", annotationExpression(oHeaderInfo.TypeName.toString()))
 		: titleNoHeaderInfo;
+	const activeExpression = oDraftRoot ? Entity.IsActive : true;
 
 	return compileBinding(
 		ifElse(
@@ -79,7 +87,11 @@ export const getExpressionForTitle = function(
 
 			createModeTitle,
 			// Otherwise show the default expression
-			ifElse(titleValueExpression && isEmpty(titleValueExpression), titleForActiveHeaderNoHeaderInfo, titleValueExpression)
+			ifElse(
+				and(activeExpression, titleValueExpression && isEmpty(titleValueExpression)),
+				titleForActiveHeaderNoHeaderInfo,
+				titleValueExpression
+			)
 		)
 	);
 };

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

@@ -4,8 +4,7 @@
 	xmlns:macrodata="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns="sap.m"
 	xmlns:core="sap.ui.core"
-	xmlns:uxap="sap.uxap"
-	xmlns:macro="sap.fe.macros"
+	xmlns:macro="sap.fe.macros.internal"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
 		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
@@ -17,8 +16,8 @@
 		FIELD: 'sap/fe/macros/field/FieldHelper'
 	}"
 >
-	<template:if test="{converterContext>headerActions}">
-	    <template:repeat list="{converterContext>headerActions}" var="headerAction">
+	<template:if test="{converterContext>header/actions}">
+	    <template:repeat list="{converterContext>header/actions}" var="headerAction">
 			<template:if test="{= CORE.isManifestAction(${headerAction>}) }">
 				<template:then>
 					<template:if test="{= ${headerAction>type} === 'Menu'}">
@@ -36,17 +35,13 @@
 											<template:with path="menuItemAction>annotationPath" var="dataField">
 												<template:if test="{= ${menuItemAction>type} === 'ForAction'}">
 													<template:then>
-															<template:with path="dataField>Action" helper="COMMON.getActionContext" var="actionContext">
-																<template:with path="dataField>Action" helper="COMMON.getPathToBoundActionOverload" var="isBound">
-																	<MenuItem
-																	id="{= ID.generate(['fe', ${dataField>}]) }"
-																	text="{dataField>Label}"
-																	press="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
-																	visible="{menuItemAction>visible}"
-																	enabled="{= ${menuItemAction>enabled} !== undefined ? ${menuItemAction>enabled} : OP.getButtonEnabledForAnnotationAction(${isBound>}, ${actionContext>@}, ${dataField>}, ${actionContext>@Org.OData.Core.V1.OperationAvailable@@MODEL.format}) }"
-																/>
-																</template:with>
-															</template:with>
+														<MenuItem
+															id="{= ID.generate(['fe', ${dataField>}]) }"
+															text="{dataField>Label}"
+															press="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
+															visible="{menuItemAction>visible}"
+															enabled="{menuItemAction>enabled}"
+														/>
 													</template:then>
 													<template:elseif test="{= ${menuItemAction>type} === 'ForNavigation'}">
 														<MenuItem
@@ -99,7 +94,7 @@
 									id="fe::StandardAction::Edit"
 									type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
 									text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_EDIT}"
-									enabled="{= OP.getEnabledExpressionForHeaderActions(${operationAvailable>}, ${entitySet>@}, ${operationAvailable>@@MODEL.format}) }"
+									enabled="{headerAction>enabled}"
 									visible="{headerAction>visible}"
 									press="cmd:Edit"
 								>
@@ -118,7 +113,7 @@
 						type="Default"
 						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_DELETE}"
 						visible="{headerAction>visible}"
-						enabled="{= ${headerAction>enabled} !== undefined ? ${headerAction>enabled} : OP.getDeleteButtonEnabled(${entitySet>@Org.OData.Capabilities.V1.DeleteRestrictions/Deletable@@MODEL.value}, ${headerAction>parentEntityDeleteEnabled})}"
+						enabled="{headerAction>enabled}"
 						press="cmd:DeleteObject"
 						ariaHasPopup="Dialog"
 					/>
@@ -157,7 +152,7 @@
 											text="{dataField>Label}"
 											press="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
 											visible="{headerAction>visible}"
-											enabled="{= ${headerAction>enabled} !== undefined ? ${headerAction>enabled} : OP.getButtonEnabledForAnnotationAction(${isBound>}, ${actionContext>@}, ${dataField>}, ${actionContext>@Org.OData.Core.V1.OperationAvailable@@MODEL.format}) }"
+											enabled="{headerAction>enabled}"
 											type="{= CRIT.buildExpressionForCriticalityButtonType(${dataField>@@UI.getDataModelObjectPath}) }"
 											ariaHasPopup="{actionContext>@@COMMON.isDialog}"
 										/>
@@ -184,5 +179,5 @@
 		</template:repeat>
 	</template:if>
 	<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.RelatedApps" type="XML" />
-	<macro:Share id="fe::Share" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
+	<macro:Share id="fe::Share" shortCutExists="true" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
 </core:FragmentDefinition>

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

@@ -115,7 +115,7 @@
 															entitySet="{targetEntitySet>}"
 															navigationPath="{= MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) ? MODEL.getNavigationPath(${facet>Target/$AnnotationPath}) : ''}"
 															dataFieldCollection="{formContainer>formElements}"
-															visibilityPath="{= ${subSection>./@com.sap.vocabularies.UI.v1.Hidden/$Path} ? ${subSection>./@com.sap.vocabularies.UI.v1.Hidden/$Path} : '' }"
+															visible="{subSection>visible}"
 														/>
 													</template:with>
 												</template:then>
@@ -127,7 +127,7 @@
 														displayMode="Edit"
 														entitySet="{entitySet>}"
 														dataFieldCollection="{formContainer>formElements}"
-														visibilityPath="{= ${subSection>./@com.sap.vocabularies.UI.v1.Hidden/$Path} ? ${subSection>./@com.sap.vocabularies.UI.v1.Hidden/$Path} : '' }"
+														visible="{subSection>visible}"
 													/>
 												</template:else>
 											</template:if>
@@ -138,7 +138,7 @@
 									<f:FormContainer
 										id="{= ${subSection>id} ? ID.generate([${subSection>id}, 'CustomFormContainer', ${subSection>}]) : undefined }"
 										title="{subSection>title}"
-										visible="{subSection>visibile}"
+										visible="{subSection>visible}"
 										dt:designtime="{= ${subSection>flexSettings/designtime} === 'Default' ? 'sap/ui/layout/designtime/form/FormContainer.designtime' : ${subSection>flexSettings/designtime}}"
 									>
 										<f:formElements>

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

@@ -65,7 +65,7 @@
 													ariaHasPopup="{actionContext>@@COMMON.isDialog}"
 													press="{= OP.getPressExpressionForFooterAnnotationAction(${dataField>}, ${entitySet>@sapui.name}, ${footerAction>}) }"
 													visible="{footerAction>visible}"
-													enabled="{= ${footerAction>enabled} !== undefined ? ${footerAction>enabled} : OP.getButtonEnabledForAnnotationAction(${isBound>}, ${actionContext>@}, ${dataField>}, ${actionContext>@Org.OData.Core.V1.OperationAvailable@@MODEL.format}) }"
+													enabled="{footerAction>enabled}"
 													type="{= CRIT.buildExpressionForCriticalityButtonType(${dataField>@@UI.getDataModelObjectPath}) }"
 												/>
 									</template:if>

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

@@ -10,45 +10,41 @@
 			ID: 'sap/fe/core/helpers/StableIdHelper'
 	}"
 >
-	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderFacets}">
-		<template:then>
-			<template:with path="converterContext>headerFacets" var="converterHeaderFacets">
-				<template:repeat list="{converterHeaderFacets>}" var="converterHeaderFacet">
-					<template:if test="{= ${converterHeaderFacet>type} === 'Annotation'}">
-						<!-- Header facets from OData Service Annotations -->
+	<template:with path="converterContext>header/facets" var="converterHeaderFacets">
+		<template:repeat list="{converterHeaderFacets>}" var="converterHeaderFacet">
+			<template:if test="{= ${converterHeaderFacet>type} === 'Annotation'}">
+				<!-- Header facets from OData Service Annotations -->
+			<template:then>
+				<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
+					<template:with path="headerFacet>" var="collectionHeaderFacet">
+						<template:if test="{= ${converterHeaderFacet>facetType} === 'Reference' }">
 						<template:then>
-							<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
-								<template:with path="headerFacet>" var="collectionHeaderFacet">
-									<template:if test="{= ${converterHeaderFacet>facetType} === 'Reference' }">
-										<template:then>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
-										</template:then>
-										<template:elseif test="{= ${converterHeaderFacet>facetType} === 'Collection' }">
-											<fe:StashableVBox
-												id="{= ID.generate(['fe', 'HeaderCollectionFacetContainer', { Facet: ${collectionHeaderFacet>} } ])}"
-												dt:designtime="{= ${converterHeaderFacet>flexSettings/designtime} === 'Default' ? 'sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime' : ${converterHeaderFacet>flexSettings/designtime}}"
-												fl:flexibility="sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility"
-												stashed="{converterHeaderFacet>stashed}"
-												displayInline="true"
-											>
-												<template:repeat list="{converterHeaderFacet>facets}" var="converterHeaderFacet">
-													<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
-														<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
-													</template:with>
-												</template:repeat>
-											</fe:StashableVBox>
-										</template:elseif>
-									</template:if>
-								</template:with>
-							</template:with>
+							<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
 						</template:then>
-						<template:elseif test="{= ${converterHeaderFacet>fragmentName}}">
-							<!-- Custom header facets from manifest (FPM) -->
-							<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacetCustomContainer" type="XML" />
+						<template:elseif test="{= ${converterHeaderFacet>facetType} === 'Collection' }">
+							<fe:StashableVBox
+										id="{= ID.generate(['fe', 'HeaderCollectionFacetContainer', { Facet: ${collectionHeaderFacet>} } ])}"
+										dt:designtime="{= ${converterHeaderFacet>flexSettings/designtime} === 'Default' ? 'sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime' : ${converterHeaderFacet>flexSettings/designtime}}"
+										fl:flexibility="sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility"
+										stashed="{converterHeaderFacet>stashed}"
+										displayInline="true"
+									>
+							<template:repeat list="{converterHeaderFacet>facets}" var="converterHeaderFacet">
+								<template:with path="converterHeaderFacet>annotationPath" var="headerFacet">
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacet" type="XML" />
+								</template:with>
+							</template:repeat>
+							</fe:StashableVBox>
 						</template:elseif>
-					</template:if>
-				</template:repeat>
-			</template:with>
-		</template:then>
-	</template:if>
+						</template:if>
+					</template:with>
+				</template:with>
+			</template:then>
+			<template:elseif test="{= ${converterHeaderFacet>fragmentName}}">
+				<!-- Custom header facets from manifest (FPM) -->
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderFacetCustomContainer" type="XML" />
+			</template:elseif>
+			</template:if>
+		</template:repeat>
+	</template:with>
 </core:FragmentDefinition>

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

@@ -19,15 +19,22 @@
 				text="{sap.fe.i18n>T_HEADER_DATAPOINT_TITLE_LINK_EXTERNAL_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="headerDataPointLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
+			<Title
+				unittest:id="headerDataPointLinkTitleTest"
+				level="H3"
 				visible="{= COMMON.getHeaderDataPointLinkVisibility(ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]), true, ${dataPoint>@@FIELD.isNotAlwaysHidden}) }"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-				class="sapUiTinyMarginBottom"
-			/>
+			>
+				<content>
+					<Link
+						unittest:id="headerDataPointLinkInsideTitleTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${converterHeaderFacet>targetAnnotationValue}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation'], ${manifest>/sap.app/crossNavigation/outbounds})}"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+						class="sapUiTinyMarginBottom"
+					/>
+				</content>
+			</Title>
 
 			<Title
 				unittest:id="headerDataPointTitleTest"
@@ -47,14 +54,17 @@
 				text="{sap.fe.i18n>T_COMMON_HEADERDP_TITLE_LINK_INPAGE_ARIA}"
 				id="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
 			/>
-			<Link
-				unittest:id="HeaderDataPointInternalLinkTest"
-				id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
-				text="{dataPoint>Title@@MODEL.value}"
-				visible="{= !!${dataPoint>Title}}"
-				press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
-				ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
-			/>
+			<Title level="H3" visible="{= !!${dataPoint>Title}}">
+				<content>
+					<Link
+						unittest:id="HeaderDataPointInternalLinkTest"
+						id="{= ID.generate(['fe', 'HeaderDPLink', ${headerFacet>Target/$AnnotationPath}]) }"
+						text="{dataPoint>Title@@MODEL.value}"
+						press="{= OP.getPressExpressionForLink(${viewData>controlConfiguration}[${converterHeaderFacet>targetAnnotationValue}]['navigation']) }"
+						ariaDescribedBy="{= ID.generate(['fe', ${converterHeaderFacet>targetAnnotationValue}, 'AriaText']) }"
+					/>
+				</content>
+			</Title>
 		</template:elseif>
 		<template:else>
 			<Title

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

@@ -3,12 +3,12 @@
 	xmlns="sap.m"
 	xmlns:internalMacro="sap.fe.macros.internal"
 	xmlns:core="sap.ui.core"
-	xmlns:l="sap.ui.layout"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 	template:require="{
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper'
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		FIELD: 'sap/fe/macros/field/FieldHelper'
 	}"
 >
 	<VBox id="{= ${converterHeaderFacet>headerFormData/id} }" displayInline="true">
@@ -38,10 +38,10 @@
 									<Label
 										unittest:id="ObjectPageHeaderLabelTest"
 										id="{= ID.generate([ ${formElement>idPrefix}, 'Label'])}"
-										text="{formElement>label}:"
-										visible="{= ${formElement>label} ? 'true':'false'}"
+										text="{= ${dataField>@@FIELD.computeLabelText} + ':' }"
+										visible="{= !!${dataField>@@FIELD.computeLabelText} }"
 										class="sapUiTinyMarginEnd"
-										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Bottom' }"
+										vAlign="{= ${formElement>isValueMultilineText} === true ? 'Middle' : 'Inherit' }"
 									/>
 									<internalMacro:Field
 										idPrefix="{formElement>idPrefix}"

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

@@ -19,9 +19,15 @@
 	For HeaderFacets, a section to the object page is added which is only visible in edit mode.
 	The object page has one section with one sub-section for all header facets, and a block for each facet.
 	-->
-	<template:with path="converterContext>headerSection" var="headerSection">
+	<template:with path="converterContext>header/section" var="headerSection">
 		<template:if test="{viewData>/editableHeaderContent}">
-			<uxap:ObjectPageSection id="{headerSection>id}" title="{headerSection>title}" visible="{headerSection>visible}" titleUppercase="false">
+			<uxap:ObjectPageSection
+				dt:designtime="not-adaptable-visibility"
+				id="{headerSection>id}"
+				title="{headerSection>title}"
+				visible="{headerSection>visible}"
+				titleUppercase="false"
+			>
 				<uxap:subSections>
 					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection">
 						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.EditableHeaderFacet" type="XML" />