@sap/open.fe 1.96.0 → 1.97.0

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating-dbg.js

@@ -43,14 +43,15 @@ sap.ui.define(["sap/fe/core/helpers/BindingExpression", "sap/fe/core/converters/
    * @returns The binding expression for the object page title
    */
   var getExpressionForTitle = function (oHeaderInfo, oViewData, fullContextPath, oDraftRoot) {
-    var _oHeaderInfo$Title, _oHeaderInfo$Title2, _oHeaderInfo$Title2$V, _oHeaderInfo$Title2$V2, _oHeaderInfo$Title2$V3, _oHeaderInfo$Title2$V4, _oHeaderInfo$Title2$V5, _oHeaderInfo$Title2$V6, _oHeaderInfo$Title2$V7;
+    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, undefined, oViewData.entitySet);
     var titleWithHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE", oViewData.resourceBundle, undefined, oViewData.entitySet);
-    var titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle);
-    var titleValueExpression = annotationExpression(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title = oHeaderInfo.Title) === null || _oHeaderInfo$Title === void 0 ? void 0 : _oHeaderInfo$Title.Value);
+    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(oHeaderInfo === null || oHeaderInfo === void 0 ? void 0 : (_oHeaderInfo$Title2 = oHeaderInfo.Title) === null || _oHeaderInfo$Title2 === void 0 ? void 0 : _oHeaderInfo$Title2.Value);
 
-    if (oHeaderInfo !== null && oHeaderInfo !== void 0 && (_oHeaderInfo$Title2 = oHeaderInfo.Title) !== null && _oHeaderInfo$Title2 !== void 0 && (_oHeaderInfo$Title2$V = _oHeaderInfo$Title2.Value) !== null && _oHeaderInfo$Title2$V !== void 0 && (_oHeaderInfo$Title2$V2 = _oHeaderInfo$Title2$V.$target) !== null && _oHeaderInfo$Title2$V2 !== void 0 && (_oHeaderInfo$Title2$V3 = _oHeaderInfo$Title2$V2.annotations) !== null && _oHeaderInfo$Title2$V3 !== void 0 && (_oHeaderInfo$Title2$V4 = _oHeaderInfo$Title2$V3.Common) !== null && _oHeaderInfo$Title2$V4 !== void 0 && (_oHeaderInfo$Title2$V5 = _oHeaderInfo$Title2$V4.Text) !== null && _oHeaderInfo$Title2$V5 !== void 0 && (_oHeaderInfo$Title2$V6 = _oHeaderInfo$Title2$V5.annotations) !== null && _oHeaderInfo$Title2$V6 !== void 0 && (_oHeaderInfo$Title2$V7 = _oHeaderInfo$Title2$V6.UI) !== null && _oHeaderInfo$Title2$V7 !== void 0 && _oHeaderInfo$Title2$V7.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);
     }
@@ -116,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","oDraftRoot","titleNoHeaderInfo","CommonUtils","getTranslatedText","resourceBundle","undefined","entitySet","titleWithHeaderInfo","titleForActiveHeaderNoHeaderInfo","titleValueExpression","annotationExpression","Title","Value","$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 titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText(\n\t\t\"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO\",\n\t\toViewData.resourceBundle\n\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"]}
+//# 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/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/templating/ObjectPageTemplating.js

@@ -2,4 +2,4 @@
  * SAP UI development toolkit for HTML5 (SAPUI5)
  *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/helpers/BindingExpression","sap/fe/core/converters/helpers/BindingHelper","sap/fe/core/CommonUtils","sap/fe/macros/field/FieldTemplating","sap/fe/core/templating/EntitySetHelper"],function(B,a,C,F,E){"use strict";var _={};var i=E.isStickySessionSupported;var f=F.formatValueRecursively;var b=F.addTextArrangementToBindingExpression;var c=a.Entity;var D=a.Draft;var U=a.UI;var d=B.compileBinding;var e=B.annotationExpression;var g=B.concat;var h=B.isEmpty;var j=B.ifElse;var k=B.and;var l=function(H,v,o,p){var q,r,s,t,u,w,x,y,z;var A=C.getTranslatedText("T_NEW_OBJECT",v.resourceBundle,undefined,v.entitySet);var G=C.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE",v.resourceBundle,undefined,v.entitySet);var I=C.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO",v.resourceBundle);var J=e(H===null||H===void 0?void 0:(q=H.Title)===null||q===void 0?void 0:q.Value);if(H!==null&&H!==void 0&&(r=H.Title)!==null&&r!==void 0&&(s=r.Value)!==null&&s!==void 0&&(t=s.$target)!==null&&t!==void 0&&(u=t.annotations)!==null&&u!==void 0&&(w=u.Common)!==null&&w!==void 0&&(x=w.Text)!==null&&x!==void 0&&(y=x.annotations)!==null&&y!==void 0&&(z=y.UI)!==null&&z!==void 0&&z.TextArrangement){J=b(J,o);}J=f(J,o);var K=H!==null&&H!==void 0&&H.TypeName?g(G,": ",e(H.TypeName.toString())):A;var L=p?c.IsActive:true;return d(j(k(U.IsCreateMode,J&&h(J)),K,j(k(L,J&&h(J)),I,J)));};_.getExpressionForTitle=l;var m=function(H,o){var p,q,r,s,t,u,v,w,x;var y=e(H===null||H===void 0?void 0:(p=H.Description)===null||p===void 0?void 0:p.Value);if(H!==null&&H!==void 0&&(q=H.Description)!==null&&q!==void 0&&(r=q.Value)!==null&&r!==void 0&&(s=r.$target)!==null&&s!==void 0&&(t=s.annotations)!==null&&t!==void 0&&(u=t.Common)!==null&&u!==void 0&&(v=u.Text)!==null&&v!==void 0&&(w=v.annotations)!==null&&w!==void 0&&(x=w.UI)!==null&&x!==void 0&&x.TextArrangement){y=b(y,o);}return d(f(y,o));};_.getExpressionForDescription=m;var n=function(v,o){var s=C.getTranslatedText("T_OP_OBJECT_PAGE_SAVE",v.resourceBundle);var p=C.getTranslatedText("T_OP_OBJECT_PAGE_CREATE",v.resourceBundle);var q;if(i(o.startingEntitySet)){q=j(U.IsCreateModeSticky,p,s);}else{q=j(D.IsNewObject,p,s);}return d(q);};_.getExpressionForSaveButton=n;return _;},false);
+sap.ui.define(["sap/fe/core/helpers/BindingExpression","sap/fe/core/converters/helpers/BindingHelper","sap/fe/core/CommonUtils","sap/fe/macros/field/FieldTemplating","sap/fe/core/templating/EntitySetHelper"],function(B,a,C,F,E){"use strict";var _={};var i=E.isStickySessionSupported;var f=F.formatValueRecursively;var b=F.addTextArrangementToBindingExpression;var c=a.Entity;var D=a.Draft;var U=a.UI;var d=B.compileBinding;var e=B.annotationExpression;var g=B.concat;var h=B.isEmpty;var j=B.ifElse;var k=B.and;var l=function(H,v,o,p){var q,r,s,t,u,w,x,y,z,A;var G=C.getTranslatedText("T_NEW_OBJECT",v.resourceBundle,undefined,v.entitySet);var I=C.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE",v.resourceBundle,undefined,v.entitySet);var J=(H===null||H===void 0?void 0:H.Title)===undefined||(H===null||H===void 0?void 0:H.Title)===""||(H===null||H===void 0?void 0:(q=H.Title)===null||q===void 0?void 0:q.Value)==="";var K=!J?C.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO",v.resourceBundle):"";var L=e(H===null||H===void 0?void 0:(r=H.Title)===null||r===void 0?void 0:r.Value);if(H!==null&&H!==void 0&&(s=H.Title)!==null&&s!==void 0&&(t=s.Value)!==null&&t!==void 0&&(u=t.$target)!==null&&u!==void 0&&(w=u.annotations)!==null&&w!==void 0&&(x=w.Common)!==null&&x!==void 0&&(y=x.Text)!==null&&y!==void 0&&(z=y.annotations)!==null&&z!==void 0&&(A=z.UI)!==null&&A!==void 0&&A.TextArrangement){L=b(L,o);}L=f(L,o);var M=H!==null&&H!==void 0&&H.TypeName?g(I,": ",e(H.TypeName.toString())):G;var N=p?c.IsActive:true;return d(j(k(U.IsCreateMode,L&&h(L)),M,j(k(N,L&&h(L)),K,L)));};_.getExpressionForTitle=l;var m=function(H,o){var p,q,r,s,t,u,v,w,x;var y=e(H===null||H===void 0?void 0:(p=H.Description)===null||p===void 0?void 0:p.Value);if(H!==null&&H!==void 0&&(q=H.Description)!==null&&q!==void 0&&(r=q.Value)!==null&&r!==void 0&&(s=r.$target)!==null&&s!==void 0&&(t=s.annotations)!==null&&t!==void 0&&(u=t.Common)!==null&&u!==void 0&&(v=u.Text)!==null&&v!==void 0&&(w=v.annotations)!==null&&w!==void 0&&(x=w.UI)!==null&&x!==void 0&&x.TextArrangement){y=b(y,o);}return d(f(y,o));};_.getExpressionForDescription=m;var n=function(v,o){var s=C.getTranslatedText("T_OP_OBJECT_PAGE_SAVE",v.resourceBundle);var p=C.getTranslatedText("T_OP_OBJECT_PAGE_CREATE",v.resourceBundle);var q;if(i(o.startingEntitySet)){q=j(U.IsCreateModeSticky,p,s);}else{q=j(D.IsNewObject,p,s);}return d(q);};_.getExpressionForSaveButton=n;return _;},false);

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

@@ -59,10 +59,12 @@ export const getExpressionForTitle = function(
 		oViewData.entitySet
 	);
 
-	const titleForActiveHeaderNoHeaderInfo = CommonUtils.getTranslatedText(
-		"T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO",
-		oViewData.resourceBundle
-	);
+	const oEmptyHeaderInfoTitle =
+		oHeaderInfo?.Title === undefined || oHeaderInfo?.Title === "" || (oHeaderInfo?.Title as DataFieldTypes)?.Value === "";
+
+	const titleForActiveHeaderNoHeaderInfo = !oEmptyHeaderInfoTitle
+		? CommonUtils.getTranslatedText("T_ANNOTATION_HELPER_DEFAULT_OBJECT_PAGE_HEADER_TITLE_NO_HEADER_INFO", oViewData.resourceBundle)
+		: "";
 
 	let titleValueExpression = annotationExpression((oHeaderInfo?.Title as DataFieldTypes)?.Value);
 	if ((oHeaderInfo?.Title as DataFieldTypes)?.Value?.$target?.annotations?.Common?.Text?.annotations?.UI?.TextArrangement) {

package/packages/sap.fe.templates/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/packages/sap.fe.templates/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/packages/sap.fe.templates/src/sap/fe/templates/RootContainer/controller/Fcl-dbg.controller.js

@@ -10,7 +10,7 @@ sap.ui.define(
 		"./RootContainerBaseController",
 		"sap/f/FlexibleColumnLayoutSemanticHelper",
 		"sap/ui/core/Component",
-		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
@@ -22,7 +22,7 @@ sap.ui.define(
 		BaseController,
 		FlexibleColumnLayoutSemanticHelper,
 		Component,
-		CommonUtils,
+		KeepAliveHelper,
 		ViewState,
 		Link,
 		MessagePage,
@@ -537,9 +537,11 @@ sap.ui.define(
 				if (FCLLevel >= this._oFCLConfig.maxColumnsCount) {
 					// The view is on a level > max number of columns. It's always fullscreen without close/exit buttons
 					viewColumn = oFclColName[this._oFCLConfig.maxColumnsCount - 1];
+					oUIState.actionButtonsInfo.midColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.exitFullScreen = null;
 					oUIState.actionButtonsInfo.midColumn.closeColumn = null;
 					oUIState.actionButtonsInfo.endColumn.exitFullScreen = null;
+					oUIState.actionButtonsInfo.endColumn.fullScreen = null;
 					oUIState.actionButtonsInfo.endColumn.closeColumn = null;
 				} else {
 					viewColumn = oFclColName[FCLLevel];
@@ -559,7 +561,13 @@ sap.ui.define(
 				// so we have to add this info manually
 				oUIState.actionButtonsInfo.beginColumn = { fullScreen: null, exitFullScreen: null, closeColumn: null };
 
-				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", Object.assign({}, oUIState.actionButtonsInfo[viewColumn]));
+				var oActionButtonInfos = Object.assign({}, oUIState.actionButtonsInfo[viewColumn]);
+				oActionButtonInfos.switchVisible = oActionButtonInfos.fullScreen !== null || oActionButtonInfos.exitFullScreen !== null;
+				oActionButtonInfos.switchIcon =
+					oActionButtonInfos.fullScreen !== null ? "sap-icon://full-screen" : "sap-icon://exit-full-screen";
+				oActionButtonInfos.isFullScreen = oActionButtonInfos.fullScreen === null;
+
+				oView.getModel("fclhelper").setProperty("/actionButtonsInfo", oActionButtonInfos);
 
 				oView.getModel("fclhelper").setProperty("/showShareIcon", this._updateShareButtonVisibility(viewColumn, sLayout));
 			},
@@ -590,11 +598,7 @@ sap.ui.define(
 
 					// Update the layout of the FlexibleColumnLayout
 					if (sLayout) {
-						if (!this.getFclControl().getModel("fcl")) {
-							this.getFclControl().setModel(new JSONModel(), "fcl");
-							this.getFclControl().bindProperty("layout", "fcl>/layout");
-						}
-						this.getFclControl().setProperty("layout", sLayout);
+						this.getFclControl().setLayout(sLayout);
 					}
 				}
 			},
@@ -750,13 +754,63 @@ sap.ui.define(
 			},
 
 			onContainerReady: function() {
+				// Restore views if neccessary.
 				var aViews = this._getAllVisibleViews();
 				var aRestorePromises = [];
 				aViews.reduce(function(aPromises, oTargetView) {
-					aPromises.push(CommonUtils.restoreView(oTargetView));
+					aPromises.push(KeepAliveHelper.restoreView(oTargetView));
 					return aPromises;
 				}, aRestorePromises);
 				return Promise.all(aRestorePromises);
+			},
+			
+			getRightmostContext: function() {
+				var oContext;
+				switch (this.getFclControl().getLayout()) {
+					case sap.f.LayoutType.OneColumn:
+						if (this.getFclControl().getCurrentBeginColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentBeginColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.TwoColumnsBeginExpanded:
+					case sap.f.LayoutType.TwoColumnsMidExpanded:
+						if (this.getFclControl().getCurrentMidColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.ThreeColumnsEndExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpanded:
+					case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:
+					case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:
+					case sap.f.LayoutType.EndColumnFullScreen:
+						if (this.getFclControl().getCurrentEndColumnPage()) {
+							oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
+						}
+						break;
+
+					case sap.f.LayoutType.MidColumnFullScreen:
+						// In this case we need to determine if this mid column fullscreen comes from a 2 or a 3 column layout
+						var sLayoutWhenExitFullScreen = this.getHelper().getCurrentUIState().actionButtonsInfo.midColumn.exitFullScreen;
+						if (sLayoutWhenExitFullScreen.indexOf("ThreeColumn") >= 0) {
+							// We come from a 3 column layout
+							if (this.getFclControl().getCurrentEndColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();
+							}
+						} else {
+							// We come from a 2 column layout
+							if (this.getFclControl().getCurrentMidColumnPage()) {
+								oContext = _getViewFromContainer(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();
+							}
+						}
+						break;
+
+					default:
+						Log.error("Unhandled switch case for " + this.getFclControl().getLayout());
+				}
+
+				return oContext;
 			}
 		});
 	},

package/packages/sap.fe.templates/src/sap/fe/templates/RootContainer/controller/Fcl.controller.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/base/Log","sap/ui/model/json/JSONModel","./RootContainerBaseController","sap/f/FlexibleColumnLayoutSemanticHelper","sap/ui/core/Component","sap/fe/core/CommonUtils","sap/fe/core/controllerextensions/ViewState","sap/m/Link","sap/m/MessagePage","sap/m/MessageBox"],function(L,J,B,F,C,a,V,b,M,c){"use strict";var d={page:{names:["BeginColumn","MidColumn","EndColumn"],currentGetter:{prefix:"getCurrent",suffix:"Page"},getter:{prefix:"get",suffix:"Pages"}}};var _=function(o){if(o.isA("sap.ui.core.ComponentContainer")){return o.getComponentInstance().getRootControl();}else{return o;}};return B.extend("sap.fe.templates.RootContainer.controller.Fcl",{viewState:V.override({applyInitialStateOnly:function(){return false;},adaptBindingRefreshControls:function(e){this.getView().getController()._getAllVisibleViews().forEach(function(o){var p=new Promise(function(r){r(o);});e.push(p);});},adaptStateControls:function(s){this.getView().getController()._getAllVisibleViews().forEach(function(o){var p=new Promise(function(r){r(o);});s.push(p);});},onRestore:function(){var v=this.getView(),n=v.byId("appContent");var i=n.getModel("internal");var p=i.getProperty("/pages");for(var s in p){i.setProperty("/pages/"+s+"/restoreStatus","pending");}},onSuspend:function(){var f=this.getView().getController();var o=f.getFclControl();var e=o.getBeginColumnPages()||[];var m=o.getMidColumnPages()||[];var E=o.getEndColumnPages()||[];var p=[].concat(e,m,E);p.forEach(function(P){var t=_(P);var g=t&&t.getController();if(g&&g.viewState&&g.viewState.onSuspend){return g.viewState.onSuspend();}});}}),onInit:function(e){B.prototype.onInit.bind(this)();this._internalInit();},attachRouteMatchers:function(){this.getRouter().attachBeforeRouteMatched(this._getViewForNavigatedRowsComputation,this);B.prototype.attachRouteMatchers.apply(this,arguments);this._internalInit();this.getRouter().attachBeforeRouteMatched(this.onBeforeRouteMatched,this);this.getRouter().attachRouteMatched(this.onRouteMatched,this);this.getFclControl().attachStateChange(this._saveLayout,this);},_internalInit:function(){if(this._oRouterProxy){return;}this.sCurrentRouteName="";this.sCurrentArguments={};this.SQUERYKEYNAME="?query";var A=this.getAppComponent();this._oRouterProxy=A.getRouterProxy();this._oFCLConfig={maxColumnsCount:3};var r=A.getManifest()["sap.ui5"].routing;if(r&&r.config){if(r.config.flexibleColumnLayout){var f=r.config.flexibleColumnLayout;if(f.defaultTwoColumnLayoutType){this._oFCLConfig.defaultTwoColumnLayoutType=f.defaultTwoColumnLayoutType;}if(f.defaultThreeColumnLayoutType){this._oFCLConfig.defaultThreeColumnLayoutType=f.defaultThreeColumnLayoutType;}if(f.limitFCLToTwoColumns===true){this._oFCLConfig.maxColumnsCount=2;}}if(r.config.controlAggregation){this._oFCLConfig.defaultControlAggregation=r.config.controlAggregation;}}this._initializeTargetAggregation(A);this._initializeRoutesInformation(A);},getFclControl:function(){return this.getView().getContent()[0];},_saveLayout:function(e){this.sPreviousLayout=e.getParameters().layout;},_getViewForNavigatedRowsComputation:function(){var A=this._getAllVisibleViews(this.sPreviousLayout);var r=A[A.length-1];var R;var t=this;t.getRouter().attachEventOnce("routeMatched",function(e){R=_(e.getParameter("views")[e.getParameter("views").length-1]);if(r){if(R.getViewData()&&R.getViewData().viewLevel===t._oFCLConfig.maxColumnsCount){t.oAdditionalViewForNavRowsComputation=R;}if(R.getViewData()&&r.getViewData()&&r.getViewData().viewLevel<t._oFCLConfig.maxColumnsCount&&r.getViewData()&&r.getViewData().viewLevel>R.getViewData().viewLevel&&R!==r){t.oAdditionalViewForNavRowsComputation=r;}}});},getViewForNavigatedRowsComputation:function(){return this.oAdditionalViewForNavRowsComputation;},onExit:function(){this.getRouter().detachRouteMatched(this.onRouteMatched,this);this.getRouter().detachBeforeRouteMatched(this.onBeforeRouteMatched,this);this.getFclControl().detachStateChange(this.onStateChanged,this);this.getFclControl().detachAfterEndColumnNavigate(this.onStateChanged,this);this._oTargetsAggregation=null;this._oTargetsFromRoutePattern=null;B.prototype.onExit.bind(this)();},isFclEnabled:function(){return true;},displayMessagePage:function(e,p){var f=this.getFclControl();if(this._oFCLConfig&&p.FCLLevel>=this._oFCLConfig.maxColumnsCount){p.FCLLevel=this._oFCLConfig.maxColumnsCount-1;}if(!this.aMessagePages){this.aMessagePages=[null,null,null];}var m=this.aMessagePages[p.FCLLevel];if(!m){m=new M({showHeader:false,icon:"sap-icon://message-error"});this.aMessagePages[p.FCLLevel]=m;switch(p.FCLLevel){case 0:f.addBeginColumnPage(m);break;case 1:f.addMidColumnPage(m);break;default:f.addEndColumnPage(m);}}m.setText(e);if(p.technicalMessage){m.setCustomDescription(new b({text:p.description||p.technicalMessage,press:function(){c.show(p.technicalMessage,{icon:c.Icon.ERROR,title:p.title,actions:[c.Action.OK],defaultAction:c.Action.OK,details:p.technicalDetails||"",contentWidth:"60%"});}}));}else{m.setDescription(p.description||"");}f.to(m.getId());},_initializeTargetAggregation:function(A){var m=A.getManifest(),t=m["sap.ui5"].routing?m["sap.ui5"].routing.targets:null,e=this;this._oTargetsAggregation={};if(t){Object.keys(t).forEach(function(T){var o=t[T];if(o.controlAggregation){e._oTargetsAggregation[T]={aggregation:o.controlAggregation,pattern:o.contextPattern};}else{e._oTargetsAggregation[T]={aggregation:"page",pattern:null};}});}},_initializeRoutesInformation:function(A){var m=A.getManifest(),r=m["sap.ui5"].routing?m["sap.ui5"].routing.routes:null,t=this;this._oTargetsFromRoutePattern={};if(r){r.forEach(function(e){t._oTargetsFromRoutePattern[e.pattern]=e.target;});}},getCurrentArgument:function(){return this.sCurrentArguments;},getCurrentRouteName:function(){return this.sCurrentRouteName;},getConstants:function(){return d;},getTargetAggregation:function(){return this._oTargetsAggregation;},onRouteMatched:function(e){var r=e.getParameter("name");this.sCurrentRouteName=r;this.sCurrentArguments=e.getParameter("arguments");},_scrollTablesToLastNavigatedItems:function(){var v=this._getAllVisibleViews();if(v.length>1||v[0].getViewData().viewLevel<this._oFCLConfig.maxColumnsCount){var s,A=this.getViewForNavigatedRowsComputation();if(A&&v.indexOf(A)===-1){v.push(A);}for(var i=v.length-1;i>0;i--){var o=v[i],p=v[i-1];if(o.getBindingContext()){s=o.getBindingContext().getPath();p.getController()._scrollTablesToRow(s);}}}},onStateChanged:function(e){var i=e.getParameter("isNavigationArrow");if(this.sCurrentArguments!==undefined){if(!this.sCurrentArguments[this.SQUERYKEYNAME]){this.sCurrentArguments[this.SQUERYKEYNAME]={};}this.sCurrentArguments[this.SQUERYKEYNAME].layout=e.getParameter("layout");}this._forceModelContextChangeOnBreadCrumbs(e);if(i){this._oRouterProxy.navTo(this.sCurrentRouteName,this.sCurrentArguments);}},_forceModelContextChangeOnBreadCrumbs:function(e){var f=e.getSource(),p=[];p=p.concat(f.getBeginColumnPages()).concat(f.getMidColumnPages()).concat(f.getEndColumnPages());p.forEach(function(P){var v=_(P);var o=v.byId&&v.byId("breadcrumbs");if(o){o.fireModelContextChange();}});},_updateShareButtonVisibility:function(v,l){var s;switch(l){case"OneColumn":s=v==="beginColumn";break;case"MidColumnFullScreen":case"ThreeColumnsBeginExpandedEndHidden":case"ThreeColumnsMidExpandedEndHidden":case"TwoColumnsBeginExpanded":case"TwoColumnsMidExpanded":s=v==="midColumn";break;case"EndColumnFullScreen":case"ThreeColumnsEndExpanded":case"ThreeColumnsMidExpanded":s=v==="endColumn";break;default:s=false;}return s;},updateUIStateForView:function(v,e){var u=this.getHelper().getCurrentUIState(),f=["beginColumn","midColumn","endColumn"],l=this.getFclControl().getLayout(),g;if(!v.getModel("fclhelper")){v.setModel(this._createHelperModel(),"fclhelper");}if(e>=this._oFCLConfig.maxColumnsCount){g=f[this._oFCLConfig.maxColumnsCount-1];u.actionButtonsInfo.midColumn.exitFullScreen=null;u.actionButtonsInfo.midColumn.closeColumn=null;u.actionButtonsInfo.endColumn.exitFullScreen=null;u.actionButtonsInfo.endColumn.closeColumn=null;}else{g=f[e];}if(e>=this._oFCLConfig.maxColumnsCount||l==="EndColumnFullScreen"||l==="MidColumnFullScreen"||l==="OneColumn"){v.getModel("fclhelper").setProperty("/breadCrumbIsVisible",true);}else{v.getModel("fclhelper").setProperty("/breadCrumbIsVisible",false);}u.actionButtonsInfo.beginColumn={fullScreen:null,exitFullScreen:null,closeColumn:null};v.getModel("fclhelper").setProperty("/actionButtonsInfo",Object.assign({},u.actionButtonsInfo[g]));v.getModel("fclhelper").setProperty("/showShareIcon",this._updateShareButtonVisibility(g,l));},onBeforeRouteMatched:function(e){if(e){var q=e.getParameters().arguments[this.SQUERYKEYNAME];var l=q?q.layout:null;if(!l){var n=this.getHelper().getNextUIState(0);l=n.layout;}var t=e.getParameter("config").target;l=this._correctLayoutForTargets(l,t);if(l){if(!this.getFclControl().getModel("fcl")){this.getFclControl().setModel(new J(),"fcl");this.getFclControl().bindProperty("layout","fcl>/layout");}this.getFclControl().setProperty("layout",l);}}},getHelper:function(){return F.getInstanceFor(this.getFclControl(),this._oFCLConfig);},calculateLayout:function(n,h,p){if(!p){p=this.getHelper().getNextUIState(n).layout;}var r=this.getRouter().getRouteByHash(h+"?layout="+p);var t=this._oTargetsFromRoutePattern[r.getPattern()];return this._correctLayoutForTargets(p,t);},_correctLayoutForTargets:function(p,t){var e={"2":["TwoColumnsMidExpanded","TwoColumnsBeginExpanded","MidColumnFullScreen"],"3":["ThreeColumnsMidExpanded","ThreeColumnsEndExpanded","ThreeColumnsMidExpandedEndHidden","ThreeColumnsBeginExpandedEndHidden","MidColumnFullScreen","EndColumnFullScreen"]};if(t&&!Array.isArray(t)){t=[t];}if(!t){return p;}else if(t.length>1){var l=e[t.length];if(l.indexOf(p)<0){p=l[0];}}else{var T=this.getTargetAggregation()[t[0]].aggregation||this._oFCLConfig.defaultControlAggregation;switch(T){case"beginColumnPages":p="OneColumn";break;case"midColumnPages":p="MidColumnFullScreen";break;case"endColumnPages":p="EndColumnFullScreen";break;}}return p;},_getAllVisibleViews:function(l){var v=[];l=!!l?l:this.getFclControl().getLayout();switch(l){case sap.f.LayoutType.EndColumnFullScreen:if(this.getFclControl().getCurrentEndColumnPage()){v.push(_(this.getFclControl().getCurrentEndColumnPage()));}break;case sap.f.LayoutType.MidColumnFullScreen:if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}break;case sap.f.LayoutType.OneColumn:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}break;case sap.f.LayoutType.ThreeColumnsEndExpanded:case sap.f.LayoutType.ThreeColumnsMidExpanded:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}if(this.getFclControl().getCurrentEndColumnPage()){v.push(_(this.getFclControl().getCurrentEndColumnPage()));}break;case sap.f.LayoutType.TwoColumnsBeginExpanded:case sap.f.LayoutType.TwoColumnsMidExpanded:case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}break;default:L.error("Unhandled switch case for "+this.getFclControl().getLayout());}return v;},onContainerReady:function(){var v=this._getAllVisibleViews();var r=[];v.reduce(function(p,t){p.push(a.restoreView(t));return p;},r);return Promise.all(r);}});},true);
+sap.ui.define(["sap/base/Log","sap/ui/model/json/JSONModel","./RootContainerBaseController","sap/f/FlexibleColumnLayoutSemanticHelper","sap/ui/core/Component","sap/fe/core/helpers/KeepAliveHelper","sap/fe/core/controllerextensions/ViewState","sap/m/Link","sap/m/MessagePage","sap/m/MessageBox"],function(L,J,B,F,C,K,V,a,M,b){"use strict";var c={page:{names:["BeginColumn","MidColumn","EndColumn"],currentGetter:{prefix:"getCurrent",suffix:"Page"},getter:{prefix:"get",suffix:"Pages"}}};var _=function(o){if(o.isA("sap.ui.core.ComponentContainer")){return o.getComponentInstance().getRootControl();}else{return o;}};return B.extend("sap.fe.templates.RootContainer.controller.Fcl",{viewState:V.override({applyInitialStateOnly:function(){return false;},adaptBindingRefreshControls:function(d){this.getView().getController()._getAllVisibleViews().forEach(function(o){var p=new Promise(function(r){r(o);});d.push(p);});},adaptStateControls:function(s){this.getView().getController()._getAllVisibleViews().forEach(function(o){var p=new Promise(function(r){r(o);});s.push(p);});},onRestore:function(){var v=this.getView(),n=v.byId("appContent");var i=n.getModel("internal");var p=i.getProperty("/pages");for(var s in p){i.setProperty("/pages/"+s+"/restoreStatus","pending");}},onSuspend:function(){var f=this.getView().getController();var o=f.getFclControl();var d=o.getBeginColumnPages()||[];var m=o.getMidColumnPages()||[];var e=o.getEndColumnPages()||[];var p=[].concat(d,m,e);p.forEach(function(P){var t=_(P);var g=t&&t.getController();if(g&&g.viewState&&g.viewState.onSuspend){return g.viewState.onSuspend();}});}}),onInit:function(e){B.prototype.onInit.bind(this)();this._internalInit();},attachRouteMatchers:function(){this.getRouter().attachBeforeRouteMatched(this._getViewForNavigatedRowsComputation,this);B.prototype.attachRouteMatchers.apply(this,arguments);this._internalInit();this.getRouter().attachBeforeRouteMatched(this.onBeforeRouteMatched,this);this.getRouter().attachRouteMatched(this.onRouteMatched,this);this.getFclControl().attachStateChange(this._saveLayout,this);},_internalInit:function(){if(this._oRouterProxy){return;}this.sCurrentRouteName="";this.sCurrentArguments={};this.SQUERYKEYNAME="?query";var A=this.getAppComponent();this._oRouterProxy=A.getRouterProxy();this._oFCLConfig={maxColumnsCount:3};var r=A.getManifest()["sap.ui5"].routing;if(r&&r.config){if(r.config.flexibleColumnLayout){var f=r.config.flexibleColumnLayout;if(f.defaultTwoColumnLayoutType){this._oFCLConfig.defaultTwoColumnLayoutType=f.defaultTwoColumnLayoutType;}if(f.defaultThreeColumnLayoutType){this._oFCLConfig.defaultThreeColumnLayoutType=f.defaultThreeColumnLayoutType;}if(f.limitFCLToTwoColumns===true){this._oFCLConfig.maxColumnsCount=2;}}if(r.config.controlAggregation){this._oFCLConfig.defaultControlAggregation=r.config.controlAggregation;}}this._initializeTargetAggregation(A);this._initializeRoutesInformation(A);},getFclControl:function(){return this.getView().getContent()[0];},_saveLayout:function(e){this.sPreviousLayout=e.getParameters().layout;},_getViewForNavigatedRowsComputation:function(){var A=this._getAllVisibleViews(this.sPreviousLayout);var r=A[A.length-1];var R;var t=this;t.getRouter().attachEventOnce("routeMatched",function(e){R=_(e.getParameter("views")[e.getParameter("views").length-1]);if(r){if(R.getViewData()&&R.getViewData().viewLevel===t._oFCLConfig.maxColumnsCount){t.oAdditionalViewForNavRowsComputation=R;}if(R.getViewData()&&r.getViewData()&&r.getViewData().viewLevel<t._oFCLConfig.maxColumnsCount&&r.getViewData()&&r.getViewData().viewLevel>R.getViewData().viewLevel&&R!==r){t.oAdditionalViewForNavRowsComputation=r;}}});},getViewForNavigatedRowsComputation:function(){return this.oAdditionalViewForNavRowsComputation;},onExit:function(){this.getRouter().detachRouteMatched(this.onRouteMatched,this);this.getRouter().detachBeforeRouteMatched(this.onBeforeRouteMatched,this);this.getFclControl().detachStateChange(this.onStateChanged,this);this.getFclControl().detachAfterEndColumnNavigate(this.onStateChanged,this);this._oTargetsAggregation=null;this._oTargetsFromRoutePattern=null;B.prototype.onExit.bind(this)();},isFclEnabled:function(){return true;},displayMessagePage:function(e,p){var f=this.getFclControl();if(this._oFCLConfig&&p.FCLLevel>=this._oFCLConfig.maxColumnsCount){p.FCLLevel=this._oFCLConfig.maxColumnsCount-1;}if(!this.aMessagePages){this.aMessagePages=[null,null,null];}var m=this.aMessagePages[p.FCLLevel];if(!m){m=new M({showHeader:false,icon:"sap-icon://message-error"});this.aMessagePages[p.FCLLevel]=m;switch(p.FCLLevel){case 0:f.addBeginColumnPage(m);break;case 1:f.addMidColumnPage(m);break;default:f.addEndColumnPage(m);}}m.setText(e);if(p.technicalMessage){m.setCustomDescription(new a({text:p.description||p.technicalMessage,press:function(){b.show(p.technicalMessage,{icon:b.Icon.ERROR,title:p.title,actions:[b.Action.OK],defaultAction:b.Action.OK,details:p.technicalDetails||"",contentWidth:"60%"});}}));}else{m.setDescription(p.description||"");}f.to(m.getId());},_initializeTargetAggregation:function(A){var m=A.getManifest(),t=m["sap.ui5"].routing?m["sap.ui5"].routing.targets:null,d=this;this._oTargetsAggregation={};if(t){Object.keys(t).forEach(function(T){var o=t[T];if(o.controlAggregation){d._oTargetsAggregation[T]={aggregation:o.controlAggregation,pattern:o.contextPattern};}else{d._oTargetsAggregation[T]={aggregation:"page",pattern:null};}});}},_initializeRoutesInformation:function(A){var m=A.getManifest(),r=m["sap.ui5"].routing?m["sap.ui5"].routing.routes:null,t=this;this._oTargetsFromRoutePattern={};if(r){r.forEach(function(d){t._oTargetsFromRoutePattern[d.pattern]=d.target;});}},getCurrentArgument:function(){return this.sCurrentArguments;},getCurrentRouteName:function(){return this.sCurrentRouteName;},getConstants:function(){return c;},getTargetAggregation:function(){return this._oTargetsAggregation;},onRouteMatched:function(e){var r=e.getParameter("name");this.sCurrentRouteName=r;this.sCurrentArguments=e.getParameter("arguments");},_scrollTablesToLastNavigatedItems:function(){var v=this._getAllVisibleViews();if(v.length>1||v[0].getViewData().viewLevel<this._oFCLConfig.maxColumnsCount){var s,A=this.getViewForNavigatedRowsComputation();if(A&&v.indexOf(A)===-1){v.push(A);}for(var i=v.length-1;i>0;i--){var o=v[i],p=v[i-1];if(o.getBindingContext()){s=o.getBindingContext().getPath();p.getController()._scrollTablesToRow(s);}}}},onStateChanged:function(e){var i=e.getParameter("isNavigationArrow");if(this.sCurrentArguments!==undefined){if(!this.sCurrentArguments[this.SQUERYKEYNAME]){this.sCurrentArguments[this.SQUERYKEYNAME]={};}this.sCurrentArguments[this.SQUERYKEYNAME].layout=e.getParameter("layout");}this._forceModelContextChangeOnBreadCrumbs(e);if(i){this._oRouterProxy.navTo(this.sCurrentRouteName,this.sCurrentArguments);}},_forceModelContextChangeOnBreadCrumbs:function(e){var f=e.getSource(),p=[];p=p.concat(f.getBeginColumnPages()).concat(f.getMidColumnPages()).concat(f.getEndColumnPages());p.forEach(function(P){var v=_(P);var o=v.byId&&v.byId("breadcrumbs");if(o){o.fireModelContextChange();}});},_updateShareButtonVisibility:function(v,l){var s;switch(l){case"OneColumn":s=v==="beginColumn";break;case"MidColumnFullScreen":case"ThreeColumnsBeginExpandedEndHidden":case"ThreeColumnsMidExpandedEndHidden":case"TwoColumnsBeginExpanded":case"TwoColumnsMidExpanded":s=v==="midColumn";break;case"EndColumnFullScreen":case"ThreeColumnsEndExpanded":case"ThreeColumnsMidExpanded":s=v==="endColumn";break;default:s=false;}return s;},updateUIStateForView:function(v,d){var u=this.getHelper().getCurrentUIState(),f=["beginColumn","midColumn","endColumn"],l=this.getFclControl().getLayout(),e;if(!v.getModel("fclhelper")){v.setModel(this._createHelperModel(),"fclhelper");}if(d>=this._oFCLConfig.maxColumnsCount){e=f[this._oFCLConfig.maxColumnsCount-1];u.actionButtonsInfo.midColumn.fullScreen=null;u.actionButtonsInfo.midColumn.exitFullScreen=null;u.actionButtonsInfo.midColumn.closeColumn=null;u.actionButtonsInfo.endColumn.exitFullScreen=null;u.actionButtonsInfo.endColumn.fullScreen=null;u.actionButtonsInfo.endColumn.closeColumn=null;}else{e=f[d];}if(d>=this._oFCLConfig.maxColumnsCount||l==="EndColumnFullScreen"||l==="MidColumnFullScreen"||l==="OneColumn"){v.getModel("fclhelper").setProperty("/breadCrumbIsVisible",true);}else{v.getModel("fclhelper").setProperty("/breadCrumbIsVisible",false);}u.actionButtonsInfo.beginColumn={fullScreen:null,exitFullScreen:null,closeColumn:null};var A=Object.assign({},u.actionButtonsInfo[e]);A.switchVisible=A.fullScreen!==null||A.exitFullScreen!==null;A.switchIcon=A.fullScreen!==null?"sap-icon://full-screen":"sap-icon://exit-full-screen";A.isFullScreen=A.fullScreen===null;v.getModel("fclhelper").setProperty("/actionButtonsInfo",A);v.getModel("fclhelper").setProperty("/showShareIcon",this._updateShareButtonVisibility(e,l));},onBeforeRouteMatched:function(e){if(e){var q=e.getParameters().arguments[this.SQUERYKEYNAME];var l=q?q.layout:null;if(!l){var n=this.getHelper().getNextUIState(0);l=n.layout;}var t=e.getParameter("config").target;l=this._correctLayoutForTargets(l,t);if(l){this.getFclControl().setLayout(l);}}},getHelper:function(){return F.getInstanceFor(this.getFclControl(),this._oFCLConfig);},calculateLayout:function(n,h,p){if(!p){p=this.getHelper().getNextUIState(n).layout;}var r=this.getRouter().getRouteByHash(h+"?layout="+p);var t=this._oTargetsFromRoutePattern[r.getPattern()];return this._correctLayoutForTargets(p,t);},_correctLayoutForTargets:function(p,t){var d={"2":["TwoColumnsMidExpanded","TwoColumnsBeginExpanded","MidColumnFullScreen"],"3":["ThreeColumnsMidExpanded","ThreeColumnsEndExpanded","ThreeColumnsMidExpandedEndHidden","ThreeColumnsBeginExpandedEndHidden","MidColumnFullScreen","EndColumnFullScreen"]};if(t&&!Array.isArray(t)){t=[t];}if(!t){return p;}else if(t.length>1){var l=d[t.length];if(l.indexOf(p)<0){p=l[0];}}else{var T=this.getTargetAggregation()[t[0]].aggregation||this._oFCLConfig.defaultControlAggregation;switch(T){case"beginColumnPages":p="OneColumn";break;case"midColumnPages":p="MidColumnFullScreen";break;case"endColumnPages":p="EndColumnFullScreen";break;}}return p;},_getAllVisibleViews:function(l){var v=[];l=!!l?l:this.getFclControl().getLayout();switch(l){case sap.f.LayoutType.EndColumnFullScreen:if(this.getFclControl().getCurrentEndColumnPage()){v.push(_(this.getFclControl().getCurrentEndColumnPage()));}break;case sap.f.LayoutType.MidColumnFullScreen:if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}break;case sap.f.LayoutType.OneColumn:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}break;case sap.f.LayoutType.ThreeColumnsEndExpanded:case sap.f.LayoutType.ThreeColumnsMidExpanded:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}if(this.getFclControl().getCurrentEndColumnPage()){v.push(_(this.getFclControl().getCurrentEndColumnPage()));}break;case sap.f.LayoutType.TwoColumnsBeginExpanded:case sap.f.LayoutType.TwoColumnsMidExpanded:case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:if(this.getFclControl().getCurrentBeginColumnPage()){v.push(_(this.getFclControl().getCurrentBeginColumnPage()));}if(this.getFclControl().getCurrentMidColumnPage()){v.push(_(this.getFclControl().getCurrentMidColumnPage()));}break;default:L.error("Unhandled switch case for "+this.getFclControl().getLayout());}return v;},onContainerReady:function(){var v=this._getAllVisibleViews();var r=[];v.reduce(function(p,t){p.push(K.restoreView(t));return p;},r);return Promise.all(r);},getRightmostContext:function(){var o;switch(this.getFclControl().getLayout()){case sap.f.LayoutType.OneColumn:if(this.getFclControl().getCurrentBeginColumnPage()){o=_(this.getFclControl().getCurrentBeginColumnPage()).getBindingContext();}break;case sap.f.LayoutType.TwoColumnsBeginExpanded:case sap.f.LayoutType.TwoColumnsMidExpanded:if(this.getFclControl().getCurrentMidColumnPage()){o=_(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();}break;case sap.f.LayoutType.ThreeColumnsEndExpanded:case sap.f.LayoutType.ThreeColumnsMidExpanded:case sap.f.LayoutType.ThreeColumnsMidExpandedEndHidden:case sap.f.LayoutType.ThreeColumnsBeginExpandedEndHidden:case sap.f.LayoutType.EndColumnFullScreen:if(this.getFclControl().getCurrentEndColumnPage()){o=_(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();}break;case sap.f.LayoutType.MidColumnFullScreen:var l=this.getHelper().getCurrentUIState().actionButtonsInfo.midColumn.exitFullScreen;if(l.indexOf("ThreeColumn")>=0){if(this.getFclControl().getCurrentEndColumnPage()){o=_(this.getFclControl().getCurrentEndColumnPage()).getBindingContext();}}else{if(this.getFclControl().getCurrentMidColumnPage()){o=_(this.getFclControl().getCurrentMidColumnPage()).getBindingContext();}}break;default:L.error("Unhandled switch case for "+this.getFclControl().getLayout());}return o;}});},true);

package/packages/sap.fe.templates/src/sap/fe/templates/RootContainer/controller/NavContainer-dbg.controller.js

@@ -8,12 +8,14 @@ sap.ui.define(
 		"sap/ui/model/json/JSONModel",
 		"./RootContainerBaseController",
 		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
 		"sap/fe/core/controllerextensions/ViewState",
 		"sap/m/Link",
 		"sap/m/MessagePage",
-		"sap/m/MessageBox"
+		"sap/m/MessageBox",
+		"sap/base/Log"
 	],
-	function(JSONModel, BaseController, CommonUtils, ViewState, Link, MessagePage, MessageBox) {
+	function(JSONModel, BaseController, CommonUtils, KeepAliveHelper, ViewState, Link, MessagePage, MessageBox, Log) {
 		"use strict";
 
 		/**
@@ -73,7 +75,7 @@ sap.ui.define(
 
 				return oPagePromise.then(function(oCurrentPage) {
 					var oTargetView = CommonUtils.getTargetView(oCurrentPage);
-					return CommonUtils.restoreView(oTargetView);
+					return KeepAliveHelper.restoreView(oTargetView);
 				});
 			},
 
@@ -127,40 +129,60 @@ sap.ui.define(
 			_scrollTablesToLastNavigatedItems: function() {},
 
 			displayMessagePage: function(sErrorMessage, mParameters) {
-				var oNavContainer = this._getNavContainer();
+				return new Promise(
+					function(resolve, reject) {
+						try {
+							var oNavContainer = this._getNavContainer();
+
+							if (!this.oMessagePage) {
+								this.oMessagePage = new MessagePage({
+									showHeader: false,
+									icon: "sap-icon://message-error"
+								});
 
-				if (!this.oMessagePage) {
-					this.oMessagePage = new MessagePage({
-						showHeader: false,
-						icon: "sap-icon://message-error"
-					});
+								oNavContainer.addPage(this.oMessagePage);
+							}
 
-					oNavContainer.addPage(this.oMessagePage);
-				}
+							this.oMessagePage.setText(sErrorMessage);
+
+							if (mParameters.technicalMessage) {
+								this.oMessagePage.setCustomDescription(
+									new Link({
+										text: mParameters.description || mParameters.technicalMessage,
+										press: function() {
+											MessageBox.show(mParameters.technicalMessage, {
+												icon: MessageBox.Icon.ERROR,
+												title: mParameters.title,
+												actions: [MessageBox.Action.OK],
+												defaultAction: MessageBox.Action.OK,
+												details: mParameters.technicalDetails || "",
+												contentWidth: "60%"
+											});
+										}
+									})
+								);
+							} else {
+								this.oMessagePage.setDescription(mParameters.description || "");
+							}
 
-				this.oMessagePage.setText(sErrorMessage);
-
-				if (mParameters.technicalMessage) {
-					this.oMessagePage.setCustomDescription(
-						new Link({
-							text: mParameters.description || mParameters.technicalMessage,
-							press: function() {
-								MessageBox.show(mParameters.technicalMessage, {
-									icon: MessageBox.Icon.ERROR,
-									title: mParameters.title,
-									actions: [MessageBox.Action.OK],
-									defaultAction: MessageBox.Action.OK,
-									details: mParameters.technicalDetails || "",
-									contentWidth: "60%"
+							if (mParameters.handleShellBack) {
+								var oErrorOriginPage = oNavContainer.getCurrentPage(),
+									oAppComponent = CommonUtils.getAppComponent(oNavContainer.getCurrentPage());
+								oAppComponent.getShellServices().setBackNavigation(function() {
+									oNavContainer.to(oErrorOriginPage.getId());
+									oAppComponent.getShellServices().setBackNavigation();
 								});
 							}
-						})
-					);
-				} else {
-					this.oMessagePage.setDescription(mParameters.description || "");
-				}
-
-				oNavContainer.to(this.oMessagePage.getId());
+							oNavContainer.attachAfterNavigate(function() {
+								resolve(true);
+							});
+							oNavContainer.to(this.oMessagePage.getId());
+						} catch (e) {
+							reject(false);
+							Log.info(e);
+						}
+					}.bind(this)
+				);
 			}
 		});
 	},

package/packages/sap.fe.templates/src/sap/fe/templates/RootContainer/controller/NavContainer.controller.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/json/JSONModel","./RootContainerBaseController","sap/fe/core/CommonUtils","sap/fe/core/controllerextensions/ViewState","sap/m/Link","sap/m/MessagePage","sap/m/MessageBox"],function(J,B,C,V,L,M,a){"use strict";return B.extend("sap.fe.templates.RootContainer.controller.NavContainer",{viewState:V.override({applyInitialStateOnly:function(){return false;},adaptBindingRefreshControls:function(c){var v=this.getView(),o=v.getController();c.push(o._getCurrentPage(v));},adaptStateControls:function(s){var v=this.getView(),c=v.getController();s.push(c._getCurrentPage(v));},onRestore:function(){var v=this.getView(),n=v.byId("appContent");var i=n.getModel("internal");var p=i.getProperty("/pages");for(var c in p){i.setProperty("/pages/"+c+"/restoreStatus","pending");}},onSuspend:function(){var v=this.getView(),n=v.byId("appContent");var p=n.getPages();p.forEach(function(P){var t=C.getTargetView(P);var c=t&&t.getController();if(c&&c.viewState&&c.viewState.onSuspend){return c.viewState.onSuspend();}});}}),onContainerReady:function(){var v=this.getView(),p=this._getCurrentPage(v);return p.then(function(c){var t=C.getTargetView(c);return C.restoreView(t);});},_getCurrentPage:function(v){return new Promise(function(r){var n=v.byId("appContent");var c=n.getCurrentPage();if(c&&c.getController&&c.getController().isPlaceholder&&c.getController().isPlaceholder()){c.getController().attachEventOnce("targetPageInsertedInContainer",function(e){var T=e.getParameter("targetpage");var t=C.getTargetView(T);r(t!==v&&t);});}else{var t=C.getTargetView(c);r(t!==v&&t);}});},_getNavContainer:function(){return this.getView().getContent()[0];},isFclEnabled:function(){return false;},_scrollTablesToLastNavigatedItems:function(){},displayMessagePage:function(e,p){var n=this._getNavContainer();if(!this.oMessagePage){this.oMessagePage=new M({showHeader:false,icon:"sap-icon://message-error"});n.addPage(this.oMessagePage);}this.oMessagePage.setText(e);if(p.technicalMessage){this.oMessagePage.setCustomDescription(new L({text:p.description||p.technicalMessage,press:function(){a.show(p.technicalMessage,{icon:a.Icon.ERROR,title:p.title,actions:[a.Action.OK],defaultAction:a.Action.OK,details:p.technicalDetails||"",contentWidth:"60%"});}}));}else{this.oMessagePage.setDescription(p.description||"");}n.to(this.oMessagePage.getId());}});},true);
+sap.ui.define(["sap/ui/model/json/JSONModel","./RootContainerBaseController","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/fe/core/controllerextensions/ViewState","sap/m/Link","sap/m/MessagePage","sap/m/MessageBox","sap/base/Log"],function(J,B,C,K,V,L,M,a,b){"use strict";return B.extend("sap.fe.templates.RootContainer.controller.NavContainer",{viewState:V.override({applyInitialStateOnly:function(){return false;},adaptBindingRefreshControls:function(c){var v=this.getView(),o=v.getController();c.push(o._getCurrentPage(v));},adaptStateControls:function(s){var v=this.getView(),c=v.getController();s.push(c._getCurrentPage(v));},onRestore:function(){var v=this.getView(),n=v.byId("appContent");var i=n.getModel("internal");var p=i.getProperty("/pages");for(var c in p){i.setProperty("/pages/"+c+"/restoreStatus","pending");}},onSuspend:function(){var v=this.getView(),n=v.byId("appContent");var p=n.getPages();p.forEach(function(P){var t=C.getTargetView(P);var c=t&&t.getController();if(c&&c.viewState&&c.viewState.onSuspend){return c.viewState.onSuspend();}});}}),onContainerReady:function(){var v=this.getView(),p=this._getCurrentPage(v);return p.then(function(c){var t=C.getTargetView(c);return K.restoreView(t);});},_getCurrentPage:function(v){return new Promise(function(r){var n=v.byId("appContent");var c=n.getCurrentPage();if(c&&c.getController&&c.getController().isPlaceholder&&c.getController().isPlaceholder()){c.getController().attachEventOnce("targetPageInsertedInContainer",function(e){var T=e.getParameter("targetpage");var t=C.getTargetView(T);r(t!==v&&t);});}else{var t=C.getTargetView(c);r(t!==v&&t);}});},_getNavContainer:function(){return this.getView().getContent()[0];},isFclEnabled:function(){return false;},_scrollTablesToLastNavigatedItems:function(){},displayMessagePage:function(E,p){return new Promise(function(r,c){try{var n=this._getNavContainer();if(!this.oMessagePage){this.oMessagePage=new M({showHeader:false,icon:"sap-icon://message-error"});n.addPage(this.oMessagePage);}this.oMessagePage.setText(E);if(p.technicalMessage){this.oMessagePage.setCustomDescription(new L({text:p.description||p.technicalMessage,press:function(){a.show(p.technicalMessage,{icon:a.Icon.ERROR,title:p.title,actions:[a.Action.OK],defaultAction:a.Action.OK,details:p.technicalDetails||"",contentWidth:"60%"});}}));}else{this.oMessagePage.setDescription(p.description||"");}if(p.handleShellBack){var o=n.getCurrentPage(),A=C.getAppComponent(n.getCurrentPage());A.getShellServices().setBackNavigation(function(){n.to(o.getId());A.getShellServices().setBackNavigation();});}n.attachAfterNavigate(function(){r(true);});n.to(this.oMessagePage.getId());}catch(e){c(false);b.info(e);}}.bind(this));}});},true);

package/packages/sap.fe.templates/src/sap/fe/templates/RootContainer/controller/RootContainerBaseController-dbg.js

@@ -54,12 +54,12 @@ sap.ui.define(
 				this.oPlaceholder.attachRouteMatchers();
 				this.getAppComponent()
 					.getRoutingService()
-					.attachAfterRouteMatched(this.shellTitleHandler, this);
+					.attachAfterRouteMatched(this._onAfterRouteMatched, this);
 			},
 			onExit: function() {
 				this.getAppComponent()
 					.getRoutingService()
-					.detachAfterRouteMatched(this.shellTitleHandler, this);
+					.detachAfterRouteMatched(this._onAfterRouteMatched, this);
 				this.oRouter = null;
 
 				SizeHelper.exit();
@@ -133,46 +133,49 @@ sap.ui.define(
 			},
 
 			/**
-			 * This function is updating the shell title after each navigation.
+			 * Callback when the navigation is done.
+			 *  - update the shell title.
+			 *  - update table scroll.
+			 *  - call onPageReady on the rightMostView.
 			 *
 			 * @param oEvent
-			 * @name sap.fe.templates.RootContainer.controller.BaseController#shellTitleHandler
+			 * @name sap.fe.templates.RootContainer.controller.BaseController#_onAfterRouteMatched
 			 * @memberof sap.fe.templates.RootContainer.controller.BaseController
 			 */
-			shellTitleHandler: function(oEvent) {
+			_onAfterRouteMatched: function(oEvent) {
 				var that = this;
-				if (!that.oShellTitlePromise) {
-					that.oShellTitlePromise = that
+				if (!that._oRouteMatchedPromise) {
+					that._oRouteMatchedPromise = that
 						.waitForRightMostViewReady(oEvent)
 						.then(function(oView) {
+							// The autoFocus is initially disabled on the navContainer or the FCL, so that the focus stays on the Shell menu
+							// even if the app takes a long time to launch
+							// The first time the view is displayed, we need to enable the autofocus so that it's managed properly during navigation
+							var oRootControl = that.getView().getContent()[0];
+							if (oRootControl && oRootControl.getAutoFocus && !oRootControl.getAutoFocus()) {
+								oRootControl.setProperty("autoFocus", true, true); // Do not mark the container as invalid, otherwise it's re-rendered
+							}
+
 							var oAppComponent = that.getAppComponent();
 							var oData = { oView: oView, oAppComponent: oAppComponent };
 							that._scrollTablesToLastNavigatedItems();
 							if (oAppComponent.getEnvironmentCapabilities().getCapabilities().UShell) {
 								that.computeTitleHierarchy(oData);
 							}
-							var oLastFocusedControl = oAppComponent.getRouterProxy().getFocusControlForCurrentHash();
+							var bForceFocus = oAppComponent.getRouterProxy().isFocusForced();
+							oAppComponent.getRouterProxy().setFocusForced(false); // reset
 							if (oView.getController() && oView.getController().onPageReady) {
-								if (oLastFocusedControl) {
-									oView.getParent().onPageReady({ lastFocusedControl: oLastFocusedControl });
-								} else {
-									var currentFocusedControlId = sap.ui.getCore().getCurrentFocusedControlId();
-									var oCurrentFocusedControl = {
-										controlId: currentFocusedControlId,
-										focusInfo: { id: currentFocusedControlId }
-									};
-									oView.getParent().onPageReady({ lastFocusedControl: oCurrentFocusedControl });
-								}
+								oView.getParent().onPageReady({ forceFocus: bForceFocus });
 							}
 							if (that.onContainerReady) {
 								that.onContainerReady();
 							}
-
-							that.oShellTitlePromise = null;
 						})
 						.catch(function(oError) {
 							Log.error("An error occurs while computing the title hierarchy and calling focus method", oError);
-							that.oShellTitlePromise = null;
+						})
+						.finally(function() {
+							that._oRouteMatchedPromise = null;
 						});
 				}
 			},