@sapui5/sap.ushell 1.120.8 → 1.121.0

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

@@ -7,8 +7,8 @@
  */
 sap.ui.define([
     "sap/ui/base/Object",
-    "sap/ui/core/Core",
-    "sap/ushell/ui/launchpad/TileState",
+    "sap/ui/core/EventBus",
+    "sap/ushell/ui/launchpad/TileStateInternal",
     "sap/ushell/EventHub",
     "sap/ushell/utils",
     "sap/ushell/components/DestroyHelper",
@@ -19,11 +19,12 @@ sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ui/performance/Measurement",
     "sap/base/Log",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils"
 ], function (
     BaseObject,
-    Core,
-    TileState,
+    EventBus,
+    TileStateInternal,
     EventHub,
     ushellUtils,
     DestroyHelper,
@@ -34,7 +35,8 @@ sap.ui.define([
     jQuery,
     Measurement,
     Log,
-    Config
+    Config,
+    LaunchPageReadUtils
 ) {
     "use strict";
 
@@ -91,7 +93,7 @@ sap.ui.define([
         },
 
         registerEvents: function () {
-            var oEventBus = Core.getEventBus();
+            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 = [
@@ -101,7 +103,7 @@ sap.ui.define([
         },
 
         unregisterEvents: function () {
-            var oEventBus = Core.getEventBus();
+            var oEventBus = EventBus.getInstance();
             oEventBus.unsubscribe("renderCatalog", this.loadAllCatalogs, this);
             this._aDoables.forEach(function (oDoable) {
                 oDoable.off();
@@ -375,7 +377,7 @@ sap.ui.define([
          */
         processPendingCatalogs: function (aPendingCatalogQueue) {
             var aCurrentCatalogs = this.oModel.getProperty("/catalogs");
-            var oEventBus = Core.getEventBus();
+            var oEventBus = EventBus.getInstance();
             var aAllEntryInCatalogMaster = this.oModel.getProperty("/masterCatalogs") || [{
                 title: MessagingHelper.getLocalizedText("all")
             }];
@@ -437,13 +439,13 @@ sap.ui.define([
         },
 
         _processCatalogObjectForModel: function (oCurrentCatalogObject, oCatalogTile) {
-            var oAppBoxNew;
             // do not add Item if no intent supported
             if (this._getIsIntentSupported(oCatalogTile)) {
                 if (this._getIsAppBox(oCatalogTile)) {
-                    oAppBoxNew = this.createCatalogAppBoxes(oCatalogTile, true);
-                    oCurrentCatalogObject.appBoxes.push(oAppBoxNew);
-                    return Promise.resolve();
+                    return this.createCatalogAppBoxes(oCatalogTile, true)
+                        .then((oAppBox) => {
+                            oCurrentCatalogObject.appBoxes.push(oAppBox);
+                        });
                 }
                 return this.createCatalogTiles(oCatalogTile).then(function (oCatalogTileNew) {
                     oCurrentCatalogObject.customTiles.push(oCatalogTileNew);
@@ -507,17 +509,14 @@ sap.ui.define([
          */
         _getCatalogTileId: function (oCatalogTile) {
             var sCatalogTileId;
-            var bStableIDsEnabled = Config.last("/core/stableIDs/enabled");
             var bSpacesEnabled = Config.last("/core/spaces/enabled");
 
-            if (bStableIDsEnabled && bSpacesEnabled) {
+            if (bSpacesEnabled) {
                 sCatalogTileId = this.oLaunchPageService.getStableCatalogTileId(oCatalogTile);
             }
 
-            /*
-            Always fallback on the catalogTileId.
-            Either getStableCatalogTileId is not implemented by the LaunchPageAdapter or spaces is disabled.
-            */
+            // Always fallback on the catalogTileId.
+            // Either getStableCatalogTileId is not implemented by the LaunchPageAdapter or spaces is disabled.
             if (!sCatalogTileId) {
                 sCatalogTileId = this.oLaunchPageService.getCatalogTileId(oCatalogTile);
             }
@@ -525,15 +524,16 @@ sap.ui.define([
             return sCatalogTileId;
         },
 
-        createCatalogAppBoxes: function (oCatalogTile, bGetTileKeyWords) {
-            var catalogTileId = encodeURIComponent(this._getCatalogTileId(oCatalogTile));
-            var associatedGrps = this.oTileCatalogToGroupsMap[catalogTileId] || [];
-            var tileTags = this.oLaunchPageService.getCatalogTileTags(oCatalogTile) || [];
-
+        createCatalogAppBoxes: async function (oCatalogTile, bGetTileKeyWords) {
+            const catalogTileId = encodeURIComponent(this._getCatalogTileId(oCatalogTile));
+            const associatedGrps = this.oTileCatalogToGroupsMap[catalogTileId] || [];
+            const tileTags = this.oLaunchPageService.getCatalogTileTags(oCatalogTile) || [];
+            const catalogTileContentProviderId = this.oLaunchPageService.getCatalogTileContentProviderId(oCatalogTile);
+            const catalogTileContentProviderLabel = await LaunchPageReadUtils.getContentProviderLabel(catalogTileContentProviderId) || catalogTileContentProviderId;
             if (tileTags.length > 0) {
                 this.tagsPool = this.tagsPool.concat(tileTags);
             }
-            var sNavigationMode;
+            let sNavigationMode;
             if (oCatalogTile.tileResolutionResult) {
                 sNavigationMode = oCatalogTile.tileResolutionResult.navigationMode;
             }
@@ -548,7 +548,8 @@ sap.ui.define([
                 keywords: bGetTileKeyWords ? (this.oLaunchPageService.getCatalogTileKeywords(oCatalogTile) || []).join(",") : [],
                 tags: tileTags,
                 navigationMode: sNavigationMode,
-                url: this.oLaunchPageService.getCatalogTileTargetURL(oCatalogTile)
+                url: this.oLaunchPageService.getCatalogTileTargetURL(oCatalogTile),
+                contentProviderLabel: catalogTileContentProviderLabel
             };
         },
 
@@ -577,7 +578,7 @@ sap.ui.define([
             }.bind(this));
 
             //Publish event catalog finished loading.
-            var oEventBus = Core.getEventBus();
+            var oEventBus = EventBus.getInstance();
             oEventBus.publish("launchpad", "catalogContentLoaded");
 
             var aLoadedCatalogs = aCatalogs.filter(function (oCatalog) {
@@ -599,11 +600,12 @@ sap.ui.define([
             ushellUtils.handleTilesVisibility();
         },
 
-        createCatalogTiles: function (oCatalogTile/*, bGetTileKeyWords*/) {
-            var oTileViewPromise = Promise.resolve();
+        createCatalogTiles: async function (oCatalogTile/*, bGetTileKeyWords*/) {
+            let oTileViewPromise = Promise.resolve();
+
             // if it's not a dynamic or static tile, we need to call the getCatalogTileView already here to make the search work
             // the keywords for Smart Business tiles are only there if their view was rendered before
-            var sChipId = oCatalogTile.getChip && oCatalogTile.getChip().getBaseChipId && oCatalogTile.getChip().getBaseChipId();
+            const sChipId = oCatalogTile.getChip && oCatalogTile.getChip().getBaseChipId && oCatalogTile.getChip().getBaseChipId();
             if (sChipId && ["X-SAP-UI2-CHIP:/UI2/DYNAMIC_APPLAUNCHER", "X-SAP-UI2-CHIP:/UI2/STATIC_APPLAUNCHER"].indexOf(sChipId) === -1) {
                 oTileViewPromise = new Promise(function (resolve, reject) {
                     this.oLaunchPageService.getCatalogTileViewControl(oCatalogTile)
@@ -612,20 +614,19 @@ sap.ui.define([
                 }.bind(this));
             }
 
-            return oTileViewPromise.then(function (oTileView) {
-                var sCatalogTileId = encodeURIComponent(this._getCatalogTileId(oCatalogTile));
-                var aAssociatedGrps = this.oTileCatalogToGroupsMap[sCatalogTileId] || [];
-                var aTileTags = this.oLaunchPageService.getCatalogTileTags(oCatalogTile) || [];
-
+            return oTileViewPromise.then(async function (oTileView) {
+                const sCatalogTileId = encodeURIComponent(this._getCatalogTileId(oCatalogTile));
+                const aAssociatedGrps = this.oTileCatalogToGroupsMap[sCatalogTileId] || [];
+                const aTileTags = this.oLaunchPageService.getCatalogTileTags(oCatalogTile) || [];
+                const catalogTileContentProviderId = this.oLaunchPageService.getCatalogTileContentProviderId(oCatalogTile);
+                const contentProviderLabel = await LaunchPageReadUtils.getContentProviderLabel(catalogTileContentProviderId);
                 if (aTileTags.length > 0) {
                     this.tagsPool = this.tagsPool.concat(aTileTags);
                 }
-
                 if (!oTileView) {
-                    oTileView = new TileState({ state: "Loading" });
+                    oTileView = new TileStateInternal({ state: "Loading" });
                 }
-
-                var sTileTitle = this.oLaunchPageService.getCatalogTilePreviewTitle(oCatalogTile);
+                let sTileTitle = this.oLaunchPageService.getCatalogTilePreviewTitle(oCatalogTile);
                 if (!sTileTitle) {
                     sTileTitle = this.oLaunchPageService.getCatalogTileTitle(oCatalogTile);
                 }
@@ -641,7 +642,8 @@ sap.ui.define([
                     size: this.oLaunchPageService.getCatalogTileSize(oCatalogTile),
                     content: [oTileView],
                     isTileIntentSupported: this.oLaunchPageService.isTileIntentSupported(oCatalogTile),
-                    tileType: oCatalogTile.tileType
+                    tileType: oCatalogTile.tileType,
+                    contentProviderLabel: contentProviderLabel
                 };
             }.bind(this));
         },
@@ -665,7 +667,7 @@ sap.ui.define([
                     // if the dashboard is already loaded and in edit mode.
                     var oDashboardView = this.oHomepageManager.getDashboardView();
                     if (oDashboardView && oDashboardView.getModel().getProperty("/tileActionModeActive")) {
-                        Core.getEventBus().publish("launchpad", "AddTileContainerContent");
+                        EventBus.getInstance().publish("launchpad", "AddTileContainerContent");
                     }
 
                     var oResponseData = {};
@@ -732,7 +734,7 @@ sap.ui.define([
             var oResponseData = {};
 
             // publish event for UserActivityLog
-            var oEventBus = Core.getEventBus();
+            var oEventBus = EventBus.getInstance();
             oEventBus.publish("launchpad", "addTile", {
                 catalogTileContext: oCatalogTileContext,
                 groupContext: oContext
@@ -873,11 +875,11 @@ sap.ui.define([
             var bIsAppBox;
 
             /*
-            When appFinderDisplayMode is set to "tiles", non-custom tiles will have the same display as custom tiles
-            (i.e. will not be displayed as AppBoxes).
-            In other words - all tiles (custom and non-custom) will be displayed as tiles
-            when appFinderDisplayMode is not set at all, or set to "appBoxes", non-custom tiles will be displayed as AppBoxes.
-            */
+             * When appFinderDisplayMode is set to "tiles", non-custom tiles will have the same display as custom tiles
+             * (i.e. will not be displayed as AppBoxes).
+             * In other words - all tiles (custom and non-custom) will be displayed as tiles
+             * when appFinderDisplayMode is not set at all, or set to "appBoxes", non-custom tiles will be displayed as AppBoxes.
+             */
 
             // get appFinder display mode from configuration
             var sAppFinderDisplayMode = this.oModel.getProperty("/appFinderDisplayMode");

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

@@ -1,23 +1,27 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Configuration",
-    "sap/ui/core/Core",
+    "sap/base/i18n/Localization",
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ushell/Config",
     "sap/ui/events/KeyCodes",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
     "sap/ushell/renderer/AccessKeysHandler",
-    "sap/ushell/bootstrap/common/common.load.model"
+    "sap/ushell/bootstrap/common/common.load.model",
+    "sap/ushell/ui/launchpad/Tile"
 ], function (
-    Configuration,
-    Core,
+    Localization,
+    Element,
+    EventBus,
     Config,
     KeyCodes,
     jQuery,
     Log,
     AccessKeysHandler,
-    oModelWrapper
+    oModelWrapper,
+    Tile
 ) {
     "use strict";
 
@@ -49,16 +53,16 @@ sap.ui.define([
                 return Promise.resolve();
             }
 
-            return new Promise(function (fnResolve) {
-                if (!this.oLaunchPageService) {
-                    sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
-                        this.oLaunchPageService = oLaunchPageService;
-                        fnResolve();
-                    }.bind(this));
-                } else {
-                    fnResolve();
-                }
-            }.bind(this));
+            /**
+             * @deprecated As of version 1.120
+             */
+            if (!this.oLaunchPageService) {
+                return sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
+                    this.oLaunchPageService = oLaunchPageService;
+                }.bind(this));
+            }
+
+            return Promise.resolve();
         },
 
         // Go to last visited tile.
@@ -189,9 +193,9 @@ sap.ui.define([
                     }
                 }
 
-                var oDashboardView = Core.byId("sapUshellDashboardPage").getParent();
+                var oDashboardView = Element.getElementById("sapUshellDashboardPage").getParent();
 
-                Core.getEventBus().publish(
+                EventBus.getInstance().publish(
                     "launchpad",
                     bSameAggregation ? "movetile" : "convertTile",
                     {
@@ -211,7 +215,7 @@ sap.ui.define([
 
         callbackSetFocus: function (oTile) {
             setTimeout(function () {
-                if (oTile.oParent && oTile.oParent instanceof sap.ushell.ui.launchpad.Tile) {
+                if (oTile.oParent && oTile.oParent instanceof Tile) {
                     this.moveScrollDashboard(jQuery(oTile.oParent.getDomRef()));
                 } else {
                     this.moveScrollDashboard(oTile.$());
@@ -319,12 +323,13 @@ sap.ui.define([
         },
 
         /**
-         * Calculates the next logical tile
+         * Calculates the next logical tile in classical home page
          *
          * @param {string} sDirection the logical direction of the key event
          * @param {boolean} bMoveTile do we currently want to move the selected tile
          *
          * @returns {object} the next logical tile in the given logical direction or undefined
+         * @deprecated As of version 1.120
          */
         _getNextTile: function (sDirection, bMoveTile) {
             var oInfo = this._getGroupAndTilesInfo();
@@ -464,6 +469,7 @@ sap.ui.define([
          * @param {object} oTile A tile instance.
          * @returns {boolean} Returns <code>true</code> if the tile's link personalization is allowed
          * @private
+         * @deprecated As of version 1.120
          */
         _isLinkPersonalizationSupported: function (oTile) {
             return !this.oLaunchPageService || this.oLaunchPageService.isLinkPersonalizationSupported(oTile);
@@ -537,6 +543,13 @@ sap.ui.define([
             };
         },
 
+        /**
+         * Move to the next element in classical home
+         * @param {string} sDirection Movement direction
+         * @param {Object} jqFocused jQuery of the focuced element
+         * @private
+         * @deprecated As of version 1.120
+         */
         _goToSiblingElementInTileContainer: function (sDirection, jqFocused) {
             var jqTileContainer = jqFocused.closest(".sapUshellTileContainer"),
                 jqTileContainerElement,
@@ -671,6 +684,7 @@ sap.ui.define([
          * @param {string} sDirection the logical direction of the key event
          * @param {jQuery} $curTile the current seleted tile
          * @param {boolean} bIsActionsModeActive is edit Mode active
+         * @deprecated as of version 1.120
          */
         _goFromFocusedTile: function (sDirection, $curTile, bIsActionsModeActive) {
             var oNextTile = this._getNextTile(sDirection),
@@ -744,13 +758,13 @@ sap.ui.define([
             oTileElement.setAttribute("tabindex", 0);
 
 
-            var oTileControl = Core.byId(oTileElement.getAttribute("id"));
+            var oTileControl = Element.getElementById(oTileElement.getAttribute("id"));
 
             if (oTileControl) {
                 var oGroupControl = oTileControl.getParent();
 
                 if (oGroupControl) {
-                    var oEventBus = Core.getEventBus();
+                    var oEventBus = EventBus.getInstance();
                     oEventBus.publish("launchpad", "scrollToGroup", { group: oGroupControl });
                 }
                 oTileControl.focus();
@@ -818,7 +832,7 @@ sap.ui.define([
                 return;
             }
 
-            Core.getEventBus().publish("launchpad", "moveGroup", { fromIndex: fromIndex, toIndex: toIndex });
+            EventBus.getInstance().publish("launchpad", "moveGroup", { fromIndex: fromIndex, toIndex: toIndex });
 
             setTimeout(function () {
                 var tileContainerHeader = jQuery(".sapUshellTileContainerHeader")[toIndex];
@@ -992,9 +1006,9 @@ sap.ui.define([
                     var oInfo = this._getGroupAndTilesInfo();
 
                     if (oInfo && !oInfo.oCurTile.isLink) { // links are handled in the HomepageManager
-                        var oDashboardView = Core.byId("sapUshellDashboardPage").getParent();
+                        var oDashboardView = Element.getElementById("sapUshellDashboardPage").getParent();
 
-                        Core.getEventBus().publish("launchpad", "deleteTile", {
+                        EventBus.getInstance().publish("launchpad", "deleteTile", {
                             tileId: oDashboardView.getController()._getTileUuid(oInfo.oCurTile),
                             items: "tiles"
                         }, this);
@@ -1035,7 +1049,7 @@ sap.ui.define([
         },
 
         handleFocusOnMe: function (oEvent, bFocusPassedFirstTime) {
-            var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+            var oRenderer = sap.ushell.Container.getRendererInternal("fiori2"),
                 handler = ComponentKeysHandler._instance;
 
             if (oRenderer) {
@@ -1045,25 +1059,23 @@ sap.ui.define([
                  * @deprecated since 1.118.
                  * This part of the code is dedicated only to the classic homepage and should therefore be deprecated.
                  */
-                (function () {
-                    if (sCurrentCoreView === "home" && !Config.last("/core/spaces/enabled")) {
-                        // handle focus after tileContainer rename
-                        var sTagName = document.activeElement ? document.activeElement.tagName : "";
-                        if (sTagName === "INPUT" || sTagName === "TEXTAREA") {
-                            if (oEvent.keyCode === handler.keyCodes.ENTER) {
-                                var $HeaderElement = jQuery(document.activeElement).closest(".sapUshellTileContainerHeader");
-                                if ($HeaderElement.length) {
-                                    setTimeout(function () {
-                                        $HeaderElement = jQuery("#" + $HeaderElement[0].id);
-                                        $HeaderElement.focus();
-                                    }, 10);
-                                }
+                if (sCurrentCoreView === "home" && !Config.last("/core/spaces/enabled")) {
+                    // handle focus after tileContainer rename
+                    var sTagName = document.activeElement ? document.activeElement.tagName : "";
+                    if (sTagName === "INPUT" || sTagName === "TEXTAREA") {
+                        if (oEvent.keyCode === handler.keyCodes.ENTER) {
+                            var $HeaderElement = jQuery(document.activeElement).closest(".sapUshellTileContainerHeader");
+                            if ($HeaderElement.length) {
+                                setTimeout(function () {
+                                    $HeaderElement = jQuery("#" + $HeaderElement[0].id);
+                                    $HeaderElement.focus();
+                                }, 10);
                             }
-                        } else {
-                            handler._dashboardKeydownHandler(oEvent);
                         }
+                    } else {
+                        handler._dashboardKeydownHandler(oEvent);
                     }
-                }());
+                }
 
                 if (sCurrentCoreView === "appFinder") {
                     // we got the focus from the shell
@@ -1071,7 +1083,7 @@ sap.ui.define([
                         if (oEvent.shiftKey) { // backwards navigation
                             handler.setFocusOnCatalogTile();
                         } else { // forward navigation
-                            var openCloseSplitAppButton = Core.byId("openCloseButtonAppFinderSubheader");
+                            var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                             if (openCloseSplitAppButton && openCloseSplitAppButton.getVisible()) {
                                 openCloseSplitAppButton.focus();
                             } else {
@@ -1187,7 +1199,7 @@ sap.ui.define([
             var jqFocused = jQuery(document.activeElement);
             if (oEvent.srcElement.id !== "appFinderSearch-I") {
                 var iPressedKeyCode = oEvent.keyCode,
-                    bIsRTL = Configuration.getRTL();
+                    bIsRTL = Localization.getRTL();
 
                 if (bIsRTL && iPressedKeyCode === this.keyCodes.ARROW_RIGHT) {
                     iPressedKeyCode = this.keyCodes.ARROW_LEFT;
@@ -1242,7 +1254,7 @@ sap.ui.define([
             }
 
             var iPressedKeyCode = oEvent.keyCode,
-                bIsRTL = Configuration.getRTL(),
+                bIsRTL = Localization.getRTL(),
                 jqFocused = jQuery(document.activeElement);
 
             if (bIsRTL) {

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

@@ -20,7 +20,7 @@ sap.ui.define([], function () {
 
     /**
      * Destroy tile models
-     * @param {Array} aTiles List of tiles to destroy
+     * @param {object[]} aTiles List of tiles to destroy
      */
     function destroyTileModels (aTiles) {
         var i;
@@ -43,7 +43,7 @@ sap.ui.define([], function () {
 
     /**
      * Destroy groups or catalogs model
-     * @param {Array} aAggregationModel List of group or catalog models to destroy
+     * @param {object[]} aAggregationModel List of group or catalog models to destroy
      */
     function destroyFLPAggregationModels (aAggregationModel) {
         var i;

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

@@ -2,8 +2,8 @@
 
 sap.ui.define([
     "sap/base/util/ObjectPath",
-    "sap/ui/core/Core",
     "sap/ui/Device",
+    "sap/ui/core/Element",
     "sap/ushell/components/_HeaderManager/PropertyStrategiesFactory",
     "sap/ushell/components/StateHelper",
     "sap/ushell/Config",
@@ -12,8 +12,8 @@ sap.ui.define([
     "sap/base/util/deepClone"
 ], function (
     ObjectPath,
-    Core,
     Device,
+    Element,
     _PropertyStrategiesFactory,
     StateHelper,
     Config,
@@ -202,7 +202,7 @@ sap.ui.define([
         } else if (sDeviceType !== "Phone" && bIsOverflowVisible) {
             // Destroy the popover to avoid duplicate elements ids in the DOM
             // and to ensure the endItems are rendered correctly in the header
-            var oPopover = Core.byId("headEndItemsOverflow");
+            var oPopover = Element.getElementById("headEndItemsOverflow");
             if (oPopover) {
                 oPopover.destroy();
             }