@sapui5/sap.ushell 1.126.1 → 1.127.1

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

@@ -2,55 +2,65 @@
 
 sap.ui.define([
     "sap/base/Log",
+    "sap/m/Avatar",
+    "sap/m/library",
     "sap/ui/Device",
     "sap/ui/core/Element",
-    "sap/ushell/components/_HeaderManager/ControlManager",
     "sap/ushell/components/_HeaderManager/ShellHeader.controller",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/EventHub",
     "sap/ushell/resources",
     "sap/ushell/utils",
-    "sap/ushell/Config",
-    "sap/ui/model/json/JSONModel",
     "sap/ui/core/mvc/View",
     "sap/ui/core/mvc/XMLView",
     "sap/ui/core/Fragment",
     "sap/ushell/api/NewExperience",
     "sap/ushell/renderer/ShellLayout",
-    // controller must be preloaded to avoid naming clashes
-    "sap/ushell/renderer/Shell.controller",
+    "sap/ushell/renderer/Shell.controller", // controller must be preloaded to avoid naming clashes
+    "sap/ushell/state/ShellModel",
+    "sap/ushell/state/StateManager",
     "sap/ushell/Container",
     "sap/ui/thirdparty/jquery"
 ], function (
     Log,
+    Avatar,
+    mobileLibrary,
     Device,
     Element,
-    HeaderControlManager,
     ShellHeaderController,
     AccessibilityCustomData,
     EventHub,
-    resources,
+    ushellResources,
     utils,
-    Config,
-    JSONModel,
     View,
     XMLView,
     Fragment,
     NewExperience,
     ShellLayout,
     ShellController,
+    ShellModel,
+    StateManager,
     Container,
     jQuery
 ) {
     "use strict";
 
-    var ShellLayoutMapping = ShellLayout.LAYOUT_MAPPING;
+    // shortcut for sap.m.AvatarSize
+    const AvatarSize = mobileLibrary.AvatarSize;
+
+    // shortcut for sap.ushell.state.StateManager.Operation
+    const Operation = StateManager.Operation;
+
+    // shortcut for sap.ushell.state.StateManager.ShellMode
+    const ShellMode = StateManager.ShellMode;
+
+    const ShellLayoutMapping = ShellLayout.LAYOUT_MAPPING;
 
     function fnShellUpdateAggItem (sId, oContext) {
         return Element.getElementById(oContext.getObject());
     }
 
-    var BINDING_TYPE = {
+    const BINDING_TYPE = {
         Property: "Property",
         List: "List"
     };
@@ -69,14 +79,6 @@ sap.ui.define([
             return this._oShellLayoutPromise;
         },
 
-        getShellModel: function () {
-            return this.getViewData().shellModel;
-        },
-
-        getHelperModel: function () {
-            return this.getViewData().helperModel;
-        },
-
         getViewDataConfig: function () {
             var oViewData = this.getViewData() || {};
             var oConfig = oViewData.config || {};
@@ -84,8 +86,11 @@ sap.ui.define([
         },
 
         createContent: function () {
+            this._createUserActionsMenuButton(ShellModel.getConfigModel());
+
             // Change config if more then three buttons moved to the header
             this._allowUpToThreeActionInShellHeader();
+            StateManager.init(this.getViewDataConfig());
 
             // BackgroundImage
             this.initBackgroundImage();
@@ -136,17 +141,11 @@ sap.ui.define([
             }).then(function (oRendererRootView) {
                 oRendererRootView.updateAggregation = this.updateShellAggregation;
 
-                Element.getElementById("viewPortContainer");
-
                 return oRendererRootView;
             }.bind(this));
         },
 
         createShellHeader: function () {
-            var oConfig = this.getViewDataConfig();
-            var oShellModel = this.getShellModel();
-            // Create own model for the header
-            var oShellHeaderModel = Config.createModel("/core/shellHeader", JSONModel);
             var oHeaderController = new ShellHeaderController();
             oHeaderController.onInit();
 
@@ -155,16 +154,15 @@ sap.ui.define([
                 controller: oHeaderController
             }).then(function (oShellHeader) {
                 oShellHeader.updateAggregation = this.updateShellAggregation;
-                HeaderControlManager.init(oConfig, oHeaderController, oShellModel);
 
-                if (oConfig.appState === "embedded") {
+                if (StateManager.getShellMode() === ShellMode.Embedded) {
                     oShellHeader.setNoLogo();
                 }
 
                 // Assign models to the Shell Header
-                oShellHeader.setModel(oShellHeaderModel);
-                oShellHeader.setModel(resources.i18nModel, "i18n");
+                oShellHeader.setModel(ushellResources.i18nModel, "i18n");
                 oShellHeader.setModel(NewExperience.getModel(), "newExperience");
+                oShellHeader.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellHeader);
                 // save for later use
                 this._oShellHeader = oShellHeader;
@@ -179,7 +177,8 @@ sap.ui.define([
             return Container.getServiceAsync("Menu")
                 .then(function (oMenuService) {
                     return oMenuService.isMenuEnabled();
-                }).then(function (bMenuEnabled) {
+                })
+                .then(function (bMenuEnabled) {
                     if (!bMenuEnabled) {
                         return;
                     }
@@ -201,15 +200,15 @@ sap.ui.define([
                         id: "right-floating-container",
                         top: "2",
                         hideItemsAfterPresentation: true,
-                        visible: "{/currentState/showRightFloatingContainer}",
+                        visible: "{shellModel>/rightFloatingContainer/visible}",
                         floatingContainerItems: {
-                            path: "/currentState/RightFloatingContainerItems",
+                            path: "shellModel>/rightFloatingContainer/items",
                             factory: fnShellUpdateAggItem
                         }
                     });
                     oRightFloatingContainer.updateAggregation = this.updateShellAggregation;
 
-                    oRightFloatingContainer.setModel(this.getShellModel());
+                    oRightFloatingContainer.setModel(ShellModel.getModel(), "shellModel");
                     this.addDanglingControl(oRightFloatingContainer);
                     // save for later use
                     this._oRightFloatingContainer = oRightFloatingContainer;
@@ -224,7 +223,7 @@ sap.ui.define([
 
         initCanvasShapesManager: function () {
             this.bindFactory({
-                model: this.getShellModel(),
+                model: ShellModel.getConfigModel(),
                 factory: this.createCanvasShapesManager.bind(this),
                 bindingPath: "/enableBackGroundShapes",
                 bindingType: BINDING_TYPE.Property,
@@ -244,13 +243,13 @@ sap.ui.define([
                 var oSubHeader = new SubHeader({
                     id: "subhdr",
                     content: {
-                        path: "/currentState/subHeader",
+                        path: "shellModel>/subHeader/items",
                         factory: fnShellUpdateAggItem
                     }
                 });
                 oSubHeader.updateAggregation = this.updateShellAggregation;
 
-                oSubHeader.setModel(this.getShellModel());
+                oSubHeader.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSubHeader);
 
                 this.waitForShellLayout().then(function () {
@@ -267,9 +266,9 @@ sap.ui.define([
                 ], function (FloatingContainer, Storage) {
                     var oFloatingContainer = new FloatingContainer({
                         id: "shell-floatingContainer",
-                        visible: "{helper>/shell/floatingContainerVisible}",
+                        visible: "{shellModel>/floatingContainer/visible}",
                         content: {
-                            path: "/currentState/floatingContainerContent",
+                            path: "shellModel>/floatingContainer/items",
                             factory: fnShellUpdateAggItem
                         }
                     });
@@ -284,8 +283,7 @@ sap.ui.define([
                         }));
                     }
 
-                    oFloatingContainer.setModel(this.getShellModel());
-                    oFloatingContainer.setModel(this.getHelperModel(), "helper");
+                    oFloatingContainer.setModel(ShellModel.getModel(), "shellModel");
                     this.addDanglingControl(oFloatingContainer);
 
                     this.waitForShellLayout().then(function () {
@@ -322,15 +320,15 @@ sap.ui.define([
             sap.ui.require(["sap/ushell/ui/shell/SidePane"], function (SidePane) {
                 var oSidePane = new SidePane({
                     id: "shell-sidePane",
-                    visible: "{/currentState/showPane}",
+                    visible: "{shellModel>/sidePane/visible}",
                     content: {
-                        path: "/currentState/paneContent",
+                        path: "shellModel>/sidePane/items",
                         factory: fnShellUpdateAggItem
                     }
                 });
                 oSidePane.updateAggregation = this.updateShellAggregation;
 
-                oSidePane.setModel(this.getShellModel());
+                oSidePane.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSidePane);
 
                 this.waitForShellLayout().then(function () {
@@ -343,15 +341,15 @@ sap.ui.define([
             sap.ui.require(["sap/ushell/ui/shell/ToolArea"], function (ToolArea) {
                 var oShellToolArea = new ToolArea({
                     id: "shell-toolArea",
-                    visible: "{/currentState/toolAreaVisible}",
+                    visible: "{shellModel>/toolArea/visible}",
                     toolAreaItems: {
-                        path: "/currentState/toolAreaItems",
+                        path: "shellModel>/toolArea/items",
                         factory: fnShellUpdateAggItem
                     }
                 });
                 oShellToolArea.updateAggregation = this.updateShellAggregation;
 
-                oShellToolArea.setModel(this.getShellModel());
+                oShellToolArea.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellToolArea);
 
                 this.waitForShellLayout().then(function () {
@@ -368,13 +366,13 @@ sap.ui.define([
                 var oShellFloatingActions = new ShellFloatingActions({
                     id: "shell-floatingActions",
                     floatingActions: {
-                        path: "/currentState/floatingActions",
+                        path: "shellModel>/floatingActions/items",
                         factory: fnShellUpdateAggItem
                     }
                 });
                 oShellFloatingActions.updateAggregation = this.updateShellAggregation;
 
-                oShellFloatingActions.setModel(this.getShellModel());
+                oShellFloatingActions.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellFloatingActions);
 
                 this.waitForShellLayout().then(function () {
@@ -396,11 +394,11 @@ sap.ui.define([
                 id: "allMyAppsView",
                 viewName: "sap.ushell.renderer.allMyApps.AllMyApps"
             }).then(function (allMyAppsView) {
-                allMyAppsView.setModel(this.getShellModel());
-                allMyAppsView.setModel(resources.i18nModel, "i18n");
+                allMyAppsView.setModel(ShellModel.getConfigModel(), "configModel");
+                allMyAppsView.setModel(ushellResources.i18nModel, "i18n");
                 allMyAppsView.addCustomData(new AccessibilityCustomData({
                     key: "aria-label",
-                    value: resources.i18n.getText("allMyApps_headerTitle"),
+                    value: ushellResources.i18n.getText("allMyApps_headerTitle"),
                     writeToDom: true
                 }));
                 this.addDanglingControl(allMyAppsView);
@@ -412,7 +410,7 @@ sap.ui.define([
          * Begin factory functions for lazy instantiation of Shell Layout controls
          */
         createPostCoreExtControls: function () {
-            var oShellModel = this.getShellModel();
+            var oShellModel = ShellModel.getModel();
 
             // apply the highest z-index used by the shell
             sap.ui.require(["sap/ui/core/Popup"], function (Popup) {
@@ -423,7 +421,7 @@ sap.ui.define([
             this.bindFactory({
                 model: oShellModel,
                 factory: this.createRightFloatingContainer.bind(this),
-                bindingPath: "/currentState/showRightFloatingContainer",
+                bindingPath: "/rightFloatingContainer/visible",
                 bindingType: BINDING_TYPE.Property,
                 valueCheck: function (bValue) {
                     return !!bValue;
@@ -434,7 +432,7 @@ sap.ui.define([
             this.bindFactory({
                 model: oShellModel,
                 factory: this.createSubHeader.bind(this),
-                bindingPath: "/currentState/subHeader",
+                bindingPath: "/subHeader/items",
                 bindingType: BINDING_TYPE.List,
                 valueCheck: function (aValues) {
                     return !!aValues.length;
@@ -445,7 +443,7 @@ sap.ui.define([
             this.bindFactory({
                 model: oShellModel,
                 factory: this.createToolArea.bind(this),
-                bindingPath: "/currentState/toolAreaVisible",
+                bindingPath: "/toolArea/visible",
                 bindingType: BINDING_TYPE.Property,
                 valueCheck: function (bValue) {
                     return !!bValue;
@@ -456,7 +454,7 @@ sap.ui.define([
             this.bindFactory({
                 model: oShellModel,
                 factory: this.createSidePane.bind(this),
-                bindingPath: "/currentState/showPane",
+                bindingPath: "/sidePane/visible",
                 bindingType: BINDING_TYPE.Property,
                 valueCheck: function (bValue) {
                     return !!bValue;
@@ -470,7 +468,7 @@ sap.ui.define([
             this.bindFactory({ // FloatingActions (deprecated)
                 model: oShellModel,
                 factory: this.createFloatingActions.bind(this),
-                bindingPath: "/currentState/floatingActions",
+                bindingPath: "/floatingActions/items",
                 bindingType: BINDING_TYPE.List,
                 valueCheck: function (aValues) {
                     return !!aValues.length;
@@ -484,31 +482,49 @@ sap.ui.define([
          * allow up to 3 actions in shell header
          */
         _allowUpToThreeActionInShellHeader: function () {
-            var oConfig = this.getViewDataConfig();
-            // in order to save performance time when these properties are not defined
-            if (Object.keys(oConfig).length > 3) {
-                var aParameter = [
-                    "moveAppFinderActionToShellHeader",
-                    "moveUserSettingsActionToShellHeader",
-                    "moveContactSupportActionToShellHeader",
-                    "moveEditHomePageActionToShellHeader"
-                ];
-                var count = 0;
-                var sParameter;
-
-                // count the number of "true" values, once get to three, force the other to be "false"
-                for (var index = 0; index < 5; index++) {
-                    sParameter = aParameter[index];
-                    if (count === 3) {
-                        // if 3 user actions have already been moved to the shell header, assign false to every other parameter
-                        oConfig[sParameter] = false;
-                    } else if (oConfig[sParameter]) {
-                        count++;
-                    }
+            const aParameter = [
+                "moveAppFinderActionToShellHeader",
+                "moveUserSettingsActionToShellHeader",
+                "moveContactSupportActionToShellHeader",
+                "moveEditHomePageActionToShellHeader"
+            ];
+            const oConfig = this.getViewDataConfig();
+
+            // only allow the first three actions to be moved to the shell header
+            aParameter.reduce((iCount, sParam) => {
+                if (iCount >= 3) {
+                    oConfig[sParam] = false;
+                    return iCount;
                 }
-            }
+                if (oConfig[sParam]) {
+                    iCount++;
+                }
+                return iCount;
+            }, 0);
+        },
+
+        _createUserActionsMenuButton: function (oConfigModel) {
+            const oUser = Container.getUser();
+            const sTooltip = ushellResources.i18n.getText("UserActionsMenuToggleButtonAria", [oUser.getFullName() || oUser.getId()]);
+
+            const oUserActionsMenuAvatar = new Avatar({
+                id: "userActionsMenuHeaderButton",
+                src: "{configModel>/userImage/personPlaceHolder}",
+                initials: oUser.getInitials(),
+                ariaHasPopup: "Menu",
+                displaySize: AvatarSize.XS,
+                tooltip: sTooltip,
+                press: function () {
+                    EventHub.emit("showUserActionsMenu", Date.now());
+                }
+            });
+            oUserActionsMenuAvatar.setModel(oConfigModel, "configModel");
+            this.addDanglingControl(oUserActionsMenuAvatar);
+
+            StateManager.updateAllBaseStates("header.headEndItems", Operation.Add, "userActionsMenuHeaderButton");
         },
 
+
         /**
          * @returns {sap.ui.core.Control} The ShellHeader
          *
@@ -525,19 +541,24 @@ sap.ui.define([
         },
 
         updateShellAggregation: function (sName) {
-            var oBindingInfo = this.mBindingInfos[sName];
-            var oAggregationInfo = this.getMetadata().getJSONKeys()[sName];
-            var oClone;
+            const oBindingInfo = this.mBindingInfos[sName];
+            const oAggregationInfo = this.getMetadata().getJSONKeys()[sName];
+            const fnGet = this[oAggregationInfo._sGetter].bind(this);
+            const fnRemove = this[oAggregationInfo._sRemoveMutator].bind(this);
+            const fnUpdate = this[oAggregationInfo._sMutator].bind(this);
+
+            const aControls = fnGet() || [];
+            // make a shallow copy to avoid issues with iteration on the original array
+            [...aControls].forEach((oControlToRemove) => {
+                fnRemove(oControlToRemove);
+            });
 
-            this[oAggregationInfo._sGetter]().forEach(function (v) {
-                this[oAggregationInfo._sRemoveMutator](v);
-            }.bind(this));
-            oBindingInfo.binding.getContexts().forEach(function (v, i) {
-                oClone = oBindingInfo.factory(this.getId() + "-" + i, v)
+            oBindingInfo.binding.getContexts().forEach((v, i) => {
+                const oClone = oBindingInfo.factory(this.getId() + "-" + i, v)
                     ? oBindingInfo.factory(this.getId() + "-" + i, v).setBindingContext(v, oBindingInfo.model)
                     : "";
-                this[oAggregationInfo._sMutator](oClone);
-            }.bind(this));
+                fnUpdate(oClone);
+            });
         },
 
         /**

package/src/main/js/sap/ushell/renderer/allMyApps/AllMyApps.controller.js

@@ -17,6 +17,7 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub",
+    "sap/ushell/state/ShellModel",
     "sap/ushell/Container"
 ], function (
     mobileLibrary,
@@ -32,6 +33,7 @@ sap.ui.define([
     ushellResources,
     WindowUtils,
     EventHub,
+    ShellModel,
     Container
 ) {
     "use strict";
@@ -39,16 +41,16 @@ sap.ui.define([
     /* global hasher */
 
     // shortcut for sap.m.ListType
-    var ListType = mobileLibrary.ListType;
+    const ListType = mobileLibrary.ListType;
 
     // shortcut for sap.ushell.AllMyAppsState
-    var AllMyAppsState = ushellLibrary.AllMyAppsState;
+    const AllMyAppsState = ushellLibrary.AllMyAppsState;
 
     // shortcut for sap.ushell.AllMyAppsProviderType
-    var AllMyAppsProviderType = ushellLibrary.AllMyAppsProviderType;
+    const AllMyAppsProviderType = ushellLibrary.AllMyAppsProviderType;
 
     // shortcut for sap.ushell.AppTitleState
-    var AppTitleState = ushellLibrary.AppTitleState;
+    const AppTitleState = ushellLibrary.AppTitleState;
 
     var bSingleDataSource = false;
 
@@ -81,6 +83,18 @@ sap.ui.define([
             oEventBus.subscribe("launchpad", "allMyAppsNoCatalogsLoaded", this.onNoCatalogsLoaded, this);
         },
 
+        /**
+         * Returns the current configuration model.
+         * Note: The model instance changes when the launchpad is restarted (e.g. in tests)
+         * @returns {sap.ui.model.Model} The configuration model.
+         *
+         * @since 1.127.0
+         * @private
+         */
+        _getConfigModel: function () {
+            return ShellModel.getConfigModel();
+        },
+
         onExit: function () {
             var oEventBus = EventBus.getInstance();
 
@@ -222,7 +236,7 @@ sap.ui.define([
             return this._isSingleDataSource()
                 .then(function (singleDataSource) {
                     if (singleDataSource) {
-                        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.FirstLevelSpread);
+                        this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.FirstLevelSpread);
 
                         // Bind the master area list to the groups level of the single provider
                         // (i.e. the data_sources/single_provider/groups array) in the model
@@ -231,7 +245,7 @@ sap.ui.define([
                             this._getMasterListItemTemplate
                         );
                     } else {
-                        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
+                        this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
 
                         // Bind the master area list to the first level (i.e. the data_sources/providers array) in the model
                         oDataSourceList.bindItems("allMyAppsModel>/AppsData", this._getMasterListItemTemplate());
@@ -274,11 +288,11 @@ sap.ui.define([
             return this._isSingleDataSource()
                 .then(function (bIsSingleDataSource) {
                     if (bIsSingleDataSource) {
-                        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.FirstLevelSpread);
+                        this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.FirstLevelSpread);
                     } else if (sPathArray.length === 3) {
-                        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
+                        this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.FirstLevel);
                     } else {
-                        Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.SecondLevel);
+                        this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.SecondLevel);
                     }
                     this.updateHeaderButtonsState();
                 }.bind(this));
@@ -301,7 +315,7 @@ sap.ui.define([
             var oView = this.getView();
             var oAllMyAppsModel = oView.getModel("allMyAppsModel");
             var oClickedObjectType = oAllMyAppsModel.getProperty(sClickedDataSourcePath + "/type");
-            var oAllMyAppsLevel = Config.last("/core/shell/model/allMyAppsMasterLevel");
+            var oAllMyAppsLevel = this._getConfigModel().getProperty("/allMyAppsMasterLevel");
             var oCustomPanel = this._getCustomPanel();
             var oCustomPanelLabel = this._getCustomPanelLabel();
             var oCustomPanelLink = this._getCustomPanelLink();
@@ -355,7 +369,7 @@ sap.ui.define([
                 "allMyAppsModel>" + sClickedDataSourcePath + "/groups",
                 this._getMasterListItemTemplate()
             );
-            Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.SecondLevel);
+            this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.SecondLevel);
 
             // Set the content of the details area to the items/apps of the group (i.e. second level)
             var oBindingContext = this._setBindingContext(sClickedDataSourcePath + "/groups/0", oView.byId("oItemsContainerlist"));
@@ -401,7 +415,7 @@ sap.ui.define([
             this._getDetailsHeaderLabel().setText(oAllMyAppsModel.getProperty(sClickedDataSourcePath + "/title"));
             if (Device.system.phone) {
                 this._getSplitApp().toDetail(this.createId("sapUshellAllMyAppsDetailsPage"));
-                Config.emit("/core/shell/model/allMyAppsMasterLevel", AllMyAppsState.Details);
+                this._getConfigModel().setProperty("/allMyAppsMasterLevel", AllMyAppsState.Details);
             }
             this.updateHeaderButtonsState();
             return oBindingContext;
@@ -539,8 +553,8 @@ sap.ui.define([
         },
 
         getBackButtonVisible: function () {
-            var oShellAppTitleState = Config.last("/core/shellHeader/ShellAppTitleState");
-            if (oShellAppTitleState !== AppTitleState.AllMyAppsOnly) {
+            var sShellAppTitleState = this._getConfigModel().getProperty("/shellAppTitleState");
+            if (sShellAppTitleState !== AppTitleState.AllMyAppsOnly) {
                 // back button leads to the navigation menu
                 return true;
             }
@@ -580,7 +594,7 @@ sap.ui.define([
          * @returns {sap.ushell.AllMyAppsState} The current state as a member of sap.ushell.AllMyAppsState.
          */
         getCurrentState: function () {
-            return Config.last("/core/shell/model/allMyAppsMasterLevel");
+            return this._getConfigModel().getProperty("/allMyAppsMasterLevel");
         },
 
         /******************************************************************************************************************/

package/src/main/js/sap/ushell/renderer/allMyApps/AllMyApps.view.xml

@@ -5,7 +5,7 @@
     height="100%">
     <SplitApp
         id="sapUshellAllMyAppsMasterDetail"
-        mode="{= ${/isPhoneWidth} ? 'ShowHideMode' : 'StretchCompressMode'}">
+        mode="{= ${configModel>/isPhoneWidth} ? 'ShowHideMode' : 'StretchCompressMode'}">
         <masterPages>
             <Page id="sapUshellAllMyAppsMasterPage" showHeader="false">
                 <landmarkInfo>
@@ -25,7 +25,7 @@
                         title="{allMyAppsModel>title}"
                         wrapping="true"
                         type="{
-                            parts: ['allMyAppsModel>type', '/allMyAppsMasterLevel'],
+                            parts: ['allMyAppsModel>type', 'configModel>/allMyAppsMasterLevel'],
                             formatter: '.formatListItemType'
                         }" />
                 </List>

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

@@ -668,6 +668,8 @@ partialCatalogFail=Failed to load one or more catalogs
 SpacePageNavgiationRegion=Space Page
 #XMSG
 PageSectionRegion=Page Sections
+#XMSG
+LogoutFailed=Logout failed. Please close all browser windows.
 
 #XTIT
 hotKeysGlossary=Keyboard Shortcuts

package/src/main/js/sap/ushell/renderer/search/searchComponent/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.renderer.search.searchComponent",
         "applicationVersion": {
-            "version": "1.126.1"
+            "version": "1.127.1"
         },
         "type": "component"
     },

package/src/main/js/sap/ushell/renderers/fiori2/History.js

@@ -2,6 +2,7 @@
 
  /**
   * File was moved to sap/ushell/renderer/History
+  * @fileoverview History
   * @deprecated since 1.120.0
   */
  sap.ui.define([

package/src/main/js/sap/ushell/renderers/fiori2/LogonFrameProvider.js

@@ -2,6 +2,7 @@
 
  /**
   * File was moved to sap/ushell/renderer/LogonFrameProvider
+  * @fileoverview LogonFrameProvider
   * @deprecated since 1.120.0
   */
  sap.ui.define([