@sapui5/sap.ushell 1.139.0 → 1.141.0

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.139.0
+ * @version 1.141.0
  * @private
  */
 sap.ui.define([

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.139.0
+ * @version 1.141.0
  * @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.139.0"
+            "version": "1.141.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

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

@@ -64,7 +64,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.139.0",
+            version: "1.141.0",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]
@@ -211,8 +211,8 @@ sap.ui.define([
                     this.oNotificationsService.getUnseenNotificationsCount().then((iNumberOfNotifications) => {
                         this.oConfigModel.setProperty("/notificationsCount", parseInt(iNumberOfNotifications, 10));
                     })
-                        .catch((data) => {
-                            Log.error("Notifications - call to notificationsService.getCount failed: ", data);
+                        .catch((oError) => {
+                            Log.error("Notifications - call to notificationsService.getCount failed: ", oError);
                         });
                 }
             });

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

@@ -167,7 +167,7 @@ sap.ui.define([
                     this.oNotificationsService._userSettingInitialization();
                 }
                 this.addBufferToModel(this.sCurrentSorting, oResult);
-            } catch (oResult) {
+            } catch (oError) {
                 if (iNumberOfItemsInModel === 0) {
                     this.removeBusyIndicatorToTabFilter(this.sCurrentSorting);
                     _errorMessage(resources.i18n.getText("errorOccurredMsg"));
@@ -332,8 +332,8 @@ sap.ui.define([
                 const aNotifications = await this.oNotificationsService.getNotificationsBufferBySortingType(sSorting, 0, iTop);
                 const oModel = this.getModel();
                 oModel.setProperty(`/${sSorting}/aNotifications`, aNotifications);
-            } catch (error) {
-                Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ", error, "sap.ushell.components.shell.Notifications.Notifications");
+            } catch (oError) {
+                Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ", oError, "sap.ushell.components.shell.Notifications.Notifications");
             } finally {
                 this.removeBusyIndicatorToTabFilter(sSorting);
                 this._retainFocus();
@@ -344,7 +344,7 @@ sap.ui.define([
             this.setMarkReadOnModel(sNotificationId, true);
             try {
                 await this.oNotificationsService.markRead(sNotificationId);
-            } catch (error) {
+            } catch (oError) {
                 _errorMessage(resources.i18n.getText("notificationsFailedMarkRead"));
                 this.setMarkReadOnModel(sNotificationId, false);
             }
@@ -377,10 +377,10 @@ sap.ui.define([
                 ]);
                 MessageToast.show(sMessage, { duration: 4000 });
                 await this.refreshModel();
-            } catch (oResult) {
-                const iNrOfSucceededNotifications = oResult.succededNotifications && oResult.succededNotifications.length;
+            } catch (oErrorResult) {
+                const iNrOfSucceededNotifications = oErrorResult.succededNotifications && oErrorResult.succededNotifications.length;
                 if (iNrOfSucceededNotifications) {
-                    const iNrOfFailedNotifications = oResult.failedNotifications.length;
+                    const iNrOfFailedNotifications = oErrorResult.failedNotifications.length;
                     sMessage = resources.i18n.getText("notificationsPartialSuccessExecuteBulkAction", [
                         sActionText,
                         iNrOfSucceededNotifications,
@@ -404,7 +404,7 @@ sap.ui.define([
                 await this.oNotificationsService.dismissNotification(sNotificationId);
                 await this.refreshModel();
                 this._retainFocus();
-            } catch (error) {
+            } catch (oError) {
                 _errorMessage(resources.i18n.getText("notificationsFailedDismiss"));
             }
         },
@@ -414,7 +414,7 @@ sap.ui.define([
                 await this.oNotificationsService.dismissBulkNotifications(oGroup.Id);
                 await this.refreshModel();
                 this._retainFocus();
-            } catch (error) {
+            } catch (oError) {
                 _errorMessage(resources.i18n.getText("notificationsFailedExecuteBulkAction"));
             }
         },

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

@@ -15,6 +15,7 @@ sap.ui.define([
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager",
     "sap/ushell/Container",
+    "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing"
 ], (
     Localization,
@@ -31,6 +32,7 @@ sap.ui.define([
     ShellModel,
     StateManager,
     Container,
+    ushellUtils,
     UrlParsing
 ) => {
     "use strict";
@@ -64,19 +66,24 @@ sap.ui.define([
             library: "sap.ushell"
         },
         init: function () {
+            this._aInitPromises = [];
             const oShellConfig = Container.getRendererInternal("fiori2").getShellConfig();
 
-            aCreatedControlIds.push(this._createBackButton());
+            this._aInitPromises.push(this._createBackButton().then((sBtnId) => {
+                aCreatedControlIds.push(sBtnId);
+            }));
             aCreatedControlIds.push(this._createOverflowButton());
 
             if (oShellConfig.moveAppFinderActionToShellHeader && Config.last("/core/catalog/enabled") && !oShellConfig.disableAppFinder) {
-                aCreatedControlIds.push(this._createAppFinderButton());
+                this._aInitPromises.push(this._createAppFinderButton().then((sBtnId) => {
+                    aCreatedControlIds.push(sBtnId);
+                }));
             }
 
             if (oShellConfig.moveContactSupportActionToShellHeader) {
-                this._createSupportButton().then((sBtnId) => {
+                this._aInitPromises.push(this._createSupportButton().then((sBtnId) => {
                     aCreatedControlIds.push(sBtnId);
-                });
+                }));
             }
 
             this._createShellNavigationMenu();
@@ -84,14 +91,16 @@ sap.ui.define([
             const oShellHeader = Element.getElementById("shell-header");
             oShellHeader.updateAggregation("headItems");
             oShellHeader.updateAggregation("headEndItems");
+
+            this._pInitPromise = Promise.all(this._aInitPromises);
         },
 
-        _createBackButton: function () {
+        _createBackButton: async function () {
             const sBackButtonIcon = Localization.getRTL() ? "feeder-arrow" : "nav-back";
             const sCurrentShellMode = StateManager.getShellMode();
             let oBackButton;
             if (Config.last("/core/shellBar/enabled")) {
-                const Button = sap.ui.require("sap/ushell/gen/ui5/webcomponents/dist/Button");
+                const [Button] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents/dist/Button"]);
                 oBackButton = new Button({
                     id: "backBtn",
                     tooltip: resources.i18n.getText("backBtn_tooltip"),
@@ -148,11 +157,11 @@ sap.ui.define([
 
         _createOverflowButton: function () {
             if (Config.last("/core/shellBar/enabled")) {
-                // overflow is hanlded by the ShellBar component
+                // overflow is handled by the ShellBar component
                 return;
             }
 
-            var oEndItemsOverflowBtn = new ShellHeadItem({
+            const oEndItemsOverflowBtn = new ShellHeadItem({
                 id: "endItemsOverflowBtn",
                 tooltip: {
                     path: "configModel>/notificationsCount",
@@ -174,25 +183,25 @@ sap.ui.define([
             return oEndItemsOverflowBtn.getId();
         },
 
-        _createHeaderItem: function (oSettings) {
+        _createHeaderItem: async function (oSettings) {
             if (Config.last("/core/shellBar/enabled")) {
-                const ShellBarItem = sap.ui.require("sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem");
+                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem"]);
                 // Create a ShellBarItem for the shell header
                 oSettings.click = oSettings.press; // web components use click instead of press
                 delete oSettings.press; // remove press to avoid confusion
 
                 oSettings.accessibilityAttributes = oSettings.accessibilityAttributes || {};
-                oSettings.accessibilityAttributes.hasPopup = oSettings.accessibilityAttributes.hasPopup || oSettings.ariaHaspopup;
+                oSettings.accessibilityAttributes.hasPopup = oSettings.accessibilityAttributes.hasPopup ?? oSettings.ariaHaspopup;
                 delete oSettings.ariaHaspopup; // web components do not support ariaHaspopup
                 delete oSettings.ariaLabel; // web components do not support ariaLabel
 
                 return new ShellBarItem(oSettings);
             }
-                return new ShellHeadItem(oSettings);
+            return new ShellHeadItem(oSettings);
         },
 
-        _createAppFinderButton: function () {
-            var oOpenCatalogButton = this._createHeaderItem({
+        _createAppFinderButton: async function () {
+            const oOpenCatalogButton = await this._createHeaderItem({
                 id: "openCatalogBtn",
                 text: resources.i18n.getText("open_appFinderBtn"),
                 ariaLabel: resources.i18n.getText("open_appFinderBtn"),
@@ -220,7 +229,7 @@ sap.ui.define([
 
         _createSupportButton: function () {
             return new Promise((fnResolve) => {
-                sap.ui.require(["sap/ushell/ui/footerbar/ContactSupportButton"], (ContactSupportButton) => {
+                sap.ui.require(["sap/ushell/ui/footerbar/ContactSupportButton"], async (ContactSupportButton) => {
                     const sButtonName = "ContactSupportBtn";
                     let oSupportButton = Element.getElementById(sButtonName);
                     if (!oSupportButton) {
@@ -234,7 +243,7 @@ sap.ui.define([
 
                         const sIcon = oTempButton.getIcon();
                         const sText = oTempButton.getText();
-                        oSupportButton = this._createHeaderItem({
+                        oSupportButton = await this._createHeaderItem({
                             id: sButtonName,
                             icon: sIcon,
                             tooltip: sText,

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.139.0",
+            version: "1.141.0",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {
@@ -69,8 +69,8 @@ sap.ui.define([
                         that._addProductSwitchButtonToHeader();
                     }
                 })
-                .catch((err) => {
-                    Log.debug(err);
+                .catch((oError) => {
+                    Log.debug("get ProductSwitch model failed: ", oError);
                 });
             return oModel;
         },

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

@@ -1,6 +1,8 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 
 sap.ui.define([
+    "sap/m/Input",
+    "sap/ui/core/Element",
     "sap/ui/core/EventBus",
     "sap/ushell/components/shell/Search/ESearch",
     "sap/ui/core/UIComponent",
@@ -9,7 +11,7 @@ sap.ui.define([
     "sap/ushell/utils",
     "sap/base/util/ObjectPath",
     "sap/ushell/Container"
-], (EventBus, ESearch, UIComponent, Component, Config, Utils, ObjectPath, Container) => {
+], (Input, Element, EventBus, ESearch, UIComponent, Component, Config, Utils, ObjectPath, Container) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.Search.Component", {

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

@@ -10,7 +10,15 @@ sap.ui.define([
     "sap/ushell/renderer/search/util",
     "sap/ushell/Container",
     "sap/ushell/Config"
-], (Element, Library, resources, IconPool, HashChanger, jQuery, util, Container, Config) => {
+], (Element,
+    Library,
+    resources,
+    IconPool,
+    HashChanger,
+    jQuery,
+    util,
+    Container,
+    Config) => {
     "use strict";
 
     let bDoExit = false;

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

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

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

@@ -33,7 +33,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.139.0",
+            version: "1.141.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]
@@ -96,8 +96,8 @@ sap.ui.define([
                     onAfterRendering: this._onAfterRendering.bind(this)
                 });
                 this.oSearchCEPController.getHomePageApps();
-            } catch (error) {
-                Log.info(`Failed to create CEP search field content${error}`);
+            } catch (oError) {
+                Log.info("Failed to create CEP search field content", oError);
             }
             EventBus.getInstance().publish("shell", "searchCompLoaded", { delay: 0 });
         },

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -41,39 +41,41 @@ sap.ui.define([
      */
     FrequentActivityProvider.prototype.execSearch = function (sQuery, sGroupName) {
         return Container.getServiceAsync("UserRecents").then((UserRecentsService) => {
-            return UserRecentsService.getFrequentActivity().then((oRecents) => {
-                let aFinalResult = [];
-                const oMapping = {
-                    frequentApplications: {
-                        Application: {
-                            icon: "sap-icon://SAP-icons-TNT/application"
+            return UserRecentsService.getFrequentActivity()
+                .then((oRecents) => {
+                    let aFinalResult = [];
+                    const oMapping = {
+                        frequentApplications: {
+                            Application: {
+                                icon: "sap-icon://SAP-icons-TNT/application"
+                            },
+                            "External Link": {
+                                icon: "sap-icon://internet-browser"
+                            }
                         },
-                        "External Link": {
-                            icon: "sap-icon://internet-browser"
+                        frequentProducts: {
+                            Product: {
+                                icon: "sap-icon://product"
+                            }
                         }
-                    },
-                    frequentProducts: {
-                        Product: {
-                            icon: "sap-icon://product"
-                        }
-                    }
-                };
+                    };
 
-                if (oRecents && Array.isArray(oRecents) && oRecents.length > 0) {
-                    aFinalResult = oRecents.filter((item) => {
-                        return oMapping[sGroupName].hasOwnProperty(item.appType);
-                    }).map((item) => {
-                        item.text = item.text || item.title;
-                        item.icon = item.icon || oMapping[sGroupName][item.appType].icon;
-                        return item;
-                    });
-                }
+                    if (oRecents && Array.isArray(oRecents) && oRecents.length > 0) {
+                        aFinalResult = oRecents.filter((item) => {
+                            return oMapping[sGroupName].hasOwnProperty(item.appType);
+                        }).map((item) => {
+                            item.text = item.text || item.title;
+                            item.icon = item.icon || oMapping[sGroupName][item.appType].icon;
+                            return item;
+                        });
+                    }
 
-                return aFinalResult;
-            }, (sError) => {
-                Log.error("Frequent Activity Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.FrequentActivityProvider::execSearch");
-                return [];
-            });
+                    return aFinalResult;
+                })
+                .catch((oError) => {
+                    Log.error("Frequent Activity Provider failed", oError, "sap.ushell.components.shell.SearchCEP.SearchProviders.FrequentActivityProvider::execSearch");
+                    return [];
+                });
         });
     };
 

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -39,23 +39,25 @@ sap.ui.define([
      */
     RecentSearchProvider.prototype.execSearch = function () {
         return Container.getServiceAsync("UserRecents").then((UserRecentsService) => {
-            return UserRecentsService.getRecentSearches().then((aRecents) => {
-                let aFinalResult = [];
-                if (Array.isArray(aRecents) && aRecents.length > 0) {
-                    aFinalResult = aRecents.map(
-                        (item) => {
-                            return {
-                                text: item.sTerm,
-                                icon: item.icon || "sap-icon://history"
-                            };
-                        });
-                }
+            return UserRecentsService.getRecentSearches()
+                .then((aRecents) => {
+                    let aFinalResult = [];
+                    if (Array.isArray(aRecents) && aRecents.length > 0) {
+                        aFinalResult = aRecents.map(
+                            (item) => {
+                                return {
+                                    text: item.sTerm,
+                                    icon: item.icon || "sap-icon://history"
+                                };
+                            });
+                    }
 
-                return aFinalResult;
-            }, (sError) => {
-                Log.error("Recent Search Terms Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.RecentSearchProvider::execSearch");
-                return [];
-            });
+                    return aFinalResult;
+                })
+                .catch((oError) => {
+                    Log.error("Recent Search Terms Provider failed", oError, "sap.ushell.components.shell.SearchCEP.SearchProviders.RecentSearchProvider::execSearch");
+                    return [];
+                });
         });
     };
 

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/ushell/resources",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.139.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -124,36 +124,38 @@ sap.ui.define([
                 break;
         }
 
-        return Container.getServiceAsync("SearchCEP").then((SearchCEPService) => {
-            return SearchCEPService.suggest(oParams).then((oResult) => {
-                const bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
-                const sPlatform = Container.getFLPPlatform(true);
-                const bIsCEPStandard = bIsSearchCEPEnabled === true && sPlatform === "cFLP";
-                let aFinalResult = [];
-                const bESSearchEnabled = ObjectPath.get("sap-ushell-config.renderers.fiori2.componentData.config.searchBusinessObjects");
-                const oDefaultIcons = {
-                    applications: "sap-icon://SAP-icons-TNT/application",
-                    homePageApplications: "sap-icon://SAP-icons-TNT/product",
-                    externalSearchApplications: "sap-icon://world"
-                };
+        return Container.getServiceAsync("SearchCEP")
+            .then((SearchCEPService) => {
+                return SearchCEPService.suggest(oParams).then((oResult) => {
+                    const bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
+                    const sPlatform = Container.getFLPPlatform(true);
+                    const bIsCEPStandard = bIsSearchCEPEnabled === true && sPlatform === "cFLP";
+                    let aFinalResult = [];
+                    const bESSearchEnabled = ObjectPath.get("sap-ushell-config.renderers.fiori2.componentData.config.searchBusinessObjects");
+                    const oDefaultIcons = {
+                        applications: "sap-icon://SAP-icons-TNT/application",
+                        homePageApplications: "sap-icon://SAP-icons-TNT/product",
+                        externalSearchApplications: "sap-icon://world"
+                    };
 
-                if (oResult) {
-                    aFinalResult = oResult.data.map((item) => {
-                        item.text = item.text || item.label || item.title;
-                        item.icon = item.icon || oDefaultIcons[sGroupName];
-                        return item;
-                    });
-                }
+                    if (oResult) {
+                        aFinalResult = oResult.data.map((item) => {
+                            item.text = item.text || item.label || item.title;
+                            item.icon = item.icon || oDefaultIcons[sGroupName];
+                            return item;
+                        });
+                    }
 
-                if (bESSearchEnabled === true && bIsCEPStandard === true && sGroupName === "externalSearchApplications") {
-                    _addESToResult(aFinalResult, sQuery);
-                }
-                return aFinalResult;
+                    if (bESSearchEnabled === true && bIsCEPStandard === true && sGroupName === "externalSearchApplications") {
+                        _addESToResult(aFinalResult, sQuery);
+                    }
+                    return aFinalResult;
+                });
+            })
+            .catch((oError) => {
+                Log.error("Search service Provider failed", oError, "sap.ushell.components.shell.SearchCEP.SearchProviders.SearchServiceProvider::execSearch");
+                return [];
             });
-        }, (sError) => {
-            Log.error("Search service Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.SearchServiceProvider::execSearch");
-            return [];
-        });
     };
 
     return new SearchServiceProvider();