@sapui5/sap.ushell 1.129.1 → 1.130.1

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

@@ -18,7 +18,6 @@ sap.ui.define([
     "sap/ui/core/routing/History",
     "sap/ui/Device",
     "sap/ui/performance/trace/Interaction",
-    "sap/ui/performance/Measurement",
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/jquery",
     "sap/ushell/bootstrap/SchedulingAgent",
@@ -32,6 +31,7 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/services/AppConfiguration",
     "sap/ushell/utils",
+    "sap/ushell/utils/UrlParsing",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/renderer/ShellLayout",
     "sap/ushell/renderer/utils",
@@ -58,7 +58,6 @@ sap.ui.define([
     Ui5History,
     Device,
     Interaction,
-    Measurement,
     hasher,
     jQuery,
     SchedulingAgent,
@@ -72,6 +71,7 @@ sap.ui.define([
     ushellResources,
     AppConfiguration,
     ushellUtils,
+    UrlParsing,
     WindowUtils,
     ShellLayout,
     RendererUtils,
@@ -119,7 +119,7 @@ sap.ui.define([
         newWindow: 1,
         replace: 0
     };
-    const oNavigationMode = {
+    const NavigationMode = {
         embedded: "embedded",
         newWindowThenEmbedded: "newWindowThenEmbedded",
         newWindow: "newWindow",
@@ -304,40 +304,18 @@ sap.ui.define([
 
             this.history = History;
             this.oViewPortContainer = Element.getElementById("viewPortContainer");
-            AppLifeCycleAI.init(this.oViewPortContainer, oViewConfig.rootIntent, oViewConfig.disableHomeAppCache);
+            AppLifeCycleAI.init(this.oViewPortContainer, oViewConfig.disableHomeAppCache);
 
             // init Shell Navigation
-            const initShellNavigationInternal = function (oShellNavigationInternal, oAppLifeCycleService) {
-                this.oShellNavigationInternal = oShellNavigationInternal;
-                this.oShellNavigationInternal.registerPrivateFilters(oAppLifeCycleService);
-
-                // 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.oShellNavigationInternal.init(this.doHashChange.bind(this));
-
-                this.oShellNavigationInternal.registerNavigationFilter(this._disableSourceAppRouter.bind(this));
-
-                this.oShellNavigationInternal.registerNavigationFilter(this.handleDataLoss.bind(this));
-                this.oShellNavigationInternal.registerNavigationFilter(this._unblockUI.bind(this));
-
-                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([
-                Container.getServiceAsync("URLParsing"),
                 Container.getServiceAsync("ShellNavigationInternal"),
                 Container.getServiceAsync("AppLifeCycle")
             ])
                 .then((aServices) => {
-                    this.oURLParsing = aServices[0];
-                    const oShellNavigationInternal = aServices[1];
-                    this._oAppLifeCycleService = aServices[2];
+                    const oShellNavigationInternal = aServices[0];
+                    this._oAppLifeCycleService = aServices[1];
 
-                    initShellNavigationInternal(oShellNavigationInternal, this._oAppLifeCycleService);
+                    this._initShellNavigationInternal(oShellNavigationInternal, this._oAppLifeCycleService, oRouter);
                 });
 
             Container.setLogonFrameProvider(this._getLogonFrameProvider());
@@ -414,6 +392,33 @@ sap.ui.define([
             }
         },
 
+        /**
+         * @param {object} oShellNavigationInternal
+         * @param {object} oAppLifeCycleService
+         * @param {object} oRouter
+         */
+        _initShellNavigationInternal: function (oShellNavigationInternal, oAppLifeCycleService, oRouter) {
+            this.oShellNavigationInternal = oShellNavigationInternal;
+            this.oShellNavigationInternal.registerPrivateFilters(oAppLifeCycleService);
+
+            // 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.oShellNavigationInternal.init(this.doHashChange.bind(this));
+
+            this.oShellNavigationInternal.registerNavigationFilter(this._disableSourceAppRouter.bind(this));
+
+            this.oShellNavigationInternal.registerNavigationFilter(this.handleDataLoss.bind(this));
+            this.oShellNavigationInternal.registerNavigationFilter(this._unblockUI.bind(this));
+
+            AppLifeCycleAI.registerHandleHashChange(this.oShellNavigationInternal);
+            // enable the direct app start and tests to wait for the initialization
+            EventHub.emit("ShellNavigationInitialized", Date.now());
+        },
+
+        /**
+         */
         _bindTabTitle: function () {
             const oBinding = ShellModel.getModel().bindProperty("/application/title");
             oBinding.attachChange(() => {
@@ -472,20 +477,19 @@ sap.ui.define([
          * This method currently assumes that the application is displayed in the "minimal" state (no home button present).
          */
         _onBackNavigationChanged: function (oEvent) {
-            AppLifeCycleAI.setBackNavigationChanged(true);
             const fnCallback = oEvent.getParameters().data;
             const sCurrentShellMode = StateManager.getShellMode();
             const sCurrentLaunchpadState = StateManager.getLaunchpadState();
 
             if (fnCallback) {
-                AppLifeCycleAI.service().setNavigateBack(fnCallback);
+                RelatedServices.setNavigateBack(fnCallback);
 
                 if (sCurrentLaunchpadState === LaunchpadState.App && [Minimal, Standalone, Embedded].includes(sCurrentShellMode)) {
                     Container.getRendererInternal("fiori2").showHeaderItem("backBtn", true);
                 }
             } else {
                 //if no callback is provided we set the default handler: history back
-                AppLifeCycleAI.service().resetNavigateBack();
+                RelatedServices.resetNavigateBack();
             }
         },
 
@@ -636,12 +640,14 @@ sap.ui.define([
         },
 
         onExit: function () {
+            closeAllDialogs = true;
+
             this._aDoables.forEach((oDoable) => {
                 oDoable.off();
             });
             this._aDoables = [];
 
-            ShellUIServiceFactory.detachBackNavigationChanged(this._onBackNavigationChange, this);
+            ShellUIServiceFactory.detachBackNavigationChanged(this._onBackNavigationChanged, this);
 
             this._aDanglingControls.forEach((oControl) => {
                 oControl.destroy();
@@ -658,7 +664,7 @@ sap.ui.define([
             EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this.onAppOpened, this);
 
             // Some qUnits destroy the shell very early, check if oShellNavigationInternal exists
-            if (this.oShellNavigationInternal) {
+            if (this.oShellNavigationInternal && this.oShellNavigationInternal.hashChanger) {
                 this.oShellNavigationInternal.hashChanger.destroy();
             }
 
@@ -764,7 +770,7 @@ sap.ui.define([
             }
 
             // Do we do an ex-place navigation?
-            const oParsedHash = this.oURLParsing.parseShellHash(targetIntent);
+            const oParsedHash = UrlParsing.parseShellHash(targetIntent);
             const bBuiltInIntent = Container.getRendererInternal()._isBuiltInIntent(oParsedHash);
             const aParsedNavMode = oParsedHash.params["sap-ushell-navmode"];
             const sNavMode = aParsedNavMode && aParsedNavMode[0];
@@ -828,7 +834,7 @@ sap.ui.define([
                         const oResolvedHashFragment = await oService.resolveHashFragment(sTargetHash);
 
                         const bIsExplaceNavigation = oResolvedHashFragment.targetNavigationMode === "explace" || oResolvedHashFragment.targetNavigationMode === "frameless";
-                        const bIsBackNavigationAndNewWindow = bIsBackNavigation && oResolvedHashFragment.navigationMode === oNavigationMode.newWindowThenEmbedded;
+                        const bIsBackNavigationAndNewWindow = bIsBackNavigation && oResolvedHashFragment.navigationMode === NavigationMode.newWindowThenEmbedded;
 
                         if (bIsExplaceNavigation && (!bIsBackNavigationAndNewWindow)) {
                             this.bExplaceNavigation = true;
@@ -1082,174 +1088,178 @@ sap.ui.define([
          */
         doHashChange: function (sShellHash, sAppPart, sOldShellHash, sOldAppPart, oParseError) {
             Log.debug(`${sLogFesrPrefix} Interaction Start`, "doHashChange", sModuleName);
-            const fnResolveInteraction = this._notifyAsyncStep();
-
-            //Performance Debug
-            Measurement.start("FLP:ShellController.doHashChange", "doHashChange", "FLP");
             ushellUtils.setPerformanceMark("FLP-ShellController-doHashChange-begin");
             EventHub.emit("trackHashChange", sShellHash);
 
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(true);
-                oDashboard.setBusy(true);
-            }
-
             const oDeferred = new jQuery.Deferred();
 
-            this._doHashChange(this, sShellHash, sAppPart, sOldShellHash, sOldAppPart, oParseError)
-                .catch(() => {
-                    EventHub.emit("doHashChangeError", Date.now());
-                    if (oDashboard) {
-                        oDashboard.setBlocked(false);
-                        oDashboard.setBusy(false);
-                    }
-                })
-                .finally(() => {
-                    Measurement.end("FLP:ShellController.doHashChange");
-
-                    Log.debug(`${sLogFesrPrefix} Interaction End`, "doHashChange", sModuleName);
-                    fnResolveInteraction();
-
-                    oDeferred.resolve();
-                });
-
-            return oDeferred.promise();
-        },
-
-        _doHashChange: async 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.oShellNavigationInternal.wasHistoryEntryReplaced();
+            this._bWasHistoryEntryReplaced = this.oShellNavigationInternal.wasHistoryEntryReplaced();
             this.oShellNavigationInternal.resetHistoryEntryReplaced();
-            let oInMemoryApplicationInstance;
 
             if (!this.bEnableHashChange) {
                 this.bEnableHashChange = true;
-                return;
+                oDeferred.resolve();
+                return oDeferred.promise();
             }
-            //When the application is opened in the new tab, the ShellHashEvent should be fired in order to update UI5 hasher,
-            //but the application should not be resolved again.
+
+            // When the application is opened in the new tab, the ShellHashEvent should be fired in order to update UI5 hasher,
+            // but the application should not be resolved again.
             if (this.bRestorePreviousHash) {
                 this.bRestorePreviousHash = false;
-                return;
+                oDeferred.resolve();
+                return oDeferred.promise();
             }
 
+            const sFixedShellHash = UrlParsing.ensureLeadingHash(sShellHash);
+            const sFixedOldShellHash = UrlParsing.ensureLeadingHash(sOldShellHash);
+
+            // todo [FLPCOREANDUX-10024] where does this oParseError come from?
             if (oParseError) {
-                await oShellController.hashChangeFailure(
-                    oShellController.history.getHistoryLength(),
+                Log.error(`Error when parsing the hash: '${sFixedShellHash}'`, oParseError);
+                this.hashChangeFailure(
+                    this.history.getHistoryLength(),
                     oParseError.message,
                     null,
                     "sap.ushell.renderer.Shell.controller",
                     false
-                );
-                return;
+                )
+                    .then(oDeferred.resolve.bind(oDeferred))
+                    .catch(oDeferred.reject.bind(oDeferred));
+                return oDeferred.promise();
             }
 
-            // save current history length to handle errors (in case)
-            const iOriginalHistoryLength = oShellController.history.getHistoryLength();
+            const oDashboard = Element.getElementById("sapUshellDashboardPage");
+            if (oDashboard) {
+                oDashboard.setBlocked(true);
+                oDashboard.setBusy(true);
+            }
 
-            const sFixedShellHash = oShellController.fixShellHash(sShellHash);
-            const sOldFixedShellHash = oShellController.fixShellHash(sOldShellHash);
+            const fnResolveInteraction = this._notifyAsyncStep();
+
+            this._doHashChange(sFixedShellHash, sAppPart, sFixedOldShellHash)
+                .catch(() => {
+                    EventHub.emit("doHashChangeError", Date.now());
+                })
+                .finally(() => {
+                    Log.debug(`${sLogFesrPrefix} Interaction End`, "doHashChange", sModuleName);
+                    fnResolveInteraction();
+
+                    if (oDashboard) {
+                        oDashboard.setBlocked(false);
+                        oDashboard.setBusy(false);
+                    }
+
+                    oDeferred.resolve();
+                });
+
+            return oDeferred.promise();
+        },
+
+        _doHashChange: async function (sShellHash, sAppPart, sOldShellHash) {
+            // save current history length to handle errors (in case)
+            const iOriginalHistoryLength = this.history.getHistoryLength();
 
             // track hash change
-            oShellController.history.hashChange(sFixedShellHash, sOldShellHash);
+            this.history.hashChange(sShellHash, sOldShellHash);
 
             // we save the current-application before resolving the next navigation's fragment,
             // as in cases of navigation in a new window we need to set it back for the app-configuration to be consistent
-            oShellController.currentAppBeforeNav = AppConfiguration.getCurrentApplication();
+            const oOldResolvedHashFragment = AppConfiguration.getCurrentApplication();
 
             try {
-                const oResult = await oShellController._resolveHashFragment(sFixedShellHash);
-                let oResolvedHashFragment = oResult.resolvedHashFragment;
-                const oParsedShellHash = oResult.parsedShellHash;
-
                 // NOTE: AppConfiguration.setCurrentApplication was called with the currently resolved target.
-                const sIntent = oParsedShellHash ? `${oParsedShellHash.semanticObject}-${oParsedShellHash.action}` : "";
-                const oConfig = oShellController._getConfig();
-                const bComponentLoaded = !!(oResolvedHashFragment && oResolvedHashFragment.componentHandle);
-                // for SAPUI5 apps, the application type is still "URL" due to backwards compatibility, but the
-                // NavTargetResolutionInternal service already extracts the component name, so this can directly be used as indicator
-                const sTargetUi5ComponentName = oResolvedHashFragment && oResolvedHashFragment.ui5ComponentName;
-
-                // calculate effective Navigation Mode with resolution result and current Application,
-                // we will determine the next navigation mode.
-                oResolvedHashFragment = oShellController._calculateNavigationMode(oResolvedHashFragment);
-
-                // do not stall for initial navigation
-                if (oShellController.currentAppBeforeNav) {
-                    // store the state of the current app before opening the new app
-                    AppLifeCycleAI.storeAppExtensions();
-                    // stall all state management changes, those __most probably__ come from the target application
-                    StateManager.stallChanges();
-                }
+                const oResult = await this._resolveHashFragment(sShellHash);
 
-                const bProcessed = await oShellController._handleEarlyNavigation(sFixedShellHash, sAppPart, oResolvedHashFragment);
-                if (bProcessed) {
-                    // navigation was NWBC or explace, any changes were done by the source application
-                    StateManager.applyStalledChanges();
+                // Only for testing
+                if (!oResult && window.QUnit !== undefined) {
+                    // return without navigation if no result was returned.
                     return;
                 }
 
-                // add application config to the application properties
-                if (oConfig && oConfig.applications && oConfig.applications[sIntent]) {
-                    oResolvedHashFragment.applicationConfiguration = oConfig.applications[sIntent];
-                }
+                const oResolvedHashFragment = oResult.resolvedHashFragment;
+                const oParsedShellHash = oResult.parsedShellHash;
 
-                oInMemoryApplicationInstance = AppLifeCycleAI.getInMemoryInstance(sIntent, sFixedShellHash, sAppPart, sOldShellHash);
+                // todo: [FLPCOREANDUX-10024] is this a real life use case?
+                /*
+                 * A null navigationMode indicates that no hashFragment was resolved.
+                 * However, we need to restore the current hash to the previous one.
+                 * If cold start happened (history has only one entry), we go to the shell home.
+                 */
+                if (oResolvedHashFragment.navigationMode === null) {
+                    if (ushellUtils.isColdStart()) {
+                        window.hasher.setHash("");
+                        return;
+                    }
 
-                if (oInMemoryApplicationInstance.isInstanceSupported) {
-                    await oShellController._initiateApplication(oResolvedHashFragment, sFixedShellHash, oParsedShellHash, iOriginalHistoryLength, sAppPart, sOldFixedShellHash, sOldAppPart);
+                    this.bEnableHashChange = false;
+                    this.history.pop();
+                    this._windowHistoryBack(1);
                     return;
                 }
 
-                if (bComponentLoaded || !sTargetUi5ComponentName) {
-                    if ((oResolvedHashFragment.applicationType === "URL" || ushellUtils.isSAPLegacyApplicationType(oResolvedHashFragment.applicationType))
-                        && oInMemoryApplicationInstance.isInstanceSupported === false && oInMemoryApplicationInstance.appId) {
-                        await AppLifeCycleAI.destroyApplication(oInMemoryApplicationInstance.appId, oInMemoryApplicationInstance.container);
-                    }
-                    await oShellController._initiateApplication(oResolvedHashFragment, sFixedShellHash, oParsedShellHash, iOriginalHistoryLength, sAppPart, sOldFixedShellHash, sOldAppPart);
+                // store the state of the current app before opening the new app
+                await AppLifeCycleAI.storeAppExtensions();
+
+                // stall all state management changes, those __most probably__ come from the target application
+                StateManager.stallChanges();
+
+                const bOpenedViaNWBC = await this._openAppViaNWBC(oResolvedHashFragment, oOldResolvedHashFragment);
+                if (bOpenedViaNWBC === true) {
+                    this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
+                        Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+                    });
+
+                    StateManager.applyStalledChanges();
                     return;
                 }
 
-                AppLifeCycleAI.destroyApplication(oInMemoryApplicationInstance.appId, oInMemoryApplicationInstance.container);
-                AppLifeCycleAI.removeApplication(sIntent);
-                AppConfiguration.setApplicationInInitMode();
+                if (oResolvedHashFragment.navigationMode === NavigationMode.newWindow) {
+                    // add the app to application usage log
+                    this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
+                        Log.info("Application in new window was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
+                    });
+                    await this._openAppExplace(oResolvedHashFragment, oOldResolvedHashFragment);
 
-                /*
-                 * normal application:
-                 * fire the _prior.newUI5ComponentInstantion event before creating the new component instance, so that
-                 * the ApplicationContainer can stop the router of the current app (avoid inner-app hash change notifications)
-                 * 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
-                 */
-                EventBus.getInstance().publish("ApplicationContainer", "_prior.newUI5ComponentInstantion",
-                    { name: sTargetUi5ComponentName }
-                );
+                    StateManager.applyStalledChanges(); // no changes were done by the source application
+                    return;
+                }
 
-                //Performance Debug
-                Measurement.start("FLP:ShellController.UI5createComponent", "UI5 createComponent", "FLP");
+                // Handle "/core/shell/model/migrationConfig"
+                const bHandledViaMigrationConfig = this._rewriteRootIntentForMigrationConfig(oResolvedHashFragment, sShellHash);
+                if (bHandledViaMigrationConfig) {
+                    StateManager.applyStalledChanges(); // no changes were done by the source application
+                    return;
+                }
 
-                // load ui5 component via shell service; core-ext-light will be loaded as part of the asyncHints
-                await Container.getServiceAsync("Ui5ComponentLoader");
+                // todo: [FLPCOREANDUX-10024] simplify error handling
                 try {
-                    await AppLifeCycleAI.createComponent(oResolvedHashFragment, oParsedShellHash);
-
-
-                    /*
-                     * return value is unused.
-                     * This is because oResolvedHashFragment contains the component handle already.
-                     * See the preceding note in AppLifeCycle.createComponent.
-                     */
-                    Measurement.end("FLP:ShellController.UI5createComponent");
-                    await oShellController._initiateApplication(oResolvedHashFragment, sFixedShellHash, oParsedShellHash, iOriginalHistoryLength, sAppPart, sOldFixedShellHash, sOldAppPart);
+                    const bPreviousIsInitialNavigation = this.oShellNavigationInternal.isInitialNavigation();
+                    try {
+                        await this._openAppInplace(oParsedShellHash, sShellHash, oResolvedHashFragment, sOldShellHash, sAppPart, oOldResolvedHashFragment);
+                    } catch (oError) {
+                        Log.error(`Application initialization for intent "${sShellHash}" failed.`, oError);
+
+                        // assumption is that the resolvedHashFragment already contains the componentHandle
+                        const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
+                        this.oShellNavigationInternal.setIsInitialNavigation(bPreviousIsInitialNavigation);
+                        await this.hashChangeFailure(
+                            iOriginalHistoryLength,
+                            oError.name,
+                            oError.message,
+                            oMetadata ? oMetadata.title : "",
+                            false
+                        );
+                    }
                 } catch (oError) {
-                    const sErrorReason = ushellResources.i18n.getText("cannot_load_ui5_component_details", [sFixedShellHash]);
-                    const sErrorReasonEnglish = `Failed to load UI5 component for navigation intent "${sFixedShellHash}"`;
+                    Log.error("Failed to open application", oError, "sap.ushell.renderer.Shell.controller");
+
+                    const sErrorReason = ushellResources.i18n.getText("cannot_load_ui5_component_details", [sShellHash]);
+                    const sErrorReasonEnglish = `Failed to load UI5 component for navigation intent "${sShellHash}"`;
 
-                    AppConfiguration.setCurrentApplication(oShellController.currentAppBeforeNav);
-                    await oShellController.hashChangeFailure(
+                    AppConfiguration.setCurrentApplication(oOldResolvedHashFragment);
+                    await this.hashChangeFailure(
                         iOriginalHistoryLength,
                         {
                             title: ushellResources.i18n.getText("error"),
@@ -1265,11 +1275,12 @@ sap.ui.define([
                     );
                 }
             } catch (oError) {
-                const sErrorReason = ushellResources.i18n.getText("cannot_resolve_navigation_target_details", [sFixedShellHash]);
+                Log.error("Hash change handling failed. Could not open app.", oError, "sap.ushell.renderer.Shell.controller");
+                const sErrorReason = ushellResources.i18n.getText("cannot_resolve_navigation_target_details", [sShellHash]);
                 // eslint-disable-next-line max-len
-                const sErrorReasonEnglish = `Failed to resolve navigation target "${sFixedShellHash}". This is most likely caused by an incorrect SAP Fiori launchpad content configuration or by missing role assignment.`;
+                const sErrorReasonEnglish = `Failed to resolve navigation target "${sShellHash}". This is most likely caused by an incorrect SAP Fiori launchpad content configuration or by missing role assignment.`;
 
-                await oShellController.hashChangeFailure(
+                await this.hashChangeFailure(
                     iOriginalHistoryLength,
                     {
                         title: ushellResources.i18n.getText("error"),
@@ -1278,7 +1289,7 @@ sap.ui.define([
                     },
                     {
                         info: sErrorReason,
-                        fixedShellHash: sFixedShellHash,
+                        fixedShellHash: sShellHash,
                         technicalMessage: oError.message
                     },
                     "sap.ushell.renderer.Shell.controller",
@@ -1289,79 +1300,16 @@ sap.ui.define([
             }
         },
 
-        /**
-         * Attempts to navigate to the target application via a shortcut,
-         * without executing unnecessary AppLifeCycle navigation logic (e.g.,
-         * application component initialization).
-         *
-         * This might be necessary when the navigation should not be handled in
-         * the current window context anymore, for example, when the
-         * application should be opened in a new window, or NWBC takes over the
-         * navigation task.
-         *
-         * @param {string} sFixedShellHash
-         *  The hash fragment including "#"
-         * @param {string} sAppPart
-         *  The inner app route part of the intent
-         * @param {object} oResolvedHashFragment
-         *  The resolved target intent
-         *
-         * @returns {Promise<boolean>} Whether the navigation was handled.
-         * @private
-         */
-        _handleEarlyNavigation: async function (sFixedShellHash, sAppPart, oResolvedHashFragment) {
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-
-            const bOpenedViaNWBC = await this._openAppViaNWBC(oResolvedHashFragment);
-
-            if (bOpenedViaNWBC === true) {
-                oResolvedHashFragment.sFixedShellHash = sFixedShellHash;
-                this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
-                    Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
-                });
-                if (oDashboard) {
-                    oDashboard.setBlocked(false);
-                    oDashboard.setBusy(false);
-                }
-
-                return true;
-            }
-
-            const bNewWindowNavigation = oResolvedHashFragment?.navigationMode === oNavigationMode.newWindow;
-            if (bNewWindowNavigation) {
-                // add the app to application usage log
-                oResolvedHashFragment.sFixedShellHash = sFixedShellHash;
-                this.logOpenAppAction(oResolvedHashFragment, sAppPart).catch(() => {
-                    Log.info("Application in new window was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
-                });
-                const [ApplicationContainer] = await ushellUtils.requireAsync(["sap/ushell/components/container/ApplicationContainer"]);
-
-                oResolvedHashFragment.url = ApplicationContainer.prototype._checkNwbcUrlAdjustment(undefined, oResolvedHashFragment.applicationType, oResolvedHashFragment.url, true);
-                this._openAppInNewWindowAndRestore(oResolvedHashFragment);
-                if (oDashboard) {
-                    oDashboard.setBlocked(false);
-                    oDashboard.setBusy(false);
-                }
-
-                return true;
-            }
-
-            // Close dialogs only for inplace navigation
-            if (InstanceManager && closeAllDialogs) {
-                InstanceManager.closeAllDialogs();
-                InstanceManager.closeAllPopovers();
-            }
-            closeAllDialogs = true;
-
+        _rewriteRootIntentForMigrationConfig: function (oResolvedHashFragment, sShellHash) {
             // In case of empty hash, if there is a resolved target, set the flag to false, from now on the rootIntent
             // will be an empty hash. Otherwise, change hash to rootIntent to trigger normal resolution.
             if (Config.last("/core/shell/model/migrationConfig")) {
                 oConfig.migrationConfig = false;
                 this._getConfigModel().setProperty("/migrationConfig", false);
 
-                if (oResolvedHashFragment && sFixedShellHash === "#") {
+                if (oResolvedHashFragment && sShellHash === "#") {
                     oConfig.rootIntent = "";
-                } else if (sFixedShellHash === "#") {
+                } else if (sShellHash === "#") {
                     window.setTimeout(() => {
                         window.hasher.setHash(oConfig.rootIntent);
                     }, 0);
@@ -1369,39 +1317,35 @@ sap.ui.define([
                     return true;
                 }
             }
-
             return false;
         },
 
-        _initiateApplication: async function (oResolvedHashFragment, sFixedShellHash, oParsedShellHash, iOriginalHistoryLength, sAppPart, sOldFixedShellHash) {
-            Measurement.start("FLP:ShellController._initiateApplication", "_initiateApplication", "FLP");
+        _openAppExplace: async function (oResolvedHashFragment, oOldResolvedHashFragment) {
+            const [ApplicationContainer] = await ushellUtils.requireAsync(["sap/ushell/components/container/ApplicationContainer"]);
 
-            const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
-            const bContactSupportEnabled = Config.last("/core/extension/SupportTicket");
-            let bPreviousIsInitialNavigation;
+            oResolvedHashFragment.url = ApplicationContainer.prototype._checkNwbcUrlAdjustment(undefined, oResolvedHashFragment.applicationType, oResolvedHashFragment.url, true);
 
-            // 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(() => {
-                    sap.ui.require(["sap/ushell/UserActivityLog"], (UserActivityLog) => {
-                        UserActivityLog.activate();
-                    });
-                }, 0);
+            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+
+            const oNewWin = WindowUtils.openURL(oResolvedHashFragment.url);
+            // Show a message when window.open returns null --> Popup Blocker
+            // Exception: in WorkZone's mobile client, when external nav happens: Keep calm and carry on.
+            if (!oNewWin && !this._checkWindowLocationSearch("workzone-mobile-app=true")) {
+                const msg = ushellResources.i18n.getText("fail_to_start_app_popup_blocker", [window.location.hostname]);
+                this.delayedMessageError(msg);
             }
 
-            try {
-                bPreviousIsInitialNavigation = this.oShellNavigationInternal.isInitialNavigation();
-                this.navigate(oParsedShellHash, sFixedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash);
-            } catch (oExc) {
-                if (oExc.stack) {
-                    Log.error(`Application initialization for intent "${sFixedShellHash}" failed.`, oExc);
-                }
-                this.oShellNavigationInternal.setIsInitialNavigation(bPreviousIsInitialNavigation);
-                await this.hashChangeFailure(iOriginalHistoryLength, oExc.name, oExc.message, oMetadata ? oMetadata.title : "", false);
+            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+            this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment, oOldResolvedHashFragment);
+        },
+
+        _closeAllDialogs: function () {
+            if (InstanceManager && closeAllDialogs) {
+                InstanceManager.closeAllDialogs();
+                InstanceManager.closeAllPopovers();
             }
 
-            Measurement.end("FLP:ShellController._initiateApplication");
+            closeAllDialogs = true;
         },
 
         /**
@@ -1414,37 +1358,68 @@ sap.ui.define([
          *   <b>and</b> core-ext-light were loaded earlier. The promise is rejected with an error message in case errors occur.
          */
         _resolveHashFragment: async function (sShellHash) {
-            //Performance Debug
-            Measurement.start("FLP:ShellController._resolveHashFragment", "_resolveHashFragment", "FLP");
-            const oParsedShellHash = this.oURLParsing.parseShellHash(sShellHash) || {}; // might be empty in tests
+            const oParsedShellHash = UrlParsing.parseShellHash(sShellHash) || {}; // might be empty in tests
             const oConfig = this._getConfig(); // for testing
+            let oResolvedHashFragment;
 
             // Check and use resolved hash fragment from direct start promise if it's there
             if (window["sap-ushell-async-libs-promise-directstart"]) {
                 try {
                     const oDirectstartPromiseResult = await window["sap-ushell-async-libs-promise-directstart"];
                     delete window["sap-ushell-async-libs-promise-directstart"];
-                    return {
-                        resolvedHashFragment: oDirectstartPromiseResult.resolvedHashFragment,
-                        parsedShellHash: oParsedShellHash
-                    };
+
+                    oResolvedHashFragment = oDirectstartPromiseResult.resolvedHashFragment;
                 } catch (oError) {
                     delete window["sap-ushell-async-libs-promise-directstart"];
                     throw oError;
                 }
+            } else {
+                // Perform target resolution as normal...
+                const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
+                oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash));
+            }
+
+            // Only for testing: return without result if the NavTargetResolutionInternal resolved nothing
+            if (!oResolvedHashFragment && window.QUnit !== undefined && !window._bTestNullNavigationMode) {
+                return;
+            }
+
+            if (!oResolvedHashFragment) {
+                // indicate that resolving failed
+                oResolvedHashFragment = {
+                    navigationMode: null
+                };
             }
 
-            // Perform target resolution as normal...
-            const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
-            const oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash)) || {}; // might be empty in tests
-            //@FIXME: Should be also executed for directstart
             AppConfiguration.setCurrentApplication(oResolvedHashFragment);
+
+            // add application config to the application properties
+            const sBasicHash = UrlParsing.getBasicHash(sShellHash);
+            if (oConfig?.applications?.[sBasicHash]) {
+                oResolvedHashFragment.applicationConfiguration = oConfig.applications[sBasicHash];
+            }
+
+            // adding intent as this published application info is required for the contact-support scenario
+            oResolvedHashFragment.sFixedShellHash = sShellHash;
+
             // 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";
+            if (`${oParsedShellHash.semanticObject}-${oParsedShellHash.action}` === oConfig.rootIntent) {
+                oResolvedHashFragment.navigationMode = NavigationMode.embedded;
+            }
+
+            // todo: [FLPCOREANDUX-10024] move any navigationMode logic to sap/ushell/navigationMode
+            if (oResolvedHashFragment.navigationMode !== null && !oResolvedHashFragment.navigationMode) {
+                Log.error(
+                    "Mandatory member 'navigationMode' is missing in the resolution result! Temporarily set to 'embedded' for further processing...",
+                    "sap.ushell.renderer.Shell.controller"
+                );
+                oResolvedHashFragment.navigationMode = NavigationMode.embedded;
             }
-            Measurement.end("FLP:ShellController._resolveHashFragment");
+
+            // override the navigation mode based on the current state of the Shell and application
+            this._setEffectiveNavigationMode(oResolvedHashFragment);
+
             ushellUtils.setPerformanceMark("FLP-ShellController-resolveHashFragment-end");
 
             return {
@@ -1455,24 +1430,19 @@ sap.ui.define([
 
         /**
          * Adjust Navigation mode based on current state of the Shell and application and the ResolveHashFragment bo be started
-         *
-         * This operation mutates oResolvedHashFragment
-         *
-         * {@link #navigate}.
+         * This operation mutates oResolvedHashFragment {@link #navigate}.
          *
          * @param {object} oResolvedHashFragment the hash fragment resolved via {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment}
-         * @returns {object} a new, potentially altered resolution result. Note that url and navigation mode may have been changed!
-         *   For navigation in new window, the URL is replaced with the current location hash.
-         *   NOTE: refactor this; we should not have these implicit changes of the navigation target
+         *
          * @private
          */
-        _calculateNavigationMode: function (oResolvedHashFragment) {
+        _setEffectiveNavigationMode: function (oResolvedHashFragment) {
             if (!oResolvedHashFragment) {
                 return; // happens in tests
             }
             const sNavigationMode = oResolvedHashFragment.navigationMode;
 
-            if (sNavigationMode === oNavigationMode.newWindowThenEmbedded) {
+            if (sNavigationMode === NavigationMode.newWindowThenEmbedded) {
                 // Implement newWindowThenEmbedded based on current state.
                 if (ushellUtils.isColdStart() || Ui5History.getInstance().getDirection() === Ui5HistoryDirection.Backwards) {
                     /*
@@ -1482,9 +1452,9 @@ sap.ui.define([
                      * Ui5History.getInstance().getDirection()
                      *   -> URL has already been navigated to and it was the predecessor of the previous page
                      */
-                    oResolvedHashFragment.navigationMode = oNavigationMode.embedded;
+                    oResolvedHashFragment.navigationMode = NavigationMode.embedded;
                 } else {
-                    oResolvedHashFragment.navigationMode = oNavigationMode.newWindow;
+                    oResolvedHashFragment.navigationMode = NavigationMode.newWindow;
                     // if its a non-native navigation, we resolve the hash again in the new window
                     // we set the full current location hash as URL for the new window as it is
                     // for avoiding encoding issues and stripping off parameters or inner-app route
@@ -1493,27 +1463,26 @@ sap.ui.define([
                         oResolvedHashFragment.url = this._getCurrentLocationHash();
                     }
                 }
-                return oResolvedHashFragment;
+                return;
             }
 
-            if (sNavigationMode === oNavigationMode.newWindow && ushellUtils.isColdStart()) {
+            if (sNavigationMode === NavigationMode.newWindow && ushellUtils.isColdStart()) {
                 // Workaround for URLs that start an FLP app which needs the shell.
                 if (this._hasAppCapabilitiesNavigationMode(oResolvedHashFragment)
-                    && oResolvedHashFragment.appCapabilities.navigationMode === oNavigationMode.embedded) {
-                    oResolvedHashFragment.navigationMode = oNavigationMode.embedded;
+                    && oResolvedHashFragment.appCapabilities.navigationMode === NavigationMode.embedded) {
+                    oResolvedHashFragment.navigationMode = NavigationMode.embedded;
                     return oResolvedHashFragment;
                 }
                 // Replace the content of the current window if the user has already opened one.
-                oResolvedHashFragment.navigationMode = oNavigationMode.replace;
-                return oResolvedHashFragment;
+                oResolvedHashFragment.navigationMode = NavigationMode.replace;
+                return;
             }
 
-            if (sNavigationMode === oNavigationMode.newWindow
+            if (sNavigationMode === NavigationMode.newWindow
                 && this._hasAppCapabilitiesNavigationMode(oResolvedHashFragment)
-                && oResolvedHashFragment.appCapabilities.navigationMode === oNavigationMode.embedded) {
+                && oResolvedHashFragment.appCapabilities.navigationMode === NavigationMode.embedded) {
                 oResolvedHashFragment.url = this._getCurrentLocationHash();
             }
-            return oResolvedHashFragment;
         },
 
         // Workaround for URLs that start an FLP app which needs the shell.
@@ -1523,106 +1492,137 @@ sap.ui.define([
 
         _usesNavigationRedirect: async function (oComponentHandle) {
             if (!oComponentHandle) {
-                throw new Error("Missing component handle");
+                return false;
             }
 
             const oComponent = oComponentHandle.getInstance({});
             if (!oComponent) {
-                throw new Error("Component instance not available");
+                return false;
             }
 
             if (typeof oComponent.navigationRedirect !== "function") {
-                throw new Error("Component does not support navigation redirect");
+                return false;
             }
 
             // oComponent refers to a trampoline application
             const oNavRedirectThenable = oComponent.navigationRedirect();
             if (!oNavRedirectThenable || typeof oNavRedirectThenable.then !== "function") {
-                throw new Error("Navigation redirect did not return a thenable");
+                return false;
             }
 
-            const sNextHash = await ushellUtils.promisify(oNavRedirectThenable);
-            Log.warning(`Performing navigation redirect to hash "${sNextHash}"`);
+            try {
+                const sNextHash = await ushellUtils.promisify(oNavRedirectThenable);
+                Log.warning(`Performing navigation redirect to hash "${sNextHash}"`);
 
-            oComponent.destroy();
-            this.history.pop();
+                oComponent.destroy();
+                this.history.pop();
+
+                const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
+                ShellNavigationInternal.toExternal({ target: { shellHash: sNextHash } }, undefined, false);
+
+                return true;
+            } catch {
+                return false;
+            }
 
-            const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
-            ShellNavigationInternal.toExternal({ target: { shellHash: sNextHash } }, undefined, false);
-            return true;
         },
 
         /**
          * Performs navigation based on the given resolved hash fragment.
          *
          * @param {object} oParsedShellHash the parsed shell hash obtained via {@link sap.ushell.services.URLParsing} service
-         * @param {string} sFixedShellHash the hash fragment to navigate to. It must start with "#" (i.e., fixed).
-         * @param {object} oMetadata the metadata object obtained via {@link sap.ushell.services.AppConfiguration#parseShellHash}
+         * @param {string} sShellHash the hash fragment to navigate to. It must start with "#" (i.e., fixed).
          * @param {object} oResolvedHashFragment the hash fragment resolved via {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment}
+         * @param {string} sOldShellHash the old hash fragment. It must start with "#" (i.e., fixed).
+         * @param {string} sAppPart the application part
          *
          * @returns {Promise} Navigation Promise
          */
-        navigate: async function (oParsedShellHash, sFixedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash) {
-            //Performance Debug
-            Measurement.start("FLP:ShellController.navigate", "navigate", "FLP");
-            let sNavigationMode = (isPlainObject(oResolvedHashFragment) ? oResolvedHashFragment.navigationMode : null);
+        _openAppInplace: async function (oParsedShellHash, sShellHash, oResolvedHashFragment, sOldShellHash, sAppPart, oOldResolvedHashFragment) {
+            // todo: [FLPCOREANDUX-10024] check the parameters sent to the AI methods
 
-            /*
-             * A null navigationMode is a no-op, it indicates no navigation should occur.
-             * However, we need to restore the current hash to the previous one.
-             * If cold start happened (history has only one entry), we go to the shell home.
-             */
-            if (sNavigationMode === null) {
-                if (ushellUtils.isColdStart()) {
-                    window.hasher.setHash("");
-                    return;
-                }
+            const bNavigationFromHome = this._isFLPIntent(sOldShellHash);
+            const bNavigationWithInnerAppRoute = !!sAppPart;
 
-                this.bEnableHashChange = false;
-                this.history.pop();
-                this._windowHistoryBack(1);
-                return;
-            }
+            // Close dialogs only for inplace navigation
+            this._closeAllDialogs();
 
-            oResolvedHashFragment = this._calculateNavigationMode(oResolvedHashFragment);
-            sNavigationMode = (isPlainObject(oResolvedHashFragment) ? oResolvedHashFragment.navigationMode : null);
+            await AppLifeCycleAI.handleBeforeCreateApp(sShellHash, oResolvedHashFragment, bNavigationFromHome, bNavigationWithInnerAppRoute);
 
-            if (!sNavigationMode) {
-                Log.error(
-                    "Mandatory member 'navigationMode' is missing in the resolution result! Temporarily set to 'embedded' for further processing...",
-                    "sap.ushell.renderer.Shell.controller"
-                );
-                sNavigationMode = "embedded";
+            // Enhances the resolved hash fragment with the componentHandle for UI5 apps
+            await AppLifeCycleAI.handleCreateApp(sShellHash, oParsedShellHash, oResolvedHashFragment, bNavigationFromHome, bNavigationWithInnerAppRoute);
+
+            // todo: [FLPCOREANDUX-10024] Validate the issue
+            // 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
+            const bContactSupportEnabled = Config.last("/core/extension/SupportTicket");
+            if (bContactSupportEnabled) {
+                ushellUtils.awaitTimeout(0)
+                    .then(() => {
+                        return ushellUtils.requireAsync("sap/ushell/UserActivityLog");
+                    })
+                    .then(([UserActivityLog]) => {
+                        UserActivityLog.activate();
+                    });
             }
 
-            if (sNavigationMode === oNavigationMode.embedded) {
-                if (!ushellUtils.isColdStart() && !this._wasHistoryEntryReplaced) {
+            const sEffectiveNavigationMode = oResolvedHashFragment.navigationMode;
+            if (sEffectiveNavigationMode === NavigationMode.embedded) {
+                if (!ushellUtils.isColdStart() && !this._bWasHistoryEntryReplaced) {
                     this.oShellNavigationInternal.setIsInitialNavigation(false);
                 }
 
-                Measurement.end("FLP:ShellController.navigate");
+                // The trampoline application subsequently gets destroyed after it's used to enable the redirection.
+                const bHandledByNavigationRedirect = await this._usesNavigationRedirect(oResolvedHashFragment.componentHandle);
+                if (bHandledByNavigationRedirect) {
+                    // todo: [FLPCOREANDUX-10024] check cleanup stuff (StateManager, ...)
+                    return;
+                }
 
-                try {
-                    await this._usesNavigationRedirect(oResolvedHashFragment.componentHandle);
-                    /*
-                     * When `_usesNavigationRedirect` succeeds, it implies the component references a trampoline application.
-                     * The trampoline application subsequently gets destroyed after it's used to enable the redirection.
-                     * The failure is being used here as a means for branching in the execution flow.
-                     */
-                } catch {
-                    await this._handleEmbeddedNavMode(sFixedShellHash, oParsedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash);
+                AppLifeCycleAI.resetGlobalShellUIService();
 
-                    /*
-                     * The event is used for FESR records
-                     * Normally FESR record is closed on the "AppRendered" event, but for some cases (stateful container, etc.)
-                     * the application container is not re-rendered and EmbeddedNavigationDone is additionally fired to close the record.
-                     */
-                    EventHub.emit("CloseFesrRecord", { time: Date.now(), technicalName: oMetadata.technicalName });
-                }
+                const oShellConfig = this._getConfig();
+                const sBasicShellHash = UrlParsing.getBasicHash(sShellHash);
+
+                await AppLifeCycleAI.handleCreateApplicationContainer(
+                    sBasicShellHash, // sAppId
+                    oParsedShellHash,
+                    oResolvedHashFragment,
+                    sOldShellHash
+                );
+
+                // todo: [FLPCOREANDUX-10024] TBD
+                AppLifeCycleAI.navToCurrentApp(); // todo: [FLPCOREANDUX-10024] triggers appLoaded event
+
+                // @Alon Barnes: Is this call even needed? The beforehand given oMetadata has not included the accessed property in the AppMeta.js
+                // So, maybe this call can even be removed?
+                AppMeta.setAppIcons();
+
+                // todo: [FLPCOREANDUX-10024] should this be done after handleControl?
+                // this only targets the overwritten rootIntent (e.g. workzone advanced)
+                const bIsNavToHome = sShellHash === "#" || (oShellConfig.rootIntent && sBasicShellHash === UrlParsing.getBasicHash(oShellConfig.rootIntent));
+                AppLifeCycleAI.switchViewState(
+                    bIsNavToHome ? LaunchpadState.Home : LaunchpadState.App,
+                    sBasicShellHash, // sAppId
+                    oResolvedHashFragment.applicationType,
+                    oResolvedHashFragment.explicitNavMode
+                );
+
+                // todo: [FLPCOREANDUX-10024] check whether this needs to be awaited
+                await AppLifeCycleAI.handleAfterNavigate(oResolvedHashFragment, oOldResolvedHashFragment);
+
+                /*
+                * The event is used for FESR records
+                * Normally FESR record is closed on the "AppRendered" event, but for some cases (stateful container, etc.)
+                * the application container is not re-rendered and EmbeddedNavigationDone is additionally fired to close the record.
+                */
+                const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
+                EventHub.emit("CloseFesrRecord", { time: Date.now(), technicalName: oMetadata.technicalName });
                 return;
             }
 
-            if (sNavigationMode === oNavigationMode.replace) {
+            // todo: [FLPCOREANDUX-10024] clarify whether there is an actual use case of replace navigation which requires the steps above
+            if (sEffectiveNavigationMode === NavigationMode.replace) {
                 this.oShellNavigationInternal.setIsInitialNavigation(false);
                 // restore hash
                 this.bEnableHashChange = false;
@@ -1630,14 +1630,15 @@ sap.ui.define([
                 return;
             }
 
-            if (sNavigationMode === oNavigationMode.newWindow) {
-                this._openAppInNewWindowAndRestore(oResolvedHashFragment);
-                return;
-            }
-
             // the navigation mode doesn't match any valid one.
             // In this case an error message is logged and previous hash is fetched
-            await this.hashChangeFailure(this.history.getHistoryLength(), "Navigation mode is not recognized", null, "sap.ushell.renderer.Shell.controller", false);
+            await this.hashChangeFailure(
+                this.history.getHistoryLength(),
+                `Navigation mode '${sEffectiveNavigationMode}' was not recognized`,
+                null,
+                "sap.ushell.renderer.Shell.controller",
+                false
+            );
         },
 
         /**
@@ -1648,7 +1649,7 @@ sap.ui.define([
          *
          * @private
          */
-        _openAppViaNWBC: async function (oResolvedHashFragment) {
+        _openAppViaNWBC: async function (oResolvedHashFragment, oOldResolvedHashFragment) {
             const bNwbcHandling = oResolvedHashFragment && (ushellUtils.isNativeWebGuiNavigation(oResolvedHashFragment) || oResolvedHashFragment.nativeNWBCNavigation);
 
             if (!bNwbcHandling) {
@@ -1660,7 +1661,7 @@ sap.ui.define([
 
             let iMode;
             if (ushellUtils.hasNavigationModeCapability()) {
-                iMode = iEPCMNavigationMode || oEPCMNavigationMode[oNavigationMode.embedded];
+                iMode = iEPCMNavigationMode || oEPCMNavigationMode[NavigationMode.embedded];
             }
 
             const sUrlWithSapUser = await this._appendUserIdToUrl("sap-user", oResolvedHashFragment.url);
@@ -1704,7 +1705,7 @@ sap.ui.define([
                 }
                 EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
 
-                await this._restoreAfterNwbcNavigation(oResolvedHashFragment);
+                await this._restoreAfterNwbcNavigation(oResolvedHashFragment, oOldResolvedHashFragment);
                 /*
                  * TODO: This is a workaround.
                  * We should rather update the resolvedHashFragment before the navigation happens. Other Components listening
@@ -1739,7 +1740,7 @@ sap.ui.define([
          * @returns {Promise} A Promise resolving when the hash is restored.
          * @private
          */
-        _restoreAfterNwbcNavigation: async function (oResolvedHashFragment) {
+        _restoreAfterNwbcNavigation: async function (oResolvedHashFragment, oOldResolvedHashFragment) {
             if (this.history.getHistoryLength() === 1 && !this._oAppLifeCycleService.getCurrentApplication()) {
                 // Deep link case
                 const Navigation = await Container.getServiceAsync("Navigation");
@@ -1748,7 +1749,7 @@ sap.ui.define([
             }
 
             // Regular case
-            this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment);
+            this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment, oOldResolvedHashFragment);
         },
 
         /**
@@ -1773,7 +1774,7 @@ sap.ui.define([
          * The method restore the previous hash when app is opened in the new tab
          * @param {*} oResolvedHashFragment resolved hash fragment
          */
-        _restorePreviousHashAfterOpenNewWindow: function (oResolvedHashFragment) {
+        _restorePreviousHashAfterOpenNewWindow: function (oResolvedHashFragment, oOldResolvedHashFragment) {
             this.history.pop();
             const oVarInstance = oResolvedHashFragment.componentHandle && oResolvedHashFragment.componentHandle.getInstance
                 && oResolvedHashFragment.componentHandle.getInstance({});
@@ -1785,178 +1786,14 @@ sap.ui.define([
             this._windowHistoryBack(1);
 
             // set back the current application to be the one before this navigation occurred as current application is opened in a new window
-            AppConfiguration.setCurrentApplication(this.currentAppBeforeNav);
+            AppConfiguration.setCurrentApplication(oOldResolvedHashFragment);
             EventHub.emit("openedAppInNewWindow", Date.now());
         },
 
-        _openAppInNewWindowAndRestore: function (oResolvedHashFragment) {
-            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
-            this._openAppNewWindow(oResolvedHashFragment.url);
-            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
-            this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment);
-        },
-
-        _handleEmbeddedNavMode: async function (sFixedShellHash, oParsedShellHash, oMetadata, oResolvedHashFragment, sOldFixedShellHash) {
-            // Performance Debug
-            Measurement.start("FLP:ShellController._handleEmbeddedNavMode", "_handleEmbeddedNavMode", "FLP");
-            const oConfig = this._getConfig();
-
-            AppLifeCycleAI.getShellUIService()?.resetService?.();
-            AppLifeCycleAI.setBackNavigationChanged(false);
-
-            // @Alon Barnes: Is this call even needed? The beforehand given oMetadata has not included the accessed property in the AppMeta.js
-            // So, maybe this call can even be removed?
-            AppMeta.setAppIcons();
-
-            // obtain a unique id for the app (or the component)
-            const sAppId = `-${oParsedShellHash.semanticObject}-${oParsedShellHash.action}`;
-
-            const bIsNavToHome = sFixedShellHash === "#" ||
-                (oConfig.rootIntent && ushellUtils.getBasicHash(oConfig.rootIntent) === `${oParsedShellHash.semanticObject}-${oParsedShellHash.action}`);
-
-            // Support migration from version 1.28 or lower in case local resolution for empty hash was used
-            const sIntent = oParsedShellHash ? `${oParsedShellHash.semanticObject}-${oParsedShellHash.action}` : "";
-
-            AppLifeCycleAI.switchViewState(
-                bIsNavToHome ? LaunchpadState.Home : LaunchpadState.App,
-                sAppId,
-                oResolvedHashFragment.applicationType,
-                oResolvedHashFragment.explicitNavMode
-            );
-
-            if (bIsNavToHome) {
-                AppLifeCycleAI.getShellUIService().setBackNavigation();
-            }
-
-            // adding intent as this published application info is required for the contact-support scenario
-            oResolvedHashFragment.sFixedShellHash = sFixedShellHash;
-
-            const oHandleControlPromise = AppLifeCycleAI.handleControl(
-                sIntent,
-                sAppId,
-                oParsedShellHash,
-                oResolvedHashFragment,
-                this.getWrappedApplicationWithMoreStrictnessInIntention.bind(this),
-                sFixedShellHash,
-                sOldFixedShellHash
-            );
-
-            if (this.currentAppBeforeNav) {
-                // todo: [FLPCOREANDUX-10024] check whether this needs to be awaited
-                if (ushellUtils.isTRApplicationType(this.currentAppBeforeNav.applicationType, ObjectPath.get("appCapabilities.appFrameworkId", this.currentAppBeforeNav)) &&
-                    !ushellUtils.isTRApplicationType(oResolvedHashFragment.applicationType)) {
-                    sap.ui.require([
-                        "sap/ushell/components/applicationIntegration/application/BlueBoxHandler",
-                        "sap/ushell/components/applicationIntegration/application/WebGUIStatefulHandler"
-                    ], (
-                        BlueBoxHandler,
-                        WebGUIStatefulHandler
-                    ) => {
-                        const oPreviousStatefulContainer = BlueBoxHandler.getBlueBoxByUrl(this.currentAppBeforeNav.url);
-                        if (oPreviousStatefulContainer && oPreviousStatefulContainer.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
-                            WebGUIStatefulHandler.guiStatefulCloseCurrentApp(oPreviousStatefulContainer);
-                        }
-                    });
-                }
-            }
-
-            Measurement.end("FLP:ShellController._handleEmbeddedNavMode");
-
-            await oHandleControlPromise;
-        },
-
         _isShellHomeIntent: function (sIntent) {
             return sIntent === "#" || sIntent === oConfig.rootIntent;
         },
 
-        // Please help improve the strictness of this method.
-        getWrappedApplicationWithMoreStrictnessInIntention: function (sIntent, oMetadata, oShellHash, oResolvedNavigationTarget, sAppId, bFullWidth, sFixedShellHash) {
-            if (Device.system.desktop) {
-                sap.ui.require(["sap/ushell/renderer/AccessKeysHandler"], (AccessKeysHandler) => {
-                    const sCurrentLaunchpadState = StateManager.getLaunchpadState();
-                    const bDefaultShellMode = StateManager.getShellMode() === ShellMode.Default;
-                    const oShellAppTitle = Element.getElementById("shellAppTitle");
-
-                    if (oShellAppTitle && sCurrentLaunchpadState === LaunchpadState.App && bDefaultShellMode) {
-                        const oShellAppTitleDomRef = oShellAppTitle.getFocusDomRef();
-                        if (oShellAppTitleDomRef) {
-                            AccessKeysHandler.sendFocusBackToShell(oShellAppTitleDomRef.getAttribute("id"));
-                        }
-                    }
-                });
-            }
-
-            window.setTimeout(() => {
-                window.setTimeout(() => {
-                    //Screen reader: "Loading Complete"
-                    this.readNavigationEnd();
-                }, 600);
-
-                EventBus.getInstance().publish("launchpad", "appOpening", oResolvedNavigationTarget);
-                Log.info("app is being opened");
-            }, 0);
-            if (oConfig.applications) {
-                oResolvedNavigationTarget.applicationConfiguration = oConfig.applications[sIntent];
-            }
-
-            const oAppContainer = AppLifeCycleAI.getAppContainer(sAppId, oResolvedNavigationTarget, ushellUtils.isColdStart(), oShellHash, sFixedShellHash);
-            let bContainerFromCachePool = false;
-            if (oAppContainer.getIsFetchedFromCache && oAppContainer.getIsFetchedFromCache()) {
-                bContainerFromCachePool = true;
-            }
-
-            if (!bContainerFromCachePool) {
-                AppLifeCycleAI.publishNavigationStateEvents(oAppContainer, oResolvedNavigationTarget, this.onAppAfterRendering.bind(this, oResolvedNavigationTarget));
-
-                if (ushellUtils.isSAPLegacyApplicationType(oAppContainer.getApplicationType(), oAppContainer.getFrameworkId())) {
-                    oAppContainer.addStyleClass("sapUShellApplicationContainerShiftedIframe");
-                }
-
-                if (!bFullWidth) {
-                    oAppContainer.addStyleClass("sapUShellApplicationContainerLimitedWidth");
-                }
-
-                if (this._isFloatingContainerDocked() && window.matchMedia("(min-width: 106.4rem)").matches) {
-                    oAppContainer.addStyleClass("sapUShellDockingContainer");
-                    oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-                } else if (this._isFloatingContainerDocked()) {
-                    oAppContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-                }
-
-                oAppContainer.toggleStyleClass("sapUshellDefaultBackground", !oMetadata.hideLightBackground);
-
-                AppMeta._applyContentDensityByPriority();
-
-                // Add inner control for next request
-                AppLifeCycleAI.addControl(oAppContainer);
-            }
-
-            ushellUtils.setPerformanceMark("FLP - addAppContainer");
-
-            Measurement.end("FLP:ShellController.getWrappedApplication");
-            return oAppContainer;
-        },
-
-        onAppAfterRendering: function (oApplication) {
-            // wrapped in setTimeout since "publish" is not async
-            window.setTimeout(() => {
-                EventBus.getInstance().publish("sap.ushell", "appOpened", oApplication);
-                Log.info("app was opened");
-            }, 0);
-
-            // publish the event externally
-            // TODO: cloned, frozen object!
-            const oAppOpenedEventData = AppLifeCycleAI._publicEventDataFromResolutionResult(oApplication);
-
-            // Event is emitted internally (EventHub) _and_ externally (for compatibility reasons)
-            EventHub.emit("AppRendered", oAppOpenedEventData, true);
-            RendererUtils.publishExternalEvent("appOpened", oAppOpenedEventData);
-            ushellUtils.setPerformanceMark("FLP.appOpened");
-
-            const sIcon = AppMeta.getAppIcon();
-            StateManager.updateCurrentState("application.icon", Operation.Set, sIcon);
-        },
-
         /**
          * Adds a listener to the "appComponentLoaded" Event that is published by the "sap.ushell".
          * Once the "home app" Component is saved, the listener is removed, and this function will not do anything.
@@ -1985,12 +1822,6 @@ sap.ui.define([
          * @returns {Promise} A promise resolving when the error message is shown.
          */
         hashChangeFailure: async function (iHistoryLength, vMessage, vDetails, sComponent, bEnableHashChange) {
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(false);
-                oDashboard.setBusy(false);
-            }
-
             StateManager.discardStalledChanges();
 
             if (ushellUtils.isPlainObject(vMessage)) {
@@ -2041,25 +1872,6 @@ sap.ui.define([
             }
         },
 
-        fixShellHash: function (sShellHash) {
-            if (!sShellHash) {
-                sShellHash = "#";
-            } else if (sShellHash.charAt(0) !== "#") {
-                sShellHash = `#${sShellHash}`;
-            }
-            return sShellHash;
-        },
-
-        _openAppNewWindow: function (sUrl) {
-            const oNewWin = WindowUtils.openURL(sUrl);
-            // Show a message when window.open returns null --> Popup Blocker
-            // Exception: in WorkZone's mobile client, when external nav happens: Keep calm and carry on.
-            if (!oNewWin && !this._checkWindowLocationSearch("workzone-mobile-app=true")) {
-                const msg = ushellResources.i18n.getText("fail_to_start_app_popup_blocker", [window.location.hostname]);
-                this.delayedMessageError(msg);
-            }
-        },
-
         _checkWindowLocationSearch: function (sTerm) {
             return window.location.search.indexOf(sTerm) > -1;
         },
@@ -2159,15 +1971,14 @@ sap.ui.define([
             const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment);
             // If the app is kept alive in the background, the fixedShellHash is often not supplied.
             // In these cases, we then try to get the hash from the current location.
-            const sFixedShellHash = oResolvedHashFragment.sFixedShellHash || this._getCurrentLocationHash();
+            const sShellHash = oResolvedHashFragment.sFixedShellHash || this._getCurrentLocationHash();
             const oRecentEntry = {
                 title: oMetadata.title,
                 appType: AppType.APP, // default app type the shell adds is 'Application'
-                url: sAppPart ? sFixedShellHash + sAppPart : sFixedShellHash
+                url: sAppPart ? sShellHash + sAppPart : sShellHash
             };
 
-            const oURLParsingService = await Container.getServiceAsync("URLParsing");
-            const oParsed = oURLParsingService.parseShellHash(sFixedShellHash);
+            const oParsed = UrlParsing.parseShellHash(sShellHash);
             if (oParsed) {
 
                 // This is the key that determines whether an existing activity should be updated or added.
@@ -2181,16 +1992,16 @@ sap.ui.define([
 
                 // Perhaps this could be further fixed by hashing a target mapping on the client before returning the resolution
                 // result, and using the hash as the id.
-                oRecentEntry.appId = `#${oURLParsingService.constructShellHash({
+                oRecentEntry.appId = `#${UrlParsing.constructShellHash({
                     semanticObject: oParsed.semanticObject,
                     action: oParsed.action
                 })}`;
             } else {
-                oRecentEntry.appId = sFixedShellHash;
+                oRecentEntry.appId = sShellHash;
             }
 
             // The recent activity for searches is done in a different way, see this._logSearchActivity
-            if (sFixedShellHash && sFixedShellHash.indexOf("#Action-search") === -1 && sFixedShellHash.indexOf("#Shell-startIntent") === -1) {
+            if (sShellHash && sShellHash.indexOf("#Action-search") === -1 && sShellHash.indexOf("#Shell-startIntent") === -1) {
                 await ushellUtils.awaitTimeout(1500);
                 await this._logRecentActivity(oRecentEntry);
                 return;
@@ -2207,12 +2018,11 @@ sap.ui.define([
          */
         _notifyUITracer: function (oResolvedHashFragment) {
             try {
-                let sApplicationId = oResolvedHashFragment.ui5ComponentName;
-                if (oResolvedHashFragment.reservedParameters) {
-                    sApplicationId =
-                        oResolvedHashFragment.reservedParameters["sap-fiori-id"] ||
-                        oResolvedHashFragment.reservedParameters["sap-ui-app-id-hint"];
-                }
+                const sApplicationId =
+                    oResolvedHashFragment.reservedParameters?.["sap-fiori-id"]?.[0] ||
+                    oResolvedHashFragment.reservedParameters?.["sap-ui-app-id-hint"]?.[0] ||
+                    oResolvedHashFragment.ui5ComponentName;
+
                 EventHub.emit("UITracer.trace", {
                     reason: "NavigateApp",
                     source: "Intent",
@@ -2252,19 +2062,6 @@ sap.ui.define([
             }
         },
 
-        readNavigationEnd: function () {
-            const oAccessibilityHelperLoadingComplete = document.getElementById("sapUshellLoadingAccessibilityHelper-loadingComplete");
-
-            if (oAccessibilityHelperLoadingComplete) {
-                oAccessibilityHelperLoadingComplete.setAttribute("aria-live", "polite");
-                oAccessibilityHelperLoadingComplete.innerHTML = ushellResources.i18n.getText("loadingComplete");
-                window.setTimeout(() => {
-                    oAccessibilityHelperLoadingComplete.setAttribute("aria-live", "off");
-                    oAccessibilityHelperLoadingComplete.innerHTML = "";
-                }, 0);
-            }
-        },
-
         _loadCoreExtNonUI5: function (oAppTarget) {
             if (oAppTarget && oAppTarget.applicationType !== "SAPUI5") {
                 this._loadCoreExt();
@@ -2329,7 +2126,6 @@ sap.ui.define([
 
         // Triggers loading of CoreExt via EventHub
         _loadCoreExt: async function () {
-            Measurement.end("FLP:Container.InitLoading");
             // Trigger oEventHub.once("loadCoreResourcesComplement") in case homepage is first rendered.
             // Usually this is done with resolveHashFragment, but without passing from that path we should trigger it actively.
             await Container.getServiceAsync("Ui5ComponentLoader");
@@ -2490,7 +2286,7 @@ sap.ui.define([
         _navBack: function () {
             // set meAria as closed when navigating back
             this.setUserActionsMenuSelected(false);
-            AppLifeCycleAI.service().navigateBack();
+            RelatedServices.navigateBack();
         },
 
         _updateUserPrefModel: function (entryObject, bGrouped) {
@@ -2586,10 +2382,16 @@ sap.ui.define([
             EventHub.emit("showNotifications", bSelected);
         },
 
-        _isFloatingContainerDocked: function () {
-            const bDocked = ShellModel.getModel().getProperty("/floatingContainer/state").includes("docked");
-            const bVisible = ShellModel.getModel().getProperty("/floatingContainer/visible");
-            return bDocked && bVisible;
+        _isFLPIntent: function (sHash) {
+            const sBasicHash = UrlParsing.getBasicHash(sHash);
+            const aFLPIntents = [
+                "Shell-home",
+                "Shell-appfinder",
+                "Launchpad-openFLPPage",
+                "Launchpad-openWorkPage"
+            ];
+
+            return aFLPIntents.some((sIntent) => sBasicHash === sIntent);
         }
     });
 });