@sapui5/sap.ushell 1.119.3 → 1.120.1

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ushell.js

@@ -119,6 +119,9 @@ sap.ui.define([
 
         oUShellConfig = window[oConstants.ushellConfigNamespace];
 
+        // migrate adapter config
+        oUtil.migrateV2ServiceConfig(oUShellConfig);
+
         fixUpPersonalisedSettings(
             oUShellConfig,
             "services.Container.adapter.config.userProfilePersonalization"

package/src/main/js/sap/ushell/bootstrap/common/common.load.launchpad.js

@@ -17,7 +17,7 @@ sap.ui.define([
         //Lazy loading of iconfonts and AppConfiguration (avoid packing this module into cdm.js bundle)
         sap.ui.require(["sap/ushell/iconfonts", "sap/ushell/services/AppConfiguration", "sap/ushell/Container"], function (IconFonts, Configuration, Container) {
             // Create the default renderer asynchronously and place its UI5 control into the canvas div replacing the contents
-            Container.createRenderer(null, true).then(
+            Container.createRendererInternal(null).then(
                 function (oContent) {
                     oContent.placeAt(sDomId || "canvas", "only");
                 }

package/src/main/js/sap/ushell/bootstrap/common/common.util.js

@@ -3,7 +3,13 @@
 /*
  * This module provides a collection of utility functions.
  */
-sap.ui.define(["sap/base/Log"], function (Log) {
+sap.ui.define([
+    "sap/base/Log",
+    "sap/base/util/ObjectPath"
+], function (
+    Log,
+    ObjectPath
+) {
     "use strict";
 
     /**
@@ -119,11 +125,37 @@ sap.ui.define(["sap/base/Log"], function (Log) {
         return !!bSapStatistics; // needed for tests only
     }
 
+    /**
+     * Migrates the config for the v2 services based on their predecessor.
+     * The migration happens INPLACE!
+     * @param {object} ushellConfig The ushell config
+     *
+     * @since 1.120.0
+     * @private
+     */
+    function migrateV2ServiceConfig (ushellConfig) {
+        // migrate adapter config
+        [
+            {from: "services.Bookmark", to: "services.BookmarkV2"},
+            {from: "services.CrossApplicationNavigation", to: "services.Navigation"},
+            {from: "services.Notification", to: "services.NotificationV2"},
+            {from: "services.Personalization", to: "services.PersonalizationV2"}
+        ].forEach((oMigration) => {
+            const oConfigFrom = ObjectPath.get(oMigration.from, ushellConfig);
+            const oConfigTo = ObjectPath.get(oMigration.to, ushellConfig);
+            if (oConfigFrom && !oConfigTo) {
+                Log.warning(`The service config for ${oMigration.from} is migrated to ${oMigration.to}`, "common.util");
+                ObjectPath.set(oMigration.to, oConfigFrom, ushellConfig);
+            }
+        });
+    }
+
     return {
         deepFreeze: deepFreeze,
         getLocationOrigin: getLocationOrigin,
         ensureTrailingSlash: ensureTrailingSlash,
         mergeConfig: mergeConfig,
-        isSapStatisticsSet: isSapStatisticsSet
+        isSapStatisticsSet: isSapStatisticsSet,
+        migrateV2ServiceConfig: migrateV2ServiceConfig
     };
 });

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.119.3
+ * @version 1.120.1
  */
 
 /* eslint-disable quote-props */
@@ -25,11 +25,13 @@
                 "sap/base/util/UriParameters",
                 "sap/base/Log",
                 "sap/base/util/ObjectPath",
+                "sap/ushell/bootstrap/common/common.util",
                 "sap/ushell/Container"
             ], function (
                 UriParameters,
                 Log,
-                ObjectPath
+                ObjectPath,
+                commonUtils
                 /* Container - necessary for sap.ushell.bootstrap */
             ) {
 
@@ -379,6 +381,9 @@
                     // convert custom data to the site data
                     const oUshellConfig = _addAppsToSite(window["sap-ushell-config"]);
 
+                    // migrate adapter config
+                    commonUtils.migrateV2ServiceConfig(oUshellConfig);
+
                     // merge custom application module paths for the loader, if provided
                     if (oUshellConfig.modulePaths) {
                         const oModules = Object.keys(oUshellConfig.modulePaths).reduce((result, sModulePath) => {

package/src/main/js/sap/ushell/components/ComponentKeysHandler.js

@@ -7,7 +7,7 @@ sap.ui.define([
     "sap/ui/events/KeyCodes",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
-    "sap/ushell/renderers/fiori2/AccessKeysHandler",
+    "sap/ushell/renderer/AccessKeysHandler",
     "sap/ushell/bootstrap/common/common.load.model"
 ], function (
     Configuration,

package/src/main/js/sap/ushell/components/HomepageManager.js

@@ -482,21 +482,21 @@ sap.ui.define([
             delete oData.group;
 
             function addBookmark () {
-                sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                sap.ushell.Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                     oBookmarkService.addBookmark(oData, tileGroup)
-                        .always(this._checkRequestQueue.bind(this))
-                        .done(function () {
+                        .then(function () {
                             // the tile is added to our model in "_addBookmarkToModel" here we just show the success toast.
                             oMessagingHelper.showLocalizedMessage("tile_created_msg");
                         })
-                        .fail(function (sMsg) {
+                        .catch(function (sMsg) {
                             Log.error(
                                 "Failed to add bookmark",
                                 sMsg,
                                 "sap.ushell.ui.footerbar.AddBookmarkButton"
                             );
                             oMessagingHelper.showLocalizedError("fail_to_add_tile_msg");
-                        });
+                        })
+                        .finally(this._checkRequestQueue.bind(this));
                 }.bind(this));
             }
 

package/src/main/js/sap/ushell/components/SharedComponentUtils.js

@@ -41,7 +41,7 @@ sap.ui.define([
             if (Device.system.desktop) {
                 sap.ui.require([
                     "sap/ushell/components/ComponentKeysHandler",
-                    "sap/ushell/renderers/fiori2/AccessKeysHandler"
+                    "sap/ushell/renderer/AccessKeysHandler"
                 ], function (ComponentKeysHandler, AccessKeysHandler) {
                     ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
                         AccessKeysHandler.registerAppKeysHandler(ComponentKeysHandlerInstance.handleFocusOnMe);
@@ -90,14 +90,11 @@ sap.ui.define([
         _getPersonalization: function (sItem) {
             return oSharedComponentUtils.getPersonalizer(sItem, sap.ushell.Container.getRenderer("fiori2"))
                 .then(function (oPersonalizer) {
-                    return new Promise(function (fnResolve, fnReject) {
-                        oPersonalizer.getPersData()
-                            .done(fnResolve)
-                            .fail(function (sError) {
-                                Log.error("Failed to load " + sItem + " from the personalization", sError, "sap.ushell.components.flp.settings.FlpSettings");
-                                fnReject();
-                            });
-                    });
+                    return oPersonalizer.getPersData();
+                })
+                .catch(function (sError) {
+                    Log.error("Failed to load " + sItem + " from the personalization", sError, "sap.ushell.components.flp.settings.FlpSettings");
+                    return Promise.reject(sError);
                 });
         },
 
@@ -108,7 +105,7 @@ sap.ui.define([
          * @private
          */
         getPersonalizer: function (sItem, oComponent) {
-            return sap.ushell.Container.getServiceAsync("Personalization")
+            return sap.ushell.Container.getServiceAsync("PersonalizationV2")
                 .then(function (oPersonalizationService) {
                     var oOwnerComponent = Component.getOwnerComponentFor(oComponent);
                     var oScope = {

package/src/main/js/sap/ushell/components/_HeaderManager/ShellHeader.controller.js

@@ -68,7 +68,7 @@ sap.ui.define([
                 oLoadPopover = new Promise(function (resolve, reject) {
                     sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
                         Fragment.load({
-                            name: "sap.ushell.renderers.fiori2.HeadEndItemsOverflowPopover",
+                            name: "sap.ushell.renderer.HeadEndItemsOverflowPopover",
                             type: "XML",
                             controller: this
                         }).then(resolve).catch(reject);
@@ -126,8 +126,8 @@ sap.ui.define([
 
                         var sTarget = oShellHeadItem.getTarget();
                         if (sTarget) {
-                            sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (CrossAppNavService) {
-                                CrossAppNavService.toExternal({ target: { shellHash: sTarget } });
+                            sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavService) {
+                                oNavService.navigate({ target: { shellHash: sTarget } });
                             });
                         }
                     }

package/src/main/js/sap/ushell/components/_HomepageManager/DashboardLoadingManager.js

@@ -1,5 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.120
+ */
 sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/components/_HomepageManager/PagingManager.js

@@ -1,5 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.120
+ */
 sap.ui.define([
     "sap/ui/base/Object",
     "sap/ui/Device",

package/src/main/js/sap/ushell/components/_HomepageManager/PersistentPageOperationAdapter.js

@@ -1,5 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.120
+ */
 sap.ui.define([
     "sap/ui/base/Object",
     "sap/ushell/Config",

package/src/main/js/sap/ushell/components/_HomepageManager/TransientPageOperationAdapter.js

@@ -1,5 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
+ *
+ * @deprecated since 1.120
+ */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/base/Object",

package/src/main/js/sap/ushell/components/appfinder/AppFinderView.js

@@ -283,7 +283,7 @@ sap.ui.define([
                 if (Device.system.desktop) {
                     sap.ui.require([
                         "sap/ushell/components/ComponentKeysHandler",
-                        "sap/ushell/renderers/fiori2/AccessKeysHandler"
+                        "sap/ushell/renderer/AccessKeysHandler"
                     ], function (ComponentKeysHandler, AccessKeysHandler) {
                         ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
                             this.oAppFinderSearchControl.addEventDelegate({

package/src/main/js/sap/ushell/components/appfinder/CatalogView.js

@@ -205,7 +205,7 @@ sap.ui.define([
             if (Device.system.desktop) {
                 sap.ui.require([
                     "sap/ushell/components/ComponentKeysHandler",
-                    "sap/ushell/renderers/fiori2/AccessKeysHandler"
+                    "sap/ushell/renderer/AccessKeysHandler"
                 ], function (ComponentKeysHandler, AccessKeysHandler) {
                     ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
                         this.oCatalogSelect.addEventDelegate({

package/src/main/js/sap/ushell/components/appfinder/EasyAccess.controller.js

@@ -146,7 +146,6 @@ sap.ui.define([
                     // change the default value of the maximum number of entries which are used for list bindings
                     this.easyAccessSearchResultsModel.setSizeLimit(10000);
                     HierarchyAppsView.setModel(this.easyAccessSearchResultsModel, "easyAccess");
-                    HierarchyAppsView.setBusyIndicatorDelay(this.getView().BUSY_INDICATOR_DELAY);
                     HierarchyAppsView.addStyleClass(" sapUshellAppsView sapMShellGlobalInnerBackground");
                     HierarchyAppsView.addCustomData(new AccessibilityCustomData({
                         key: "role",
@@ -173,7 +172,7 @@ sap.ui.define([
                     // Solution for Internal incident #1770582955: After doing 'search' the results are coming from
                     // the backend and the 'bookmarkCount' property is not part of the properties there.
                     // Hence, we need to copy its previous content to the new results
-                    sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+                    sap.ushell.Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                         response.results.forEach(function (element) {
                             oBookmarkService.countBookmarks(element.url).then(function (count) {
                                 element.bookmarkCount = count;
@@ -477,7 +476,8 @@ sap.ui.define([
         },
 
         _callODataService: function (oRequest, fSuccessHandler, oSuccessHandlerParameters) {
-            var sLanguage, iSapClient;
+            var sLanguage;
+            var iSapClient;
             var oDeferred = new jQuery.Deferred();
 
             if (sap.ushell.Container) {

package/src/main/js/sap/ushell/components/appfinder/EasyAccessView.js

@@ -12,8 +12,6 @@ sap.ui.define([
     "use strict";
 
     return View.extend("sap.ushell.components.appfinder.EasyAccessView", {
-        BUSY_INDICATOR_DELAY: 1000,
-
         createContent: function (oController) {
             this.oResourceBundle = resources.i18n;
 
@@ -34,10 +32,7 @@ sap.ui.define([
                 }
             }).then(function (HierarchyFolders) {
                 this.hierarchyFolders = HierarchyFolders;
-
-                this.hierarchyFolders.setBusyIndicatorDelay(this.BUSY_INDICATOR_DELAY);
                 this.hierarchyFolders.addStyleClass("sapUshellHierarchyFolders");
-
                 return HierarchyFolders;
             }.bind(this));
 
@@ -57,12 +52,9 @@ sap.ui.define([
                 }
             }).then(function (HierarchyApps) {
                 this.hierarchyApps = HierarchyApps;
-                this.hierarchyApps.setBusyIndicatorDelay(this.BUSY_INDICATOR_DELAY);
-
                 return HierarchyApps;
             }.bind(this));
 
-
             /*
              * Setup split app
              */

package/src/main/js/sap/ushell/components/appfinder/HierarchyApps.controller.js

@@ -58,7 +58,7 @@ sap.ui.define([
         },
 
         updateBookmarkCount: function (appsData) {
-            return sap.ushell.Container.getServiceAsync("Bookmark")
+            return sap.ushell.Container.getServiceAsync("BookmarkV2")
                 .then(function (BookmarkService) {
                     var countPromiseList = appsData.map(function (appData) {
                         return BookmarkService.countBookmarks(appData.url).then(function (count) {
@@ -275,7 +275,7 @@ sap.ui.define([
             var deferred = jQuery.Deferred(),
                 oResponseData = {};
 
-            sap.ushell.Container.getServiceAsync("Bookmark").then(function (oBookmarkService) {
+            sap.ushell.Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                 var addBookmarkPromise = oBookmarkService.addBookmark({
                     url: app.url,
                     title: app.text,
@@ -285,10 +285,10 @@ sap.ui.define([
 
                 var action = isNewGroup ? "addBookmark_ToNewGroup" : "addBookmark_ToExistingGroup";
 
-                addBookmarkPromise.done(function () {
+                addBookmarkPromise.then(function () {
                     oResponseData = { group: group, status: 1, action: action }; // 1 - success
                     deferred.resolve(oResponseData);
-                }).fail(function () {
+                }).catch(function () {
                     oResponseData = { group: group, status: 0, action: action }; // 0 - failure
                     deferred.resolve(oResponseData);
                 });

package/src/main/js/sap/ushell/components/appfinder/HierarchyFolders.controller.js

@@ -59,7 +59,7 @@ sap.ui.define([
 
         getPersonalizer: function () {
             if (!this.oPersonalizerPromise) {
-                this.oPersonalizerPromise = sap.ushell.Container.getServiceAsync("Personalization")
+                this.oPersonalizerPromise = sap.ushell.Container.getServiceAsync("PersonalizationV2")
                     .then(function (oPersonalizationService) {
                         var oComponent = Component.getOwnerComponentFor(this),
                         oScope = {
@@ -131,20 +131,22 @@ sap.ui.define([
             var oDeferred = new jQuery.Deferred();
 
             this.getPersonalizer().then(function (oPersonalizer) {
-                oPersonalizer.getPersData().then(function (persSystemSelected) {
-                    if (persSystemSelected) {
-                        oDeferred.resolve(persSystemSelected);
-                    } else {
-                        oDeferred.resolve();
-                    }
-                }, function (error) {
-                    Log.error(
-                        "Failed to get selected system from the personalization",
-                        error,
-                        "sap.ushell.components.appfinder.HierarchyFolders"
-                    );
-                    oDeferred.reject();
-                });
+                oPersonalizer.getPersData()
+                    .then(function (persSystemSelected) {
+                        if (persSystemSelected) {
+                            oDeferred.resolve(persSystemSelected);
+                        } else {
+                            oDeferred.resolve();
+                        }
+                    })
+                    .catch(function (error) {
+                        Log.error(
+                            "Failed to get selected system from the personalization",
+                            error,
+                            "sap.ushell.components.appfinder.HierarchyFolders"
+                        );
+                        oDeferred.reject();
+                    });
 
             });
             return oDeferred.promise();
@@ -152,7 +154,7 @@ sap.ui.define([
 
         setSystemSelectedInPersonalization: function (oSystem) {
             this.getPersonalizer().then(function (oPersonalizer) {
-                oPersonalizer.setPersData(oSystem).fail(function (error) {
+                oPersonalizer.setPersData(oSystem).catch(function (error) {
                     Log.error(
                         "Failed to save selected system in the personalization",
                         error,

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

@@ -3,10 +3,10 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.119.3"
+            "version": "1.120.1"
         },
         "i18n": {
-            "bundleUrl": "../../renderers/fiori2/resources/resources.properties",
+            "bundleUrl": "../../renderer/resources/resources.properties",
             "fallbackLocale": "en"
         },
         "ach": "CA-FLP-FE-COR",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -28,7 +28,7 @@ sap.ui.define([
     "sap/ui/core/Core",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/services/_MessageBroker/MessageBrokerEngine",
-    "sap/ushell/renderers/fiori2/utils",
+    "sap/ushell/renderer/utils",
     "sap/m/library"
 ], function (
     ElementsModel,

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.119.3
+ * @version 1.120.1
  * @private
  */
 sap.ui.define([
@@ -845,7 +845,7 @@ sap.ui.define([
             oServiceCalls: {
                 setApplicationFullWidth: {
                     executeServiceCallFn: function (oServiceParams) {
-                        AppConfiguration.setApplicationFullWidth(oServiceParams.oMessageData.body.bValue);
+                        AppConfiguration.setApplicationFullWidthInternal(oServiceParams.oMessageData.body.bValue);
                         return new jQuery.Deferred().resolve().promise();
                     }
                 }

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/ushell/EventHub",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/ui/core/Core"

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.119.3
+ * @version 1.120.1
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/cards/Card.controller.js

@@ -50,8 +50,8 @@ sap.ui.define([
             } else if (sCardTileConfiguration) {
                 oCardTileConfiguration = JSON.parse(sCardTileConfiguration);
 
-                sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossApplicationNavigation) {
-                    oCrossApplicationNavigation.toExternal({
+                sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavigation) {
+                    oNavigation.navigate({
                         target: {
                             semanticObject: oCardTileConfiguration.navigation_semantic_object,
                             action: oCardTileConfiguration.navigation_semantic_action