@sapui5/sap.ushell 1.130.1 → 1.131.1

package/src/main/js/sap/ushell/components/workPageBuilder/resources/resources_zh_TW.properties

@@ -1,5 +1,4 @@
 
-
 WorkPage.EmptyPage.Title=\u7A7A\u767D\u9801\u9762
 WorkPage.EmptyPage.Message=\u6B64\u9801\u9762\u5C1A\u672A\u5305\u542B\u5340\u6BB5\u3002
 WorkPage.EmptyPage.Button.Add=\u65B0\u589E\u5340\u6BB5
@@ -8,6 +7,7 @@ WorkPage.EditMode.Save=\u5132\u5B58
 WorkPage.EditMode.Cancel=\u53D6\u6D88
 WorkPage.Message.WidgetMoved=\u5DF2\u79FB\u52D5 Widget
 
+
 WorkPage.Row.OverflowToolbar.RowTitleLabel=\u5340\u6BB5\u6A19\u984C
 WorkPage.Row.OverflowToolbar.RowTitleOptional=\u8F38\u5165\u9078\u64C7\u6027\u5340\u6BB5\u6A19\u984C
 WorkPage.Row.OverflowToolbar.DeleteRowButtonText=\u79FB\u9664\u5340\u6BB5
@@ -21,6 +21,8 @@ WorkPage.Row.MessageStrip.DeprecatedColumnCount=\u5728\u57F7\u884C\u6642\u671F\u
 WorkPage.Row.AriaLabel=\u5DE5\u4F5C\u9801\u9762\u5340\u6BB5
 WorkPage.Row.Unnamed.AriaLabel=\u4F4D\u7F6E {0} \u7684\u672A\u547D\u540D\u5340\u6BB5
 WorkPage.Row.Named.AriaLabel={0} \u5340\u6BB5
+
+
 WorkPage.Column.AriaLabel=\u6B04 {0}/{1}
 WorkPage.Column.AddWidgetButtonText=\u65B0\u589E Widget
 WorkPage.Column.DeleteColumnButtonTooltip=\u79FB\u9664\u6B04
@@ -28,6 +30,7 @@ WorkPage.Column.AddColumnButtonTooltip=\u65B0\u589E\u6B04
 WorkPage.Column.EmptyIllustrationTitle=\u641C\u5C0B\u61C9\u7528\u7A0B\u5F0F
 WorkPage.Column.EmptyIllustrationDescription=\u5C07\u61C9\u7528\u7A0B\u5F0F\u52A0\u5165 Widget\uFF0C\u6216\u662F\u4E0D\u9700\u8981\u6642\u522A\u9664 Widget\u3002
 
+
 WorkPage.Cell.HeaderBar.AddTilesTooltip=\u65B0\u589E\u61C9\u7528\u7A0B\u5F0F
 WorkPage.Cell.HeaderBar.DeleteWidgetTooltip=\u522A\u9664 Widget
 WorkPage.Cell.EmptyIllustrationTitle=\u641C\u5C0B\u61C9\u7528\u7A0B\u5F0F
@@ -37,9 +40,11 @@ WorkPage.Cell.DeleteDialog.ConfirmText=\u60A8\u78BA\u5B9A\u8981\u522A\u9664\u6B6
 WorkPage.Cell.DeleteDialog.Button.Confirm=\u522A\u9664
 WorkPage.Cell.DeleteDialog.Button.Cancel=\u53D6\u6D88
 
+
 WorkPage.WidgetContainer.OpenWidgetSettingsButtonTooltip=\u958B\u555F Widget \u8A2D\u5B9A
 WorkPage.WidgetContainer.DeleteWidgetButtonTooltip=\u522A\u9664 Widget
 
+
 WorkPage.Section.AddVizInstanceButtonText=\u65B0\u589E\u529F\u80FD\u78DA
 
 
@@ -49,9 +54,11 @@ ContentFinder.Widgets.Tiles.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89
 ContentFinder.Widgets.Cards.Title=\u5361\u7247
 ContentFinder.Widgets.Cards.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89BA\u8868\u793A\u65B9\u5F0F (\u4F9D\u5F48\u6027\u914D\u7F6E\u986F\u793A)\u3002
 
+
 ContentFinder.CategoryTree.Category.AllTiles=\u6240\u6709\u529F\u80FD\u78DA
 ContentFinder.CategoryTree.Category.Catalogs=\u76EE\u9304
 
+
 WorkPage.CardEditor.Save=\u5132\u5B58
 WorkPage.CardEditor.Cancel=\u53D6\u6D88
 WorkPage.CardEditor.Title=\u7D44\u614B "{0}"
@@ -59,6 +66,7 @@ WorkPage.CardEditor.Title.NoCardTitle=\u7D44\u614B
 WorkPage.Card.ActionDefinition.Configure=\u7D44\u614B
 WorkPage.Card.ActionDefinition.Reset=\u522A\u9664\u7D44\u614B
 
+
 WorkPage.Host.Context.WorkZone.Label=SAP Build Work Zone
 WorkPage.Host.Context.WorkZone.CurrentUser.Label=\u76EE\u524D\u4F7F\u7528\u8005
 WorkPage.Host.Context.WorkZone.CurrentUser.Id.Label=SAP Build Work Zone \u4F7F\u7528\u8005 ID

package/src/main/js/sap/ushell/components/workPageRuntime/Component.js

@@ -3,7 +3,7 @@
  * @fileOverview WorkPages Runtime Component
  * This UIComponent gets initialized by the FLP renderer if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.130.1
+ * @version 1.131.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageRuntime controller for WorkPageRuntime view
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/workPageRuntime/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.workPageRuntime",
         "applicationVersion": {
-            "version": "1.130.1"
+            "version": "1.131.1"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/library.js

@@ -35,7 +35,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Library.init({
         name: "sap.ushell",
-        version: "1.130.1",
+        version: "1.131.1",
         dependencies: [
             "sap.ui.core",
             "sap.m"

package/src/main/js/sap/ushell/navigationMode.js

@@ -11,7 +11,7 @@
  * Method Compute is used by ClientSide TargetResolution and takes not only the
  * next application but also the current application into account.
  *
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/Log",
@@ -29,6 +29,7 @@ sap.ui.define([
     let aDoables = [];
     let bHomePageLoaded = false;
     let bInitialized = false;
+    let bCloseExplaceStarted = false;
 
     let oStatisticalRecord, // current statistical record
         oCurrentApplication,
@@ -127,6 +128,7 @@ sap.ui.define([
      * @returns {sap.ushell.performance.StatisticalRecord} The current statistical record
      */
     function _getOrCreateCurrentStatisticalRecord () {
+
         if (!oStatisticalRecord) {
             const oLastRecord = aStatisticalRecords[aStatisticalRecords.length - 1] || null;
             oStatisticalRecord = new StatisticalRecord(oLastRecord);
@@ -140,6 +142,10 @@ sap.ui.define([
      * @param {string} sNewHash New hash value
      */
     function trackNewTargetHash (sNewHash) {
+        if (bCloseExplaceStarted) {
+            bCloseExplaceStarted = false;
+            return;
+        }
         const oRecord = _getOrCreateCurrentStatisticalRecord();
         oRecord.setTargetHash(sNewHash);
         oRecord.setTimeStart(lastHashChangeTime || performance.now());
@@ -329,6 +335,7 @@ sap.ui.define([
      * Closes explace navigation
      */
     function _closeExplaceNavigation () {
+        bCloseExplaceStarted = true;
         const oRecordTmp = oStatisticalRecord;
         oStatisticalRecord = null;
         const oCurrentApp = getCurrentApplication();
@@ -447,6 +454,7 @@ sap.ui.define([
         aStatisticalRecords = [];
         oStatisticalRecord = null;
         bInitialized = false;
+        bCloseExplaceStarted = false;
     }
 
     return {

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.130.1
+ * @version 1.131.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.130.1",
+                version: "1.131.1",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -104,9 +104,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.130.1",
+            version: "1.131.1",
             dependencies: {
-                version: "1.130.1",
+                version: "1.131.1",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -1062,6 +1062,16 @@ sap.ui.define([
         this.shellCtrl.setNavigationBar(oNavigationBar);
     };
 
+    /**
+     * @param {sap.ui.core.Control} oSideNavigation The SideNavigation Control
+     *
+     * @private
+     * @since 1.131.0
+     */
+    Renderer.prototype.setSideNavigation = function (oSideNavigation) {
+        this.shellCtrl.setSideNavigation(oSideNavigation);
+    };
+
     /**
      * @param {sap.ui.core.Control | HTMLElement} oShellShapes The shapes
      *

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -86,7 +86,8 @@ sap.ui.define([
 ) => {
     "use strict";
 
-    const ShellLayoutMapping = ShellLayout.LAYOUT_MAPPING;
+    // shortcut for sap.ushell.renderer.ShellLayout.ShellArea
+    const ShellArea = ShellLayout.ShellArea;
 
     // shortcut for sap.ui.core.routing.HistoryDirection
     const Ui5HistoryDirection = library.routing.HistoryDirection;
@@ -365,7 +366,7 @@ sap.ui.define([
             if (Device.system.desktop) {
                 sap.ui.require(["sap/ushell/renderer/AccessKeysHandler"], (AccessKeysHandler) => {
                     oView.waitForShellLayout().then(() => {
-                        const oNavigationBar = document.getElementById(ShellLayoutMapping.NavigationBar);
+                        const oNavigationBar = document.getElementById(ShellArea.NavigationBar);
                         oNavigationBar.addEventListener("focusin", () => {
                             // focus not in the shell
                             AccessKeysHandler.bFocusOnShell = false;
@@ -376,7 +377,7 @@ sap.ui.define([
                             AccessKeysHandler.bFocusOnShell = true;
                             AccessKeysHandler.bFocusPassedToExternalHandlerFirstTime = true;
                         });
-                        const oRootView = document.getElementById(ShellLayoutMapping.RendererRootView);
+                        const oRootView = document.getElementById(ShellArea.RendererRootView);
                         oRootView.addEventListener("focusin", () => {
                             // focus not in the shell
                             AccessKeysHandler.bFocusOnShell = false;
@@ -1588,7 +1589,8 @@ sap.ui.define([
                     sBasicShellHash, // sAppId
                     oParsedShellHash,
                     oResolvedHashFragment,
-                    sOldShellHash
+                    sOldShellHash,
+                    bNavigationFromHome
                 );
 
                 // todo: [FLPCOREANDUX-10024] TBD
@@ -1673,7 +1675,7 @@ sap.ui.define([
             let oPostBodyParams;
             try {
                 if (ushellUtils.isSAPLegacyApplicationType(sAppType, sFrameworkId)) {
-                    const oFLPParams = {};
+                    const oFLPParams = Object.create(null);
                     const Navigation = await Container.getServiceAsync("Navigation");
                     const oAppStatesInfo = ushellUtils.getParamKeys(sUrlWithSapUserAndShellParam);
 
@@ -1889,7 +1891,7 @@ sap.ui.define([
         },
 
         _setMenuVisible: function (bVisible) {
-            const navigationBar = document.getElementById(ShellLayoutMapping.NavigationBar);
+            const navigationBar = document.getElementById(ShellArea.NavigationBar);
             if (!navigationBar) {
                 return;
             }
@@ -2143,16 +2145,21 @@ sap.ui.define([
         },
 
         setNavigationBar: function (oNavigationBar) {
-            oNavigationBar.placeAt(ShellLayoutMapping.NavigationBar, "only");
+            oNavigationBar.placeAt(ShellArea.NavigationBar, "only");
             this.addDanglingControl(oNavigationBar);
         },
 
+        setSideNavigation: function (oSideNavigation) {
+            oSideNavigation.placeAt(ShellArea.SideNavigation, "only");
+            this.addDanglingControl(oSideNavigation);
+        },
+
         setShellShapes: function (oShellShapes) {
             if (oShellShapes.placeAt) {
-                oShellShapes.placeAt(ShellLayoutMapping.ShellShapes, "only");
+                oShellShapes.placeAt(ShellArea.ShellShapes, "only");
                 this.addDanglingControl(oShellShapes);
             } else if (oShellShapes instanceof Node) {
-                document.getElementById(ShellLayoutMapping.ShellShapes).appendChild(oShellShapes);
+                document.getElementById(ShellArea.ShellShapes).appendChild(oShellShapes);
             }
         },
 
@@ -2167,7 +2174,7 @@ sap.ui.define([
             }
 
             StateManager.updateAllBaseStates("footer.content", Operation.Set, oFooter.getId());
-            oFooter.placeAt(ShellLayoutMapping.Footer, "only");
+            oFooter.placeAt(ShellArea.Footer, "only");
             this.addDanglingControl(oFooter);
 
             if (oFooter._applyContextClassFor) {

package/src/main/js/sap/ushell/renderer/Shell.view.js

@@ -54,7 +54,8 @@ sap.ui.define([
     // shortcut for sap.ushell.state.StateManager.ShellMode
     const ShellMode = StateManager.ShellMode;
 
-    const ShellLayoutMapping = ShellLayout.LAYOUT_MAPPING;
+    // shortcut for sap.ushell.renderer.ShellLayout.ShellArea
+    const ShellArea = ShellLayout.ShellArea;
 
     const BINDING_TYPE = {
         Property: "Property",
@@ -118,7 +119,7 @@ sap.ui.define([
 
         initBackgroundImage: function () {
             this.waitForShellLayout().then(function () {
-                var oDomRef = document.getElementById(ShellLayoutMapping.BackgroundImage);
+                var oDomRef = document.getElementById(ShellArea.BackgroundImage);
                 var sBackgroundHtml = [
                     // "Shell Canvas" category in ThemeDesigner
                     "<div class='sapUiShellBackgroundImage sapUiGlobalBackgroundImageForce sapUshellShellBG sapContrastPlus'></div>",
@@ -163,7 +164,7 @@ sap.ui.define([
                 this._oShellHeader = oShellHeader;
 
                 this.waitForShellLayout().then(function () {
-                    oShellHeader.placeAt(ShellLayoutMapping.ShellHeader, "only");
+                    oShellHeader.placeAt(ShellArea.ShellHeader, "only");
                     oHeaderController.onInit();
                 });
             }.bind(this));
@@ -180,7 +181,7 @@ sap.ui.define([
                     }
 
                     this.waitForShellLayout().then(function () {
-                        var navigationBar = document.getElementById(ShellLayoutMapping.NavigationBar);
+                        var navigationBar = document.getElementById(ShellArea.NavigationBar);
                         navigationBar.classList.add("sapUshellMenuBarHeight");
                     });
                 }.bind(this))
@@ -211,7 +212,7 @@ sap.ui.define([
                     resolve();
 
                     this.waitForShellLayout().then(function () {
-                        oRightFloatingContainer.placeAt(ShellLayoutMapping.RightFloatingContainer, "only");
+                        oRightFloatingContainer.placeAt(ShellArea.RightFloatingContainer, "only");
                     });
                 }.bind(this));
             }.bind(this)));
@@ -249,7 +250,7 @@ sap.ui.define([
                 this.addDanglingControl(oSubHeader);
 
                 this.waitForShellLayout().then(function () {
-                    oSubHeader.placeAt(ShellLayoutMapping.SubHeader, "only");
+                    oSubHeader.placeAt(ShellArea.SubHeader, "only");
                 });
             }.bind(this));
         },
@@ -278,7 +279,7 @@ sap.ui.define([
                 this.addDanglingControl(oSidePane);
 
                 this.waitForShellLayout().then(function () {
-                    oSidePane.placeAt(ShellLayoutMapping.SidePane, "only");
+                    oSidePane.placeAt(ShellArea.SidePane, "only");
                 });
             }.bind(this));
         },
@@ -299,7 +300,7 @@ sap.ui.define([
                 this.addDanglingControl(oShellToolArea);
 
                 this.waitForShellLayout().then(function () {
-                    oShellToolArea.placeAt(ShellLayoutMapping.ToolArea, "only");
+                    oShellToolArea.placeAt(ShellArea.ToolArea, "only");
                 });
             }.bind(this));
         },
@@ -322,7 +323,7 @@ sap.ui.define([
                 this.addDanglingControl(oShellFloatingActions);
 
                 this.waitForShellLayout().then(function () {
-                    oShellFloatingActions.placeAt(ShellLayoutMapping.FloatingActions, "only");
+                    oShellFloatingActions.placeAt(ShellArea.FloatingActions, "only");
                 });
             }.bind(this));
         },

package/src/main/js/sap/ushell/renderer/ShellLayout.js

@@ -7,69 +7,196 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var LAYOUT_MAPPING = {
+    /**
+     * @alias sap.ushell.renderer.ShellLayout.ShellArea
+     * @enum {string}
+     * Enumeration of shell areas. Used to access the DOM elements of the shell layout.
+     *
+     * @example
+     *   const ShellArea = ShellLayout.ShellArea;
+     *   const oShellHeader = document.getElementById(ShellArea.ShellHeader);
+     *
+     * @private
+     */
+    const ShellArea = {
+        /**
+         * Root node of the shell layout.
+         *
+         * @private
+         */
         RootDomRef: "shellLayout",
+
+        /**
+         * The Shell header node.
+         *
+         * @private
+         */
         ShellHeader: "header-shellArea",
+
+        /**
+         * The Renderer root view node containing the runtime and applications.
+         * The actual id might be changed dynamically once the layout is applied.
+         *
+         * @private
+         */
         RendererRootView: "canvas", // default
+
+        /**
+         * The side navigation node.
+         *
+         * @since 1.131.0
+         * @private
+         */
+        SideNavigation: "sideNavigation-shellArea",
+
+        /**
+         * The side pane node. {@link sap.ushell.services.FrameBoundExtension.SidePane} is rendered here.
+         *
+         * @private
+         */
         SidePane: "sidePane-shellArea",
+
+        /**
+         * The footer node. {@link sap.ushell.services.FrameBoundExtension.Footer} is rendered here.
+         *
+         * @private
+         */
         Footer: "footer-shellArea",
+
+        /**
+         * The tool area node. {@link sap.ushell.services.FrameBoundExtension.ToolArea} is rendered here.
+         *
+         * @private
+         */
         ToolArea: "toolArea-shellArea",
+
+        /**
+         * The sub header node. Items created via {@link sap.ushell.services.FrameBoundExtension#createSubHeader} are rendered here.
+         *
+         * @private
+         */
         SubHeader: "subHeader-shellArea",
+
+        /**
+         * The navigation bar node.
+         *
+         * @private
+         */
         NavigationBar: "navigationBar-shellArea",
-        FloatingActions: "floatingActions-shellArea", // deprecated
+
+        /**
+         * The floating actions node. Used by deprecated Renderer API {@link sap.ushell.renderers.fiori2.Renderer#addFloatingButton}.
+         *
+         * @private
+         */
+        FloatingActions: "floatingActions-shellArea",
+
+        /**
+         * The Floating Container node. It contains the component wrapping the floating container.
+         * This node is moved in and out of the docking areas.
+         *
+         * @private
+         */
         FloatingContainer: "floatingContainer-shellArea",
+
+        /**
+         * The node used to dock the floating container at the start of the shell area.
+         *
+         * @private
+         */
         FloatingContainerDockStart: "floatingContainerDockStart-shellArea",
+
+        /**
+         * The node used to dock the floating container at the end of the shell area.
+         *
+         * @private
+         */
         FloatingContainerDockEnd: "floatingContainerDockEnd-shellArea",
+
+        /**
+         * The shapes node. It is used to render the background shapes.
+         * The shapes are only visible for sap_belize if the
+         * <code>renderers/fiori2/componentData/config/enableBackGroundShapes</code> flag is enabled.
+         *
+         * @see sap.ushell.CanvasShapesManager
+         *
+         * @private
+         */
         ShellShapes: "shapes-shellArea",
+
+        /**
+         * The right floating container node. It is used to render the notifications.
+         *
+         * @private
+         */
         RightFloatingContainer: "rightFloatingContainer-shellArea",
+
+        /**
+         * The background image node. It is used to render the background images.
+         *
+         * @private
+         */
         BackgroundImage: "backgroundImage-shellArea",
+
+        /**
+         * The help content node. It used by the WebAssistant and SAP Companion.
+         *
+         * @private
+         */
         HelpContent: "helpContent-shellArea"
     };
 
     function applyLayout (sRendererPlaceAtElementId) {
         var oRendererPlaceAtElement = document.getElementById(sRendererPlaceAtElementId);
-        LAYOUT_MAPPING.RendererRootView = sRendererPlaceAtElementId;
+        ShellArea.RendererRootView = sRendererPlaceAtElementId;
 
         // data-sap-ui-root-content
         // Controls like sap/m/App change the element styles of all parents
         // This attribute is a marker to stop changing more parents
 
+        /* eslint-disable max-len */
         var sHTMLTemplate = [
-            "<div id='shellLayout' class='sapUshellFlexRow'>",
-            "    <div id='backgroundImage-shellArea' data-sap-ui-root-content=true></div>",
-            "    <div id='shapes-shellArea' data-sap-ui-root-content=true></div>",
+            `<div id='${ShellArea.RootDomRef}' class='sapUshellFlexRow'>`,
+            `    <div id='${ShellArea.BackgroundImage}' data-sap-ui-root-content=true></div>`,
+            `    <div id='${ShellArea.ShellShapes}' data-sap-ui-root-content=true></div>`,
             // the area "sapUshellPopupWithinArea" helps the WebAssistant colleagues to prevent popup overlaps (see sap.ui.core.Popup.setWithinArea)
             "    <div id='sapUshellPopupWithinArea' class='sapUshellFlexGrowShrink sapUshellFlexRow'>",
-            "        <div id='floatingContainerDockStart-shellArea' class='sapUshellFloatingContainerDock' data-sap-ui-root-content=true></div>",
+            `        <div id='${ShellArea.FloatingContainerDockStart}' class='sapUshellFloatingContainerDock' data-sap-ui-root-content=true></div>`,
             "        <div class='sapUshellFlexGrowShrink sapUshellFlexColumn'>",
-            "            <div id='header-shellArea' data-sap-ui-root-content=true></div>",
-            "            <div id='subHeader-shellArea' data-sap-ui-root-content=true></div>",
+            `            <div id='${ShellArea.ShellHeader}' data-sap-ui-root-content=true></div>`,
             "            <div class='sapUshellFlexGrowShrink sapUshellFlexRow'>",
-            "                <div id='toolArea-shellArea' class='sapUshellPositionRelative' data-sap-ui-root-content=true></div>",
-            "                <div id='sidePane-shellArea' data-sap-ui-root-content=true></div>",
+            `                <div id='${ShellArea.SideNavigation}' data-sap-ui-root-content=true></div>`,
             "                <div class='sapUshellFlexGrowShrink sapUshellFlexColumn'>",
-            "                    <div id='navigationBar-shellArea' data-sap-ui-root-content=true></div>",
-            "                    <div class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellOverflowHidden sapUshellFlexColumn'>",
-            "                        <div id='" + LAYOUT_MAPPING.RendererRootView + "' class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellShell' data-sap-ui-root-content=true></div>",
-            "                        <div id='floatingActions-shellArea' data-sap-ui-root-content=true></div>", // deprecated
-            "                        <div id='rightFloatingContainer-shellArea' data-sap-ui-root-content=true></div>",
+            `                    <div id='${ShellArea.SubHeader}' data-sap-ui-root-content=true></div>`,
+            "                    <div class='sapUshellFlexGrowShrink sapUshellFlexRow'>",
+            `                        <div id='${ShellArea.ToolArea}' class='sapUshellPositionRelative' data-sap-ui-root-content=true></div>`,
+            `                        <div id='${ShellArea.SidePane}' data-sap-ui-root-content=true></div>`,
+            "                        <div class='sapUshellFlexGrowShrink sapUshellFlexColumn'>",
+            `                            <div id='${ShellArea.NavigationBar}' data-sap-ui-root-content=true></div>`,
+            "                            <div class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellOverflowHidden sapUshellFlexColumn'>",
+            `                                <div id='${ShellArea.RendererRootView}' class='sapUshellFlexGrowShrink sapUshellPositionRelative sapUshellShell' data-sap-ui-root-content=true></div>`,
+            `                                <div id='${ShellArea.FloatingActions}' data-sap-ui-root-content=true></div>`, // deprecated Renderer API
+            `                                <div id='${ShellArea.RightFloatingContainer}' data-sap-ui-root-content=true></div>`,
+            "                            </div>",
+            "                        </div>",
             "                    </div>",
             "                </div>",
             "            </div>",
-            "            <footer id='footer-shellArea' class='sapUshellPositionStatic sapMPageFooter' data-sap-ui-root-content=true></footer>",
+            `            <footer id='${ShellArea.Footer}' class='sapUshellPositionStatic sapMPageFooter' data-sap-ui-root-content=true></footer>`,
             "        </div>",
-            "        <div id='floatingContainerDockEnd-shellArea' class='sapUshellFloatingContainerDock' data-sap-ui-root-content=true></div>",
-            "        <div id='floatingContainer-shellArea' data-sap-ui-root-content=true></div>",
+            `        <div id='${ShellArea.FloatingContainerDockEnd}' class='sapUshellFloatingContainerDock' data-sap-ui-root-content=true></div>`,
+            `        <div id='${ShellArea.FloatingContainer}' data-sap-ui-root-content=true></div>`,
             "    </div>",
-            "    <div id='helpContent-shellArea' data-sap-ui-root-content=true></div>",
+            `    <div id='${ShellArea.HelpContent}' data-sap-ui-root-content=true></div>`,
             "</div>"
         ].join("\n");
+        /* eslint-enable max-len */
 
-        var bLayoutAlreadyApplied = Object.keys(LAYOUT_MAPPING).some(function (sShellArea) {
+        var bLayoutAlreadyApplied = Object.keys(ShellArea).some(function (sShellArea) {
             if (sShellArea === "RendererRootView") { // canvas might be present already
                 return false;
             }
-            var sShellAreaDomRef = LAYOUT_MAPPING[sShellArea];
+            var sShellAreaDomRef = ShellArea[sShellArea];
             return !!document.getElementById(sShellAreaDomRef);
         });
 
@@ -85,15 +212,15 @@ sap.ui.define([
     }
 
     function destroyLayout () {
-        var oRootDomRef = document.getElementById(LAYOUT_MAPPING.RootDomRef);
+        var oRootDomRef = document.getElementById(ShellArea.RootDomRef);
         if (oRootDomRef) {
-            document.getElementById(LAYOUT_MAPPING.RootDomRef).remove();
+            document.getElementById(ShellArea.RootDomRef).remove();
         }
     }
 
     return {
         applyLayout: applyLayout,
         destroyLayout: destroyLayout,
-        LAYOUT_MAPPING: LAYOUT_MAPPING
+        ShellArea: ShellArea
     };
 });

package/src/main/js/sap/ushell/renderer/resources/resources.properties

@@ -422,9 +422,9 @@ fail_tile_operation_some_actions=Could not complete all your actions
 #XMSG
 fail_to_start_app_try_later=Could not open app. Please try again later.
 #XMSG
-failed_to_open_app_missing_configuration_or_role_assignment=App could not be opened either due to an incorrect configuration or missing role assignment.
+failed_to_open_app_missing_configuration_or_role_assignment=Sorry, the app couldn't be opened.
 #YMSG
-cannot_resolve_navigation_target_details=The navigation target "{0}" of the app could not be resolved. This can be caused e.g. by an incorrect SAP Fiori launchpad content configuration or an incorrect or missing role assignment.
+cannot_resolve_navigation_target_details=The navigation target "{0}" of the app could not be resolved. This can be caused, for example, by an incorrect content configuration, an incorrect or missing role assignment, or because your current device is not supported.
 #XMSG
 failed_to_open_ui5_component=App could not be opened because the SAPUI5 component of the application could not be loaded.
 #XMSG
@@ -563,7 +563,7 @@ appFrameworkVersion=Framework Version
 #XFLD
 productName=Product Name
 #XFLD
-appId=ID
+appId=Fiori ID
 #XFLD
 appVersion=Version
 #XFLD