@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/components/pages/controller/MyHome.controller.js

@@ -14,7 +14,7 @@ sap.ui.define([
     myHomeImport,
     JSONModel,
     Controller,
-    resources,
+    ushellResources,
     EventHub,
     Log
 ) {
@@ -31,7 +31,7 @@ sap.ui.define([
                 this.oViewModel.setProperty("/personalizationAvailable", !!bFlag);
             }.bind(this);
 
-            this.getView().setModel(resources.i18nModel, "i18n");
+            this.getView().setModel(ushellResources.i18nModel, "i18n");
             this.getView().setModel(this.oViewModel, "view");
             myHomeImport.isImportEnabled().then(fnSetEnableImport);
             this.oImportBookmarksFlagListener = EventHub.on("importBookmarksFlag").do(fnSetEnableImport);
@@ -76,7 +76,7 @@ sap.ui.define([
             this.oViewModel.setProperty("/personalizationAvailable", false);
             myHomeImport.setImportEnabled(false);
             sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
-                MessageBox.information(resources.i18n.getText("MyHome.InitialPage.MessageStrip.Popup"));
+                MessageBox.information(ushellResources.i18n.getText("MyHome.InitialPage.MessageStrip.Popup"));
             });
         }
     });

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ui/core/Element",

package/src/main/js/sap/ushell/components/pages/controller/PagesAndSpaceId.js

@@ -1,11 +1,14 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/ui/thirdparty/hasher",
     "sap/ushell/resources",
     "sap/ushell/Config",
     "sap/ushell/Container"
-], function (resources, Config, Container) {
+], function (hasher, resources, Config, Container) {
     "use strict";
+
+    // todo FLPCOREANDUX-10676: rework i18n for error handling, this conflicts with the usage in the boottask
     var PagesAndSpaceId = function () {
     };
 
@@ -22,16 +25,16 @@ sap.ui.define([
             // during boottask the hash gets provided via parameter
             // within the controller it needs to be fetched via the hasher
             if (sShellHash === undefined) {
-                sShellHash = window.hasher.getHash();
+                sShellHash = hasher.getHash();
             }
-            var oHash = urlParsingService.parseShellHash(sShellHash) || {};
-            var oIntent = {
+            const oHash = urlParsingService.parseShellHash(sShellHash) || {};
+            const oIntent = {
                 semanticObject: oHash.semanticObject || "",
                 action: oHash.action || ""
             };
-            var oHashPartsParams = oHash.params || {};
-            var aPageId = oHashPartsParams.pageId || [];
-            var aSpaceId = oHashPartsParams.spaceId || [];
+            const oHashPartsParams = oHash.params || {};
+            const aPageId = oHashPartsParams.pageId || [];
+            const aSpaceId = oHashPartsParams.spaceId || [];
 
             return this._parsePageAndSpaceId(aPageId, aSpaceId, oIntent);
         }.bind(this));

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.pages",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",
@@ -56,7 +56,7 @@
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",
-        "title": "",
+        "title": "{{Component.Pages.Title}}",
         "resources": "resources.json"
     },
     "sap.ui": {

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/FloatingContainer/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.FloatingContainer",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/MenuBar/Component.js

@@ -5,7 +5,8 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ushell/Config",
     "sap/ushell/Container",
-    "sap/ushell/resources"
+    "sap/ushell/resources",
+    "sap/ushell/renderer/ShellLayout"
 ], function (
     UIComponent,
     ComponentContainer,
@@ -13,8 +14,7 @@ sap.ui.define([
     Config,
     Container,
     resources,
-    ShellLayout,
-    ushellUtils
+    ShellLayout
 ) {
     "use strict";
 
@@ -55,6 +55,25 @@ sap.ui.define([
                         }.bind(this));
                     }
             }.bind(this));
+
+            // handle initial state of the side content
+            const bInitialValue = ShellLayout.hasAdjacentSideContentBeforeMain();
+            this._applySideContent(bInitialValue);
+
+            // attach event handler for side content changes
+            ShellLayout.attachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
+        },
+
+        _handleSideContent: function (oEvent) {
+            const oParameters = oEvent.getParameters();
+            const bHasAdjacentContentBefore = oParameters.hasAdjacentContentBefore;
+            this._applySideContent(bHasAdjacentContentBefore);
+        },
+
+        _applySideContent: function (bHasAdjacentContentBefore) {
+            this.rootControlLoaded().then((oView) => {
+                oView.toggleStyleClass("sapUshellFixedPadding", bHasAdjacentContentBefore);
+            });
         },
 
         createContent: function () {
@@ -70,6 +89,10 @@ sap.ui.define([
             });
 
             return this.oViewPromise;
+        },
+
+        exit: function () {
+            ShellLayout.detachAdjacentSideContentBeforeMainChanged(this._handleSideContent, this);
         }
     });
 });

package/src/main/js/sap/ushell/components/shell/MenuBar/controller/MenuBar.controller.js

@@ -3,6 +3,7 @@ sap.ui.define([
     "sap/ui/core/CustomData",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
+    "sap/ui/thirdparty/hasher",
     "sap/base/util/ObjectPath",
     "sap/ushell/EventHub",
     "sap/ushell/resources",
@@ -16,6 +17,7 @@ sap.ui.define([
     CustomData,
     Controller,
     JSONModel,
+    hasher,
     ObjectPath,
     EventHub,
     resources,
@@ -222,7 +224,7 @@ sap.ui.define([
                 var oDefaultSpace = aResults[1];
 
                 var sSelectedMenuKey;
-                var sHash = window.hasher.getHash();
+                var sHash = hasher.getHash();
                 var oHashParts = oUrlParsingService.parseShellHash(sHash);
                 var aMenuEntries = this.getView().getModel("menu").getProperty("/");
 

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",
@@ -55,7 +55,7 @@
             "fallbackLocale": "en"
         },
         "type": "component",
-        "title": "",
+        "title": "{{Component.MenuBar.Title}}",
         "resources": "resources.json"
     },
     "sap.ui": {

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.136.3
+ * @version 1.138.1
  * @private
  */
 sap.ui.define([
@@ -17,6 +17,7 @@ sap.ui.define([
     "sap/ui/model/Sorter",
     "sap/ushell/resources",
     "sap/ushell/utils/WindowUtils",
+    "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ui/model/json/JSONModel"
@@ -30,6 +31,7 @@ sap.ui.define([
     Sorter,
     resources,
     WindowUtils,
+    Config,
     Container,
     EventHub,
     JSONModel
@@ -218,38 +220,18 @@ sap.ui.define([
          * @private
          */
         unpinAllSpaces: function () {
-            var oPinnedSpaces = this.byId("PinnedSpaces");
-            var aNavBarItems = oPinnedSpaces.getModel("spaces").getData();
-            aNavBarItems = aNavBarItems.map(function (oNavBarItem) {
-                oNavBarItem.pinnedSortOrder = parseInt(oNavBarItem.pinnedSortOrder, 10);
-                return oNavBarItem;
-            });
-            var aSpacesToUnpin = aNavBarItems.sort(function (oItemA, oItemB) {
-                if (oItemA.pinnedSortOrder < oItemB.pinnedSortOrder) {
-                    return -1;
+            const oPinnedSpaces = this.byId("PinnedSpaces");
+            const aNavBarItems = oPinnedSpaces.getModel("spaces").getData();
+            const sMyHomePageId = Config.last("/core/spaces/myHome/myHomeSpaceId");
+
+            aNavBarItems.forEach((oItem) => {
+                // Unpinning separators and the My Home space is not allowed
+                if (oItem.pinned && oItem.type !== "separator" && oItem.id !== sMyHomePageId) {
+                    oItem.pinned = false;
+                    oItem.pinnedSortOrder = "-1";
                 }
-
-                if (oItemA.pinnedSortOrder > oItemB.pinnedSortOrder) {
-                    return 1;
-                }
-
-                return 0;
             });
-            var oSpaceToUnpin;
-            var bRemovableSpace = false;
-            for (var i = 0; i < aSpacesToUnpin.length; ++i) {
-                oSpaceToUnpin = aSpacesToUnpin[i];
-
-                if (bRemovableSpace) {
-                    oSpaceToUnpin.pinned = false;
-                    oSpaceToUnpin.pinnedSortOrder = "-1";
-                } else {
-                    oSpaceToUnpin.pinnedSortOrder = "" + oSpaceToUnpin.pinnedSortOrder;
-                    if (oSpaceToUnpin.type === "separator") {
-                        bRemovableSpace = true;
-                    }
-                }
-            }
+
             this._savePinnedSpaces();
         },
 

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenuButton.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.136.3
+ * @version 1.138.1
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/Notifications/Component.js

@@ -7,6 +7,7 @@ sap.ui.define([
     "sap/ui/core/IconPool",
     "sap/ui/core/InvisibleText",
     "sap/ui/core/UIComponent",
+    "sap/ui/thirdparty/hasher",
     "sap/ui/Device",
     "sap/m/library",
     "sap/m/Popover",
@@ -27,6 +28,7 @@ sap.ui.define([
     IconPool,
     InvisibleText,
     UIComponent,
+    hasher,
     Device,
     mobileLibrary,
     Popover,
@@ -62,7 +64,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.136.3",
+            version: "1.138.1",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]
@@ -124,7 +126,7 @@ sap.ui.define([
         // Alert (badge in the UXC terminology)
         handleNotification: function (oNotification) {
             const fnItemClick = () => {
-                if (window.hasher.getHash() !== oNotification.NavigationTargetObject + "-" + oNotification.NavigationTargetAction) {
+                if (hasher.getHash() !== `${oNotification.NavigationTargetObject}-${oNotification.NavigationTargetAction}`) {
                     if (oNotification.NavigationTargetObject && oNotification.NavigationTargetAction) {
                         utils.toExternalWithParameters(
                             oNotification.NavigationTargetObject,
@@ -284,10 +286,7 @@ sap.ui.define([
                                 oPopover.addStyleClass("sapUshellNotificationsListPopup");
 
                                 // Every time the popover opens, we need to load the notifications.
-                                oPopover.attachBeforeOpen(() => {
-                                    this.oNotificationsService.setUnseenNotificationsCount(0);
-                                    oController.getNextPage(true);
-                                });
+                                oPopover.attachBeforeOpen(oController.getNextPage.bind(oController, true));
 
                                 // Initial focus is required, otherwise the focus is lost and not set properly.
                                 oPopover.setInitialFocus(oController.byId("sapUshellNotificationsList"));

package/src/main/js/sap/ushell/components/shell/Notifications/NotificationsListPopoverContent.view.xml

@@ -70,7 +70,7 @@
         title="{i18n>Notifications.Popover.NoData.Title}"
         description="{i18n>Notifications.Popover.NoData.Description}"
         visible="{parts: ['/hasMoreItemsInBackend', '/listMaxReached', '/notifications'], formatter: '.formatShowNoDataIllustration'}"
-    >
+        ariaTitleLevel="H3">
         <additionalContent>
             <Button
                 id="sapUshellNotificationsListNoDataSettingsButton"

package/src/main/js/sap/ushell/components/shell/ProductSwitch/Component.js

@@ -41,7 +41,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.136.3",
+            version: "1.138.1",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Search/ESearch.js

@@ -37,6 +37,9 @@ sap.ui.define([
 
         // loads the searchShellHelper when the search button in the new ShellBar web-component is clicked
         if (Config.last("/core/shellBar/enabled")) {
+            loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
+                searchShellHelper.init();
+            });
             Element.getElementById("shell-header").attachSearchButtonPress((event) => {
                 loadSearchShellHelper(oComponent).then(function (searchShellHelper) {
                     searchShellHelper.onShellSearchButtonPressed(event);

package/src/main/js/sap/ushell/components/shell/Search/manifest.json

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.136.3"
+            "version": "1.138.1"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js

@@ -1,37 +1,39 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/base/Log",
+    "sap/m/SearchField",
+    "sap/ui/Device",
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
+    "sap/ui/core/IconPool",
     "sap/ui/core/UIComponent",
-    "sap/m/SearchField",
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/Config",
+    "sap/ushell/Container",
     "sap/ushell/components/shell/SearchCEP/SearchCEP.controller",
-    "sap/base/Log",
     "sap/ushell/resources",
-    "sap/ui/core/IconPool",
-    "sap/ui/Device",
-    "sap/ui/thirdparty/jquery",
-    "sap/ushell/utils/UrlParsing",
-    "sap/ushell/Container"
+    "sap/ushell/utils/UrlParsing"
 ], function (
+    Log,
+    SearchField,
+    Device,
     Element,
     EventBus,
+    IconPool,
     UIComponent,
-    SearchField,
+    jQuery,
+    Config,
+    Container,
     SearchCEPController,
-    Log,
     resources,
-    IconPool,
-    Device,
-    jQuery,
-    UrlParsing,
-    Container
+    UrlParsing
 ) {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.136.3",
+            version: "1.138.1",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchCEP.controller.js

@@ -218,7 +218,7 @@ sap.ui.define([
         getHomePageApps: function () {
 
             var sGroupName = "homePageApplications",
-                oProductsProvider = SearchProvider.defaultProviders[sGroupName];
+                oProductsProvider = SearchProvider.getDefaultProviders()[sGroupName];
 
             oProductsProvider.execSearch("", sGroupName);
         },
@@ -289,8 +289,8 @@ sap.ui.define([
 
         _registerDefaultProviders: function (oSearchCEPService) {
 
-            for (var sKey in SearchProvider.defaultProviders) {
-                oSearchCEPService._registerDefaultSearchProvider(SearchProvider.defaultProviders[sKey]);
+            for (var sKey in SearchProvider.getDefaultProviders()) {
+                oSearchCEPService._registerDefaultSearchProvider(SearchProvider.getDefaultProviders()[sKey]);
             }
         },
 

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/base/Log",