@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/components/shell/Settings/homepage/HomepageEntry.js

@@ -60,10 +60,10 @@ sap.ui.define([
 
                             return oViewInstance;
                         })
-                        .catch((error) => {
-                            Log.error("Failed to get effective hompage setting.", error,
+                        .catch((oError) => {
+                            Log.error("Failed to get effective hompage setting.", oError,
                                 "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
-                            return Promise.reject();
+                            throw oError;
                         });
                 },
                 onSave: function () {
@@ -80,11 +80,11 @@ sap.ui.define([
                             .then(() => {
                                 Config.emit("/core/home/homePageGroupDisplay", sDisplay);
                             })
-                            .catch((error) => {
+                            .catch((oError) => {
                                 // Log failure if occurs.
-                                Log.error("Failed to save the anchor bar mode in personalization", error,
+                                Log.error("Failed to save the anchor bar mode in personalization", oError,
                                     "sap.ushell.components.ushell.settings.homepage.HomepageEntry");
-                                return Promise.reject(error);
+                                throw oError;
                             });
                     }
                     Log.warning("Save operation for user account settings was not executed, because the homepage view was not initialized");

package/src/main/js/sap/ushell/components/shell/Settings/notifications/NotificationsSetting.controller.js

@@ -114,11 +114,11 @@ sap.ui.define([
             aSettingsToSave.forEach((setting) => {
                 aSaveDeferres.push(this._oNotificationService.saveSettingsEntry(setting));
             });
-            return Promise.all(aSaveDeferres).catch((error) => {
+            return Promise.all(aSaveDeferres).catch((oError) => {
                 Log.error(
-                    "Failed to save the notification settings in the notifivation service.", error,
+                    "Failed to save the notification settings in the notifivation service.", oError,
                     "sap.ushell.components.ushell.settings.notifications.NotificationsSetting");
-                throw error;
+                throw oError;
             });
         },
 

package/src/main/js/sap/ushell/components/shell/Settings/spaces/SpacesSetting.controller.js

@@ -14,7 +14,7 @@ sap.ui.define([
     EventHub,
     Config,
     resources,
-    utils,
+    ushellUtils,
     Log
 ) => {
     "use strict";
@@ -68,7 +68,7 @@ sap.ui.define([
             this.oImportBookmarksFlagListener.off();
         },
 
-        onSave: function (fnUpdateUserPreferences) {
+        onSave: async function (fnUpdateUserPreferences) {
             let bRestart = false;
             let bUpdate = false;
             const aUpdatePromises = [];
@@ -114,10 +114,10 @@ sap.ui.define([
             }
 
             if (bOldHideEmptySpaces !== bNewHideEmptySpaces) {
-                const oHideEmptySpacesPromise = utils.setHideEmptySpacesEnabled(bNewHideEmptySpaces)
-                    .catch((sErrorMessage) => {
+                const oHideEmptySpacesPromise = ushellUtils.setHideEmptySpacesEnabled(bNewHideEmptySpaces)
+                    .catch((oError) => {
                         oModel.setProperty("/hideEmptySpaces/selected", bOldHideEmptySpaces);
-                        return Promise.reject(sErrorMessage);
+                        throw oError;
                     });
                 aUpdatePromises.push(oHideEmptySpacesPromise);
             }
@@ -136,7 +136,8 @@ sap.ui.define([
                             oUser.resetChangedProperty("importBookmarks");
                             resolve();
                         })
-                        .catch((sErrorMessage) => {
+                        .catch((oError) => {
+                            const sErrorMessage = oError.message;
                             if (
                                 !sErrorMessage.includes("SPACES_ENABLEMENT")
                                 && !sErrorMessage.includes("MYHOME_ENABLEMENT")
@@ -153,7 +154,7 @@ sap.ui.define([
                                 oUser.resetChangedProperty("spacesEnabled");
                                 oUser.resetChangedProperty("showMyHome");
                                 oUser.resetChangedProperty("importBookmarks");
-                                reject(sErrorMessage);
+                                reject(oError);
                             }
                         });
                 });

package/src/main/js/sap/ushell/components/shell/Settings/userAccount/UserAccountSelector.controller.js

@@ -103,7 +103,8 @@ sap.ui.define([
                         oUser.resetChangedProperty("isImageConsent");
                         resolve();
                     });
-                    oUserPreferencesPromise.catch((sErrorMessage) => {
+                    oUserPreferencesPromise.catch((oError) => {
+                        const sErrorMessage = oError.message;
                         if (!sErrorMessage.includes("ISIMAGECONSENT")) {
                             oUser.resetChangedProperty("isImageConsent");
                             resolve();
@@ -112,8 +113,8 @@ sap.ui.define([
                             oUser.setImageConsent(bOrigUserImgConsent);
                             oUser.resetChangedProperty("isImageConsent");
                             oModel.setProperty("/isImageConsentForUser", bOrigUserImgConsent);
-                            Log.error(sErrorMessage);
-                            reject(sErrorMessage);
+                            Log.error("Failed to update user image consent", oError);
+                            reject(oError);
                         }
                     });
                 });

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesSetting.controller.js

@@ -69,12 +69,12 @@ sap.ui.define([
                 .then(() => {
                     Config.emit("/core/shell/model/enableTrackingActivity", enabled);
                 })
-                .catch((error) => {
+                .catch((oError) => {
                     // Log failure if occurs.
                     Log.error(
-                        "Failed to save the user activities tracking in personalization", error,
+                        "Failed to save the user activities tracking in personalization", oError,
                         "sap.ushell.components.ushell.settings.userActivities.UserActivitiesSetting");
-                    return Promise.reject(error);
+                    throw oError;
                 });
         },
 

package/src/main/js/sap/ushell/components/shell/Settings/userDefaults/controller/UserDefaultsSetting.controller.js

@@ -118,10 +118,10 @@ sap.ui.define([
                 .then(() => {
                     oView.setBusy(false);
                 })
-                .catch((err) => {
+                .catch((oError) => {
                     Log.error(
                         "Error during UserDefaultsSetting controller initialization",
-                        err,
+                        oError,
                         "sap.ushell.components.shell.Settings.userDefaults.UserDefaultsSetting"
                     );
                     oView.setBusy(false);

package/src/main/js/sap/ushell/components/shell/Settings/userLanguageRegion/LanguageRegionSelector.controller.js

@@ -317,10 +317,10 @@ sap.ui.define([
                         return this.onSaveSuccess(oUser, bUpdateLanguage, sSelectedLanguage);
                     })
                     // in case of failure - return to the original language
-                    .catch((errorMessage) => {
-                        Log.debug("[000] onSave:catch:errorMessage", errorMessage, "LanguageRegionSelector.controller");
+                    .catch((oError) => {
+                        Log.debug("[000] onSave:catch:errorMessage", oError, "LanguageRegionSelector.controller");
                         const bSomeNamesInErrorMessage = aPropertyNames.some((sName) => {
-                            return errorMessage.includes(sName);
+                            return oError.message.includes(sName);
                         });
                         if (!bSomeNamesInErrorMessage) {
                             return this.onSaveSuccess(oUser, bUpdateLanguage, sSelectedLanguage);
@@ -339,9 +339,9 @@ sap.ui.define([
                         if (oModelData.isEnableUserProfileSetting) {
                             this._restoreUserSettingPreferenceValues();
                         }
-                        Log.error("Failed to save Language and Region Settings", errorMessage,
+                        Log.error("Failed to save Language and Region Settings", oError,
                             "sap.ushell.components.ushell.settings.userLanguageRegion.LanguageRegionSelector.controller");
-                        throw errorMessage;
+                        throw oError;
                     });
             }
             return Promise.resolve();

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

@@ -1,15 +1,21 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/ui/core/Element",
     "sap/ui/core/UIComponent",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
+    "sap/ushell/Container",
+    "sap/ushell/EventHub",
     "sap/ushell/renderer/ShellLayout",
     "sap/ushell/utils"
 ], (
+    Element,
     UIComponent,
     Device,
     JSONModel,
+    Container,
+    EventHub,
     ShellLayout,
     ushellUtils
 ) => {
@@ -80,8 +86,9 @@ sap.ui.define([
         setSearch: function (oSearchField) {
             this.rootControlLoaded().then((oView) => {
                 // removes the dummy input in the searchField slot for ESearch case when the search is being init by the SearchShellHelper
-                oView.byId("dummySearchInput")?.destroy();
-                oView.byId("shellBar").addSearchField(oSearchField);
+                const oShellBar = oView.byId("shellBar");
+                oShellBar.destroySearchField();
+                oShellBar.addSearchField(oSearchField);
             });
         },
 
@@ -111,6 +118,37 @@ sap.ui.define([
             }
         },
 
+        /**
+         * Sets the focus on the Logo for AccessKeyHandling
+         */
+        setFocusToLogo: function () {
+            this.rootControlLoaded().then((oView) => {
+                oView.byId("shellBar").getBranding()[0]?.focus();
+            });
+        },
+
+        /**
+         * Sets the focus on the App Finder Button for AccessKeyHandling
+         */
+        setFocusToAppFinderButton: function () {
+            this.rootControlLoaded().then((oView) => {
+                const oConfig = Container.getRendererInternal("fiori2").getShellConfig();
+                if (oConfig.moveAppFinderActionToShellHeader) {
+                    Element.getElementById("openCatalogBtn")?.focus();
+                } else {
+                    EventHub.emit("showUserActionsMenu", Date.now());
+                    window.setTimeout(() => {
+                        const aMenuItems = Element.getElementById("sapUshellUserActionsMenuPopover").getMenuItems();
+                        aMenuItems.forEach((item) => {
+                            if (item.getId().includes("openCatalogBtn")) {
+                                item.focus();
+                            }
+                        });
+                    }, 300);
+                }
+            });
+        },
+
         isPhoneState: function () {
             const deviceType = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD).name;
             const bEnoughSpaceForSearch = this.getDomRef().getBoundingClientRect().width > this.getSearchWidth();
@@ -121,6 +159,10 @@ sap.ui.define([
             return _iSearchWidth;
         },
 
+        isLargeState: function () {
+            return Device.media.getCurrentRange(this.FLPRangeSet.name).from === this.FLPRangeSet.rangeBorders[2];
+        },
+
         isExtraLargeState: function () {
             return Device.media.getCurrentRange(this.FLPRangeSet.name).from === this.FLPRangeSet.rangeBorders[3];
         },
@@ -143,9 +185,12 @@ sap.ui.define([
             oComponentContainer.attachSearchButtonPress = this.attachSearchButtonPress.bind(this);
             oComponentContainer.setAppTitle = this.setAppTitle.bind(this);
             oComponentContainer.getAppTitle = this.getAppTitle.bind(this);
+            oComponentContainer.isLargeState = this.isLargeState.bind(this);
             oComponentContainer.isExtraLargeState = this.isExtraLargeState.bind(this);
             oComponentContainer.getNotificationsBtnDomRef = this.getNotificationsBtnDomRef.bind(this);
             oComponentContainer.getProductSwitchDomRef = this.getProductSwitchDomRef.bind(this);
+            oComponentContainer.setFocusToLogo = this.setFocusToLogo.bind(this);
+            oComponentContainer.setFocusToAppFinderButton = this.setFocusToAppFinderButton.bind(this);
         },
 
         exit: function () {

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

@@ -2,6 +2,7 @@
 sap.ui.define([
     "sap/ui/Device",
     "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
     "sap/ui/thirdparty/hasher",
@@ -20,6 +21,7 @@ sap.ui.define([
 ], (
     Device,
     Element,
+    EventBus,
     Controller,
     JSONModel,
     hasher,
@@ -76,6 +78,7 @@ sap.ui.define([
             this._updateHomeUri(Config.last("/core/shellHeader/homeUri"));
 
             this.getView().setModel(this.getConfigurationModel(), "config");
+            this.getView().setModel(ShellModel.getConfigModel(), "shellConfig");
 
             this.prepareShellAppTitle();
             this._aDoables.push(EventHub.on("navigateBack").do(this.pressNavBackButton.bind(this)));
@@ -130,7 +133,14 @@ sap.ui.define([
         },
 
         onSearchButtonClick: function (oEvent) {
+            // Ensure that the event is also fired again if the search was not yet loaded, so we listen to the event once.
+            EventBus.getInstance().subscribeOnce("shell", "searchCompLoaded", () => {
+                this.getOwnerComponent().fireSearchButtonPress(oEvent);
+            });
+            // Used in the old CEP Search to open the search field
             this.getOwnerComponent().fireSearchButtonPress(oEvent);
+            // Used in the new CEP Search to trigger the search event in case the WC is inside the overflow on small screens
+            Element.getElementById("newCEPShellBarSearch")?.fireSearch();
         },
 
         _delegateHeadEndItemClick: function (sItemId) {
@@ -253,6 +263,16 @@ sap.ui.define([
             }
         },
 
+        onSearchFieldToggle: function () {
+            const oShellBarSearch = Element.getElementById("newCEPShellBarSearch");
+            if (oShellBarSearch) {
+                const bSearchExpanded = this.getOwnerComponent().getModel().getProperty("/searchField/show");
+                if (!bSearchExpanded && oShellBarSearch.getValue()) {
+                    oShellBarSearch.setValue("");
+                }
+            }
+        },
+
         /**
          * UI5 lifecycle method which is called upon controller destruction.
          * It detaches the router events and config listeners.

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.ShellBar",
         "applicationVersion": {
-            "version": "1.139.0"
+            "version": "1.141.0"
         },
         "type": "component",
         "ach": "CA-FLP-FE-COR",

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

@@ -56,6 +56,15 @@
             filters: [{ path: '', test: '.isProfileMenu' }]
         }"
     >
+        <thirdparty:searchField>
+            <!-- Create dummy search input for ESearch when ShellBar is enabled for the old ESH. -->
+            <!-- Make it busy to indicate that the search is not yet ready to be used. -->
+            <!-- If the Slot is empty, the Icon is missing; If the Slot content is invisible, the Icon is also missing. -->
+            <m:Input id="dummySearchInput"
+                     busy="true"
+                     busyIndicatorDelay="0"
+                     visible="{shellConfig>/searchAvailable}"/>
+        </thirdparty:searchField>
         <thirdparty:branding>
             <thirdparty:ShellBarBranding
                 href="{/logo/homeUri}"
@@ -77,11 +86,5 @@
                 writeToDom="true"
             />
         </thirdparty:customData>
-
-        <thirdparty:searchField>
-            <!-- content added by the ESearch module (library "sap/esh/search/ui/SearchShellHelper") by calling setSearch method on ShellBar component -->
-            <!-- this is required in order to avoid pre-fetching a lot of fragment.xmls on first render which might not be used -->
-            <m:Input id="dummySearchInput"/>
-        </thirdparty:searchField>
     </thirdparty:ShellBar>
 </mvc:View>

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

@@ -1,22 +1,22 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/base/util/ObjectPath",
+    "sap/base/Log",
     "sap/ui/core/EventBus",
     "sap/ui/core/mvc/Controller",
-    "sap/ui/Device",
+    "sap/ushell/components/shell/SideNavigation/interface/ListProviderAPI",
+    "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/EventHub",
-    "sap/ushell/Config",
-    "sap/base/Log"
+    "sap/ushell/utils"
 ], (
-    ObjectPath,
+    Log,
     EventBus,
     Controller,
-    Device,
+    ListProviderAPI,
+    Config,
     Container,
     EventHub,
-    Config,
-    Log
+    ushellUtils
 ) => {
     "use strict";
 
@@ -52,7 +52,7 @@ sap.ui.define([
         onInit: function () {
             const oUpdateNavigationListOnConfigChange = Config.on("/core/sideNavigation/navigationListProvider").do((oConfig) => {
                 this.pNavigationListProvider = this._initNavigationListProvider("/core/sideNavigation/navigationListProvider");
-                this._selectIndexAfterRouteChange();
+                this.selectIndexAfterRouteChange();
             });
             const oUpdateFixedNavigationListOnConfigChange = Config.on("/core/sideNavigation/fixedNavigationListProvider").do((oConfig) => {
                 this._initNavigationListProvider("/core/sideNavigation/fixedNavigationListProvider", "fixedItem");
@@ -63,12 +63,12 @@ sap.ui.define([
 
             this.oContainerRouter = Container.getRendererInternal().getRouter();
 
-            this.oContainerRouter.getRoute("home").attachMatched(this._selectIndexAfterRouteChange, this);
-            this.oContainerRouter.getRoute("openFLPPage").attachMatched(this._selectIndexAfterRouteChange, this);
-            this.oContainerRouter.getRoute("openWorkPage").attachMatched(this._selectIndexAfterRouteChange, this);
+            this.oContainerRouter.getRoute("home").attachMatched(this.selectIndexAfterRouteChange, this);
+            this.oContainerRouter.getRoute("openFLPPage").attachMatched(this.selectIndexAfterRouteChange, this);
+            this.oContainerRouter.getRoute("openWorkPage").attachMatched(this.selectIndexAfterRouteChange, this);
 
             this.oEnableMenuBarNavigationListener = EventHub.on("enableMenuBarNavigation").do((bEnableSideNavigation) => this.onEnableSideNavigation(bEnableSideNavigation));
-            EventBus.getInstance().subscribe("sap.ushell", "appOpened", this._selectIndexAfterRouteChange, this);
+            EventBus.getInstance().subscribe("sap.ushell", "appOpened", this.selectIndexAfterRouteChange, this);
         },
 
         /**
@@ -78,53 +78,42 @@ sap.ui.define([
          *
          * @param {string} sConfigPath The configuration path.
          * @param {string} sAggregationName The name of the aggregation.
-         * @returns {Promise<object>} A promise that resolves with the NavigationListProvider when it is initialized.
+         * @returns {Promise<sap.ushell.modules.NavigationMenu.ListProvider>} A promise that resolves with the NavigationListProvider when it is initialized.
          * @private
          * @since 1.134.0
          */
-        _initNavigationListProvider: function (sConfigPath, sAggregationName) {
-            return new Promise((resolve) => {
-                const oSideNavigation = this.byId("sideNavigation");
-                const oNavContainer = this.byId("navContainer");
-                const sModulePath = Config.last(`${sConfigPath}/modulePath`);
-                const oComponent = this.getOwnerComponent();
-                if (sModulePath) {
-                    const oAPIClosure = {
-                        getConfigValue: (sPath) => {
-                            let oConfig;
-                            try {
-                                oConfig = JSON.parse(Config.last(`${sConfigPath}/configuration`));
-                            } catch (oError) {
-                                oConfig = {};
-                            }
-                            return ObjectPath.get(sPath, oConfig);
-                        },
-                        getNavContainerFacade: () => {
-                            return {
-                                add: (oControl) => oNavContainer.addPage(oControl),
-                                to: (vControl) => oNavContainer.to(vControl),
-                                toRoot: () => oNavContainer.to(oSideNavigation)
-                            };
-                        },
-                        updateSelectedKey: () => this._selectIndexAfterRouteChange(),
-                        openSideNavigation: () => oComponent.popoverOpen(),
-                        closeSideNavigation: () => oComponent.popoverClose(),
-                        expandSideNavigation: () => oComponent.toggleSideNavigationExpansion(true),
-                        collapseSideNavigation: () => oComponent.toggleSideNavigationExpansion(false)
-                    };
-
-                    sap.ui.require([sModulePath], async (NavigationListProvider) => {
-                        const oNavigationListProvider = new NavigationListProvider(oAPIClosure);
-                        const oNavigationListItems = await oNavigationListProvider.getRootItem();
-                        if (sAggregationName === "fixedItem") {
-                            oSideNavigation.setFixedItem(oNavigationListItems);
-                        } else {
-                            oSideNavigation.setItem(oNavigationListItems);
-                        }
-                        resolve(oNavigationListProvider);
-                    });
+        _initNavigationListProvider: async function (sConfigPath, sAggregationName) {
+            const oSideNavigation = this.byId("sideNavigation");
+            const oNavContainer = this.byId("navContainer");
+            const sModulePath = Config.last(`${sConfigPath}/modulePath`);
+            const oComponent = this.getOwnerComponent();
+            if (sModulePath) {
+                let oProviderConfig;
+                try {
+                    oProviderConfig = JSON.parse(Config.last(`${sConfigPath}/configuration`));
+                } catch (oError) {
+                    oProviderConfig = {};
                 }
-            });
+
+                const oListProviderAPI = new ListProviderAPI(
+                    oProviderConfig,
+                    oNavContainer,
+                    oSideNavigation,
+                    oComponent,
+                    this
+                );
+
+                const [NavigationListProvider] = await ushellUtils.requireAsync([sModulePath]);
+
+                const oNavigationListProvider = new NavigationListProvider(oListProviderAPI);
+                const oNavigationListItems = await oNavigationListProvider.getRootItem();
+                if (sAggregationName === "fixedItem") {
+                    oSideNavigation.setFixedItem(oNavigationListItems);
+                } else {
+                    oSideNavigation.setItem(oNavigationListItems);
+                }
+                return oNavigationListProvider;
+            }
         },
 
         /**
@@ -153,7 +142,7 @@ sap.ui.define([
         * @private
         * @since 1.132.0
         */
-        _selectIndexAfterRouteChange: async function () {
+        selectIndexAfterRouteChange: async function () {
             const oViewConfigModel = this.getOwnerComponent().getModel("viewConfiguration");
             const oNavigationListProvider = await this.pNavigationListProvider;
             const sSelectedKey = await oNavigationListProvider.findSelectedKey();
@@ -177,7 +166,7 @@ sap.ui.define([
          */
         onExit: function () {
             this.oEnableMenuBarNavigationListener.off();
-            EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this._selectIndexAfterRouteChange, this);
+            EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this.selectIndexAfterRouteChange, this);
             this._aDoables.forEach((oConfigListener) => {
                 oConfigListener.off();
             });
@@ -195,7 +184,7 @@ sap.ui.define([
                 // ... or the route is not available in the test environment in some cases
                 const oRoute = oRouter.getRoute(sRouteName);
                 if (oRoute) {
-                    oRoute.detachMatched(this._selectIndexAfterRouteChange, this);
+                    oRoute.detachMatched(this.selectIndexAfterRouteChange, this);
                 }
             }
             try {

package/src/main/js/sap/ushell/components/shell/SideNavigation/fragment/Popover.fragment.xml

@@ -4,12 +4,12 @@
     xmlns:mvc="sap.ui.core.mvc"
     xmlns:tnt="sap.tnt"
     core:require="{
-        mLibrary: 'sap/m/library'
+        Device: 'sap/ui/Device'
     }">
     <ResponsivePopover
         id="sideNavigationPopover"
         verticalScrolling="false"
-        showHeader="false"
+        showHeader="{= Device.system.phone}"
         placement="Bottom"
         ariaLabelledBy="sideNavigationLabel">
 		<core:InvisibleText id="sideNavigationLabel" text="{i18n>SideNavigation.PopoverLabel}"/>