@sapui5/sap.ushell 1.120.8 → 1.121.0

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

@@ -2,8 +2,9 @@
 
 sap.ui.define([
     "sap/base/util/extend",
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ushell/library",
-    "sap/ui/core/Core",
     "sap/ui/core/mvc/View",
     "sap/ui/core/mvc/Controller",
     "sap/ushell/components/_HomepageManager/PagingManager",
@@ -22,8 +23,9 @@ sap.ui.define([
     "sap/base/Log"
 ], function (
     extend,
+    Element,
+    EventBus,
     ushellLibrary,
-    Core,
     View,
     Controller,
     PagingManager,
@@ -55,6 +57,10 @@ sap.ui.define([
     return Controller.extend("sap.ushell.components.appfinder.Catalog", {
         oPopover: null,
         onInit: function () {
+
+            /**
+             * @deprecated As of version 1.120
+             */
             sap.ushell.Container.getServiceAsync("LaunchPage").then(function (oLaunchPageService) {
                 this.oLaunchPageService = oLaunchPageService;
             }.bind(this));
@@ -94,7 +100,7 @@ sap.ui.define([
         onBeforeRendering: function () {
             // Invoking loading of all catalogs here instead of 'onBeforeShow' as it improves the perceived performance.
             // Fix of incident#:1570469901
-            Core.getEventBus().publish("renderCatalog");
+            EventBus.getInstance().publish("renderCatalog");
         },
 
         onAfterRendering: function () {
@@ -116,8 +122,8 @@ sap.ui.define([
                 this.PagingManager.setContainerSize(windowWidth, windowHeight);
             }.bind(this));
             this._handleAppFinderWithDocking();
-            Core.getEventBus().subscribe("launchpad", "appFinderWithDocking", this._handleAppFinderWithDocking, this);
-            Core.getEventBus().subscribe("sap.ushell", "appFinderAfterNavigate", this._handleAppFinderAfterNavigate, this);
+            EventBus.getInstance().subscribe("launchpad", "appFinderWithDocking", this._handleAppFinderWithDocking, this);
+            EventBus.getInstance().subscribe("sap.ushell", "appFinderAfterNavigate", this._handleAppFinderAfterNavigate, this);
         },
 
         _setPagingManager: function () {
@@ -414,7 +420,7 @@ sap.ui.define([
             this.oView.oCatalogsContainer.updateAllocatedUnits(this.allocateTiles);
             this.oView.oCatalogsContainer.resetCatalogPagination();
 
-            var oPage = Core.byId("catalogTilesDetailedPage");
+            var oPage = Element.getElementById("catalogTilesDetailedPage");
             if (oPage) {
                 oPage.scrollTo(0, 0);
             }
@@ -523,7 +529,7 @@ sap.ui.define([
 
         _restoreSelectedMasterItem: function () {
             var oCatalogsList = this.oView.splitApp.getMasterPage("catalogSelect");
-            var oOrigSelectedListItem = Core.byId(this.selectedCategoryId);
+            var oOrigSelectedListItem = Element.getElementById(this.selectedCategoryId);
 
             if (oOrigSelectedListItem) {
                 this.categoryFilter = oOrigSelectedListItem.getTitle();
@@ -548,11 +554,11 @@ sap.ui.define([
                     // for Phone the split app is behaving differently
                 } else if (this.oView.splitApp.isMasterShown()) {
                     // calculate the relevant detailed page to nav to
-                    var oDetail = Core.byId(this.getView()._calculateDetailPageId());
+                    var oDetail = Element.getElementById(this.getView()._calculateDetailPageId());
                     this.oView.splitApp.toDetail(oDetail);
                 } else if (bButtonToggled) {
                     // go to master
-                    var oCatalogSelectMaster = Core.byId("catalogSelect");
+                    var oCatalogSelectMaster = Element.getElementById("catalogSelect");
                     this.oView.splitApp.toMaster(oCatalogSelectMaster, "show");
                 }
             }
@@ -602,7 +608,7 @@ sap.ui.define([
         },
 
         catalogTilePress: function (/*oController*/) {
-            Core.getEventBus().publish("launchpad", "catalogTileClick");
+            EventBus.getInstance().publish("launchpad", "catalogTileClick");
         },
 
         onAppBoxPressed: function (oEvent) {
@@ -613,6 +619,9 @@ sap.ui.define([
                 return;
             }
 
+            /**
+             * @deprecated As of version 1.120
+             */
             fnPressHandler = this.oLaunchPageService.getAppBoxPressHandler(oTile);
 
             if (fnPressHandler) {
@@ -642,7 +651,7 @@ sap.ui.define([
                             url: sUrl,
                             appId: sUrl
                         };
-                        sap.ushell.Container.getRenderer("fiori2").logRecentActivity(oRecentEntry);
+                        sap.ushell.Container.getRendererInternal("fiori2").logRecentActivity(oRecentEntry);
                     }
 
                     WindowUtils.openURL(sUrl, "_blank");
@@ -737,6 +746,9 @@ sap.ui.define([
             }.bind(this));
         },
 
+        /**
+         * @deprecated As of version 1.120
+         */
         _getGroupTitle: function (oDefaultGroup, oGroupObject) {
             var oLaunchPageService = this.oLaunchPageService;
             var sTitle;
@@ -929,6 +941,7 @@ sap.ui.define([
          * @param {object} oCatalogTileModel - The catalog tile model from /catalogTiles array
          * @param {object} oGroupModel - The model of the relevant group
          * @param {boolean} bTileAdded - Whether the performed action is adding or removing the tile to/from the group
+         * @deprecated As of version 1.120
          */
         _groupContextOperationSucceeded: function (oSourceContext, oCatalogTileModel, oGroupModel, bTileAdded) {
             var oLaunchPageService = this.oLaunchPageService;
@@ -1109,7 +1122,7 @@ sap.ui.define([
          *
          * @param {sap.ui.model.Context} oTileContext the catalog tile to add
          * @param {sap.ui.model.Context} oGroupContext the group where the tile should be added
-         * @returns {object} deferred
+         * @returns {jQuery.Deferred} Resolves once the tile was added.
          * @private
          *
          * @deprecated since 1.112
@@ -1135,7 +1148,7 @@ sap.ui.define([
          *
          * @param {int} tileCatalogId the id of the tile
          * @param {int} index the index of the group in the model
-         * @returns {object} deferred
+         * @returns {jQuery.Deferred} Resolves once the tile was removed.
          * @private
          *
          * @deprecated since 1.112
@@ -1163,7 +1176,7 @@ sap.ui.define([
          *
          * @param {sap.ui.model.Context} oTileContext the catalog tile to add
          * @param {string} newGroupName the name of the new group where the tile should be added
-         * @returns {object} deferred
+         * @returns {jQuery.Deferred} Resolves once the group was created and the tile was saved.
          * @private
          *
          * @deprecated since 1.112
@@ -1184,8 +1197,8 @@ sap.ui.define([
 
         onExit: function () {
             VisualizationOrganizerHelper.destroy();
-            Core.getEventBus().unsubscribe("launchpad", "appFinderWithDocking", this._handleAppFinderWithDocking, this);
-            Core.getEventBus().unsubscribe("launchpad", "appFinderAfterNavigate", this._handleAppFinderAfterNavigate, this);
+            EventBus.getInstance().unsubscribe("launchpad", "appFinderWithDocking", this._handleAppFinderWithDocking, this);
+            EventBus.getInstance().unsubscribe("launchpad", "appFinderAfterNavigate", this._handleAppFinderAfterNavigate, this);
         }
     });
 });

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

@@ -9,7 +9,8 @@ sap.ui.define([
     "sap/m/PageAccessibleLandmarkInfo",
     "sap/m/SplitApp",
     "sap/m/StandardListItem",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/mvc/View",
     "sap/ui/core/library",
     "sap/ui/Device",
@@ -31,7 +32,8 @@ sap.ui.define([
     PageAccessibleLandmarkInfo,
     SplitApp,
     StandardListItem,
-    Core,
+    Element,
+    EventBus,
     View,
     coreLibrary,
     Device,
@@ -136,6 +138,8 @@ sap.ui.define([
                 url: "{url}",
                 navigationMode: "{navigationMode}",
                 pinButton: oAppBoxPinButton,
+                contentProviderId: "{contentProviderId}",
+                contentProviderLabel: "{contentProviderLabel}",
                 press: [oController.onAppBoxPressed, oController]
             });
 
@@ -197,10 +201,8 @@ sap.ui.define([
                 return this.oCatalogSelect;
             };
 
-            /*
-             * override original onAfterRendering as currently sap.m.Select does not support afterRendering handler in the constructor
-             * this is done to support tab order accessibility
-             */
+            // override original onAfterRendering as currently sap.m.Select does not support afterRendering handler in the constructor
+            // this is done to support tab order accessibility
             var origCatalogSelectOnAfterRendering = this.oCatalogSelect.onAfterRendering;
             if (Device.system.desktop) {
                 sap.ui.require([
@@ -231,7 +233,7 @@ sap.ui.define([
                                 try {
                                     oEvent.preventDefault();
                                     AccessKeysHandler.setIsFocusHandledByAnotherHandler(true);
-                                    var openCloseSplitAppButton = Core.byId("openCloseButtonAppFinderSubheader");
+                                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                                     if (openCloseSplitAppButton.getVisible()) {
                                         openCloseSplitAppButton.focus();
                                     } else {
@@ -288,16 +290,14 @@ sap.ui.define([
 
                 // set focus on first segmented button
                 setTimeout(function () {
-                    var oSegmentedButton = Core.byId("appFinderSegmentedButtons");
+                    var oSegmentedButton = Element.getElementById("appFinderSegmentedButtons");
                     if (oSegmentedButton) {
                         oSegmentedButton.focus();
                     }
                 }, 0);
             };
 
-            /*
-             * setting followOf to false, so the popover won't close on IE.
-             */
+            // setting followOf to false, so the popover won't close on IE.
             var origOnAfterRenderingPopover = this.oCatalogSelect._onAfterRenderingPopover;
             this.oCatalogSelect._onAfterRenderingPopover = function () {
                 if (this._oPopover) {
@@ -308,7 +308,7 @@ sap.ui.define([
                 }
             };
 
-            var oEventBus = Core.getEventBus();
+            var oEventBus = EventBus.getInstance();
             var sDetailPageId;
             var fnUpdateMasterDetail = function () {
                 this.splitApp.toMaster("catalogSelect", "show");
@@ -378,17 +378,17 @@ sap.ui.define([
 
             this.oCatalogsContainer.addEventDelegate({
                 onsaptabprevious: function (oEvent) {
-                    var openCloseSplitAppButton = Core.byId("openCloseButtonAppFinderSubheader");
+                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                     var oDomRef = oEvent.srcControl.getDomRef();
                     if (openCloseSplitAppButton.getVisible() && !openCloseSplitAppButton.getPressed() &&
                         !oDomRef.classList.contains("sapUshellPinButton")) {
                         oEvent.preventDefault();
-                        var appFinderSearch = Core.byId("appFinderSearch");
+                        var appFinderSearch = Element.getElementById("appFinderSearch");
                         appFinderSearch.focus();
                     }
                 },
                 onsapskipback: function (oEvent) {
-                    var openCloseSplitAppButton = Core.byId("openCloseButtonAppFinderSubheader");
+                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                     if (openCloseSplitAppButton.getVisible() && !openCloseSplitAppButton.getPressed()) {
                         oEvent.preventDefault();
                         openCloseSplitAppButton.focus();
@@ -397,7 +397,7 @@ sap.ui.define([
             });
 
             this.oCatalogsContainer.onAfterRendering = function () {
-                var oCatalogTilesDetailedPage = Core.byId("catalogTilesDetailedPage");
+                var oCatalogTilesDetailedPage = Element.getElementById("catalogTilesDetailedPage");
                 if (!this.getBusy()) {
                     oCatalogTilesDetailedPage.setBusy(false);
                     Measurement.end("FLP:AppFinderLoadingStartToEnd");
@@ -406,7 +406,7 @@ sap.ui.define([
                 }
 
                 document.getElementById("catalogTilesDetailedPage-cont").addEventListener("scroll", function () {
-                    var oPage = Core.byId("catalogTilesDetailedPage");
+                    var oPage = Element.getElementById("catalogTilesDetailedPage");
                     var scroll = oPage.getScrollDelegate();
                     var currentPos = scroll.getScrollTop();
                     var max = scroll.getMaxScrollTop();

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

@@ -61,17 +61,17 @@ sap.ui.define([
             sHash = hasher.getHash();
 
             Promise.all([
-                sap.ushell.Container.getServiceAsync("ShellNavigation"),
+                sap.ushell.Container.getServiceAsync("ShellNavigationInternal"),
                 sap.ushell.Container.getServiceAsync("URLParsing")
             ]).then(function (aServices) {
-                var oShellNavigation = aServices[0];
+                var oShellNavigationInternal = aServices[0];
                 var oUrlParsing = aServices[1];
                 var oShellHash = oUrlParsing.parseShellHash(sHash);
                 if (oShellHash && oShellHash.semanticObject === "shell" && oShellHash.action === "catalog") {
                     mParameters = this.parseOldCatalogParams(sHash);
-                    oComponentConfig = this.getMetadata().getConfig();
+                    oComponentConfig = this.getManifestEntry("/sap.ui5/config");
 
-                    oShellNavigation.toExternal({
+                    oShellNavigationInternal.toExternal({
                         target: {
                             semanticObject: oComponentConfig.semanticObject,
                             action: oComponentConfig.action

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

@@ -1,8 +1,8 @@
 // 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/mvc/Controller",
     "sap/ui/core/mvc/View",
     "sap/base/Log",
@@ -14,8 +14,8 @@ sap.ui.define([
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/Config"
 ], function (
-    Configuration,
-    Core,
+    Localization,
+    Element,
     Controller,
     View,
     Log,
@@ -316,7 +316,7 @@ sap.ui.define([
             if (bSearchMode) {
                 // update 'aria-controls' property of the App Finder's Search Field
                 // (This property is the first custom data of the search-field control)
-                Core.byId("appFinderSearch").getCustomData()[0].setValue(this.getView().getId() + "hierarchyAppsSearchResults");
+                Element.getElementById("appFinderSearch").getCustomData()[0].setValue(this.getView().getId() + "hierarchyAppsSearchResults");
 
                 // of search term is a real value (not empty) then we perform search
                 if (sSearchTerm) {
@@ -326,7 +326,7 @@ sap.ui.define([
                 // so this is a search click on 'X' scenario OR empty search scenario
             } else {
                 // clear the 'aria-controls' property of the App Finder's Search Field
-                Core.byId("appFinderSearch").getCustomData()[0].setValue("");
+                Element.getElementById("appFinderSearch").getCustomData()[0].setValue("");
 
                 // else - search mode is false, so we go back to the hierarchy apps regular view
                 this.oView.splitApp.toDetail(this.getView().getId() + "hierarchyApps");
@@ -497,7 +497,7 @@ sap.ui.define([
                             "Cache-Control": "no-cache, no-store, must-revalidate",
                             Pragma: "no-cache",
                             Expires: "0",
-                            "Accept-Language": Configuration.getLanguage() || "",
+                            "Accept-Language": Localization.getLanguage() || "",
                             "sap-client": iSapClient || "",
                             "sap-language": sLanguage || ""
                         }

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

@@ -19,9 +19,7 @@ sap.ui.define([
             this.setModel(this.getViewData().subHeaderModel, "subHeaderModel");
             this.setModel(this.getViewData().parentComponent.getModel());
 
-            /*
-             * Initialize split app master view.
-             */
+            // Initialize split app master view.
             this.pHierarchyFolders = View.create({
                 viewName: "module:sap/ushell/components/appfinder/HierarchyFoldersView",
                 height: "100%",
@@ -38,9 +36,7 @@ sap.ui.define([
 
             var oViewData = this.getViewData();
 
-            /*
-             * Initialize split app details view.
-             */
+            // Initialize split app details view.
             this.pHierarchyApps = View.create({
                 id: this.getId() + "hierarchyApps",
                 viewName: "module:sap/ushell/components/appfinder/HierarchyAppsView",
@@ -55,9 +51,7 @@ sap.ui.define([
                 return HierarchyApps;
             }.bind(this));
 
-            /*
-             * Setup split app
-             */
+            // Setup split app
             this.splitApp = new SplitApp();
 
             Promise.all([

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

@@ -1,14 +1,14 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ui/core/mvc/Controller",
     "sap/m/library",
     "sap/ushell/resources",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel"
 ], function (
-    Core,
+    Element,
     Controller,
     mobileLibrary,
     resources,
@@ -169,7 +169,7 @@ sap.ui.define([
 
         _setFooterVisibility: function (bVisible) {
             // as there is not public API to control the footer we get the control by its id and set its visibility
-            var oFooter = Core.byId("groupsPopover-footer");
+            var oFooter = Element.getElementById("groupsPopover-footer");
             if (oFooter) {
                 oFooter.setVisible(bVisible);
             }

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

@@ -11,7 +11,7 @@ sap.ui.define([
     "sap/m/library",
     "sap/m/Page",
     "sap/m/PageAccessibleLandmarkInfo",
-    "sap/m/MessagePage",
+    "sap/m/IllustratedMessage",
     "sap/ui/model/json/JSONModel",
     "sap/m/Link",
     "sap/m/Breadcrumbs",
@@ -30,7 +30,7 @@ sap.ui.define([
     mobileLibrary,
     Page,
     PageAccessibleLandmarkInfo,
-    MessagePage,
+    IllustratedMessage,
     JSONModel,
     Link,
     Breadcrumbs,
@@ -115,10 +115,9 @@ sap.ui.define([
             });
 
             // create message-page as invisible by default
-            this.oMessagePage = new MessagePage({
+            this.oMessagePage = new IllustratedMessage({
                 visible: false,
-                showHeader: false,
-                text: resources.i18n.getText("EasyAccessMenu_NoAppsToDisplayMessagePage_Text"),
+                title: resources.i18n.getText("EasyAccessMenu_NoAppsToDisplayMessagePage_Text"),
                 description: ""
             });
 
@@ -220,7 +219,7 @@ sap.ui.define([
             return sTooltip;
         },
 
-        /*
+        /**
          * updates the text-field OR the messagePage according to
          *   - if items exist we update the text-field, otherwise show message page
          *   - if bIsSearchResults we use different text then if is not (e.g. standard empty folder navigation)
@@ -257,7 +256,7 @@ sap.ui.define([
                 this.oMessagePage.setVisible(true);
 
                 var sEmptyContentMessageText = resources.i18n.getText(sEmptyContentMessageKey);
-                this.oMessagePage.setText(sEmptyContentMessageText);
+                this.oMessagePage.setTitle(sEmptyContentMessageText);
             }
         },
 

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

@@ -47,10 +47,8 @@ sap.ui.define([
         },
 
         onAfterRendering: function () {
-            /*
-             * making sure that on every click anywhere on the left panel which is basically
-             * the hierarchy-folders view (this view), we invoke exit search mode (if necessary)
-             */
+            // making sure that on every click anywhere on the left panel which is basically
+            // the hierarchy-folders view (this view), we invoke exit search mode (if necessary)
             var jqThis = jQuery("#" + this.getView().getId());
             jqThis.on("click", function (/*event*/) {
                 this.exitSearchMode();

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Core",
+    "sap/ui/core/Lib",
     "sap/ui/core/mvc/View",
     "sap/m/Button",
     "sap/m/Label",
@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/m/Text",
     "sap/ushell/resources"
 ], function (
-    Core,
+    Library,
     View,
     Button,
     Label,
@@ -90,7 +90,7 @@ sap.ui.define([
             });
 
             this._navBackButton = new Button({
-                tooltip: Core.getLibraryResourceBundle("sap.m").getText("PAGE_NAVBUTTON_TEXT"),
+                tooltip: Library.getResourceBundleFor("sap.m").getText("PAGE_NAVBUTTON_TEXT"),
                 type: ButtonType.Back,
                 visible: false,
                 press: function () {

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

@@ -2,11 +2,12 @@
 
 sap.ui.define([
     "sap/m/library",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
     "sap/ushell/Config",
+    "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ushell/resources"
-], function (mobileLibrary, Core, Config, EventHub, resources) {
+], function (mobileLibrary, Element, Config, Container, EventHub, resources) {
     "use strict";
 
     // shortcut for sap.m.ButtonType
@@ -20,7 +21,7 @@ sap.ui.define([
      * @returns {sap.ui.core.mvc.View|undefined} The "catalogView" of the AppFinder or "undefined" if the view was not found.
      */
     function getCatalogView () {
-        return Core.byId("catalogView");
+        return Element.getElementById("catalogView");
     }
     /**
      * Helper function to get the "appFinderView".
@@ -28,7 +29,7 @@ sap.ui.define([
      * @returns {sap.ui.core.mvc.View|undefined} The "appFinderView" or "undefined" if the view was not found.
      */
     function getAppFinderView () {
-        return Core.byId("appFinderView");
+        return Element.getElementById("appFinderView");
     }
 
     /**
@@ -272,6 +273,9 @@ sap.ui.define([
          * @protected
          */
         this.updateModelWithContext = function (oDataParam) {
+            /**
+            * @deprecated As of version 1.120
+            */
             if (!isSpacesEnabled()) {
                 this._updateModelWithGroupContext.apply(this, arguments);
                 return Promise.resolve();
@@ -463,7 +467,7 @@ sap.ui.define([
                 } else if (!Config.last("/core/spaces/myHome/enabled")) {
                     resolve(false);
                 } else {
-                    sap.ushell.Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
+                    Container.getServiceAsync("UserInfo").then(function (oUserInfoService) {
                         resolve(oUserInfoService.getUser().getShowMyHome());
                     });
                 }

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

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