@sapui5/sap.ushell 1.120.8 → 1.121.0

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -6,18 +6,18 @@
 sap.ui.define([
     "./History",
     "sap/base/Log",
+    "sap/base/i18n/Localization",
     "sap/base/util/extend",
     "sap/base/util/isPlainObject",
     "sap/m/InstanceManager",
     "sap/ui/core/Component",
-    "sap/ui/core/Configuration",
-    "sap/ui/core/Core",
+    "sap/ui/core/Element",
+    "sap/ui/core/EventBus",
     "sap/ui/core/library",
     "sap/ui/core/mvc/Controller",
     "sap/ui/core/routing/HashChanger",
     "sap/ui/core/routing/History",
     "sap/ui/Device",
-    "sap/ui/model/json/JSONModel",
     "sap/ui/performance/trace/Interaction",
     "sap/ui/performance/Measurement",
     "sap/ui/thirdparty/hasher",
@@ -35,7 +35,6 @@ sap.ui.define([
     "sap/ushell/renderer/LogonFrameProvider",
     "sap/ushell/resources",
     "sap/ushell/services/AppConfiguration",
-    "sap/ushell/UserActivityLog",
     "sap/ushell/utils",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/renderer/ShellLayout",
@@ -44,18 +43,18 @@ sap.ui.define([
 ], function (
     History,
     Log,
+    Localization,
     extend,
     isPlainObject,
     InstanceManager,
     Component,
-    Configuration,
-    Core,
+    Element,
+    EventBus,
     library,
     Controller,
     HashChanger,
     Ui5History,
     Device,
-    JSONModel,
     Interaction,
     Measurement,
     hasher,
@@ -73,7 +72,6 @@ sap.ui.define([
     LogonFrameProvider,
     ushellResources,
     AppConfiguration,
-    UserActivityLog,
     ushellUtils,
     WindowUtils,
     ShellLayout,
@@ -121,11 +119,12 @@ sap.ui.define([
     const sLogFesrPrefix = "[FesrFlp]";
 
     /**
-     * @name sap.ushell.renderer.Shell
+     * @alias sap.ushell.renderer.Shell
+     * @class
      * @extends sap.ui.core.mvc.Controller
-     * @public
+     * @private
      */
-    return Controller.extend("sap.ushell.renderer.Shell", {
+    return Controller.extend("sap.ushell.renderer.Shell", /** @lends sap.ushell.renderer.Shell.prototype */ {
         _aDoables: [],
 
         addDoable: function (oDoable) {
@@ -136,7 +135,7 @@ sap.ui.define([
 
         /**
          * @param {sap.ui.core.Control} oControl The Control
-         * @see sap.ushell.renderer.Shell.controller#onExit
+         * @see #onExit
          *
          * @private
          * @since 1.115.0
@@ -150,7 +149,7 @@ sap.ui.define([
         /**
          * Adds a binding which is destroyed on Renderer destroy
          * @param {sap.ui.model.Binding} oBinding The Binding
-         * @see sap.ushell.renderer.Shell.controller#onExit
+         * @see #onExit
          *
          * @private
          * @since 1.115.0
@@ -161,7 +160,7 @@ sap.ui.define([
 
         /**
          * @param {sap.ui.model.Binding} oTargetBinding The Binding
-         * @see sap.ushell.renderer.Shell.controller#onExit
+         * @see #onExit
          *
          * @private
          * @since 1.115.0
@@ -247,7 +246,7 @@ sap.ui.define([
              * in the URL - &/userMenu part is eaten by the default hash changer.
              */
             oRouter.oHashChanger = HashChanger.getInstance();
-            oRouter.initialize(true /*tell the router not to parse the current browser hash, and wait for ShellNavigation.init*/);
+            oRouter.initialize(true /*tell the router not to parse the current browser hash, and wait for ShellNavigationInternal.init*/);
 
             this.bEnableHashChange = true;
             closeAllDialogs = true;
@@ -275,9 +274,9 @@ sap.ui.define([
             // Bind the translation model to this view
             oView.setModel(ushellResources.i18nModel, "i18n");
 
-            Core.getEventBus().subscribe("externalSearch", this.externalSearchTriggered, this);
-            Core.getEventBus().subscribe("sap.ushell", "appOpened", this.onAppOpened, this);
-            Core.getEventBus().subscribe("ESHSearchFinished", this._logSearchActivity, this);
+            EventBus.getInstance().subscribe("externalSearch", this.externalSearchTriggered, this);
+            EventBus.getInstance().subscribe("sap.ushell", "appOpened", this.onAppOpened, this);
+            EventBus.getInstance().subscribe("ESHSearchFinished", this._logSearchActivity, this);
             // handling of configuration should be done before the code block below otherwise the doHashChange is
             // triggered before the personalization flag is disabled (URL may contain hash value which invokes navigation)
             this._setConfigurationToModel();
@@ -295,42 +294,42 @@ sap.ui.define([
             }
 
             this.history = History;
-            this.oViewPortContainer = Core.byId("viewPortContainer");
+            this.oViewPortContainer = Element.getElementById("viewPortContainer");
             AppLifeCycleAI.init(oViewConfig.appState, this.oViewPortContainer, oViewConfig.rootIntent, oViewConfig.disableHomeAppCache, {
                 ownerComponent: this.getOwnerComponent()
             }, aActions, oViewConfig.cacheConfiguration);
 
             // init Shell Navigation
-            var initShellNavigation = function (oShellNavigation, oAppLifeCycleService) {
-                this.oShellNavigation = oShellNavigation;
-                this.oShellNavigation.registerPrivateFilters(oAppLifeCycleService);
+            var initShellNavigationInternal = function (oShellNavigationInternal, oAppLifeCycleService) {
+                this.oShellNavigationInternal = oShellNavigationInternal;
+                this.oShellNavigationInternal.registerPrivateFilters(oAppLifeCycleService);
 
-                // register the router in the ShellNavigation to let it skip the split of hash before firing the hashChange event
-                this.oShellNavigation.registerExtraRouter(oRouter);
-                this.oShellNavigation.registerNavigationFilter(this._handleEmptyHash.bind(this));
+                // register the router in the ShellNavigationInternal to let it skip the split of hash before firing the hashChange event
+                this.oShellNavigationInternal.registerExtraRouter(oRouter);
+                this.oShellNavigationInternal.registerNavigationFilter(this._handleEmptyHash.bind(this));
                 // must be after event registration (for synchronous nav target resolver calls)
-                this.oShellNavigation.init(this.doHashChange.bind(this));
+                this.oShellNavigationInternal.init(this.doHashChange.bind(this));
 
-                this.oShellNavigation.registerNavigationFilter(this._disableSourceAppRouter.bind(this));
+                this.oShellNavigationInternal.registerNavigationFilter(this._disableSourceAppRouter.bind(this));
 
-                this.oShellNavigation.registerNavigationFilter(this.handleDataLoss.bind(this));
+                this.oShellNavigationInternal.registerNavigationFilter(this.handleDataLoss.bind(this));
 
-                AppLifeCycleAI.registerHandleHashChange(this.oShellNavigation);
+                AppLifeCycleAI.registerHandleHashChange(this.oShellNavigationInternal);
                 // enable the direct app start and tests to wait for the initialization
                 EventHub.emit("ShellNavigationInitialized", Date.now());
             }.bind(this);
 
             Promise.all([
                 sap.ushell.Container.getServiceAsync("URLParsing"),
-                sap.ushell.Container.getServiceAsync("ShellNavigation"),
+                sap.ushell.Container.getServiceAsync("ShellNavigationInternal"),
                 sap.ushell.Container.getServiceAsync("AppLifeCycle")
             ])
                 .then(function (aServices) {
                     this.oURLParsing = aServices[0];
-                    var oShellNavigation = aServices[1];
+                    var oShellNavigationInternal = aServices[1];
                     this._oAppLifeCycleService = aServices[2];
 
-                    initShellNavigation(oShellNavigation, this._oAppLifeCycleService);
+                    initShellNavigationInternal(oShellNavigationInternal, this._oAppLifeCycleService);
                 }.bind(this));
 
             sap.ushell.Container.setLogonFrameProvider(this._getLogonFrameProvider());
@@ -401,11 +400,11 @@ sap.ui.define([
         },
 
         shellUpdateAggItem: function (sId, oContext) {
-            return Core.byId(oContext.getObject());
+            return Element.getElementById(oContext.getObject());
         },
 
         getViewPortContainer: function () {
-            return Core.byId("viewPortContainer");
+            return Element.getElementById("viewPortContainer");
         },
 
         /**
@@ -454,7 +453,7 @@ sap.ui.define([
             }
         },
 
-        /*
+        /**
          * This method change the back navigation handler with custom logic in the shell header when the ShellUIService#setBackNavigation method is called.
          *
          * This method currently assumes that the application is displayed in the "minimal" state (no home button present).
@@ -468,7 +467,7 @@ sap.ui.define([
                 AppLifeCycleAI.service().setNavigateBack(fnCallback);
 
                 if (oCurrentStateModel.stateName === "minimal" || oCurrentStateModel.stateName === "standalone" || oCurrentStateModel.stateName === "embedded") {
-                    sap.ushell.Container.getRenderer("fiori2").showHeaderItem("backBtn", true);
+                    sap.ushell.Container.getRendererInternal("fiori2").showHeaderItem("backBtn", true);
                 }
             } else {
                 //if no callback is provided we set the default handler: history back
@@ -490,16 +489,16 @@ sap.ui.define([
                 // Migration support: we have to set rootIntent empty
                 // And continue navigation in order to check if  empty hash is resolved locally
                 if (oConfig.migrationConfig) {
-                    return this.oShellNavigation.NavigationFilterStatus.Continue;
+                    return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
                 }
                 if (oConfig.rootIntent) {
                     window.setTimeout(function () {
                         window.hasher.setHash(oConfig.rootIntent);
                     }, 0);
-                    return this.oShellNavigation.NavigationFilterStatus.Abandon;
+                    return this.oShellNavigationInternal.NavigationFilterStatus.Abandon;
                 }
             }
-            return this.oShellNavigation.NavigationFilterStatus.Continue;
+            return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
         },
 
         _setConfigurationToModel: function () {
@@ -609,19 +608,19 @@ sap.ui.define([
             });
             this._aDanglingBindings = [];
 
-            Core.getEventBus().unsubscribe("externalSearch", this.externalSearchTriggered, this);
-            Core.getEventBus().unsubscribe("ESHSearchFinished", this._logSearchActivity, this);
-            Core.getEventBus().unsubscribe("sap.ushell", "appOpened", this.onAppOpened, this);
+            EventBus.getInstance().unsubscribe("externalSearch", this.externalSearchTriggered, this);
+            EventBus.getInstance().unsubscribe("ESHSearchFinished", this._logSearchActivity, this);
+            EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this.onAppOpened, this);
 
-            // Some qUnits destroy the shell very early, check if oShellNavigation exists
-            if (this.oShellNavigation) {
-                this.oShellNavigation.hashChanger.destroy();
+            // Some qUnits destroy the shell very early, check if oShellNavigationInternal exists
+            if (this.oShellNavigationInternal) {
+                this.oShellNavigationInternal.hashChanger.destroy();
             }
 
             HeaderManager.destroy();
             HeaderControlManager.destroy();
 
-            UserActivityLog.deactivate();
+            sap.ui.require("sap/ushell/UserActivityLog")?.deactivate();
             oShellModel.destroy();
             AppLifeCycleAI.shellElements().clean();
             oShellModel = undefined;
@@ -647,14 +646,14 @@ sap.ui.define([
          * @param {string} newHash new url hash
          * @param {string} oldHash old url hash
          *
-         * @returns {string} ShellNavigation.NavigationFilterStatus
+         * @returns {string} ShellNavigationInternal.NavigationFilterStatus
          */
         _disableSourceAppRouter: function (newHash, oldHash) {
             if (!this.bEnableHashChange || this.bRestorePreviousHash) {
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
-            var bAppSpecificChange = this.oShellNavigation.hashChanger.isInnerAppNavigation(newHash, oldHash);
+            var bAppSpecificChange = this.oShellNavigationInternal.hashChanger.isInnerAppNavigation(newHash, oldHash);
             if (!bAppSpecificChange) {
                 var oCurrentAppRouter = this._getCurrentAppRouter();
 
@@ -663,7 +662,7 @@ sap.ui.define([
                 }
             }
 
-            return this.oShellNavigation.NavigationFilterStatus.Continue;
+            return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
         },
 
         /**
@@ -680,7 +679,7 @@ sap.ui.define([
         },
 
         /**
-         * Navigation Filter function registered with ShellNavigation service.
+         * Navigation Filter function registered with ShellNavigationInternal service.
          * Triggered on each navigation.
          * Aborts navigation if there are unsaved data inside app(getDirtyFlag returns true).
          * For non-IE browsers the dirtyState=true gets handled asynchronously by undoing the navigation and redoing the navigation.
@@ -692,7 +691,7 @@ sap.ui.define([
          * @private
          */
         handleDataLoss: function (targetIntent, currentIntent) {
-            var oShellNavigationHashChanger = this.oShellNavigation.hashChanger;
+            var oShellNavigationHashChanger = this.oShellNavigationInternal.hashChanger;
             var bReloadApplication = oShellNavigationHashChanger.getReloadApplication();
 
             if (this.bReloadApplication !== null && this.bReloadApplication !== undefined) {
@@ -702,17 +701,17 @@ sap.ui.define([
 
             // We are navigating from empty hash to rootIntent
             if (currentIntent === "" || hasher.disableBlueBoxHashChangeTrigger === true) {
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
             if (!this.bEnableHashChange && !this.bRedoNavigation) {
                 this.bEnableHashChange = true;
 
-                return this.oShellNavigation.NavigationFilterStatus.Custom;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Custom;
             }
 
             if (this.bRestorePreviousHash) {
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
             // User confirmed the data loss and now we do the hash change again
@@ -720,12 +719,12 @@ sap.ui.define([
                 this.bRedoNavigation = false;
                 this.bEnableHashChange = true;
                 this.bExplaceNavigation = false;
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
             // Do we do an ex-place navigation?
             var oParsedHash = this.oURLParsing.parseShellHash(targetIntent);
-            var bBuiltInIntent = sap.ushell.Container.getRenderer()._isBuiltInIntent(oParsedHash);
+            var bBuiltInIntent = sap.ushell.Container.getRendererInternal()._isBuiltInIntent(oParsedHash);
             var aParsedNavMode = oParsedHash.params["sap-ushell-navmode"];
             var sNavMode = aParsedNavMode && aParsedNavMode[0];
 
@@ -733,7 +732,7 @@ sap.ui.define([
             if (!bBuiltInIntent && (this.bExplaceNavigation || sNavMode === "explace" || sNavMode === "frameless")) {
                 // Yes, just continue the navigation without a dirtyFlag popup
                 this.bExplaceNavigation = false;
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
             // In case the async dirtyState provider is NOT set we only have to check the sync dirtyState.
@@ -743,15 +742,13 @@ sap.ui.define([
             var bIsAsyncDirtyStateProviderSet = sap.ushell.Container.isAsyncDirtyStateProviderSet();
             if (!bIsAsyncDirtyStateProviderSet && !bIsDirty) {
                 bPreviousPageDirty = bIsDirty;
-                return this.oShellNavigation.NavigationFilterStatus.Continue;
+                return this.oShellNavigationInternal.NavigationFilterStatus.Continue;
             }
 
-            /*
-            The dirtyState is either true or has to be retrieved async.
-            After the hash changes we evaluate the dirtyState asynchronously
-            and redo the navigation in case it is false. In case it is true we do additional logic
-            _restoreHashUsingAction returns the NavigationFilterStatus Custom.
-            */
+            // The dirtyState is either true or has to be retrieved async.
+            // After the hash changes we evaluate the dirtyState asynchronously
+            // and redo the navigation in case it is false. In case it is true we do additional logic
+            // _restoreHashUsingAction returns the NavigationFilterStatus Custom.
             var bIsBackNavigation = Ui5History.getInstance().getHistoryStateOffset() < 0;
             Promise.all([
                 this._waitForHash(currentIntent),
@@ -762,11 +759,9 @@ sap.ui.define([
                     var oService = aResults[1];
                     var bIsDirty = aResults[2];
 
-                    /*
-                    Update the internal dirtyFlag to match the current dirtyFlag
-                    This is needed in case of a hashChangeFailure. When we navigate to a broken app the
-                    controller does not ask for the dirtyState therefore we need to be able to restore it
-                    */
+                    // Update the internal dirtyFlag to match the current dirtyFlag
+                    // This is needed in case of a hashChangeFailure. When we navigate to a broken app the
+                    // controller does not ask for the dirtyState therefore we need to be able to restore it
                     bPreviousPageDirty = bIsDirty;
 
                     if (!bIsDirty) {
@@ -810,7 +805,7 @@ sap.ui.define([
                     }
                 }.bind(this));
 
-            // Returns this.oShellNavigation.NavigationFilterStatus.Custom
+            // Returns this.oShellNavigationInternal.NavigationFilterStatus.Custom
             return this._restoreHashUsingAction(currentIntent, "undo");
         },
 
@@ -878,7 +873,7 @@ sap.ui.define([
          * @private
          */
         _restoreHashUsingAction: function (sHash, sAction) {
-            var bWasHistoryEntryReplaced = this.oShellNavigation.wasHistoryEntryReplaced();
+            var bWasHistoryEntryReplaced = this.oShellNavigationInternal.wasHistoryEntryReplaced();
             var oRestoreStrategy = this._getRestoreHashStrategy(bWasHistoryEntryReplaced, sAction);
 
             this._resumeAppRouterIgnoringCurrentHash();
@@ -969,7 +964,7 @@ sap.ui.define([
          */
         _restoreHash: function (oRestoreStrategy, sHash) {
             var oNavigationFilterStatus = {
-                status: this.oShellNavigation.NavigationFilterStatus.Custom,
+                status: this.oShellNavigationInternal.NavigationFilterStatus.Custom,
                 hash: ""
             };
             switch (oRestoreStrategy.strategy) {
@@ -1042,7 +1037,7 @@ sap.ui.define([
          * @param {string} sOldShellHash previous shell hash
          * @param {string} sOldAppPart previous application part
          * @param {object} oParseError parse error
-         * @returns {Promise} promise
+         * @returns {jQuery.Promise} Resolves once the hash change is done.
          * @public
          */
         doHashChange: function (sShellHash, sAppPart, sOldShellHash, sOldAppPart, oParseError) {
@@ -1054,7 +1049,7 @@ sap.ui.define([
             ushellUtils.setPerformanceMark("FLP-ShellController-doHashChange-begin");
             EventHub.emit("trackHashChange", sShellHash);
 
-            var oDashboard = Core.byId("sapUshellDashboardPage");
+            var oDashboard = Element.getElementById("sapUshellDashboardPage");
             if (oDashboard) {
                 oDashboard.setBlocked(true);
                 oDashboard.setBusy(true);
@@ -1080,12 +1075,10 @@ sap.ui.define([
         },
 
         _doHashChange: function (oShellController, sShellHash, sAppPart, sOldShellHash, sOldAppPart, oParseError) {
-            /*
-             * reset here because the result of wasHistoryEntryReplaced is only useful in navigation filters
-             * and might give inconsistent results after this point.
-             */
-            this._wasHistoryEntryReplaced = this.oShellNavigation.wasHistoryEntryReplaced();
-            this.oShellNavigation.resetHistoryEntryReplaced();
+            // reset here because the result of wasHistoryEntryReplaced is only useful in navigation filters
+            // and might give inconsistent results after this point.
+            this._wasHistoryEntryReplaced = this.oShellNavigationInternal.wasHistoryEntryReplaced();
+            this.oShellNavigationInternal.resetHistoryEntryReplaced();
             var oInMemoryApplicationInstance;
 
             if (!this.bEnableHashChange) {
@@ -1183,7 +1176,7 @@ sap.ui.define([
                             // NOTE: this dependency to the ApplicationContainer is not nice, but we need a fast fix now; we should refactor
                             // the ApplicationContainer code, because most of the logic has to be done by the shell controller;
                             // maybe rather introduce a utility module
-                            Core.getEventBus().publish("ApplicationContainer", "_prior.newUI5ComponentInstantion",
+                            EventBus.getInstance().publish("ApplicationContainer", "_prior.newUI5ComponentInstantion",
                                 { name: sTargetUi5ComponentName }
                             );
 
@@ -1277,8 +1270,7 @@ sap.ui.define([
                         that.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
                             Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                         });
-                        oDashboard = Core.byId("sapUshellDashboardPage");
-
+                        oDashboard = Element.getElementById("sapUshellDashboardPage");
                         if (oDashboard) {
                             oDashboard.setBlocked(false);
                             oDashboard.setBusy(false);
@@ -1298,7 +1290,7 @@ sap.ui.define([
                         sap.ui.require(["sap/ushell/components/container/ApplicationContainer"], function (ApplicationContainer) {
                             oResolvedHashFragment.url = ApplicationContainer.prototype._checkNwbcUrlAdjustment(undefined, oResolvedHashFragment.applicationType, oResolvedHashFragment.url, true);
                             that._openAppInNewWindowAndRestore(oResolvedHashFragment);
-                            oDashboard = Core.byId("sapUshellDashboardPage");
+                            oDashboard = Element.getElementById("sapUshellDashboardPage");
                             if (oDashboard) {
                                 oDashboard.setBlocked(false);
                                 oDashboard.setBusy(false);
@@ -1355,19 +1347,21 @@ sap.ui.define([
             // the activation of user activity logging must be done after the app component is fully loaded
             // otherwise the module loading sequence causes race conditions on firefox
             if (bContactSupportEnabled) {
-                window.setTimeout(function () {
-                    UserActivityLog.activate();
+                window.setTimeout(() => {
+                    sap.ui.require(["sap/ushell/UserActivityLog"], (UserActivityLog) => {
+                        UserActivityLog.activate();
+                    });
                 }, 0);
             }
 
             try {
-                bPreviousIsInitialNavigation = this.oShellNavigation.isInitialNavigation();
+                bPreviousIsInitialNavigation = this.oShellNavigationInternal.isInitialNavigation();
                 this.navigate(oParsedShellHash, sFixedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash);
             } catch (oExc) {
                 if (oExc.stack) {
                     Log.error("Application initialization (Intent: \n" + sFixedShellHash + "\n failed due to an Exception:\n" + oExc.stack);
                 }
-                this.oShellNavigation.setIsInitialNavigation(bPreviousIsInitialNavigation);
+                this.oShellNavigationInternal.setIsInitialNavigation(bPreviousIsInitialNavigation);
                 this.hashChangeFailure(iOriginalHistoryLength, oExc.name, oExc.message, oMetadata ? oMetadata.title : "", false);
             }
 
@@ -1378,7 +1372,7 @@ sap.ui.define([
          * Callback registered with NavService. Triggered on navigation requests
          *
          * @param {string} sShellHash the hash fragment to parse (must start with "#")
-         * @returns {jQuery.Deferred.promise} a promise resolved with an object containing the resolved hash fragment (i.e., the result of
+         * @returns {jQuery.Promise} Resolves with an object containing the resolved hash fragment (i.e., the result of
          *   {@link sap.ushell.services.NavTargetResolution#resolveHashFragment}), the parsed shell hash obtained via
          *   {@link sap.ushell.services.URLParsing#parseShellHash}, and a boolean value indicating whether application dependencies
          *   <b>and</b> core-ext-light were loaded earlier. The promise is rejected with an error message in case errors occur.
@@ -1413,10 +1407,8 @@ sap.ui.define([
                     .done(function (oResolvedHashFragment) {
                         //@FIXME: Should be also executed for directstart
                         AppConfiguration.setCurrentApplication(oResolvedHashFragment);
-                        /*
-                         * Override navigation mode for root intent.
-                         * Shell home should be opened in embedded mode to allow a new window to be opened from GUI applications.
-                         */
+                        // Override navigation mode for root intent.
+                        // Shell home should be opened in embedded mode to allow a new window to be opened from GUI applications.
                         if (oParsedShellHash && (oParsedShellHash.semanticObject + "-" + oParsedShellHash.action) === oConfig.rootIntent) {
                             oResolvedHashFragment.navigationMode = "embedded";
                         }
@@ -1514,8 +1506,8 @@ sap.ui.define([
                         Log.warning("Performing navigation redirect to hash " + sNextHash);
                         oComponent.destroy();
                         that.history.pop();
-                        sap.ushell.Container.getServiceAsync("ShellNavigation").then(function (oShellNavigation) {
-                            oShellNavigation.toExternal({ target: { shellHash: sNextHash } }, undefined, false);
+                        sap.ushell.Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
+                            oShellNavigationInternal.toExternal({ target: { shellHash: sNextHash } }, undefined, false);
                             oDeferred.resolve(true);
                         });
                     }, function () {
@@ -1573,7 +1565,7 @@ sap.ui.define([
 
             if (sNavigationMode === oNavigationMode.embedded) {
                 if (!ushellUtils.isColdStart() && !this._wasHistoryEntryReplaced) {
-                    this.oShellNavigation.setIsInitialNavigation(false);
+                    this.oShellNavigationInternal.setIsInitialNavigation(false);
                 }
 
                 var oDeferred = this._usesNavigationRedirect(oResolvedHashFragment.componentHandle);
@@ -1598,7 +1590,7 @@ sap.ui.define([
             }
 
             if (sNavigationMode === oNavigationMode.replace) {
-                this.oShellNavigation.setIsInitialNavigation(false);
+                this.oShellNavigationInternal.setIsInitialNavigation(false);
                 // restore hash
                 this.bEnableHashChange = false;
                 this._changeWindowLocation(oResolvedHashFragment.url);
@@ -1660,8 +1652,6 @@ sap.ui.define([
                             var sAppType = oResolvedHashFragment.applicationType;
                             var sFrameworkId = (oResolvedHashFragment.appCapabilities && oResolvedHashFragment.appCapabilities.appFrameworkId);
                             var oFLPParams = {};
-                            var aInfoArray = [];
-                            var aKeysArray;
                             var fnPreparePostBodyParams = function () {
                                 oFLPParams["sap-flp-url"] = sap.ushell.Container.getFLPUrl(true);
                                 oFLPParams["system-alias"] = oResolvedHashFragment.systemAlias;
@@ -1670,33 +1660,16 @@ sap.ui.define([
                                     value: JSON.stringify(oFLPParams)
                                 }];
                             };
-                            var getParamKeys = function getParamKeys (sUrl, aInfoArray) {
-                                var aAppStateKeysArray = [];
-                                var fnAddKey = function (sName, sDataName) {
-                                    if (sUrl.indexOf(sName + "=") > 0) {
-                                        var aParams = new RegExp("(?:" + sName + "=)([^&/]+)").exec(sUrl);
-                                        if (aParams && aParams.length === 2) {
-                                            aAppStateKeysArray.push([aParams[1]]);
-                                            aInfoArray.push(sDataName);
-                                        }
-                                    }
-                                };
-
-                                fnAddKey("sap-iapp-state", "sap-iapp-state-data");
-                                fnAddKey("sap-xapp-state", "sap-xapp-state-data");
-                                fnAddKey("sap-xapp-state-data", "sap-xapp-state-data");
-                                fnAddKey("sap-intent-param", "sap-intent-param-data");
-                                return aAppStateKeysArray;
-                            };
 
                             if (ushellUtils.isSAPLegacyApplicationType(sAppType, sFrameworkId)) {
-                                sap.ushell.Container.getServiceAsync("Navigation").then(function (oCrossAppNavService) {
-                                    aKeysArray = getParamKeys(sUrlWithSapUserAndShellParam, aInfoArray);
-                                    if (aKeysArray.length > 0) {
-                                        oCrossAppNavService.getAppStateData(aKeysArray).then(function (aDataArray) {
-                                            aInfoArray.forEach(function (item, index) {
-                                                if (aDataArray[index][0]) {
-                                                    oFLPParams[item] = aDataArray[index][0];
+                                sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavService) {
+                                    var oAppStatesInfo = ushellUtils.getParamKeys(sUrlWithSapUserAndShellParam);
+
+                                    if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
+                                        oNavService.getAppStateData(oAppStatesInfo.aAppStateKeysArray).then(function (aDataArray) {
+                                            oAppStatesInfo.aAppStateNamesArray.forEach(function (item, index) {
+                                                if (aDataArray[index]) {
+                                                    oFLPParams[item] = aDataArray[index];
                                                 }
                                             });
                                             fnResolveParams(fnPreparePostBodyParams());
@@ -1721,20 +1694,19 @@ sap.ui.define([
                     //the promise can not reject as we have to try to open the app
                     function (oPostBodyParams) {
                         try {
-                            Core.getEventBus().publish("launchpad", "appOpening", oResolvedHashFragment);
+                            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
                             if (!oEPCM.doNavigate(sUrlWithSapUserAndShellParam, iMode, undefined, undefined, undefined, undefined, undefined, oPostBodyParams)) {
                                 fnResolve(false);
                                 return;
                             }
-                            Core.getEventBus().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+                            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
 
                             that._restoreAfterNwbcNavigation(oResolvedHashFragment).then(function () {
-                                /*
-                                TODO: This is a workaround.
-                                We should rather update the resolvedHashFragment before the navigation happens. Other Components listening
-                                to the appOpened event might rely on the correct navigationMode / targetNavigationMode of the
-                                resolvedHashFragment.
-                                */
+                                // TODO: This is a workaround.
+                                // We should rather update the resolvedHashFragment before the navigation happens. Other Components listening
+                                // to the appOpened event might rely on the correct navigationMode / targetNavigationMode of the
+                                // resolvedHashFragment.
+
                                 // restore menu bar in case we are still on home
                                 if (that._oAppLifeCycleService.getCurrentApplication() && that._oAppLifeCycleService.getCurrentApplication().homePage) {
                                     that._setMenuVisible(true);
@@ -1819,9 +1791,9 @@ sap.ui.define([
         },
 
         _openAppInNewWindowAndRestore: function (oResolvedHashFragment) {
-            Core.getEventBus().publish("launchpad", "appOpening", oResolvedHashFragment);
+            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
             this._openAppNewWindow(oResolvedHashFragment.url);
-            Core.getEventBus().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
             this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment);
         },
 
@@ -1907,7 +1879,7 @@ sap.ui.define([
 
             if (Device.system.desktop) {
                 sap.ui.require(["sap/ushell/renderer/AccessKeysHandler"], function (AccessKeysHandler) {
-                    var oShellAppTitle = Core.byId("shellAppTitle");
+                    var oShellAppTitle = Element.getElementById("shellAppTitle");
                     if (oShellAppTitle && Config.last("/core/shell/model/currentState/stateName") === "app") {
                         var oShellAppTitleDomRef = oShellAppTitle.getFocusDomRef();
                         if (oShellAppTitleDomRef) {
@@ -1923,7 +1895,7 @@ sap.ui.define([
                     that.readNavigationEnd();
                 }, 600);
 
-                Core.getEventBus().publish("launchpad", "appOpening", oResolvedNavigationTarget);
+                EventBus.getInstance().publish("launchpad", "appOpening", oResolvedNavigationTarget);
                 Log.info("app is being opened");
             }, 0);
             if (oConfig.applications) {
@@ -1978,7 +1950,7 @@ sap.ui.define([
             var oShellUIService = AppLifeCycleAI.getShellUIService();
             // wrapped in setTimeout since "publish" is not async
             window.setTimeout(function () {
-                Core.getEventBus().publish("sap.ushell", "appOpened", oApplication);
+                EventBus.getInstance().publish("sap.ushell", "appOpened", oApplication);
                 Log.info("app was opened");
             }, 0);
 
@@ -2010,9 +1982,9 @@ sap.ui.define([
             var sContainerNS = "sap.ushell";
             var fListener = function (oEvent, sChannel, oData) {
                 that.oHomeApp = oData.component;
-                Core.getEventBus().unsubscribe(sContainerNS, "appComponentLoaded", fListener);
+                EventBus.getInstance().unsubscribe(sContainerNS, "appComponentLoaded", fListener);
             };
-            Core.getEventBus().subscribe(sContainerNS, "appComponentLoaded", fListener);
+            EventBus.getInstance().subscribe(sContainerNS, "appComponentLoaded", fListener);
         },
 
         /**
@@ -2025,7 +1997,7 @@ sap.ui.define([
          * @param {boolean} bEnableHashChange enable hash change
          */
         hashChangeFailure: function (iHistoryLength, vMessage, vDetails, sComponent, bEnableHashChange) {
-            var oDashboard = Core.byId("sapUshellDashboardPage");
+            var oDashboard = Element.getElementById("sapUshellDashboardPage");
             if (oDashboard) {
                 oDashboard.setBlocked(false);
                 oDashboard.setBusy(false);
@@ -2137,7 +2109,7 @@ sap.ui.define([
                 this._setMenuVisible(false);
             }
 
-            var sAppHash = this.oShellNavigation.hashChanger.getAppHash();
+            var sAppHash = this.oShellNavigationInternal.hashChanger.getAppHash();
             var sAppPart = sAppHash ? "&/" + sAppHash : null;
 
             this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
@@ -2170,14 +2142,14 @@ sap.ui.define([
         onAfterNavigate: function (oEvent) {
             var sToId = oEvent.mParameters ? oEvent.mParameters.toId : undefined;
 
-            var oDashboard = Core.byId("sapUshellDashboardPage");
+            var oDashboard = Element.getElementById("sapUshellDashboardPage");
             if (oDashboard) {
                 oDashboard.setBlocked(false);
                 oDashboard.setBusy(false);
             }
 
             AppLifeCycleAI.onAfterNavigate(oEvent.getParameter("fromId"), oEvent.getParameter("from"), sToId, oEvent.getParameter("to"));
-            Core.getEventBus().publish("sap.ushell", "navigated", {});
+            EventBus.getInstance().publish("sap.ushell", "navigated", {});
         },
 
         /**
@@ -2206,6 +2178,7 @@ sap.ui.define([
             const oURLParsingService = await sap.ushell.Container.getServiceAsync("URLParsing");
             const oParsed = oURLParsingService.parseShellHash(sFixedShellHash);
             if (oParsed) {
+
                 // This is the key that determines whether an existing activity should be updated or added.
 
                 // In theory we could use the full hash without parameters here, however this causes the same application to be logged
@@ -2277,7 +2250,7 @@ sap.ui.define([
             if (Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging")) {
                 var sTitle = "";
                 try {
-                    sTitle = Core.byId("searchFieldInShell-input").getModel().getLastSearchTerm();
+                    sTitle = Element.getElementById("searchFieldInShell-input").getModel().getLastSearchTerm();
                 } catch (ex) {
                     Log.error("Shell: last search term is not available to log a recent activity");
                 }
@@ -2343,7 +2316,7 @@ sap.ui.define([
             EventHub.emit("startScheduler");
         },
 
-        /*
+        /**
          * After core-ext is loaded (see_onCoreResourcesComplementLoaded) the renderer extensions plugins can be loaded.
          * To enable the Scheduling Agent to direct this the loading is wrapped in this function.
          */
@@ -2521,30 +2494,29 @@ sap.ui.define([
 
             this._moveFloatingContainerIntoDock(oDockCfg);
             const oData = {
-                isDocked: (this.getFloatingContainerState() || "").startsWith("docked"),
-                isVisible: this.getFloatingContainerVisibility()
+                visible: this.getFloatingContainerVisibility()
             };
             // New event for co-pilot is docked.
-            Core.getEventBus().publish("launchpad", "shellFloatingContainerIsDocked", oData);
+            EventBus.getInstance().publish("launchpad", "shellFloatingContainerIsDocked", oData);
         },
 
         _expandFloatingContainerToDock: function () {
             var oWrapperElement = document.getElementById(ShellLayoutMapping.FloatingContainer);
             oWrapperElement.style.height = "100%";
 
-            Core.byId("shell-floatingContainer").addStyleClass("sapUshellShellFloatingContainerFullHeight");
+            Element.getElementById("shell-floatingContainer").addStyleClass("sapUshellShellFloatingContainerFullHeight");
         },
 
         _shrinkFloatingContainerToDragUI: function () {
             var oWrapperElement = document.getElementById(ShellLayoutMapping.FloatingContainer);
             oWrapperElement.classList.remove("sapUshellContainerDocked");
 
-            Core.byId("shell-floatingContainer").removeStyleClass("sapUshellShellFloatingContainerFullHeight");
+            Element.getElementById("shell-floatingContainer").removeStyleClass("sapUshellShellFloatingContainerFullHeight");
             jQuery(".sapUshellShellFloatingContainerFullHeight").removeClass("sapUshellShellFloatingContainerFullHeight"); // remove it also for the clone
         },
 
         _emitFloatingContainerResizeEvent: function () {
-            var oViewPortContainer = Core.byId("viewPortContainer");
+            var oViewPortContainer = Element.getElementById("viewPortContainer");
             if (oViewPortContainer) {
                 oViewPortContainer._handleSizeChange();
             }
@@ -2552,7 +2524,7 @@ sap.ui.define([
             // handle appFinder size changed
             // timeOut waiting for resize event is finish
             window.setTimeout(function () {
-                Core.getEventBus().publish("launchpad", "appFinderWithDocking");
+                EventBus.getInstance().publish("launchpad", "appFinderWithDocking");
             }, 300);
         },
 
@@ -2569,10 +2541,9 @@ sap.ui.define([
         _handleFloatingContainerUndockOnResize: function () {
             this._undockFloatingContainer();
             const oData = {
-                isDocked: (this.getFloatingContainerState() || "").startsWith("docked"),
-                isVisible: this.getFloatingContainerVisibility()
+                visible: this.getFloatingContainerVisibility()
             };
-            Core.getEventBus().publish("launchpad", "shellFloatingContainerIsUnDockedOnResize", oData);
+            EventBus.getInstance().publish("launchpad", "shellFloatingContainerIsUnDockedOnResize", oData);
         },
 
         /**
@@ -2584,11 +2555,10 @@ sap.ui.define([
             Measurement.start("FLP:Shell.controller._onDragStartUI", "start drag", "FLP");
             this._undockFloatingContainer();
             const oData = {
-                isDocked: (this.getFloatingContainerState() || "").startsWith("docked"),
-                isVisible: this.getFloatingContainerVisibility()
+                visible: this.getFloatingContainerVisibility()
             };
             // New event for co-pilot is unDock
-            Core.getEventBus().publish("launchpad", "shellFloatingContainerIsUnDocked", oData);
+            EventBus.getInstance().publish("launchpad", "shellFloatingContainerIsUnDocked", oData);
             Measurement.end("FLP:Shell.controller._onDragStartUI");
         },
 
@@ -2641,7 +2611,7 @@ sap.ui.define([
             var bIsDock = oDockProperties ? oDockProperties.setIsDockingAreaOpen : false;
             // check if need to open docking area and it doesn't exist already
             if (bIsDock && jQuery("#DockingAreaDiv").length === 0) {
-                var bIsRTL = Configuration.getRTL();
+                var bIsRTL = Localization.getRTL();
                 if ((oDockProperties.dockPos === "right" && oCfg.clone && !bIsRTL) || (oDockProperties.dockPos === "left" && oCfg.clone && bIsRTL)) {
                     jQuery('<div id="DockingAreaDiv" class="sapUshellShellDisplayDockingAreaRight">').appendTo(oCfg.clone.parentElement);
                 } else if ((oDockProperties.dockPos === "left" && oCfg.clone && !bIsRTL) || (oDockProperties.dockPos === "right" && oCfg.clone && bIsRTL)) {
@@ -2682,7 +2652,7 @@ sap.ui.define([
          * @private
          */
         _moveFloatingContainerIntoDock: function (oDockedProp) {
-            var bIsRTL = Configuration.getRTL();
+            var bIsRTL = Localization.getRTL();
             var oWrapper = document.getElementById(ShellLayoutMapping.FloatingContainer);
             oWrapper.classList.add("sapUshellContainerDocked");
 
@@ -2740,7 +2710,7 @@ sap.ui.define([
 
         _handleFloatingContainerDrop: function (oEvent, floatingContainerWrapper, oDelta) {
             Measurement.start("FLP:Shell.controller._handleFloatingContainerDrop", "drop floating container", "FLP");
-            var oFloatingContainer = floatingContainerWrapper.firstChild ? Core.byId(floatingContainerWrapper.firstChild.id) : undefined;
+            var oFloatingContainer = floatingContainerWrapper.firstChild ? Element.getElementById(floatingContainerWrapper.firstChild.id) : undefined;
             var oStorage = new Storage(Storage.Type.local, "com.sap.ushell.adapters.local.FloatingContainer");
             var iWindowWidth = jQuery(window).width();
             var iWindowHeight = jQuery(window).height();
@@ -2918,7 +2888,7 @@ sap.ui.define([
             var sFooterId = oHelperModel.getProperty("/shell/footerContent");
 
             if (sFooterId) {
-                var oFooter = Core.byId(sFooterId);
+                var oFooter = Element.getElementById(sFooterId);
                 if (oFooter && oFooter.destroy) {
                     oFooter.destroy();
                 }