@sapui5/sap.ushell 1.121.2 → 1.122.0

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.121.2
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/_SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/cdm/cdm.constants.js

@@ -157,7 +157,7 @@ sap.ui.define([
                 },
                 VisualizationDataProvider: {
                     adapter: {
-                        module: "sap.ushell.adapters.cdm.v3.LaunchPageAdapter"
+                        module: "sap.ushell.adapters.cdm.v3.FlpLaunchPageAdapter"
                     }
                 }
             },

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

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.121.2
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -137,6 +137,7 @@ sap.ui.define([
                 name: "sap.ushell.components.workPageRuntime",
                 asyncHints: {
                     preloadBundles: [
+                        "sap/ushell/preload-bundles/workpage-rt-common.js",
                         "sap/ushell/preload-bundles/workpage-rt-0.js",
                         "sap/ushell/preload-bundles/workpage-rt-1.js",
                         "sap/ushell/preload-bundles/workpage-rt-2.js",
@@ -380,7 +381,8 @@ sap.ui.define([
                 catalog: {
                     enabled: getEnablePersonalization() || getConfigValue("renderers/fiori2/componentData/config/enableAppFinder", false),
                     appFinderDisplayMode:
-                        getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/appFinderDisplayMode", undefined),
+                        getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/AppFinderDisplayMode",
+                        getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/appFinderDisplayMode", undefined)),
                     easyAccessNumbersOfLevels:
                         getConfigValue("renderers/fiori2/componentData/config/applications/Shell-home/easyAccessNumbersOfLevels",
                             undefined),

package/src/main/js/sap/ushell/bootstrap/common/common.read.ushell.config.from.url.js

@@ -39,7 +39,8 @@ sap.ui.define([
         "services/Container/adapter/config/userProfile/defaults/fullName": [],
 
         // The usageRecorder serviceUrl must not be overwritten for security reasons
-        "services/NavTargetResolution/config/usageRecorder/serviceUrl": []
+        "services/NavTargetResolution/config/usageRecorder/serviceUrl": [],
+        "services/NavTargetResolutionInternal/config/usageRecorder/serviceUrl": []
     };
 
     function isBlockListed (oConsideredBlockList, oEntry) {

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

@@ -134,6 +134,13 @@ sap.ui.define([
      * @private
      */
     function migrateV2ServiceConfig (ushellConfig) {
+        /**
+         * Store whether some migration happened.
+         * This allows us to provide a fallback as part of {@link sap.ushell.bootstrap}
+         * @deprecated As of version 1.120
+         */
+        window["sap-ushell-config-migration"] = true;
+
         // migrate service config
         [
             { from: "services.Bookmark", to: "services.BookmarkV2" },
@@ -141,7 +148,8 @@ sap.ui.define([
             { from: "services.Notifications", to: "services.NotificationsV2" },
             { from: "services.Personalization", to: "services.PersonalizationV2" },
             { from: "services.LaunchPage", to: "services.FlpLaunchPage" },
-            { from: "services.ShellNavigation", to: "services.ShellNavigationInternal" }
+            { from: "services.ShellNavigation", to: "services.ShellNavigationInternal" },
+            { from: "services.NavTargetResolution", to: "services.NavTargetResolutionInternal" }
         ].forEach((oMigration) => {
             const oConfigFrom = ObjectPath.get(oMigration.from, ushellConfig);
             const oConfigTo = ObjectPath.get(oMigration.to, ushellConfig);
@@ -155,12 +163,19 @@ sap.ui.define([
      /**
      * Migrates the config for the v2 services based on their predecessor.
      * @param {object} ushellConfig The ushell config
-     * @returns {object} The migrated config
+     * @returns {object} The migrated config, ONLY the migrated part
      *
      * @since 1.121.0
      * @private
      */
     function getV2ServiceMigrationConfig (ushellConfig) {
+        /**
+         * Store whether some migration happened.
+         * This allows us to provide a fallback as part of {@link sap.ushell.bootstrap}
+         * @deprecated As of version 1.120
+         */
+        window["sap-ushell-config-migration"] = true;
+
         // migrate service config
         const oConfig = {};
         [

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

@@ -156,6 +156,15 @@
                 "module": "sap.ushell.adapters.local.NavTargetResolutionAdapter"
             }
         },
+        "NavTargetResolutionInternal": {
+            "config": {
+                "allowTestUrlComponentConfig": false,
+                "enableClientSideTargetResolution": true
+            },
+            "adapter": {
+                "module": "sap.ushell.adapters.local.NavTargetResolutionInternalAdapter"
+            }
+        },
         "SupportTicket": {
             "config": {
                 "enabled": false
@@ -181,7 +190,7 @@
         },
         "VisualizationDataProvider": {
             "adapter": {
-                "module": "sap.ushell.adapters.cdm.v3.LaunchPageAdapter"
+                "module": "sap.ushell.adapters.cdm.v3.FlpLaunchPageAdapter"
             }
         },
         "CommonDataModel": {
@@ -195,7 +204,7 @@
         },
         "LaunchPage": {
             "adapter": {
-                "module": "sap.ushell.adapters.cdm.v3.LaunchPageAdapter"
+                "module": "sap.ushell.adapters.cdm.v3.FlpLaunchPageAdapter"
             }
         },
         "Search": {
@@ -211,4 +220,4 @@
             "sap.ushell": true
         }
     }
-}
+}

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.121.2
+ * @version 1.122.0
  */
 
 /* eslint-disable quote-props */
@@ -75,11 +75,15 @@
                 /**
                  * Add custom applications and tiles from the provided custom configuration to the template site:
                  * 1. Applications and tiles from oConfig.applications (documented way, My Home section)
-                 * 2. Applications from oConfig.services.NavTargetResolution.adapter.config.applications
+                 * 2. Applications from oConfig.services.NavTargetResolutionInternal.adapter.config.applications
                  * 3. Applications from oConfig.services.ClientSideTargetResolution.adapter.config.inbounds
                  * 4. Groups and tiles from oConfig.services.LaunchPage.adapter.config.groups (a new section is created for each group)
-                 */
+                 *
+                 * @param {object} oConfig The current ushell configuration
+                */
                 function _addAppsToSite (oConfig) {
+                    const oApplicationConfig = {};
+
                     function getComponentName (oApplication) {
                         return oApplication.additionalInformation.replace("SAPUI5.Component=", "");
                     }
@@ -226,7 +230,7 @@
                     // predefined site is found here
                     const oSiteData = oConfig.services.CommonDataModel.adapter.config.siteData;
 
-                    // generate applications and tiles from window["sap-ushell-config"].applications and add them to the site
+                    // generate applications and tiles from oConfig.applications and add them to the site
                     const oApplications = ObjectPath.get("applications", oConfig) || {};
                     for (let [sAppKey, oApplication] of Object.entries(oApplications)) {
                         const sVizId = "custom_viz_" + sAppKey;
@@ -240,8 +244,9 @@
                         };
                     }
 
-                    // generate applications from NavTargetResolution config
-                    const oNavTargetApps = ObjectPath.get("services.NavTargetResolution.adapter.config.applications", oConfig) || {};
+                    // generate applications from NavTargetResolutionInternal config
+                    const oNavTargetApps = JSON.parse(JSON.stringify(ObjectPath.get("services.NavTargetResolutionInternal.adapter.config.applications", oConfig) || {}));
+                    ObjectPath.set("services.NavTargetResolutionInternal.adapter.config.applications", oNavTargetApps, oApplicationConfig);
                     for (let [sNTAppKey, oNTApp] of Object.entries(oNavTargetApps)) {
                         if (oNTApp.additionalInformation) {
                             oSiteData.applications[sNTAppKey] = createApp(oNTApp, sNTAppKey);
@@ -249,13 +254,15 @@
                     }
 
                     // generate applications from ClientSideTargetResolution config (application dependencies not taken into account yet)
-                    const oClientTargetApps = ObjectPath.get("services.ClientSideTargetResolution.adapter.config.inbounds", oConfig) || {};
+                    const oClientTargetApps = JSON.parse(JSON.stringify(ObjectPath.get("services.ClientSideTargetResolution.adapter.config.inbounds", oConfig) || {}));
+                    ObjectPath.set("services.ClientSideTargetResolution.adapter.config.inbounds", oClientTargetApps, oApplicationConfig);
                     for (let oInbound of Object.values(oClientTargetApps)) {
                         oSiteData.applications[oInbound.semanticObject + "-" + oInbound.action] = createAppFromInbound(oInbound);
                     }
 
                     // generate sections and tiles from the LaunchPage adapter config and add them to the site
-                    const aGroups = ObjectPath.get("services.LaunchPage.adapter.config.groups", oConfig) || [];
+                    const aGroups = JSON.parse(JSON.stringify(ObjectPath.get("services.LaunchPage.adapter.config.groups", oConfig) || []));
+                    ObjectPath.set("services.LaunchPage.adapter.config.groups", aGroups, oApplicationConfig);
                     aGroups.forEach((oGroup, index) => {
                         const sGroupId = oGroup.id || "GROUP_" + index;
                         const oPage = oSiteData.pages.page1; // predefined page
@@ -306,17 +313,37 @@
                             };
                         });
                     });
-
                     delete oConfig.applications;
+
+                    const oServiceMigration = commonUtils.getV2ServiceMigrationConfig(oApplicationConfig);
+                    mergeConfig(oConfig, oServiceMigration, true);
+                    mergeConfig(oConfig, oApplicationConfig, true);
+
                     return oConfig;
                 }
 
-                function _applyDefaultUshellConfig (oConfig) {
-                    mergeConfig(window["sap-ushell-config"], oConfig, true);
+                /**
+                 * Apply the default Ushell Config and merge into
+                 * window["sap-ushell-config"].
+                 *
+                 * @param {object} oConfig The config to be merged into the window object
+                 * @param {object} oUshellConfig The current ushell configuration
+                 */
+                function _applyDefaultUshellConfig (oConfig, oUshellConfig) {
+                    const oDefaultApplicationMigration = commonUtils.getV2ServiceMigrationConfig(oConfig);
+
+                    mergeConfig(oUshellConfig, oDefaultApplicationMigration, true);
+                    mergeConfig(oUshellConfig, oConfig, true);
                 }
 
-                function _applyDefaultSiteData (oSiteData) {
-                    const oAdapterConfig = window["sap-ushell-config"].services.CommonDataModel.adapter.config;
+                /**
+                 * Apply the default site data and delete the siteDataUrl from the adapter config.
+                 *
+                 * @param {object} oSiteData The site data to be merged into the window object
+                 * @param {object} oUshellConfig The current ushell configuration
+                 */
+                function _applyDefaultSiteData (oSiteData, oUshellConfig) {
+                    const oAdapterConfig = oUshellConfig.services.CommonDataModel.adapter.config;
                     oAdapterConfig.siteData = oSiteData;
                     delete oAdapterConfig.siteDataUrl;
                 }
@@ -326,12 +353,16 @@
                  * window["sap-ushell-config"].
                  *
                  * @param {string} sUrlPrefix URL of JSON file to be merged into the configuration
+                 * @param {object} oUshellConfig The current ushell configuration
                  */
-                async function _applyJsonApplicationConfig (sUrlPrefix) {
+                async function _applyJsonApplicationConfig (sUrlPrefix, oUshellConfig) {
                     const sUrl = /\.json/i.test(sUrlPrefix) ? sUrlPrefix : sUrlPrefix + ".json";
                     const oAppConfig = await _loadJSON(sUrl);
                     if (oAppConfig) {
-                        mergeConfig(window["sap-ushell-config"], oAppConfig, true);
+                        const oDefaultApplicationMigration = commonUtils.getV2ServiceMigrationConfig(oAppConfig);
+
+                        mergeConfig(oUshellConfig, oDefaultApplicationMigration, true);
+                        mergeConfig(oUshellConfig, oAppConfig, true);
                     }
                 }
 
@@ -361,27 +392,28 @@
                     // otherwise, /appconfig/fioriSandboxConfig.json is the convention for WebIDE developers
                     if (aConfigFiles.length === 0) {
                         aConfigFiles.push("/appconfig/fioriSandboxConfig.json");
+                        aConfigFiles.push("../appconfig/fioriSandboxConfig.json"); // some configurations work with relative path only
                     }
 
                     if (!window["sap-ushell-config"]) {
                         window["sap-ushell-config"] = {};
                     }
+                    const oUshellConfig = window["sap-ushell-config"];
+                    // migrate config set via window object
+                    commonUtils.migrateV2ServiceConfig(oUshellConfig);
 
                     // load the predefined ushell configuration and site contents
                     const [oDefaultConfig, oDefaultSite] = await Promise.all([_loadJSON(sDefaultConfigUrl), _loadJSON(sDefaultSiteUrl)]);
-                    _applyDefaultUshellConfig(oDefaultConfig);
-                    _applyDefaultSiteData(oDefaultSite);
+                    _applyDefaultUshellConfig(oDefaultConfig, oUshellConfig);
+                    _applyDefaultSiteData(oDefaultSite, oUshellConfig);
 
                     // merge with the custom configuration
                     for (const sConfigFile of aConfigFiles) {
-                        await _applyJsonApplicationConfig(sConfigFile);
+                        await _applyJsonApplicationConfig(sConfigFile, oUshellConfig);
                     }
 
                     // convert custom data to the site data
-                    const oUshellConfig = _addAppsToSite(window["sap-ushell-config"]);
-
-                    // migrate adapter config
-                    commonUtils.migrateV2ServiceConfig(oUshellConfig);
+                    _addAppsToSite(oUshellConfig);
 
                     // merge custom application module paths for the loader, if provided
                     if (oUshellConfig.modulePaths) {

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

@@ -1,9 +1,8 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 /**
- * ONLY CALLED WHEN CLASSIC HOMEPAGE IS ENABLED!
- *
- * @deprecated since 1.112
+ * @fileoverview Catalogs manager. Used in AppFinder to assign tiles to groups.
+ * Part of CatalogsManager is used to load all catalogs in space mode. See loadAllCatalogs.
  */
 sap.ui.define([
     "sap/ui/base/Object",
@@ -66,8 +65,9 @@ sap.ui.define([
         _aDoables: [],
 
         constructor: function (sId, mSettings) {
-            this.oLaunchPageServicePromise = sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+            this.oLaunchPageServicePromise = sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                 this.oLaunchPageService = oLaunchPageService;
+                return oLaunchPageService;
             }.bind(this));
 
             //TODO should be removed when AppFinder and Homepage use separate model
@@ -96,10 +96,15 @@ sap.ui.define([
             var oEventBus = EventBus.getInstance();
             oEventBus.subscribe("renderCatalog", this.loadAllCatalogs, this);
             // Doable objects are kept in a global array to enable their off-ing later on.
-            this._aDoables = [
-                EventHub.on("showCatalog").do(this.updateTilesAssociation.bind(this)),
-                EventHub.on("updateGroups").do(this.updateTilesAssociation.bind(this))
-            ];
+            this._aDoables = [];
+            /**
+             * @deprecated As of version 1.121
+             */
+            this._aDoables.push(EventHub.on("showCatalog").do(this.updateTilesAssociation.bind(this)));
+            /**
+             * @deprecated As of version 1.121
+             */
+            this._aDoables.push(EventHub.on("updateGroups").do(this.updateTilesAssociation.bind(this)));
         },
 
         unregisterEvents: function () {
@@ -127,6 +132,9 @@ sap.ui.define([
             // this is a local function (which could be invoked at 2 points in this method).
             // this sets a Done callback on the promise object of the groups.
             var setDoneCBForGroups = function () {
+                /**
+                 * @deprecated As of version 1.121
+                 */
                 oGroupsPromise.done(function () {
                     var aGroups = that.getModel().getProperty("/groups");
                     if (aGroups && aGroups.length !== 0) {
@@ -162,7 +170,7 @@ sap.ui.define([
                 Measurement.pause("FLP:DashboardManager.BuildCatalogModelWithRendering");
 
                 // Trigger loading of catalogs
-                sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                this.oLaunchPageServicePromise.then(function (oLaunchPageService) {
                     oLaunchPageService.getCatalogs()
                         // There's a need to make sure that onDoneLoadingCatalogs is called only after all catalogs are loaded
                         // (i.e. all calls to addCatalogToModel are finished).
@@ -193,12 +201,18 @@ sap.ui.define([
             }
         },
 
+        /**
+         * @deprecated As of version 1.121
+         */
         updateTilesAssociation: function () {
             this.mapCatalogTilesToGroups();
             // update the catalogTile model after mapCatalogTilesToGroups() was called
             this.updateCatalogTilesToGroupsMap();
         },
 
+        /**
+         * @deprecated As of version 1.121
+         */
         mapCatalogTilesToGroups: function () {
             var that = this;
             this.oTileCatalogToGroupsMap = {};
@@ -227,6 +241,9 @@ sap.ui.define([
             });
         },
 
+        /**
+         * @deprecated As of version 1.121
+         */
         updateCatalogTilesToGroupsMap: function () {
             var tileId;
             var associatedGroups;
@@ -864,6 +881,9 @@ sap.ui.define([
          */
         resetAssociationOnFailure: function (sMsgId, aParameters) {
             this.notifyOnActionFailure(sMsgId, aParameters);
+            /**
+             * @deprecated As of version 1.121
+             */
             this.updateTilesAssociation();
         },
 
@@ -882,10 +902,10 @@ sap.ui.define([
              */
 
             // get appFinder display mode from configuration
-            var sAppFinderDisplayMode = this.oModel.getProperty("/appFinderDisplayMode");
+            var sAppFinderDisplayMode = this.oModel.getProperty("/appFinderDisplayMode") || "appBoxes";
 
             // determine the catalog tile display mode:
-            if (sAppFinderDisplayMode === "tiles") {
+            if (sAppFinderDisplayMode.toLowerCase() === "tiles") {
                 bIsAppBox = false;
             } else {
                 bIsAppBox = !!(

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

@@ -57,7 +57,7 @@ sap.ui.define([
              * @deprecated As of version 1.120
              */
             if (!this.oLaunchPageService) {
-                return sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                return sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                     this.oLaunchPageService = oLaunchPageService;
                 }.bind(this));
             }

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

@@ -8,6 +8,7 @@
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/core/Core",
+    "sap/ui/core/Theming",
     "sap/ui/base/Object",
     "sap/ui/Device",
     "sap/ui/model/Filter",
@@ -37,6 +38,7 @@ sap.ui.define([
 ], function (
     jQuery,
     Core,
+    Theming,
     BaseObject,
     Device,
     Filter,
@@ -106,7 +108,7 @@ sap.ui.define([
                 return oHomepageManagerInstance;
             }
 
-            this.oServiceLoadingPromise = sap.ushell.Container.getServiceAsync("LaunchPage")
+            this.oServiceLoadingPromise = sap.ushell.Container.getServiceAsync("FlpLaunchPage")
                 .then(function (oLaunchPageService) {
                     this.oPageBuilderService = oLaunchPageService;
                     // add Remove action for all tiles
@@ -118,7 +120,7 @@ sap.ui.define([
             // when the core theme changes, it's required to calculate again, which tiles are visible. In case of
             // dynamic tiles, a request should be triggered. In some cases it can happen, that the tile visibility
             // is calculated before the initial theme is applied. Also these cases are covered, when we react to the theme changed event.
-            Core.attachThemeChanged(oUtils.handleTilesVisibility);
+            Theming.attachApplied(oUtils.handleTilesVisibility);
 
             // eslint-disable-next-line consistent-this
             oHomepageManagerInstance = this;
@@ -459,7 +461,7 @@ sap.ui.define([
             oEventBus.unsubscribe("launchpad", "sortableStart", this._sortableStart, this);
             oEventBus.unsubscribe("launchpad", "sortableStop", this._sortableStop, this);
             oEventBus.unsubscribe("launchpad", "dashboardModelContentLoaded", this._modelLoaded, this);
-            Core.detachThemeChanged(oUtils.handleTilesVisibility);
+            Theming.detachApplied(oUtils.handleTilesVisibility);
 
             aDoables.forEach(function (oDoable) {
                 oDoable.off();

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

@@ -311,7 +311,7 @@ sap.ui.define([
             if (this.bEnableEasyAccessOnTablet) {
                 // We need to filter out the Shell-startWDA and Shell-startGUI systems
                 // that do not support tablet
-                sap.ushell.Container.getServiceAsync("NavTargetResolution").then(function (oService) {
+                sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (oService) {
                     // Shell-startWDA often requires the additional parameter sap-ui2-wd-app-id
                     // and Shell-startGUI requires the additional parameter sap-ui2-tcode
                     // We are providing these with a placeholder value to be able to use
@@ -617,7 +617,7 @@ sap.ui.define([
             // If sPath is defined and is different than empty string - set the group context id.
             // The recursive call is needed in order to wait until groups data is inserted to the model
             if (sPath && sPath !== "") {
-                sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                     var timeoutGetGroupDataFromModel = function () {
                         var aModelGroups = oModel.getProperty("/groups");
                         if (aModelGroups.length) {

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

@@ -61,7 +61,7 @@ sap.ui.define([
             /**
              * @deprecated As of version 1.120
              */
-            sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+            sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                 this.oLaunchPageService = oLaunchPageService;
             }.bind(this));
 

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

@@ -16,7 +16,7 @@ sap.ui.define([
     "sap/ui/Device",
     "sap/ui/performance/Measurement",
     "sap/ushell/components/appfinder/VisualizationOrganizerHelper",
-    "sap/ushell/ui/appfinder/AppBox",
+    "sap/ushell/ui/appfinder/AppBoxInternal",
     "sap/ushell/ui/appfinder/PinButton",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/ui/launchpad/CatalogEntryContainer",
@@ -39,7 +39,7 @@ sap.ui.define([
     Device,
     Measurement,
     VisualizationOrganizerHelper,
-    AppBox,
+    AppBoxInternal,
     PinButton,
     AccessibilityCustomData,
     CatalogEntryContainer,
@@ -131,14 +131,13 @@ sap.ui.define([
                 visible: false
             });
 
-            this.oAppBoxesTemplate = new AppBox({
+            this.oAppBoxesTemplate = new AppBoxInternal({
                 title: "{title}",
                 icon: "{icon}",
                 subtitle: "{subtitle}",
                 url: "{url}",
                 navigationMode: "{navigationMode}",
                 pinButton: oAppBoxPinButton,
-                contentProviderId: "{contentProviderId}",
                 contentProviderLabel: "{contentProviderLabel}",
                 press: [oController.onAppBoxPressed, oController]
             });

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

@@ -49,7 +49,10 @@ sap.ui.define([
                 oSharedComponentUtils.getEffectiveHomepageSetting("/core/home/homePageGroupDisplay", "/core/home/enableHomePageSettings");
             }
 
-            // Relevant for functions in views and controllers, used by CLASSIC HOMEPAGE
+            /**
+             * Relevant for functions in views and controllers, used by CLASSIC HOMEPAGE
+             * @deprecated As of version 1.121
+             */
             this.oCatalogsManager = new CatalogsManager("dashboardMgr", {
                 model: this.oModel
             });
@@ -102,7 +105,7 @@ sap.ui.define([
         destroy: function () {
             return Promise.all([
                 UIComponent.prototype.destroy.apply(this, arguments),
-                this.oCatalogsManager.destroy()
+                this.oCatalogsManager && this.oCatalogsManager.destroy()
             ]);
         }
     });

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

@@ -3,7 +3,7 @@
 sap.ui.define([
     "sap/ui/core/library",
     "sap/ui/core/mvc/View",
-    "sap/ushell/ui/appfinder/AppBox",
+    "sap/ushell/ui/appfinder/AppBoxInternal",
     "sap/ushell/ui/appfinder/PinButton",
     "sap/ushell/resources",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
@@ -22,7 +22,7 @@ sap.ui.define([
 ], function (
     coreLibrary,
     View,
-    AppBox,
+    AppBoxInternal,
     PinButton,
     resources,
     AccessibilityCustomData,
@@ -76,7 +76,7 @@ sap.ui.define([
             }));
             oPinButton.addStyleClass("sapUshellPinButton");
 
-            this.oItemTemplate = new AppBox({
+            this.oItemTemplate = new AppBoxInternal({
                 title: "{easyAccess>text}",
                 subtitle: "{easyAccess>subtitle}",
                 url: "{easyAccess>url}",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.121.2"
+            "version": "1.122.0"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

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.121.2
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/core/Element",
@@ -1113,7 +1113,7 @@ sap.ui.define([
         /**
          * Creates a new object Expose a minimal set of values to public external stakeholders
          * only expose what you can guarantee under any evolution of the unified shell on all platforms
-         * @param {object} oApplication an internal result of NavTargetResolution
+         * @param {object} oApplication an internal result of NavTargetResolutionInternal
          * @returns {object} an object exposing certain information to external stakeholders
          */
         this._publicEventDataFromResolutionResult = function (oApplication) {
@@ -1503,17 +1503,6 @@ sap.ui.define([
             //Process Dangling UI elements.
             this.shellElements().setDangling(false);
             this.shellElements().processDangling();
-
-            if (sState === "searchResults") {
-                this.getElementsModel().setProperty("/lastSearchScreen", "");
-                if (!hasher.getHash().indexOf("Action-search") === 0) {
-                    var searchModel = Core.getModel("searchModel");
-                    hasher.setHash("Action-search&/searchTerm=" +
-                        searchModel.getProperty("/uiFilter/searchTerms") +
-                        "&dataSource=" +
-                        JSON.stringify(searchModel.getProperty("/uiFilter/dataSource").getJson()));
-                }
-            }
         };
 
         this.registerShellCommunicationHandler = function (oCommunicationHandler) {

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.121.2
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

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.121.2
+ * @version 1.122.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",