@sapui5/sap.ushell 1.119.3 → 1.120.1

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

@@ -2,14 +2,16 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.119.3
+ * @version 1.120.1
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",
-    "sap/ushell/components/pages/controller/PagesAndSpaceId"
+    "sap/ushell/components/pages/controller/PagesAndSpaceId",
+    "sap/base/util/UriParameters"
  ], function (
     Controller,
-    PagesAndSpaceId
+    PagesAndSpaceId,
+    UriParameters
 ) {
     "use strict";
 
@@ -65,7 +67,8 @@
                     return oMenuService.isWorkPage(sPageId);
                 })
                 .then(function (bIsWorkPage) {
-                    if (bIsWorkPage) {
+                    // allow to force using the workpages runtime via URL parameter
+                    if (bIsWorkPage || UriParameters.fromQuery(window.location.search).get("sap-ushell-rt") === "workpage") {
                         this._toggleToWorkPagesRuntime();
                     } else {
                         this._toggleToPagesRuntime();

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

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

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

@@ -106,7 +106,7 @@ sap.ui.define([
             var oDestinationIntent = this._getNestedMenuEntryByUid(aMenuEntries, sSelectedMenuEntryKey);
 
             if (oDestinationIntent.type === "IBN") {
-                this._performCrossApplicationNavigation(oDestinationIntent.target);
+                this._performNavigation(oDestinationIntent.target);
             }
 
             if (oDestinationIntent.type === "URL") {
@@ -155,11 +155,10 @@ sap.ui.define([
         },
 
         /**
-         * Performs a Cross Application Navigation to the provided intent using the
-         * CrossApplicationNavigation service.
+         * Performs a navigation to the provided intent using the Navigation service.
          *
          * @param {object} destinationTarget
-         *  The destination target which is used for the Cross Application Navigation
+         *  The destination target which is used for the Navigation
          *
          * @returns {Promise<undefined>}
          *  A promise which is resolved after the CrossAppNavigation is performed
@@ -167,8 +166,8 @@ sap.ui.define([
          * @private
          * @since 1.74.0
          */
-        _performCrossApplicationNavigation: function (destinationTarget) {
-            return sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCANService) {
+         _performNavigation: function (destinationTarget) {
+            return sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavigationService) {
                 var oParams = {};
                 destinationTarget.parameters.forEach(function (oParameter) {
                     if (oParameter.name && oParameter.value) {
@@ -176,7 +175,7 @@ sap.ui.define([
                     }
                 });
 
-                oCANService.toExternal({
+                oNavigationService.navigate({
                     target: {
                         semanticObject: destinationTarget.semanticObject,
                         action: destinationTarget.action

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

@@ -3,10 +3,10 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.119.3"
+            "version": "1.120.1"
         },
         "i18n": {
-            "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",
+            "bundleUrl": "../../../renderer/resources/resources.properties",
             "supportedLocales": [
                 "",
                 "ar",

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.119.3
+ * @version 1.120.1
  * @private
  */
 sap.ui.define([
@@ -172,10 +172,37 @@ sap.ui.define([
          */
         unpinAllSpaces: function () {
             var oPinnedSpaces = this.byId("PinnedSpaces");
-            var aSpacesToUnpin = oPinnedSpaces.getItems();
-            aSpacesToUnpin.forEach(function (oSpaceToUnpin) {
-                this._unpinSpace(oSpaceToUnpin.getBindingContextPath("spaces"), false);
-            }.bind(this));
+            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;
+                }
+
+                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();
         },
 
@@ -397,11 +424,10 @@ sap.ui.define([
         },
 
         /**
-         * Performs a Cross Application Navigation to the provided intent using the
-         * CrossApplicationNavigation service.
+         * Performs a navigation to the provided intent using the Navigation service.
          *
          * @param {object} oDestinationTarget
-         *  The destination target which is used for the Cross Application Navigation
+         *  The destination target which is used for the navigation
          *
          * @returns {Promise}
          *  A promise which is resolved after the CrossAppNavigation is performed
@@ -409,9 +435,9 @@ sap.ui.define([
          * @private
          * @since 1.114.0
          */
-        _performCrossApplicationNavigation: function (oDestinationTarget) {
-            return sap.ushell.Container.getServiceAsync("CrossApplicationNavigation")
-                .then(function (oCANService) {
+        _performNavigation: function (oDestinationTarget) {
+            return sap.ushell.Container.getServiceAsync("Navigation")
+                .then(function (oNavigationService) {
                     var oParams = {};
                     oDestinationTarget.parameters.forEach(function (oParameter) {
                         if (oParameter.name && oParameter.value) {
@@ -419,7 +445,7 @@ sap.ui.define([
                         }
                     });
 
-                    return oCANService.toExternal({
+                    return oNavigationService.navigate({
                         target: {
                             semanticObject: oDestinationTarget.semanticObject,
                             action: oDestinationTarget.action
@@ -465,7 +491,7 @@ sap.ui.define([
             if (oListItem.isLeaf()) {
                 // Intent based navigation
                 if (oListItemModelEntry.type === "IBN") {
-                    this._performCrossApplicationNavigation(oListItemModelEntry.target)
+                    this._performNavigation(oListItemModelEntry.target)
                         .then(this.closeNavigationBarMenuPopover.bind(this));
                 }
 

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

@@ -3,10 +3,10 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.119.3"
+            "version": "1.120.1"
         },
         "i18n": {
-            "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",
+            "bundleUrl": "../../../renderer/resources/resources.properties",
             "fallbackLocale": "en"
         },
         "type": "component",
@@ -40,7 +40,7 @@
             "i18n": {
                 "type": "sap.ui.model.resource.ResourceModel",
                 "settings": {
-                    "bundleName": "sap.ushell.renderers.fiori2.resources.resources"
+                    "bundleName": "sap.ushell.renderer.resources.resources"
                 }
             }
         },

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

@@ -44,7 +44,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.119.3",
+            version: "1.120.1",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]
@@ -55,7 +55,7 @@ sap.ui.define([
             this._aTimeouts = [];
             this.oRenderer = sap.ushell.Container.getRenderer("fiori2");
             this.oShellModel = this.oRenderer.shellCtrl.getModel();
-            sap.ushell.Container.getServiceAsync("Notifications").then(function (oNotificationsService) {
+            sap.ushell.Container.getServiceAsync("NotificationsV2").then(function (oNotificationsService) {
 
                 this.oNotificationsService = oNotificationsService;
 
@@ -65,7 +65,7 @@ sap.ui.define([
                     this.oNotificationsService.init();
                     if (this.oRenderer.getShellConfig().enableNotificationsUI === true) {
                         this.oShellModel.setProperty("/enableNotificationsUI", true);
-                        this.oNotificationsService.registerDependencyNotificationsUpdateCallback(this._updateCount.bind(this), true);
+                        this.oNotificationsService.registerNotificationsUpdateCallback(this._updateCount.bind(this), true);
                     }
                     this._createNotificationButton(this.oShellModel);
                     //ElementsModel, not shell model. Need only 3 state, for this reason call directly
@@ -143,9 +143,9 @@ sap.ui.define([
         // Update the notifications count in the UI
         // The new count is also displayed when the notifications popover is already opened
         _updateCount: function () {
-            this.oNotificationsService.getUnseenNotificationsCount().done(function (iNumberOfNotifications) {
+            this.oNotificationsService.getUnseenNotificationsCount().then(function (iNumberOfNotifications) {
                 this.oShellModel.setProperty("/notificationsCount", parseInt(iNumberOfNotifications, 10));
-            }.bind(this)).fail(function (data) {
+            }.bind(this)).catch(function (data) {
                 Log.error("Notifications - call to notificationsService.getCount failed: ", data);
             });
         },

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

@@ -169,7 +169,7 @@ sap.ui.define([
             // Fetch a buffer of notification items from notification service
             oPromise = this.oNotificationsService.getNotificationsBufferBySortingType(sCurrentSorting, iNumberOfItemsInModel, iNumberOfItemsToFetch);
 
-            oPromise.done(function (oResult) {
+            oPromise.then(function (oResult) {
                 var dNotificationsUserSettingsAvailability = this.oNotificationsService._getNotificationSettingsAvailability();
                 if (dNotificationsUserSettingsAvailability.state() === "pending") {
                     this.oNotificationsService._userSettingInitialization();
@@ -177,7 +177,7 @@ sap.ui.define([
                 this.addBufferToModel(sCurrentSorting, oResult);
             }.bind(this));
 
-            oPromise.fail(function (/*oResult*/) {
+            oPromise.catch(function (/*oResult*/) {
                 if (iNumberOfItemsInModel === 0) {
                     this.removeBusyIndicatorToTabFilter(sCurrentSorting);
                     this.handleError();
@@ -210,11 +210,11 @@ sap.ui.define([
             // Fetch a buffer of notification items from notification service
             oPromise = this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, iNumberOfItemsInModel, this.iMaxNotificationItemsForDevice);
 
-            oPromise.done(function (oResult) {
+            oPromise.then(function (oResult) {
                 this.addTypeBufferToModel(selectedTypeId, oResult, false);
             }.bind(this));
 
-            oPromise.fail(function (/*oResult*/) {
+            oPromise.catch(function (/*oResult*/) {
                 this.getNextBufferFailHandler(sSortingType);
             }.bind(this));
         },
@@ -321,9 +321,8 @@ sap.ui.define([
          * - Registered as callback using a call to this.oNotificationsService.registerNotificationsUpdateCallback
          * - Called by Notifications service when updated notifications data is obtained
          * - Gets the updated notifications array and sets the model accordingly
-         * @param {object} oDependenciesDeferred Dependencies promise
          */
-        notificationsUpdateCallback: function (oDependenciesDeferred) {
+        notificationsUpdateCallback: function () {
             var that = this,
                 sCurrentSorting = this.sCurrentSorting,
                 aCurrentItems,
@@ -332,10 +331,6 @@ sap.ui.define([
 
             if (sCurrentSorting === this.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING) {
                 this.notificationsUpdateCallbackForType();
-
-                // If there is any flow in any module that depends on this flow - release it
-                // see notification service private API registerDependencyNotificationsUpdateCallback
-                oDependenciesDeferred.resolve();
                 return;
             }
 
@@ -350,18 +345,14 @@ sap.ui.define([
 
             iNumberOfItemsToFetch = this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel);
 
-            this.oNotificationsService.getNotificationsBufferBySortingType(sCurrentSorting, 0, iNumberOfItemsToFetch).done(function (aNotifications) {
+            this.oNotificationsService.getNotificationsBufferBySortingType(sCurrentSorting, 0, iNumberOfItemsToFetch).then(function (aNotifications) {
                 if (!aNotifications) {
                     return;
                 }
 
-                // If there is any flow in any module that depends on this flow - release it
-                // see notification service private API registerDependencyNotificationsUpdateCallback
-                oDependenciesDeferred.resolve();
-
                 // Updating the model with the updated array of notification objects
                 that.replaceItemsInModel(sCurrentSorting, aNotifications, iNumberOfItemsToFetch);
-            }).fail(function (data) {
+            }).catch(function (data) {
                 Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ",
                     data,
                     "sap.ushell.components.shell.Notifications.Notifications");
@@ -423,10 +414,10 @@ sap.ui.define([
             var oPromise = this.oNotificationsService.getNotificationsGroupHeaders(),
                 that = this,
                 aGroups = that.getView().getModel().getProperty("/" + that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
-            oPromise.fail(function (data) {
+            oPromise.catch(function (data) {
                 Log.error("Notifications control - call to notificationsService.updateGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
             });
-            oPromise.done(function (notificationsByType) {
+            oPromise.then(function (notificationsByType) {
                 var oJson = JSON.parse(notificationsByType),
                     arr = oJson.value;
 
@@ -449,24 +440,13 @@ sap.ui.define([
 
         updateNotificationsByDate: function () {
             var iTop = this.getNumberOfItemsToFetchOnScroll(this.sCurrentSorting);
-            var aCurrentNotifications = this.getView().getModel().getProperty("/" + this.sCurrentSorting);
 
             this.oNotificationsService.getNotificationsBufferBySortingType(this.sCurrentSorting, 0, iTop)
-                .done(function (aNotifications) {
-                    aNotifications.forEach(function (item) {
-                        for (var i = 0; i < aCurrentNotifications.length; i++) {
-                            if (aCurrentNotifications[i].Id === item.Id) {
-                                // Add item at the beginning of the current list of notifications if it did not yet exist.
-                                aCurrentNotifications.unshift(item);
-                                break;
-                            }
-                        }
-                    });
-
-                    this.getView().getModel().setProperty("/" + this.sCurrentSorting, aCurrentNotifications);
+                .then(function (aNotifications) {
+                    this.getView().getModel().setProperty("/" + this.sCurrentSorting + "/aNotifications", aNotifications);
                     this.removeBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING);
                 }.bind(this))
-                .fail(function (error) {
+                .catch(function (error) {
                     Log.error("Notifications control - call to notificationsService.getNotificationsBufferBySortingType failed: ", error, "sap.ushell.components.shell.Notifications.Notifications");
                     this.removeBusyIndicatorToTabFilter(this.oSortingType.NOTIFICATIONS_BY_DATE_DESCENDING);
                 }.bind(this));
@@ -475,11 +455,11 @@ sap.ui.define([
         reloadGroupHeaders: function () {
             var oPromise = this.oNotificationsService.getNotificationsGroupHeaders(),
                 that = this;
-            oPromise.fail(function (data) {
+            oPromise.catch(function (data) {
                 Log.error("Notifications control - call to notificationsService.getNotificationsGroupHeaders failed: ", data, "sap.ushell.components.shell.Notifications.Notifications");
                 that.removeBusyIndicatorToTabFilter(that.oSortingType.NOTIFICATIONS_BY_TYPE_DESCENDING);
             });
-            oPromise.done(function (notificationsByType) {
+            oPromise.then(function (notificationsByType) {
                 var oJson = JSON.parse(notificationsByType),
                     arr = oJson.value,
                     result = [];
@@ -497,7 +477,7 @@ sap.ui.define([
         markRead: function (sNotificationId) {
             var oPromise = this.oNotificationsService.markRead(sNotificationId),
                 that = this;
-            oPromise.fail(function () {
+            oPromise.catch(function () {
                 _errorMessage(resources.i18n.getText("notificationsFailedMarkRead"));
                 that.setMarkReadOnModel(sNotificationId, false);
             });
@@ -509,7 +489,7 @@ sap.ui.define([
         onBeforeRendering: function () {
             if (!this._bDependencyCallbackRegistered) { // register once: the service registration is primitive and does not remove duplicates
                 this._bDependencyCallbackRegistered = true;
-                this.oNotificationsService.registerDependencyNotificationsUpdateCallback(this.notificationsUpdateCallback.bind(this), false);
+                this.oNotificationsService.registerNotificationsUpdateCallback(this.notificationsUpdateCallback.bind(this), false);
             }
         },
 
@@ -531,7 +511,7 @@ sap.ui.define([
             if (sNotificationTypeDesc === "") {
                 sNotificationTypeDesc = this.getView().getModel().getProperty(sPathToNotification + "/NotificationTypeKey");
             }
-            oPromise.fail(function (oResult) {
+            oPromise.catch(function (oResult) {
                 this.getView().getModel().setProperty(sPathToNotification + "/Busy", false);
 
                 if (oResult && oResult.succededNotifications && oResult.succededNotifications.length) {
@@ -566,7 +546,7 @@ sap.ui.define([
                 }
             }.bind(this));
 
-            oPromise.done(function () {
+            oPromise.then(function () {
                 sMessage = resources.i18n.getText("notificationsSuccessExecuteBulkAction", [
                     sGroupActionText, sNotificationTypeDesc
                 ]);
@@ -586,7 +566,7 @@ sap.ui.define([
                 oPromise = this.oNotificationsService.dismissNotification(notificationId);
             // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
             this.cleanModel();
-            oPromise.fail(function () {
+            oPromise.catch(function () {
                 _errorMessage(resources.i18n.getText("notificationsFailedDismiss"));
                 that.addNotificationToModel(oRemovedNotification.obj, oRemovedNotification.index);
             });
@@ -597,7 +577,7 @@ sap.ui.define([
                 oPromise = this.oNotificationsService.dismissBulkNotifications(oGroup.Id);
             // There is need to load again the other 2 tabs, therefore we need to "clean"  other models.
             this.cleanModel();
-            oPromise.fail(function () {
+            oPromise.catch(function () {
                 _errorMessage(resources.i18n.getText("notificationsFailedExecuteBulkAction"));
                 this.reAddFailedGroup(oRemovedGroup);
             }.bind(this));
@@ -957,7 +937,7 @@ sap.ui.define([
 
             oModel.setProperty(sPathToNotification + "/Busy", true);
 
-            this.executeAction(sNotificationId, oNotificationModelPart.ActionId).done(function (responseAck) {
+            this.executeAction(sNotificationId, oNotificationModelPart.ActionId).then(function (responseAck) {
                 if (responseAck && responseAck.isSucessfull) {
                     sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
                         if (responseAck.message && responseAck.message.length) {
@@ -982,7 +962,7 @@ sap.ui.define([
                     _errorMessage(resources.i18n.getText("notificationsFailedExecuteAction"));
                 }
                 oModel.setProperty(sPathToNotification + "/Busy", false);
-            }.bind(this)).fail(function () {
+            }.bind(this)).catch(function () {
                 oModel.setProperty(sPathToNotification + "/Busy", false);
                 _errorMessage(resources.i18n.getText("notificationsFailedExecuteAction"));
             });
@@ -1063,7 +1043,7 @@ sap.ui.define([
          * @returns {int} Basic buffer size
          */
         getNumberOfItemsToFetchOnScroll: function (sSortingType) {
-            var iCurrentNumberOfItems = this.getItemsFromModel(sSortingType).length,
+            var iCurrentNumberOfItems = (this.getItemsFromModel(sSortingType) || []).length,
                 iBasicBufferSize = this.getBasicBufferSize();
 
             if (iCurrentNumberOfItems >= this.iMaxNotificationItemsForDevice) {
@@ -1192,11 +1172,11 @@ sap.ui.define([
             if (selectedTypeId) {
                 oPromise = this.oNotificationsService.getNotificationsBufferInGroup(selectedTypeId, 0, this.getNumberOfItemsToFetchOnUpdate(iNumberOfItemsInModel));
 
-                oPromise.done(function (oResult) {
+                oPromise.then(function (oResult) {
                     this.addTypeBufferToModel(selectedTypeId, oResult, true);
                 }.bind(this));
 
-                oPromise.fail(function (oResult) {
+                oPromise.catch(function (oResult) {
                     this.getNextBufferFailHandler(oResult);
                 }.bind(this));
             }

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

@@ -107,8 +107,8 @@ sap.ui.define([
                 tooltip: resources.i18n.getText("open_appFinderBtn"),
                 icon: "sap-icon://sys-find",
                 press: function () {
-                    sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCAN) {
-                        oCAN.toExternal({
+                    sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavService) {
+                        oNavService.navigate({
                             target: {
                                 semanticObject: "Shell",
                                 action: "appfinder"

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

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

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

@@ -5,7 +5,7 @@ sap.ui.define([
     "sap/ui/core/IconPool",
     "sap/ui/core/routing/HashChanger",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/renderers/fiori2/search/util"
+    "sap/ushell/renderer/search/util"
 ], function (resources, IconPool, HashChanger, jQuery, util) {
     "use strict";
 

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

@@ -4,10 +4,10 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.119.3"
+            "version": "1.120.1"
         },
         "i18n": {
-            "bundleUrl": "../../../renderers/fiori2/resources/resources.properties",
+            "bundleUrl": "../../../renderer/resources/resources.properties",
             "fallbackLocale": "en"
         },
         "type": "component",

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

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ui/core/IconPool",
-    "sap/ushell/renderers/fiori2/search/util",
+    "sap/ushell/renderer/search/util",
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/ui/Device",
     "sap/ui/core/Core",
@@ -24,7 +24,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.119.3",
+            version: "1.120.1",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

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

@@ -937,9 +937,9 @@ sap.ui.define([
                     sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
             }
 
-            var pNavServicePromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
-            pNavServicePromise.then(function (oCrossAppNavService) {
-                oCrossAppNavService.toExternal({
+            var pNavServicePromise = sap.ushell.Container.getServiceAsync("Navigation");
+            pNavServicePromise.then(function (oNavigationService) {
+                oNavigationService.navigate({
                     target: {
                         shellHash: sHash
                     }

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.119.3
+ * @version 1.120.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.119.3
+ * @version 1.120.1
  */
 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.119.3
+ * @version 1.120.1
  */
 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.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -48,7 +48,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.119.3",
+            version: "1.120.1",
             library: "sap.ushell",
             dependencies: {
                 libs: {
@@ -141,16 +141,16 @@ sap.ui.define([
          * @private
          */
         _addNotificationSettings: function () {
-            sap.ushell.Container.getServiceAsync("Notifications").then(function (service) {
+            sap.ushell.Container.getServiceAsync("NotificationsV2").then(function (service) {
                 service._userSettingInitialization();
-                service._getNotificationSettingsAvailability().done(function (status) {
+                service._getNotificationSettingsAvailability().then(function (status) {
                     if (status.settingsAvailable) {
                         var aEntities = Config.last("/core/userPreferences/entries");
                         aEntities.push(NotificationsEntry.getEntry());
                         Config.emit("/core/userPreferences/entries", aEntities);
                     }
                 });
-            });
+            }).catch(() => {}); // Notification settings are not available, do nothing.
         },
 
         /**

package/src/main/js/sap/ushell/components/shell/Settings/ProfilingLoader.js

@@ -1,5 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * @deprecated since 1.120. UsageAnalytics service is deprecated, because
+ *  cloud service "SAP Web Analytics" has been retired.
+ */
 sap.ui.define([
     "sap/ushell/Config"
 ], function (Config) {

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

@@ -371,6 +371,10 @@ sap.ui.define([
             }
         },
 
+        _afterMasterClose: function () {
+            this._updateHeaderButtonVisibility(false);
+        },
+
         /**
          * Handles the entry item press
          *