@sapui5/sap.ushell 1.141.3 → 1.143.0

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

@@ -4,19 +4,15 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
-    "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",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
-    "sap/ushell/library",
     "sap/ushell/resources",
     "sap/ushell/utils",
-    "sap/ushell/ui/shell/ShellHeadItem",
     "sap/ushell/Container",
     "sap/ushell/state/ShellModel",
     "sap/ui/core/mvc/XMLView",
@@ -25,19 +21,15 @@ sap.ui.define([
     Log,
     Element,
     EventBus,
-    IconPool,
     InvisibleText,
     UIComponent,
     hasher,
-    Device,
     mobileLibrary,
     Popover,
     Config,
     EventHub,
-    ushellLibrary,
     resources,
     utils,
-    ShellHeadItem,
     Container,
     ShellModel,
     XMLView,
@@ -51,9 +43,6 @@ sap.ui.define([
     // shortcut for sap.m.PlacementType
     const PlacementType = mobileLibrary.PlacementType;
 
-    // shortcut for sap.ushell.FloatingNumberType
-    const FloatingNumberType = ushellLibrary.FloatingNumberType;
-
     function getNotificationButton () {
         return Element.getElementById("NotificationsCountButton");
     }
@@ -64,13 +53,24 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.141.3",
+            version: "1.143.0",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]
             }
         },
 
+        init: function (...args) {
+            this._oNotificationsAPI = this.getComponentData().notificationsAPI;
+            // Call the init function of the parent
+            UIComponent.prototype.init.apply(this, args);
+            this._aDoables = [];
+        },
+
+        _useNewUI: function () {
+            return !!this._oNotificationsAPI.getConfigValue("newNotificationsUI");
+        },
+
         createContent: function () {
             this._aTimeouts = [];
             this.oRenderer = Container.getRendererInternal("fiori2");
@@ -86,36 +86,10 @@ sap.ui.define([
                         this.oConfigModel.setProperty("/enableNotificationsUI", true);
                         this.oNotificationsService.registerNotificationsUpdateCallback(this._updateCount.bind(this), true);
                     }
-                    this._createNotificationButton(this.oConfigModel);
-
-                    EventHub.on("showNotifications").do(this._toggleNotifications.bind(this));
-                }
-            });
-        },
 
-        _createNotificationButton: function (oConfigModel) {
-            // The press handler is added in the Notification Component
-            const oNotificationToggleButton = new ShellHeadItem({
-                id: "NotificationsCountButton",
-                tooltip: resources.i18n.getText("notificationsBtn_title"),
-                icon: IconPool.getIconURI("bell"),
-                text: resources.i18n.getText("notificationsBtn_title"),
-                ariaLabel: resources.i18n.getText("notificationsBtn_title"),
-                ariaHaspopup: "dialog",
-                enabled: true,
-                selected: false,
-                visible: "{configModel>/enableNotifications}",
-                floatingNumber: "{configModel>/notificationsCount}",
-                floatingNumberMaxValue: Device.system.phone ? 99 : 999, // according to the UX specification
-                floatingNumberType: FloatingNumberType.Notifications,
-                press: function () {
-                    EventHub.emit("showNotifications", Date.now());
+                    this._aDoables.push(EventHub.on("showNotifications").do(this._toggleNotifications.bind(this)));
                 }
             });
-            oNotificationToggleButton.setModel(oConfigModel, "configModel");
-            oNotificationToggleButton.setModel(resources.i18nModel, "i18n");
-
-            this.oRenderer.showHeaderEndItem([oNotificationToggleButton.getId()], false, ["home", "app"]);
         },
 
         _handleAlerts: function (sChannelId, sEventId, aNewNotifications) {
@@ -138,11 +112,11 @@ sap.ui.define([
             };
 
             // Use new notifications popover
-            if (Config.last("/core/notifications/enabled")) {
+            if (this._useNewUI()) {
                 sap.ui.require([
-                    "sap/ushell/gen/ui5/webcomponents/dist/Label",
-                    "sap/ushell/gen/ui5/webcomponents-fiori/dist/NotificationList",
-                    "sap/ushell/gen/ui5/webcomponents-fiori/dist/NotificationListItem"
+                    "sap/f/gen/ui5/webcomponents/dist/Label",
+                    "sap/f/gen/ui5/webcomponents_fiori/dist/NotificationList",
+                    "sap/f/gen/ui5/webcomponents_fiori/dist/NotificationListItem"
                 ], (Label, NotificationList, NotificationListItem) => {
                     if (!this._oNotificationsAlertList) {
                         this._oNotificationsAlertList = new NotificationList({
@@ -152,8 +126,8 @@ sap.ui.define([
                         this.oRenderer.addRightFloatingContainerItem({ id: this._oNotificationsAlertList.getId() }, true, true);
                     }
 
-                    const fnNotificationDismiss = (oNotificationItem) => {
-                        oNotificationItem.destroy();
+                    const fnNotificationDismiss = (oItem) => {
+                        oItem.destroy();
                         if (this._oNotificationsAlertList.getItems().length <= 0) {
                             this.oRenderer.showRightFloatingContainer(false);
                         }
@@ -255,8 +229,6 @@ sap.ui.define([
         /**
          * Creates a popover which contains the notifications list.
          *
-         * If the configuration "/core/notifications/enabled" is true, the new notification popover is used, otherwise the classic notification popover.
-         *
          * @returns {Promise<sap.m.Popover>} A promise that resolves with the popover.
          *
          * @since 1.136.0
@@ -264,7 +236,7 @@ sap.ui.define([
          */
         _getPopover: function () {
             if (!this._oNotificationsPopoverPromise) {
-                if (Config.last("/core/notifications/enabled")) {
+                if (this._useNewUI()) {
                     this._oNotificationsPopoverPromise = new Promise((resolve, reject) => {
                         this.runAsOwner(() => {
                             XMLView.create({
@@ -353,7 +325,7 @@ sap.ui.define([
 
                 if (oPopover.isOpen()) {
                     oPopover.close();
-                } else if (bShow !== false) { // Special case: ComponentKeysHandler may emit showNotifications:false
+                } else if (bShow !== false && oSource) { // Special case: ComponentKeysHandler may emit showNotifications:false
                     this._resetCount();
                     oPopover.openBy(oSource);
                 }
@@ -366,6 +338,9 @@ sap.ui.define([
         },
 
         exit: function () {
+            this._aDoables.forEach((oDoable) => { oDoable.off(); });
+            this._aDoables = [];
+
             EventBus.getInstance().unsubscribe("sap.ushell.services.Notifications", "onNewNotifications", this._handleAlerts, this);
             if (this.oNotificationsService && this.oNotificationsService.isEnabled() === true) {
                 this.oNotificationsService.destroy();
@@ -378,7 +353,7 @@ sap.ui.define([
                 oNotificationBtn.destroy();
             }
             this.oRenderer = null;
-            let oNotificationsPopover = Element.getElementById("notificationsView");
+            let oNotificationsPopover = Element.getElementById("shellNotificationsPopover");
             if (oNotificationsPopover) {
                 oNotificationsPopover.destroy();
                 oNotificationsPopover = null;

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

@@ -764,7 +764,7 @@ sap.ui.define([
             const oItem = oEvent.getParameter("item");
 
             // Only Continue of the Item is a valid notification list item, it could be a menu list item.
-            if (this._bRemoving || !oItem?.isA || !oItem.isA("sap.ushell.gen.ui5.webcomponents-fiori.dist.NotificationListItem")) {
+            if (this._bRemoving || !oItem?.isA || !oItem.isA("sap.f.gen.ui5.webcomponents_fiori.dist.NotificationListItem")) {
                 return;
             }
 

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

@@ -3,8 +3,8 @@
     xmlns="sap.m"
     xmlns:mvc="sap.ui.core.mvc"
     xmlns:core="sap.ui.core"
-    xmlns:thirdparty="sap.ushell.gen.ui5.webcomponents-fiori.dist"
-    xmlns:thirdpartywc="sap.ushell.gen.ui5.webcomponents.dist"
+    xmlns:thirdparty="sap.f.gen.ui5.webcomponents_fiori.dist"
+    xmlns:thirdpartywc="sap.f.gen.ui5.webcomponents.dist"
     core:require="{
         formatMessage: 'sap/base/strings/formatMessage',
         Utils: 'sap/ushell/utils',

package/src/main/js/sap/ushell/components/shell/Notifications/NotificationsListPopoverHeader.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
     xmlns="sap.m"
     xmlns:core="sap.ui.core"
-    xmlns:thirdpartywc="sap.ushell.gen.ui5.webcomponents.dist"
+    xmlns:thirdpartywc="sap.f.gen.ui5.webcomponents.dist"
     core:require="{
         formatMessage: 'sap/base/strings/formatMessage',
         Utils: 'sap/ushell/utils'

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

@@ -0,0 +1,169 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+
+/**
+ * @file This is Notifications module that loads the Notifications component. And also creates a notification button if the ShellHeader is used.
+ */
+sap.ui.define([
+    "sap/ui/Device",
+    "sap/ui/core/Component",
+    "sap/ushell/Config",
+    "sap/ushell/Container",
+    "sap/ushell/EventHub",
+    "sap/ushell/modules/Notifications/NotificationsProvider",
+    "sap/ushell/resources",
+    "sap/ushell/state/ShellModel",
+    "sap/ushell/ui/shell/ShellHeadItem",
+    "sap/ushell/library"
+], (
+    Device,
+    Component,
+    Config,
+    Container,
+    EventHub,
+    NotificationsProvider,
+    ushellResources,
+    ShellModel,
+    ShellHeadItem,
+    ushellLibrary
+) => {
+    "use strict";
+
+    async function getRendererInternalAsync (sRendererName) {
+        return new Promise(async (resolve) => {
+            const oRenderer = Container.getRendererInternal(sRendererName);
+            if (oRenderer) {
+                resolve(oRenderer);
+            } else {
+                Container.attachRendererCreatedEvent(function onRendererCreated () {
+                    Container.detachRendererCreatedEvent(onRendererCreated);
+                    resolve(Container.getRendererInternal(sRendererName));
+                });
+            }
+        });
+    }
+
+    /**
+     * Default Notifications component for the Fiori Launchpad.
+     *
+     * @augments sap.ushell.modules.Notifications.NotificationsProvider
+     * @since 1.142.0
+     * @private
+     */
+    class NotificationsModule extends NotificationsProvider {
+        /**
+         * The promise that resolves when the component is created.
+         *
+         * @type {Promise<sap.ui.core.Component>}
+         * @since 1.142.0
+         * @private
+         */
+        #pComponent;
+
+        /**
+         * The promise that resolves when the notification button is created.
+         *
+         * @type {Promise}
+         * @since 1.142.0
+         * @private
+         */
+        #pNotificationButton;
+
+        /**
+         * Loads the notifications component and initializes the notifications functionality.
+         *
+         * @param {sap.ushell.modules.Notifications.NotificationsAPI} oNotificationsAPI The side navigation API object.
+         *
+         * @since 1.142.0
+         * @private
+         */
+        constructor (oNotificationsAPI) {
+            super(oNotificationsAPI);
+            this.#init(oNotificationsAPI);
+        }
+
+        async #init (oNotificationsAPI) {
+            await getRendererInternalAsync();
+            const oConfigModel = ShellModel.getConfigModel();
+            // create the notification button for ShellHeader only.
+            this.#pNotificationButton = this.#createNotificationButton();
+            this.#pNotificationButton.then(() => {
+                oNotificationsAPI.bindNotificationsCount("/notificationsCount", oConfigModel);
+                oNotificationsAPI.attachNotificationsPress(() => {
+                    EventHub.emit("showNotifications", Date.now());
+                });
+            });
+
+            this.#pComponent = Component.create({
+                name: "sap.ushell.components.shell.Notifications",
+                componentData: {
+                    notificationsAPI: oNotificationsAPI
+                }
+            });
+        }
+
+        /**
+         * Returns a promise that resolves when the module is initialized.
+         * Used for testing purposes.
+         *
+         * @returns {Promise} A promise that resolves when the module is initialized.
+         * @since 1.142.0
+         * @private
+         */
+        async initialized () {
+            return Promise.all([this.#pNotificationButton, this.#pComponent]);
+        }
+
+        /**
+         * Cleans up the component instance.
+         *
+         * @returns {Promise} A promise that resolves when the component is destroyed.
+         * @since 1.142.0
+         * @private
+         * @override
+         */
+        async exit () {
+            (await this.#pComponent).exit();
+            (await this.#pNotificationButton)?.destroy();
+        }
+
+        /**
+         * Creates the notification button and adds it to the ShellHeader.
+         * This is only required for compatibility reasons. Once the ShellHeader is removed, this can be removed.
+         *
+         * @returns {Promise} A promise that resolves when the button is created.
+         * @since 1.142.0
+         * @private
+         */
+        async #createNotificationButton () {
+            if (Config.last("/core/shellBar/enabled")) {
+                return;
+            }
+
+            const FloatingNumberType = ushellLibrary.FloatingNumberType;
+
+            // The press handler is added in the Notification Component
+            const oNotificationToggleButton = new ShellHeadItem({
+                id: "NotificationsCountButton",
+                tooltip: ushellResources.i18n.getText("notificationsBtn_title"),
+                icon: "sap-icon://bell",
+                text: ushellResources.i18n.getText("notificationsBtn_title"),
+                ariaLabel: ushellResources.i18n.getText("notificationsBtn_title"),
+                ariaHaspopup: "dialog",
+                enabled: true,
+                selected: false,
+                floatingNumberMaxValue: Device.system.phone ? 99 : 999, // according to the UX specification
+                floatingNumberType: FloatingNumberType.Notifications
+            });
+            oNotificationToggleButton.setModel(ushellResources.i18nModel, "i18n");
+
+            const FrameBoundExtension = await Container.getServiceAsync("FrameBoundExtension");
+            const oHeaderItem = await FrameBoundExtension.createHeaderItem({
+                id: oNotificationToggleButton.getId()
+            });
+            oHeaderItem.showOnHome();
+            oHeaderItem.showForAllApps();
+            return oNotificationToggleButton;
+        }
+    }
+    return NotificationsModule;
+}, false);

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

@@ -100,7 +100,7 @@ sap.ui.define([
             const sCurrentShellMode = StateManager.getShellMode();
             let oBackButton;
             if (Config.last("/core/shellBar/enabled")) {
-                const [Button] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents/dist/Button"]);
+                const [Button] = await ushellUtils.requireAsync(["sap/f/gen/ui5/webcomponents/dist/Button"]);
                 oBackButton = new Button({
                     id: "backBtn",
                     tooltip: resources.i18n.getText("backBtn_tooltip"),
@@ -142,8 +142,8 @@ sap.ui.define([
             const { oldURL, newURL } = oHashChangeEvent;
             const sOldHash = UrlParsing.getHash(oldURL);
             const sNewHash = UrlParsing.getHash(newURL);
-            const sOldInnerAppRoute = UrlParsing.parseShellHash(sOldHash).appSpecificRoute;
-            const sNewInnerAppRoute = UrlParsing.parseShellHash(sNewHash).appSpecificRoute;
+            const sOldInnerAppRoute = UrlParsing.parseShellHash(sOldHash, true).appSpecificRoute;
+            const sNewInnerAppRoute = UrlParsing.parseShellHash(sNewHash, true).appSpecificRoute;
 
             const bInnerAppNavigationOccurred = sOldInnerAppRoute !== sNewInnerAppRoute;
 
@@ -185,7 +185,7 @@ sap.ui.define([
 
         _createHeaderItem: async function (oSettings) {
             if (Config.last("/core/shellBar/enabled")) {
-                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem"]);
+                const [ShellBarItem] = await ushellUtils.requireAsync(["sap/f/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

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.141.3",
+            version: "1.143.0",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

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

@@ -21,6 +21,7 @@ sap.ui.define([
         },
 
         createContent: function () {
+            this._oSearchAPI = this.getComponentData().searchAPI;
             const that = this;
             const bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
             // check that search is enabled
@@ -35,10 +36,13 @@ sap.ui.define([
 
             Container.getFLPPlatform().then((sPlatform) => {
                 if (sPlatform === "MYHOME" || (sPlatform === "cFLP" && bIsSearchCEPEnabled === true)) {
-                    if (Config.last("/core/shellBar/enabled") && Config.last("/core/searchCEPNew/enabled")) {
+                    if (Config.last("/core/shellBar/enabled") && this._oSearchAPI.getConfigValue("newSearchUI")) {
                         Component.create({
                             id: "searchCEPNew",
-                            name: "sap.ushell.components.shell.SearchCEPNew"
+                            name: "sap.ushell.components.shell.SearchCEPNew",
+                            componentData: {
+                                searchAPI: this._oSearchAPI
+                            }
                         });
                     } else {
                         Component.create({

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

@@ -0,0 +1,58 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+
+sap.ui.define([
+    "sap/ui/core/Component",
+    "sap/ushell/modules/Search/SearchProvider"
+], (
+    Component,
+    SearchProvider
+) => {
+    "use strict";
+
+    /**
+     * Default Search component for the Fiori Launchpad.
+     *
+     * @since 1.142.0
+     * @private
+     */
+    class Search extends SearchProvider {
+        /**
+         * @type {Promise<sap.ui.core.Component>} A promise that resolves to the component instance.
+         */
+        #pComponent;
+        /**
+         * Loads the search component and initializes the search functionality.
+         *
+         * @param {sap.ushell.modules.Search.SearchAPI} oSearchAPI The search API object.
+         *
+         * @since 1.142.0
+         * @private
+         */
+        constructor (oSearchAPI) {
+            super(oSearchAPI);
+            this.init(oSearchAPI);
+        }
+
+        async init (oSearchAPI) {
+            this.#pComponent = Component.create({
+                name: "sap.ushell.components.shell.Search",
+                componentData: {
+                    searchAPI: oSearchAPI
+                }
+            });
+        }
+
+        /**
+         * Cleans up the component instance.
+         *
+         * @returns {Promise} A promise that resolves when the component is destroyed.
+         * @since 1.142.0
+         * @private
+         * @override
+         */
+        async exit () {
+            (await this.#pComponent).exit();
+        }
+    }
+    return Search;
+});

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

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.141.3"
+            "version": "1.143.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.141.3",
+            version: "1.143.0",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.141.3
+ * @version 1.143.0
  */
 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.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",

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.141.3
+ * @version 1.143.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.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",