@sapui5/sap.ushell 1.120.7 → 1.121.0

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -5,10 +5,12 @@
  * Publishes all lifecycle events as described in the documentation of the "sap.ushell" namespace.
  */
 sap.ui.define([
-    "sap/ui/core/Core",
+    "sap/ui/core/Component",
+    "sap/ui/core/Element",
     "sap/ui/core/UIComponent",
     "sap/ushell/ui/shell/ToolAreaItem",
     "sap/ushell/Config",
+    "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ushell/utils",
     "sap/ushell/components/applicationIntegration/AppLifeCycle",
@@ -30,12 +32,15 @@ sap.ui.define([
     "sap/ushell/ui/shell/ShellHeadItem",
     "sap/m/NotificationListItem",
     "sap/ushell/renderer/ShellLayout",
-    "sap/ushell/renderer/utils"
+    "sap/ushell/renderer/utils",
+    "sap/ushell/ui/launchpad/ActionItem"
 ], function (
-    Core,
+    Component,
+    Element,
     UIComponent,
     ToolAreaItem,
     Config,
+    Container,
     EventHub,
     oUshellUtils,
     AppLifeCycle,
@@ -57,7 +62,8 @@ sap.ui.define([
     ShellHeadItem,
     NotificationListItem,
     ShellLayout,
-    RendererUtils
+    RendererUtils,
+    ActionItem
 ) {
     "use strict";
 
@@ -68,26 +74,24 @@ sap.ui.define([
     var AppType = ushellLibrary.AppType;
 
     /**
-     * This method MUST be called by the Unified Shell's container only.
-     *
-     * @class The SAPUI5 component of SAP Fiori Launchpad renderer for the Unified Shell.
+     * @alias sap.ushell.renderer.Renderer
+     * @class
+     * @classdesc The SAPUI5 component of SAP Fiori Launchpad renderer for the Unified Shell.
      * @extends sap.ui.core.UIComponent
-     * @name sap.ushell.renderer.Renderer
      * @since 1.15.0
      * @private
      */
-    var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", {
+    var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.120.7",
+            version: "1.121.0",
             dependencies: {
-                version: "1.120.7",
+                version: "1.121.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
             interfaces: ["sap.ui.core.IAsyncContentCreation"],
             routing: {
                 config: {
-                    path: "sap.ushell.components",
                     async: true,
                     controlId: "viewPortContainer",
                     clearAggregation: false,
@@ -104,13 +108,13 @@ sap.ui.define([
                             return "homeapp";
                         }
 
-                        // CEP MyHome
-                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
+                        // SAP Start
+                        if (Config.last("/core/workPages/enabled") && !Config.last("/core/workPages/runtimeSwitcher")) {
                             return "workpages";
                         }
 
-                        // CEP Standard
-                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
+                        // SAP Build Work Zone Standard Edition
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/runtimeSwitcher")) {
                             return "runtimeSwitcher";
                         }
 
@@ -138,13 +142,13 @@ sap.ui.define([
                         "Launchpad-openFLPPage"
                     ],
                     target: (function () {
-                        // CEP MyHome
-                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") !== null) {
+                        // SAP Start
+                        if (Config.last("/core/workPages/enabled") && !Config.last("/core/workPages/runtimeSwitcher")) {
                             return "workpages";
                         }
 
-                        // CEP Standard
-                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/myHome/pageId") === null) {
+                        // SAP Build Work Zone Standard Edition
+                        if (Config.last("/core/workPages/enabled") && Config.last("/core/workPages/runtimeSwitcher")) {
                             return "runtimeSwitcher";
                         }
 
@@ -171,7 +175,7 @@ sap.ui.define([
                 }],
                 targets: {
                     home: {
-                        name: "homepage",
+                        name: "sap.ushell.components.homepage",
                         type: "Component",
                         title: resources.i18n.getText("homeBtn_tooltip"), // TODO does not work yet
                         id: "Shell-home-component",
@@ -192,7 +196,7 @@ sap.ui.define([
                         }
                     },
                     appfinder: {
-                        name: "appfinder",
+                        name: "sap.ushell.components.appfinder",
                         type: "Component",
                         // TODO title: "",
                         id: "Shell-appfinder-component",
@@ -209,7 +213,7 @@ sap.ui.define([
                         }
                     },
                     pages: {
-                        name: "pages",
+                        name: "sap.ushell.components.pages",
                         type: "Component",
                         id: "pages-component",
                         options: {
@@ -220,23 +224,15 @@ sap.ui.define([
                         }
                     },
                     workpages: {
-                        name: "workPageRuntime",
+                        // always use the default runtime for direct embedding for now
+                        // to simplify the contract for DWS work page builder
+                        name: Config.last("/core/workPages/defaultComponent/name"),
                         type: "Component",
                         id: "workPageRuntime-component",
-                        options: {
-                            componentData: {},
-                            asyncHints: {
-                                preloadBundles: [
-                                    "sap/ushell/preload-bundles/workpage-rt-0.js",
-                                    "sap/ushell/preload-bundles/workpage-rt-1.js",
-                                    "sap/ushell/preload-bundles/workpage-rt-2.js",
-                                    "sap/ushell/preload-bundles/workpage-rt-3.js"
-                                ]
-                            }
-                        }
+                        options: Config.last("/core/workPages/defaultComponent")
                     },
                     runtimeSwitcher: {
-                        name: "runtimeSwitcher",
+                        name: "sap.ushell.components.runtimeSwitcher",
                         type: "Component",
                         id: "runtimeSwitcher-component",
                         options: {
@@ -244,6 +240,8 @@ sap.ui.define([
                             asyncHints: {
                                 preloadBundles: [
                                     "sap/ushell/preload-bundles/homepage-af-dep.js",
+                                    // TODO: remove preload bundles for workpage-rt
+                                    // cannot be passed in ComponentContainer, requires bugfix in UI5 or workaround
                                     "sap/ushell/preload-bundles/workpage-rt-0.js",
                                     "sap/ushell/preload-bundles/workpage-rt-1.js",
                                     "sap/ushell/preload-bundles/workpage-rt-2.js",
@@ -253,7 +251,7 @@ sap.ui.define([
                         }
                     },
                     wzsearch: {
-                        name: "cepsearchresult.app",
+                        name: "sap.ushell.components.cepsearchresult.app",
                         type: "Component",
                         id: "cepsearchresult-app-component",
                         options: {
@@ -321,11 +319,11 @@ sap.ui.define([
                     return;
                 }
 
-                var oComponent = Core.getComponent(this.createId("Shell-appfinder-component"));
+                var oComponent = Component.getComponentById(this.createId("Shell-appfinder-component"));
                 var oData = oEvent.getParameter("arguments");
-                if (sap.ushell.Container.getRenderer("fiori2")) {
+                if (Container.getRendererInternal("fiori2")) {
                     AppLifeCycle.getShellUIService().setBackNavigation();
-                    sap.ushell.Container.getRenderer("fiori2").setCurrentCoreView("appFinder");
+                    Container.getRendererInternal("fiori2").setCurrentCoreView("appFinder");
                 }
                 AppConfiguration.setCurrentApplication(null);
 
@@ -362,15 +360,15 @@ sap.ui.define([
      */
     Renderer.prototype._prepareHomepage = function (oEvent) {
         if (AppConfiguration.getCurrentApplication()) {
-            sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (ShellNavigation) {
-                ShellNavigation.setIsInitialNavigation(false);
+            Container.getServiceAsync("ShellNavigationInternal").then(function (ShellNavigationInternal) {
+                ShellNavigationInternal.setIsInitialNavigation(false);
             });
         }
 
         var sCurrentHash = window.hasher.getHash();
         if (!Config.last("/core/spaces/enabled") && sCurrentHash.indexOf("Launchpad-openFLPPage") === 0) {
-            sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (ShellNavigation) {
-                ShellNavigation.replaceHashWithoutNavigation("Shell-home");
+            Container.getServiceAsync("ShellNavigationInternal").then(function (ShellNavigationInternal) {
+                ShellNavigationInternal.replaceHashWithoutNavigation("Shell-home");
             });
         }
 
@@ -401,7 +399,7 @@ sap.ui.define([
      * @since 1.100.0
      */
     Renderer.prototype._getHomeAppTarget = function () {
-        return sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (Ui5ComponentLoader) {
+        return Container.getServiceAsync("Ui5ComponentLoader").then(function (Ui5ComponentLoader) {
             var oHomeAppComponent = Config.last("/core/homeApp/component");
             var aCoreResourcesComplement = Ui5ComponentLoader.getCoreResourcesComplementBundle();
 
@@ -448,14 +446,13 @@ sap.ui.define([
          * code shall be automatically removed by tooling
          * @deprecated since 1.120.0
          */
-        (function () {
-            if (!sState) {
-                sState = UriParameters.fromQuery(window.location.search).get("appState");
-                if (sState) {
-                    Log.error("URL parameter 'appState' is given, but deprecated. Please use 'sap-ushell-config' instead!", "sap.ushell.renderer.Renderer");
-                }
+        if (!sState) {
+            sState = UriParameters.fromQuery(window.location.search).get("appState");
+            if (sState) {
+                Log.error("URL parameter 'appState' is given, but deprecated. Please use 'sap-ushell-config' instead!", "sap.ushell.renderer.Renderer");
             }
-        })();
+        }
+
         return sState && sState.toLowerCase();
     };
 
@@ -521,25 +518,12 @@ sap.ui.define([
         });
 
         if (!this.getComponentData().async) {
+            let oView;
             Log.error("sap/ushell/renderer/Renderer component is created synchronously. Synchronous instantiation is not allowed. Please use async:true in component data");
-            var oSyncView = sap.ui.view("mainShell", { // LEGACY API (deprecated)
-                type: ViewType.JS,
-                viewName: "sap.ushell.renderers.fiori2.Shell",
-                height: "100%",
-                viewData: viewData
-            });
-            oSyncView.addStyleClass("sapUshellRenderer");
-            this._oShellView = oSyncView;
-            this.oShellModel = AppLifeCycle.getElementsModel();
-
-            oSyncView.loaded().then(function (oCreatedView) {
-                // initialize the RendererExtensions after the view is created.
-                // This also publishes an external event that indicates that sap.ushell.renderer.RendererExtensions can be used.
-                this.shellCtrl = oCreatedView.oController;
-                RendererUtils.init(oCreatedView.getController());
-            }.bind(this));
-
-            return oSyncView;
+            (function () {
+                oView = this._createSyncContent(viewData);
+            }.bind(this))();
+            return oView;
         }
 
         return View.create({
@@ -560,17 +544,47 @@ sap.ui.define([
         }.bind(this));
     };
 
+    /**
+     * Creates the renderer synchronously.
+     * @param {object} viewData The viewData.
+     * @returns {sap.ui.core.JSView} The Renderer view.
+     *
+     * @since 1.121.0
+     * @private
+     * @deprecated since 1.120
+     */
+    Renderer.prototype._createSyncContent = function (viewData) {
+        var oSyncView = sap.ui.view("mainShell", { // LEGACY API (deprecated)
+            type: ViewType.JS,
+            viewName: "sap.ushell.renderers.fiori2.Shell",
+            height: "100%",
+            viewData: viewData
+        });
+        oSyncView.addStyleClass("sapUshellRenderer");
+        this._oShellView = oSyncView;
+        this.oShellModel = AppLifeCycle.getElementsModel();
+
+        oSyncView.loaded().then(function (oCreatedView) {
+            // initialize the RendererExtensions after the view is created.
+            // This also publishes an external event that indicates that sap.ushell.renderer.RendererExtensions can be used.
+            this.shellCtrl = oCreatedView.oController;
+            RendererUtils.init(oCreatedView.getController());
+        }.bind(this));
+
+        return oSyncView;
+    };
+
     /**
      * Creates an extended shell state.<br>
      * An extended shell state is an extension for the current shell that can be applied by the function applyExtendedShellState.<br>
      *
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").createCustomShellState('test1', function () {
-     *   var oTileActionsButton = sap.ushell.Container.getRenderer("fiori2").addActionButton("sap.ushell.ui.launchpad.ActionItem",{
+     * Container.getRendererInternal("fiori2").createCustomShellState('test1', function () {
+     *   var oTileActionsButton = Container.getRendererInternal("fiori2").addActionButton("sap.ushell.ui.launchpad.ActionItem",{
      *   id: "xxx2",
      *   text: 'aaaaaaaaaaaa',
      *   icon: 'sap-icon://edit',
-     *   tooltip: sap.ushell.resources.i18n.getText("activateActionMode"),
+     *   tooltip: resources.i18n.getText("activateActionMode"),
      *   press: function () {
      *     sap.ushell.components.homepage.ActionMode.toggleActionMode(oModel, "Menu Item");
      *   }}, true, true);
@@ -595,17 +609,17 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").createCustomShellState('test1', function () {
-     *   var oTileActionsButton = sap.ushell.Container.getRenderer("fiori2").addActionButton("sap.ushell.ui.launchpad.ActionItem",{
+     * Container.getRendererInternal("fiori2").createCustomShellState('test1', function () {
+     *   var oTileActionsButton = Container.getRendererInternal("fiori2").addActionButton("sap.ushell.ui.launchpad.ActionItem",{
      *   id: "xxx2",
      *   text: 'aaaaaaaaaaaa',
      *   icon: 'sap-icon://edit',
-     *   tooltip: sap.ushell.resources.i18n.getText("activateActionMode"),
+     *   tooltip: resources.i18n.getText("activateActionMode"),
      *   press: function () {
      *     sap.ushell.components.homepage.ActionMode.toggleActionMode(oModel, "Menu Item");
      *   }}, true, true);
      * });
-     * sap.ushell.Container.getRenderer("fiori2").applyExtendedShellState('test1');
+     * Container.getRendererInternal("fiori2").applyExtendedShellState('test1');
      * </pre>
      *
      * @param {string} sShellName Name of the extended shell state.
@@ -626,7 +640,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * var oButton = new Button(id: "newButton", text: "Test Button"); // e.g. sap.m.Button
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * oRenderer.showActionButton([oButton.getId()], false, ["home", "app"]);
      * </pre>
      *
@@ -659,7 +673,7 @@ sap.ui.define([
      * <pre>
      * var button1 = new sap.ushell.ui.shell.ShellHeadItem();
      * var button2 = new sap.ushell.ui.shell.ShellHeadItem();
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showHeaderItem ([button1.getId(), button2.getId()], false, ["home", "app"]);
      * </pre>
      * <br>Note: Was public with fiori2/Renderer
@@ -692,7 +706,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * var button1 = new sap.ushell.ui.shell.RightFloatingContainerItem();
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showRightFloatingContainerItem(button1.getId(), false, ["home", "app"]);
      * </pre>
      *
@@ -731,7 +745,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * sap.ui.require(["sap/ushell/ui/shell/ToolAreaItem"], function (ToolAreaItem) {
-     *     var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     *     var oRenderer = Container.getRendererInternal("fiori2"),
      *         oToolAreaItem = new ToolAreaItem({ icon: "sap-icon://wrench" });
      *     renderer.showToolAreaItem(oToolAreaItem.getId(), false, ["home", "app"]);
      * });
@@ -762,7 +776,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * var button1 = new sap.m.Button();
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showActionButton([button1.getId()], false, ["home", "app"]);
      * </pre>
      *
@@ -788,12 +802,12 @@ sap.ui.define([
         // In case the method was called with instance of sap.m.Button, we need to convert it to
         // sap.ushell.ui.launchpad.ActionItem in order to apply the action item behavior and styles to this control
         aButtons = aIds.filter(function (sId) {
-            oButton = Core.byId(sId);
-            return BaseObject.isA(oButton, "sap.m.Button") && !(BaseObject.isA(oButton, "sap.ushell.ui.launchpad.ActionItem"));
+            oButton = Element.getElementById(sId);
+            return BaseObject.isObjectA(oButton, "sap.m.Button") && !(BaseObject.isObjectA(oButton, "sap.ushell.ui.launchpad.ActionItem"));
         });
         aActions = aIds.filter(function (sId) {
-            oButton = Core.byId(sId);
-            return oButton instanceof sap.ushell.ui.launchpad.ActionItem;
+            oButton = Element.getElementById(sId);
+            return oButton instanceof ActionItem;
         });
         if (aButtons.length) {
             this.convertButtonsToActions(aButtons, bCurrentState, aStates);
@@ -816,7 +830,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * var button1 = new sap.ushell.ui.shell.ShellFloatingAction();
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showFloatingActionButton([button1.getId()], true);
      * </pre>
      *
@@ -848,7 +862,7 @@ sap.ui.define([
      * <b>Example:</b>
      * <pre>
      * var button1 = new sap.ushell.ui.shell.ShellHeadItem();
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showHeaderEndItem ([button1.getId()], false, ["home", "app"]);
      * </pre>
      *
@@ -875,7 +889,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * oRenderer.setHeaderVisibility(false, false, ["home", "app"]);
      * </pre>
      *
@@ -911,7 +925,7 @@ sap.ui.define([
      *     sap.m.MessageToast.show("Pressed");
      *   }})
      * ]});
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * oRenderer.showSubHeader([bar.getId()], false, ["home", "app"]);
      * </pre>
      *
@@ -943,7 +957,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showSignOutItem (false, ["home", "app"]);
      * </pre>
      *
@@ -970,7 +984,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.showSettingsItem (false, ["home", "app"]);
      * </pre>
      *
@@ -996,7 +1010,7 @@ sap.ui.define([
      *     sap.m.MessageToast.show("Pressed");
      *   }})
      * ]});
-     * var renderer = sap.ushell.Container.getRenderer("fiori2");
+     * var renderer = Container.getRendererInternal("fiori2");
      * renderer.setFooter(bar);
      * </pre>
      *
@@ -1036,7 +1050,7 @@ sap.ui.define([
      *
      * <b>For example, using the sap.m.Bar control:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     * var oRenderer = Container.getRendererInternal("fiori2"),
      *   oFooterControlProperties = {
      *     controlType : "sap.m.Bar",
      *     oControlProperties : {
@@ -1057,7 +1071,7 @@ sap.ui.define([
      * @param {string} oParameters.controlType The (class) name of the control type to create, for example: <code>sap.m.Bar</code>
      * @param {object} oParameters.oControlProperties The properties that will be passed to the created control, for example: <code>{id: "testBar"}</code>
      *
-     * @returns {jQuery.Deferred.promise} jQuery.deferred.promise object that when resolved, returns the newly created control
+     * @returns {jQuery.Promise} Resolves with the newly created control
      * @since 1.48
      * @private
      */
@@ -1069,8 +1083,8 @@ sap.ui.define([
         var oControlProperties = oParameters.oControlProperties;
 
         // If a control instance is already created - get it by its id
-        if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
-            oControlInstance = Core.byId(oControlProperties.id);
+        if (oControlProperties && oControlProperties.id && Element.getElementById(oControlProperties.id)) {
+            oControlInstance = Element.getElementById(oControlProperties.id);
             if (oControlInstance) {
                 // In case a footer was created before, we remove it first before setting a new one
                 if (this.lastFooterId) {
@@ -1113,7 +1127,7 @@ sap.ui.define([
      *
      * <b>For example, using the sap.m.Bar control:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * oRenderer.setFooterControl("sap.m.Bar", {id: "testBar", contentLeft: [new sap.m.Button({text: "Test Footer Button",
      *   press: function () {
      *     sap.m.MessageToast.show("Pressed");
@@ -1375,7 +1389,7 @@ sap.ui.define([
         if (footerId === this.shellCtrl.getFooterId()) {
             this.shellCtrl.removeFooter();
         }
-        var oFooter = Core.byId(footerId);
+        var oFooter = Element.getElementById(footerId);
         if (oFooter) {
             oFooter.destroy();
         }
@@ -1394,7 +1408,7 @@ sap.ui.define([
         this.shellCtrl.removeFooter();
         //If the footer was created by the renderer (setFooterControl API) then we will destroy it after it removed
         if (this.lastFooterId) {
-            var oFooter = Core.byId(this.lastFooterId);
+            var oFooter = Element.getElementById(this.lastFooterId);
             if (oFooter) {
                 oFooter.destroy();
             }
@@ -1422,7 +1436,7 @@ sap.ui.define([
      * If a sub header already exists, the new created one will replace the existing one.<br><br>
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     * var oRenderer = Container.getRendererInternal("fiori2"),
      *     oAddSubHeaderProperties = {
      *         controlType : "sap.m.Bar",
      *         oControlProperties : {
@@ -1450,7 +1464,7 @@ sap.ui.define([
      * navigates to another app or back to the Home page, this control will be removed.
      * @param {string[]} oParameters.aStates (only valid if bCurrentState is set to false) - list of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      *
-     * @returns {jQuery.Deferred.promise} jQuery.Deferred.promise object that when resolved, returns the newly created control
+     * @returns {jQuery.Promise} Resolves with the newly created control
      * @since 1.48
      * @private
      */
@@ -1465,8 +1479,8 @@ sap.ui.define([
         var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
-        if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
-            oControlInstance = Core.byId(oControlProperties.id);
+        if (oControlProperties && oControlProperties.id && Element.getElementById(oControlProperties.id)) {
+            oControlInstance = Element.getElementById(oControlProperties.id);
             if (oControlInstance) {
                 if (bIsVisible) {
                     this.showSubHeader(oControlInstance.getId(), bCurrentState, aStates);
@@ -1498,7 +1512,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * oRenderer.addSubHeader("sap.m.Bar", {id: "testBar", contentLeft: [new sap.m.Button({text: "Test SubHeader Button",
      *   press: function () {
      *     sap.m.MessageToast.show("Pressed");
@@ -1570,7 +1584,7 @@ sap.ui.define([
      * The button will be displayed in the user actions menu, that is opened from the user button in the shell header.</br>
      *  <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     * var oRenderer = Container.getRendererInternal("fiori2"),
      *     oAddActionButtonProperties = {
      *         controlType : "sap.m.Button",
      *         oControlProperties : {
@@ -1597,7 +1611,7 @@ sap.ui.define([
      * @param {string[]} oParameters.aStates (only valid if bCurrentState is set to false) - list of the sap.ushell.renderer.Renderer.LaunchpadState in which to add the control.
      * If no launchpad state is provided the content is added in all states. @see LaunchpadState
      *
-     * @returns {jQuery.Deferred.promise} jQuery.Deferred.promise object that when resolved, returns the newly created control
+     * @returns {jQuery.Promise} Resolves with the newly created control
      * @since 1.48
      * @private
      */
@@ -1614,7 +1628,7 @@ sap.ui.define([
 
         // If a control instance is already created - get it by its id
         if (oControlProperties) {
-            oControlInstance = Core.byId(oControlProperties.id);
+            oControlInstance = Element.getElementById(oControlProperties.id);
         }
 
         if (oControlInstance) {
@@ -1669,7 +1683,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addActionButton("sap.m.Button", {id: "testBtn2", text: "test button"}, true, true);
+     * Container.getRendererInternal("fiori2").addActionButton("sap.m.Button", {id: "testBtn2", text: "test button"}, true, true);
      * </pre>
      *
      * This function is marked for deprecation as of version 1.48.<br>
@@ -1740,7 +1754,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addFloatingActionButton("sap.ushell.ui.shell.ShellFloatingAction", {id: "testBtn"}, true, true);
+     * Container.getRendererInternal("fiori2").addFloatingActionButton("sap.ushell.ui.shell.ShellFloatingAction", {id: "testBtn"}, true, true);
      * </pre>
      *
      * <br>Note: Was public with fiori2/Renderer
@@ -1760,7 +1774,7 @@ sap.ui.define([
      *
      *   @see LaunchpadState
      *   If no launchpad state is provided the content is added in all states.
-     * @returns {object} jQuery.deferred.promise object that when resolved, returns the newly created control
+     * @returns {jQuery.Promise} Resolves with the newly created control
      * @since 1.48
      * @private
      * @deprecated since 1.52
@@ -1777,8 +1791,8 @@ sap.ui.define([
         var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
-        if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
-            oControlInstance = Core.byId(oControlProperties.id);
+        if (oControlProperties && oControlProperties.id && Element.getElementById(oControlProperties.id)) {
+            oControlInstance = Element.getElementById(oControlProperties.id);
             if (oControlInstance) {
                 if (bIsVisible) {
                     that.showFloatingActionButton(oControlInstance.getId(), bCurrentState, aStates);
@@ -1811,7 +1825,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addFloatingActionButton("sap.ushell.ui.shell.ShellFloatingAction", {id: "testBtn"}, true, true);
+     * Container.getRendererInternal("fiori2").addFloatingActionButton("sap.ushell.ui.shell.ShellFloatingAction", {id: "testBtn"}, true, true);
      * </pre>
      *
      * This function is marked for deprecation as of version 1.48.<br>
@@ -1879,7 +1893,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     * var oRenderer = Container.getRendererInternal("fiori2"),
      *     oSidePaneContentProperties = {
      *         controlType : "sap.m.Button",
      *         oControlProperties : {
@@ -1910,7 +1924,7 @@ sap.ui.define([
      *      @see LaunchpadState
      *      If no launchpad state is provided the content is added in all states.
      *
-     * @returns {jQuery.Deferred.promise} jQuery.Deferred.promise object that when resolved, returns the newly created control.
+     * @returns {jQuery.Promise} Resolves with the newly created control
      *
      * @since 1.48
      * @private
@@ -1926,8 +1940,8 @@ sap.ui.define([
         var aStates = oParameters.aStates;
 
         // If a control instance is already created - get it by its id
-        if (oControlProperties && oControlProperties.id && Core.byId(oControlProperties.id)) {
-            oControlInstance = Core.byId(oControlProperties.id);
+        if (oControlProperties && oControlProperties.id && Element.getElementById(oControlProperties.id)) {
+            oControlInstance = Element.getElementById(oControlProperties.id);
             if (oControlInstance) {
                 oDeferred.resolve(oControlInstance);
             }
@@ -1955,7 +1969,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addLeftPaneContent("sap.m.Button", {id: "testBtn", text: "Test Button"}, true, true);
+     * Container.getRendererInternal("fiori2").addLeftPaneContent("sap.m.Button", {id: "testBtn", text: "Test Button"}, true, true);
      * </pre>
      *
      * This function is marked for deprecation as of version 1.48.<br>
@@ -2020,7 +2034,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      *     oRenderer.addHeaderItem({
      *         id: "myTestButton",
      *         ariaLabel: resources.i18n.getText("testButton.label"),
@@ -2082,7 +2096,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addRightFloatingContainerItem({
+     * Container.getRendererInternal("fiori2").addRightFloatingContainerItem({
      *   id: 'testButton',
      *   icon: "sap-icon://documents",
      *   press: function (evt) {
@@ -2124,7 +2138,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * sap.ushell.Container.getRenderer("fiori2").addToolAreaItem({
+     * Container.getRendererInternal("fiori2").addToolAreaItem({
      *   id: "testButton",
      *   icon: "sap-icon://documents",
      *   expandable: true,
@@ -2177,7 +2191,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      *
      *     // Create an icon button that opens a dialog
      *     oRenderer.addHeaderEndItem({
@@ -2274,7 +2288,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * var oEntry = {
      *   title: "title",
      *   value: function() {
@@ -2294,11 +2308,11 @@ sap.ui.define([
      * @param {object} entryObject The data of the new added User Preference entry.
      * @param {string} entryObject.entryHelpID (Optional) - The ID of the object.
      * @param {string} entryObject.title - The title of the entry to be presented in the list in the User Preferences dialog box. We recommend using a string from the translation bundle.
-     * @param {string|function} value - A string to be presented as the value of the entry OR a function to be called which returns a {jQuery.Deferred.promise} object.
-     * @param {function} entryObject.content - A function to be called that returns a {jQuery.Deferred.promise} object which consists of a
+     * @param {string|function} value - A string to be presented as the value of the entry OR a function to be called which returns a {@link jQuery.Promise} object.
+     * @param {function} entryObject.content - A function to be called that returns a {@link jQuery.Promise} object which consists of a
      * {sap.ui.core.Control} to be displayed in a follow-on dialog box. A SAPUI5 view instance can also be returned. The function is called on each time the user opens the User Preferences dialog box.
-     * @param {function} entryObject.onSave - A function to be called which returns a {jQuery.Deferred.promise} object when the user clicks "save" in the User Preferences dialog box.
-     * If an error occurs, pass the error message via the {jQuery.Deferred.promise} object. Errors are displayed in the log.
+     * @param {function} entryObject.onSave - A function to be called which returns a {@link jQuery.Promise} object when the user clicks "save" in the User Preferences dialog box.
+     * If an error occurs, pass the error message via the {@link jQuery.Promise} object. Errors are displayed in the log.
      * @param {function} entryObject.onCancel - A function to be called that closes the User Preferences dialog box without saving any changes.
      * @param {boolean} entryObject.provideEmptyWrapper - Experimental. Set this value to true if you want that your content is displayed without the standard header.
      *
@@ -2318,7 +2332,7 @@ sap.ui.define([
      *
      * <b>Example:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2");
+     * var oRenderer = Container.getRendererInternal("fiori2");
      * var oEntry = {
      *     title: "title",
      *     value: function() {
@@ -2344,13 +2358,13 @@ sap.ui.define([
      *     <li>{string} title - The title of the entry to be presented in the list in the User Preferences dialog box.<br>
      *     We recommend using a string from the translation bundle.<br>
      *     <li>{string}/{Function} value - A string to be presented as the value of the entry<br>
-     *     OR a function to be called which returns a {jQuery.Deferred.promise} object.<br>
-     *     <li>{Function} content - A function to be called that returns a {jQuery.Deferred.promise} object<br>
+     *     OR a function to be called which returns a {@link jQuery.Promise} object.<br>
+     *     <li>{Function} content - A function to be called that returns a {@link jQuery.Promise} object<br>
      *     which consists of a {sap.ui.core.Control} to be displayed in a follow-on dialog box. A SAPUI5 view instance can also be returned.
      *     The functions is called on each time the user opens the User Preferences dialog box.
-     *     <li>{Function} onSave - A function to be called which returns a {jQuery.Deferred.promise}
+     *     <li>{Function} onSave - A function to be called which returns a {@link jQuery.Promise}
      *     object when the user clicks Save in the User Preferences dialog box.<br>
-     *     If an error occurs, pass the error message via the {jQuery.Deferred.promise} object. Errors are displayed in the log.<br>
+     *     If an error occurs, pass the error message via the {@link jQuery.Promise} object. Errors are displayed in the log.<br>
      *     <li>{Function} onCancel - A function to be called that closes the User Preferences dialog box without saving any changes. <br>
      *     <li>{boolean} provideEmptyWrapper - Experimental. Set this value to true if you want that your content is displayed without the standard header<br>
      *     <li>{string} groupingId - The ID of the group this entry should be included in <br>
@@ -2418,7 +2432,7 @@ sap.ui.define([
      *
      * <b>Example for setting the container's content for the "home" and "app" states:</b>
      * <pre>
-     * var oRenderer = sap.ushell.Container.getRenderer("fiori2"),
+     * var oRenderer = Container.getRendererInternal("fiori2"),
      *     oButton = new sap.m.Button("Button", {text: "Button"});
      * oRenderer.setFloatingContainerContent(oButton, false, ["home", "app"]);
      * oRenderer.setFloatingContainerVisibility(true);
@@ -2520,7 +2534,7 @@ sap.ui.define([
         var oProperties = {};
         var that = this;
         aIds.forEach(function (sId) {
-            var oButton = Core.byId(sId);
+            var oButton = Element.getElementById(sId);
             oProperties.id = oButton.getId();
             oProperties.text = oButton.getText();
             oProperties.icon = oButton.getIcon();
@@ -2539,7 +2553,7 @@ sap.ui.define([
         // create the object
         var oItem;
         if (oControlProperties && oControlProperties.id) {
-            oItem = Core.byId(oControlProperties.id);
+            oItem = Element.getElementById(oControlProperties.id);
         }
         if (!oItem) {
             oItem = fnCreateItem(oControlProperties);
@@ -2657,78 +2671,6 @@ sap.ui.define([
         return this.currentCoreView;
     };
 
-    /**
-     * Calls the provider with an object providing the tile information
-     * @example of a tile actions provider callback:
-     * <pre>
-     *     function fnProvider (oTileObject){
-     *       // oTileObject properties:
-     *       // controlId: The id of the actual control in the dom
-     *       // tileId: the id of the tile
-     *       // stableId: the id of the catalogTile (or tile as fallback)
-     *       // control: the actual tile control
-     *       // domRef: the dom node of the tile
-     *
-     *       return [
-     *         {
-     *           text: "Some Action",
-     *           icon: "sap-icon://action",
-     *           targetURL: "#SemanticObject-Action"
-     *         },
-     *         {
-     *           text: "Settings",
-     *           icon: "sap-icon://action-settings",
-     *           press: function () {
-     *             //Open settings UI
-     *           }
-     *         }
-     *       ];
-     *     }
-     * </pre>
-     * @param {function} fnProvider A function returning an array
-     * @returns {Promise<undefined>} Resolves once the provider was registered
-     *
-     * @private
-     */
-    Renderer.prototype.registerTileActionsProvider = function (fnProvider) {
-        if (!Config.last("/core/spaces/enabled")) {
-            return Promise.reject("registerTileActionsProvider is only supported with spaces enabled");
-        }
-        if (!this._aTileActionProviders) {
-            this._aTileActionProviders = [];
-        }
-        this._aTileActionProviders.push(fnProvider);
-        return Promise.resolve();
-    };
-
-    /**
-     * Collects the custom TileActions
-     * @param {object} oTile A VizInstance
-     * @returns {Promise<object[]>} Resolves a list of TileActions
-     *
-     * @private
-     */
-    Renderer.prototype.getCustomTileActions = function (oTile) {
-        if (!Config.last("/core/spaces/enabled")) {
-            return Promise.reject("getCustomTileActions is only supported with spaces enabled");
-        }
-
-        var oTileObject = {
-            controlId: oTile.getId(),
-            tileId: oTile.getVizRefId(),
-            stableId: oTile.getDataHelpId() || oTile.getVizRefId(),
-            control: oTile,
-            domRef: oTile.getDomRef()
-        };
-
-        var aTileActions = [];
-        this._aTileActionProviders.forEach(function (fnProvider) {
-            var aNewTileActions = fnProvider(oTileObject) || [];
-            aTileActions.push.apply(aTileActions, aNewTileActions);
-        });
-        return Promise.resolve(aTileActions);
-    };
-
     /**
      * Helper function that determines if a given intent is a built-in intent
      * (as listed in the metadata's routes).
@@ -2742,7 +2684,7 @@ sap.ui.define([
      */
     Renderer.prototype._isBuiltInIntent = function (oParsedHash) {
         if (!Renderer._aBuiltInRoutes) {
-            var aRoutes = Renderer.getMetadata().getRoutes();
+            var aRoutes = this.getManifestEntry("/sap.ui5/routing/routes");
             Renderer._aBuiltInRoutes = aRoutes.reduce(function (aConcatenatedRoutes, oCurrentRoutes) {
                 return aConcatenatedRoutes.concat(oCurrentRoutes.pattern);
             }, []);
@@ -2762,8 +2704,9 @@ sap.ui.define([
      * This method is relevant only for the AppRuntime and not
      * for the shell rendering.
      *
-     * @private
      * @since 1.100.0
+     * @private
+     * @ui5-restricted sap.ui.fl, sap.ui.rta
      */
     this.addTopHeaderPlaceHolder = function () {
     };
@@ -2773,14 +2716,15 @@ sap.ui.define([
      * This method is relevant only for the AppRuntime and not
      * for the shell rendering.
      *
-     * @private
      * @since 1.100.0
+     * @private
+     * @ui5-restricted sap.ui.fl, sap.ui.rta
      */
     this.removeTopHeaderPlaceHolder = function () {
     };
 
     Renderer.prototype.updateHeaderItem = function (sId, oControlProperties) {
-        var oItem = Core.byId(sId);
+        var oItem = Element.getElementById(sId);
 
         if (oItem && oControlProperties) {
             if (oControlProperties.hasOwnProperty("floatingNumber")) {
@@ -2803,7 +2747,7 @@ sap.ui.define([
         }
         aIds = typeof aIds === "string" ? [aIds] : aIds;
         aIds.forEach(function (sId) {
-            var oButton = Core.byId(sId);
+            var oButton = Element.getElementById(sId);
             if (oButton) {
                 oButton.destroy();
             }
@@ -2838,14 +2782,12 @@ sap.ui.define([
      * restore deprecated globals
      * @deprecated since 1.119.0
      */
-    (function () {
-        setTimeout(() => { // defer by a tick to avoid circular dependencies
-            sap.ui.require([
-                "sap/ushell/renderers/fiori2/Renderer",
-                "sap/ushell/renderers/fiori2/RendererExtensions"
-            ], function () {});
-        }, 0);
-    })();
+    setTimeout(() => { // defer by a tick to avoid circular dependencies
+        sap.ui.require([
+            "sap/ushell/renderers/fiori2/Renderer",
+            "sap/ushell/renderers/fiori2/RendererExtensions"
+        ], function () {});
+    }, 0);
 
     return Renderer;
 });