@sapui5/sap.ushell 1.126.1 → 1.127.1

package/src/main/js/sap/ushell/themes/sap_hcb/base_shared.less

@@ -0,0 +1,40 @@
+/* =============================================== */
+/* Shared styles for all other CSS of this library */
+/* =============================================== */
+
+/* In order to override any unwanted scrolling, overflow should be hidden */
+html {
+  overflow: hidden;
+}
+
+/* Shared between ShellLayout and ShellHeader */
+@_sap_ushell_ShellHeader_BarHeight: 2.75rem;
+@_sap_ushell_CoPilot_DockingWidth: 26rem;
+
+/* For cross-browser compatible animations */
+.opacity(@opacity: 0.5) {
+  opacity: @opacity;
+}
+
+.transition(...) {
+  -webkit-transition: @arguments;
+  -moz-transition: @arguments;
+  transition: @arguments;
+}
+
+.sapUshellIframeDialog .sapMDialogScrollCont {
+  height: 100%;
+}
+
+.sapUShellFullHeight {
+  height: 100%;
+  overflow-y: hidden;
+}
+
+.sapUshellFullWidth {
+  width: 100%
+}
+
+.sapUshellZeroOpacity {
+  opacity: 0;
+}

package/src/main/js/sap/ushell/themes/sap_hcb/library.source.less

@@ -1,7 +1,76 @@
 /*!
  * Copyright (c) 2009-2023 SAP SE, All Rights Reserved
  */
-@import "../base/library.source.less";
+/***********************************************************************************
+/* Due to deprecation of sap_hcb with SAPUI5 version 1.46 the library.source.less
+/* file of base is resolved: Imports to base.less and global.less of
+/* base are added to this library.source.less file (sap_hcb) and the
+/* respective control css files of base are added to the sap_hcb theme folder.
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.126.
+***********************************************************************************/
+
+@import "../../../ui/core/themes/base/base.less";
+@import "../../../ui/core/themes/base/global.less";
+
+@import "base_shared.less";
+@import "base_ActionMode.less";
+@import "base_AddBookmarkButton.less";
+@import "base_AnchorItem.less";
+@import "base_AnchorNavigationBar.less";
+@import "base_AppearanceView.less";
+@import "base_ApplicationContainer.less";
+@import "base_Catalog.less";
+@import "base_ContentFinder.less";
+@import "base_ContactSupport.less";
+@import "base_CustomGroupHeaderListItem.less";
+@import "base_Dashboard.less";
+@import "base_DynamicTile.less";
+@import "base_Factsheet.less";
+@import "base_FloatingContainer.less";
+@import "base_FlpSettings.less";
+@import "base_GroupList.less";
+@import "base_GroupListItem.less";
+@import "base_IconFonts.less";
+@import "base_ImageTile.less";
+@import "base_LoadingDialog.less";
+@import "base_MenuBar.less";
+@import "base_Notifications.less";
+@import "base_Page.less";
+@import "base_PictureTile.less";
+@import "base_PictureViewer.less";
+@import "base_PlusTile.less";
+@import "base_QuickAccess.less";
+@import "base_RightFloatingContainerItem.less";
+@import "base_SearchFLP.less";
+@import "base_SearchCEP.less";
+@import "base_Section.less";
+@import "base_ShellFloatingAction.less";
+@import "base_ShellFloatingActions.less";
+@import "base_ShellHeader.less";
+@import "base_ShellAppTitle.less";
+@import "base_ShellLayout.less";
+@import "base_SidePane.less";
+@import "base_StaticTile.less";
+@import "base_SubHeader.less";
+@import "base_SysInfoBar.less";
+@import "base_TargetMappingConfiguration.less";
+@import "base_Tile.less";
+@import "base_TileBase.less";
+@import "base_TileContainer.less";
+@import "base_TilePlaceholder.less";
+@import "base_TileState.less";
+@import "base_ToolAreaItem.less";
+@import "base_UserActionsMenu.less";
+@import "base_UserConsentDialog.less";
+@import "base_UserSettings.less";
+@import "base_ViewPortContainer.less";
+@import "base_WorkPage.less";
+@import "base_WorkPageButton.less";
+@import "base_WorkPageRow.less";
+@import "base_WorkPageColumn.less";
+@import "base_WorkPageCell.less";
+@import "base_WorkPageColumnResizer.less";
+
 @import "../../../../sap/ui/core/themes/sap_hcb/global.less";
 
 @import "AddBookmarkButton.less";

package/src/main/js/sap/ushell/ui/ShellHeader.fragment.xml

@@ -4,21 +4,27 @@
     xmlns:shell="sap.ushell.ui.shell">
     <ShellHeader
         id="shell-header"
-        showLogo="{/showLogo}"
-        visible="{/headerVisible}"
-        homeUri="{/homeUri}"
-        headItems="{ path: '/headItems', factory: '.shellUpdateAggItem' }"
-        headEndItems="{ path: '/headEndItems', factory: '.shellUpdateAggItem', filters: [{ path: '', test: '.isHeadEndItemNotInOverflow' }] }"
-        centralAreaElement="{/centralAreaElement}"
+        showLogo="{shellModel>/header/home/showLogo}"
+        visible="{shellModel>/header/visible}"
+        headItems="{
+            path: 'shellModel>/header/headItems',
+            factory: '.shellUpdateAggItem'
+        }"
+        headEndItems="{
+            path: 'shellModel>/header/headEndItems',
+            factory: '.shellUpdateAggItem',
+            filters: [{ path: '', test: '.isHeadEndItemNotInOverflow' }]
+        }"
+        centralAreaElement="{shellModel>/header/centralAreaElement}"
         showNewExperienceSwitch="{newExperience>/showInShellHeader}"
-        title="{/title}">
+        title="{shellModel>/header/secondTitle}">
         <appTitle>
             <shell:ShellAppTitle
                 id="shellAppTitle"
-                text="{/application/title}"
-                title="{/application/title}"
-                icon="{/application/icon}"
-                subTitle="{/title}"
+                text="{shellModel>/application/title}"
+                title="{shellModel>/application/title}"
+                icon="{shellModel>/application/icon}"
+                subTitle="{shellModel>/header/secondTitle}"
             />
         </appTitle>
     </ShellHeader>

package/src/main/js/sap/ushell/ui/ShellHeader.js

@@ -17,6 +17,7 @@ sap.ui.define([
     "sap/ushell/ui/ShellHeaderRenderer",
     "sap/ushell/utils",
     "sap/ushell/utils/WindowUtils",
+    "sap/ushell/state/StateManager",
     "sap/ushell/Container"
 ], function (
     Localization,
@@ -34,10 +35,14 @@ sap.ui.define([
     ShellHeaderRenderer,
     utils,
     WindowUtils,
+    StateManager,
     Container
 ) {
     "use strict";
 
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
+
     var sSearchOverlayCSS = "sapUshellShellShowSearchOverlay";
 
     var _iSearchWidth = 0; // width as requested by the SearchShellHelper
@@ -408,9 +413,11 @@ sap.ui.define([
             if (oSpanElement) {
                 var sNewTooltip;
 
-                var sShellStateName = Config.last("/core/shell/model/currentState/stateName");
                 var bAllMyAppsEnabled = Config.last("/core/services/allMyApps/enabled");
-                var bAllMyAppsMenu = (sShellStateName === "app" || sShellStateName === "home") && bAllMyAppsEnabled;
+                const bDefaultShellMode = StateManager.getShellMode() === ShellMode.Default;
+                const bLegacyHomeState = StateManager.isLegacyHome();
+
+                var bAllMyAppsMenu = (bDefaultShellMode || bLegacyHomeState) && bAllMyAppsEnabled;
 
                 var oNavMenu = Element.getElementById(oAppTitle.getNavigationMenu());
                 var bNavMenu = oNavMenu && oNavMenu.getItems() && oNavMenu.getItems().length > 0;
@@ -591,7 +598,7 @@ sap.ui.define([
      * @private
      */
     ShellHeader.prototype._getLeanMode = function () {
-        return Container.getRendererInternal().getSapUshellConfigParam() === "lean";
+        return StateManager.getShellMode() === ShellMode.Lean;
     };
 
     /**

package/src/main/js/sap/ushell/ui/cards/FrequentActivitiesExtension.js

@@ -86,10 +86,6 @@ sap.ui.define([
          * @returns {Promise} A Promise with the frequently used card items.
          */
         getData: function () {
-            if (!Config.last("/core/shell/model/enableTrackingActivity")) {
-                return Promise.resolve([]);
-            }
-
             if (this._sortedData) {
                 return Promise.resolve(this._resolvedData);
             }

package/src/main/js/sap/ushell/ui/cards/RecentActivitiesExtension.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Extension for recent activities card
  *
- * @version 1.126.1
+ * @version 1.127.1
  */
 sap.ui.define([
     "sap/ui/integration/Extension",
@@ -90,10 +90,6 @@ sap.ui.define([
          * @returns {Promise} A Promise with the recently used card items.
          */
         getData: function () {
-            if (!Config.last("/core/shell/model/enableTrackingActivity")) {
-                return Promise.resolve([]);
-            }
-
             return this.oUserRecentsPromise
                 .then(function (oUserRecents) {
                     return oUserRecents.getRecentActivity();

package/src/main/js/sap/ushell/ui/footerbar/AddBookmarkButton.js

@@ -16,7 +16,8 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/ushell/Config",
     "sap/ushell/library", // css style dependency
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/state/StateManager"
 ], function (
     Log,
     Button,
@@ -32,7 +33,8 @@ sap.ui.define([
     JSONModel,
     Config,
     ushellLibrary,
-    resources
+    resources,
+    StateManager
 ) {
     "use strict";
 
@@ -45,6 +47,18 @@ sap.ui.define([
     // shortcut for sap.ui.core.mvc.ViewType
     var ViewType = coreLibrary.mvc.ViewType;
 
+    // shortcut for sap.ushell.state.StateManager.LaunchpadState
+    const LaunchpadState = StateManager.LaunchpadState;
+
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
+    const {
+        Headerless,
+        Standalone,
+        Embedded,
+        Merged
+    } = ShellMode;
+
     /**
      * @alias sap.ushell.ui.footerbar.AddBookmarkButton
      * @class
@@ -614,11 +628,11 @@ sap.ui.define([
     };
 
     AddBookmarkButton.prototype.setEnabled = function (bEnabled) {
-        var sState = "";
         var bPersonalizationEnabled = true;
+        const sCurrentLaunchpadState = StateManager.getLaunchpadState();
+        const sCurrentShellMode = StateManager.getShellMode();
 
         if (sap.ushell.Container) {
-            sState = Config.last("/core/shell/model/currentState/stateName");
             var bConfigPersonalization = Config.last("/core/shell/enablePersonalization");
             if (bConfigPersonalization !== undefined) {
                 bPersonalizationEnabled = bConfigPersonalization;
@@ -628,7 +642,7 @@ sap.ui.define([
                 bPersonalizationEnabled = true;
             }
         }
-        if (sState === "headerless" || sState === "standalone" || sState === "embedded" || sState === "merged" || !bPersonalizationEnabled) {
+        if (!bPersonalizationEnabled || (sCurrentLaunchpadState === LaunchpadState.App && [Headerless, Standalone, Embedded, Merged].includes(sCurrentShellMode))) {
             bEnabled = false;
         }
         if (!sap.ushell.Container) {

package/src/main/js/sap/ushell/ui/footerbar/ContactSupportDialog.controller.js

@@ -6,16 +6,22 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/ushell/UserActivityLog",
     "sap/ushell/resources",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/state/StateManager"
 ], function (
     Controller,
     Fragment,
     JSONModel,
     UserActivityLog,
     resources,
-    Container
+    Container,
+    StateManager
 ) {
     "use strict";
+
+    // shortcut for sap.ushell.state.StateManager.LaunchpadState
+    const LaunchpadState = StateManager.LaunchpadState;
+
     const _sFragmentId = "contactSupportDialogFragment";
 
     return Controller.extend("sap.ushell.ui.footerbar.ContactSupportDialog.controller", {
@@ -46,7 +52,7 @@ sap.ui.define([
             const oUserDetails = oClientContext.userDetails;
             const oModelData = {
                 showTechInfo: false,
-                showAppData: oClientContext.shellState === "app" || oClientContext.shellState === "standalone",
+                showAppData: StateManager.getLaunchpadState() === LaunchpadState.App,
                 subject: "",
                 description: "",
                 userName: oUserDetails.fullName || "",

package/src/main/js/sap/ushell/ui/footerbar/SendAsEmailButton.js

@@ -6,17 +6,17 @@ sap.ui.define([
     "sap/m/Button",
     "sap/m/ButtonRenderer",
     "sap/m/library",
-    "sap/ushell/Config",
     "sap/ushell/resources",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/state/ShellModel"
 ], function (
     Log,
     Button,
     ButtonRenderer,
     mobileLibrary,
-    Config,
     resources,
-    Container
+    Container,
+    ShellModel
 ) {
     "use strict";
 
@@ -80,7 +80,7 @@ sap.ui.define([
             });
         } else {
             var sURL = document.URL;
-            var sAppName = Config.last("/core/shellHeader/application").title;
+            const sAppName = ShellModel.getModel().getProperty("/application/title");
             var sSubject = (sAppName === undefined) ?
                 resources.i18n.getText("linkToApplication") :
                 resources.i18n.getText("linkTo") + " '" + sAppName + "'";

package/src/main/js/sap/ushell/ui/launchpad/ExtendedChangeDetection.js

@@ -7,7 +7,7 @@
  * of recreating them. Items which get removed from the aggregation get destroyed and items which get added to the
  * aggregation get created.
  *
- * @version 1.126.1
+ * @version 1.127.1
  */
 sap.ui.define([
     "sap/ui/base/ManagedObject",

package/src/main/js/sap/ushell/ui/launchpad/Section.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.Section
  *
- * @version 1.126.1
+ * @version 1.127.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/ui/launchpad/TileContainer.js

@@ -195,15 +195,20 @@ sap.ui.define([
                 }
             }.bind(this),
             onAfterRendering: function () {
-                var $Ref = this.oEditInputField.$("inner");
-                $Ref.focus();
-                // jQuery Plugin "selectText"
-                $Ref.selectText(0, $Ref.val().length);
-
-                var oEditInputFieldDomRef = this.oEditInputField.getDomRef();
-                if (oEditInputFieldDomRef) {
-                    oEditInputFieldDomRef.addEventListener("focusout", fnFocusOut);
-                }
+                // UI5 Rendering sets the focus back to the previously focused control after firing
+                // "AfterRendering" event. Therefore the 0 setTimeout is needed to actively set the
+                // focus to the input after UI5 Rendering.
+                setTimeout(() => {
+                    var $Ref = this.oEditInputField.$("inner");
+                    $Ref.focus();
+                    // jQuery Plugin "selectText"
+                    $Ref.selectText(0, $Ref.val().length);
+
+                    var oEditInputFieldDomRef = this.oEditInputField.getDomRef();
+                    if (oEditInputFieldDomRef) {
+                        oEditInputFieldDomRef.addEventListener("focusout", fnFocusOut);
+                    }
+                }, 0);
             }.bind(this)
         }).addStyleClass("sapUshellTileContainerTitleInput");
 
@@ -273,9 +278,9 @@ sap.ui.define([
 
     TileContainer.prototype._titleTextClickHandler = function () {
         var bEnableRenameLockedGroup = this.getModel() && this.getModel().getProperty("/enableRenameLockedGroup"),
-        bEditMode = (bEnableRenameLockedGroup || !this.getIsGroupLocked())
-            && !this.getDefaultGroup()
-            && this.getTileActionModeActive();
+            bEditMode = (bEnableRenameLockedGroup || !this.getIsGroupLocked())
+                && !this.getDefaultGroup()
+                && this.getTileActionModeActive();
         this.setEditMode(bEditMode);
     };
 

package/src/main/js/sap/ushell/ui/launchpad/section/CompactArea.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Provides control sap.ushell.ui.launchpad.section.CompactArea
  *
- * @version 1.126.1
+ * @version 1.127.1
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/ui/shell/ShellAppTitle.js

@@ -29,7 +29,9 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/library",
     "sap/ushell/resources",
-    "sap/ushell/ui/launchpad/AccessibilityCustomData"
+    "sap/ushell/ui/launchpad/AccessibilityCustomData",
+    "sap/ushell/state/StateManager",
+    "sap/ushell/state/ShellModel"
 ], function (
     Bar,
     Button,
@@ -49,18 +51,23 @@ sap.ui.define([
     Config,
     ushellLibrary,
     ushellResources,
-    AccessibilityCustomData
+    AccessibilityCustomData,
+    StateManager,
+    ShellModel
 ) {
     "use strict";
 
     // shortcut for sap.ushell.AppTitleState
-    var AppTitleState = ushellLibrary.AppTitleState;
+    const AppTitleState = ushellLibrary.AppTitleState;
 
     // shortcut for sap.ushell.AllMyAppsState
-    var AllMyAppsState = ushellLibrary.AllMyAppsState;
+    const AllMyAppsState = ushellLibrary.AllMyAppsState;
 
     // shortcut for sap.m.PlacementType
-    var PlacementType = mobileLibrary.PlacementType;
+    const PlacementType = mobileLibrary.PlacementType;
+
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
 
     var ShellAppTitle = Button.extend("sap.ushell.ui.shell.ShellAppTitle", {
         metadata: {
@@ -179,7 +186,18 @@ sap.ui.define([
      * @private
      */
     ShellAppTitle._getCurrentState = function () {
-        return Config.last("/core/shellHeader/ShellAppTitleState");
+        return ShellModel.getConfigModel().getProperty("/shellAppTitleState");
+    };
+
+    /**
+     * Sets the ShellAppTitleState configuration value.
+     *
+     * @param {sap.ushell.AppTitleState} sNewState The new value as a member of sap.ushell.AppTitleState.
+     * @static
+     * @private
+     */
+    ShellAppTitle._setCurrentState = function (sNewState) {
+        ShellModel.getConfigModel().setProperty("/shellAppTitleState", sNewState);
     };
 
     /**
@@ -234,7 +252,7 @@ sap.ui.define([
             this.oNavMenuPopover = this._createNavMenuPopover();
         }
 
-        this.getModel().setProperty("/ShellAppTitleState", AppTitleState.ShellNavMenu);
+        ShellAppTitle._setCurrentState(AppTitleState.ShellNavMenu);
 
         if (this.oNavMenuPopover.isOpen()) {
             this.oNavMenuPopover.close();
@@ -243,9 +261,10 @@ sap.ui.define([
         }
 
         if (this.oNavMenuPopover.getFooter()) {
-            var sStateName = Config.last("/core/shell/model/currentState/stateName");
+            const bDefaultShellMode = StateManager.getShellMode() === ShellMode.Default;
+            const bLegacyHomeState = StateManager.isLegacyHome();
             // Popover footer should be visible only on SHELL_NAV_MENU state, while the shell is either in home or in app state
-            this.oNavMenuPopover.getFooter().setVisible(sStateName === "home" || sStateName === "app");
+            this.oNavMenuPopover.getFooter().setVisible(bDefaultShellMode || bLegacyHomeState);
         }
     };
 
@@ -262,17 +281,12 @@ sap.ui.define([
             "Check AllMyApps and NavShellMenu visibility",
             "FLP"
         );
-
-        var oModel = this.getModel();
-        var sShellStateName = Config.last("/core/shell/model/currentState/stateName");
+        const bDefaultShellMode = StateManager.getShellMode() === ShellMode.Default;
+        const bLegacyHomeState = StateManager.isLegacyHome();
         var bNavMenuEnabled = this._isNavMenuEnabled();
         var bVisible = bNavMenuEnabled;
 
-        if (!oModel) {
-            return false;
-        }
-
-        if (sShellStateName === "app" || sShellStateName === "home") {
+        if (bDefaultShellMode || bLegacyHomeState) {
             var bAllMyAppsEnabled = Config.last("/core/services/allMyApps/enabled");
 
             // ShellAppTitle is visible if at least one of the options AllMyApps & NavMenu is enabled
@@ -281,18 +295,18 @@ sap.ui.define([
             // Calculate the state
             // Option 1: both AllMyApps && NavMenu are enabled
             if (bAllMyAppsEnabled && bNavMenuEnabled) {
-                oModel.setProperty("/ShellAppTitleState", AppTitleState.ShellNavMenu);
+                ShellAppTitle._setCurrentState(AppTitleState.ShellNavMenu);
 
                 // Option 2: Only NavMenu is enabled
             } else if (!bAllMyAppsEnabled && bNavMenuEnabled) {
-                oModel.setProperty("/ShellAppTitleState", AppTitleState.ShellNavMenuOnly);
+                ShellAppTitle._setCurrentState(AppTitleState.ShellNavMenuOnly);
 
                 // Option 3: Only AllMyApps is enabled
             } else if (bAllMyAppsEnabled && !bNavMenuEnabled) {
-                oModel.setProperty("/ShellAppTitleState", AppTitleState.AllMyAppsOnly);
+                ShellAppTitle._setCurrentState(AppTitleState.AllMyAppsOnly);
             }
         } else {
-            oModel.setProperty("/ShellAppTitleState", AppTitleState.ShellNavMenuOnly);
+            ShellAppTitle._setCurrentState(AppTitleState.ShellNavMenuOnly);
         }
         Measurement.end("FLP:ShellAppTitle.getControlVisibilityAndState");
         return bVisible;
@@ -319,7 +333,7 @@ sap.ui.define([
             customHeader: this._getPopoverHeader(),
             verticalScrolling: false,
             showHeader: {
-                path: "/ShellAppTitleState",
+                path: "configModel>/shellAppTitleState",
                 formatter: function (oCurrentState) {
                     return oCurrentState !== AppTitleState.ShellNavMenu;
                 }
@@ -328,7 +342,7 @@ sap.ui.define([
             contentHeight: "28rem",
             contentWidth: "56rem"
         }).addStyleClass("sapContrastPlus");
-        oAllMyAppsPopover.setModel(this.getModel());
+        oAllMyAppsPopover.setModel(ShellModel.getConfigModel(), "configModel");
 
         oAllMyAppsPopover.attachAfterOpen(function () {
             var oHeader = oAllMyAppsPopover.getCustomHeader();
@@ -371,15 +385,15 @@ sap.ui.define([
 
         this.oTitle = new Title("navMenuInnerTitle", {
             wrapping: true,
-            text: "{/application/title}"
+            text: "{shellModel>/application/title}"
         });
         this.oSecondTitle = new Label("navMenuInnerSecondTitle", {
-            text: "{/title}",
-            visible: "{= !!${/title}}",
+            text: "{shellModel>/header/secondTitle}",
+            visible: "{= !!${shellModel>/header/secondTitle}}",
             wrapping: true
         });
         this.oIconControl = new Icon({
-            src: "{/application/icon}"
+            src: "{shellModel>/application/icon}"
         });
 
         const oTitleBox = new VBox({
@@ -410,8 +424,8 @@ sap.ui.define([
         }
 
         oNavMenuPopover.addStyleClass("sapUshellAppTitleNavigationMenuPopover");
-        oNavMenuPopover.setModel(this.getModel());
-        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
+        oNavMenuPopover.setModel(ShellModel.getModel(), "shellModel");
+        ShellModel.getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
 
         // before popover open - call to before menu open
         oNavMenuPopover.attachBeforeOpen(function () {
@@ -452,9 +466,10 @@ sap.ui.define([
     };
 
     ShellAppTitle.prototype._setAllMyAppsTitle = function (text) {
-        var oCurrentState = Config.last("/core/shellHeader");
-        if (oCurrentState.title && (oCurrentState.ShellAppTitleState === "AllMyAppsOnly" || oCurrentState.ShellAppTitleState === "AllMyApps")) {
-            text = text + " - " + oCurrentState.title;
+        const sCurrentState = ShellAppTitle._getCurrentState();
+        const sSecondTitle = ShellModel.getModel().getProperty("/header/secondTitle");
+        if (sSecondTitle && (sCurrentState === "AllMyAppsOnly" || sCurrentState === "AllMyApps")) {
+            text = `${text} - ${sSecondTitle}`;
         }
         Title.prototype.setText.apply(this, [text]);
     };
@@ -514,7 +529,7 @@ sap.ui.define([
         if ((oAllMyAppsState === AllMyAppsState.FirstLevel) ||
             (oAllMyAppsState === AllMyAppsState.FirstLevelSpread)) {
             if (ShellAppTitle._getCurrentState() !== AppTitleState.AllMyAppsOnly) {
-                this.getModel().setProperty("/ShellAppTitleState", AppTitleState.ShellNavMenu);
+                ShellAppTitle._setCurrentState(AppTitleState.ShellNavMenu);
 
                 //Open Nav Menu popover and close allMyAppsPopover
                 this.oAllMyAppsPopover.close();
@@ -563,7 +578,7 @@ sap.ui.define([
             text: ushellResources.i18n.getText("allMyApps_launchingButtonTitle"),
             press: this._allMyAppsButtonPressHandler.bind(this),
             visible: {
-                path: "/ShellAppTitleState",
+                path: "shellConfig>/shellAppTitleState",
                 formatter: function (oCurrentState) {
                     return oCurrentState === AppTitleState.ShellNavMenu;
                 }
@@ -590,7 +605,7 @@ sap.ui.define([
                 "FLP"
             );
 
-            this.getModel().setProperty("/ShellAppTitleState", AppTitleState.AllMyApps);
+            ShellAppTitle._setCurrentState(AppTitleState.AllMyApps);
             this.oNavMenuPopover.close();
             this._bOpenAllMyApps = true;
         }