@sapui5/sap.ushell 1.143.3 → 1.144.0

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

@@ -1,10 +1,9 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview Shell Controller
  */
 sap.ui.define([
-    "sap/ushell/renderer/History",
     "sap/base/Log",
     "sap/base/util/extend",
     "sap/m/InstanceManager",
@@ -19,6 +18,7 @@ sap.ui.define([
     "sap/ui/performance/trace/Interaction",
     "sap/ui/thirdparty/hasher",
     "sap/ui/thirdparty/jquery",
+    "sap/ushell/api/SAPBusinessClient",
     "sap/ushell/appIntegration/AppLifeCycle",
     "sap/ushell/appIntegration/PostMessageManager",
     "sap/ushell/ApplicationType/UrlPostProcessing",
@@ -40,13 +40,12 @@ sap.ui.define([
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager",
     "sap/ushell/renderers/fiori2/LogonFrameProvider", // restore deprecated globals
-    "sap/ushell/renderers/fiori2/History", // restore deprecated globals
     "sap/ushell/renderer/RendererManagedComponents",
     "sap/ushell/ui5service/ShellUIServiceFactory",
+    "sap/ushell/navigation/ColdStart",
     "sap/ushell/navigation/NavigationState",
     "sap/ushell/utils/SmartBusiness"
 ], (
-    History,
     Log,
     extend,
     InstanceManager,
@@ -61,6 +60,7 @@ sap.ui.define([
     Interaction,
     hasher,
     jQuery,
+    SAPBusinessClient,
     AppLifeCycleAI,
     PostMessageManager,
     UrlPostProcessing,
@@ -82,9 +82,9 @@ sap.ui.define([
     ShellModel,
     StateManager,
     DeprecatedLogonFrameProvider, // restore deprecated globals
-    DeprecatedHistory, // restore deprecated globals
     RendererManagedComponents,
     ShellUIServiceFactory,
+    ColdStart,
     NavigationState,
     SmartBusiness
 ) => {
@@ -119,7 +119,7 @@ sap.ui.define([
     /* don't delay these cause they are needed for direct bookmarks */
 
     // create global model and add some demo data
-    let closeAllDialogs = true;
+    let bCloseAllDialogsOnNextNavigation = true;
     let bPreviousPageDirty = false;
     const oEPCMNavigationMode = {
         embedded: 0,
@@ -151,6 +151,7 @@ sap.ui.define([
      */
     return Controller.extend("sap.ushell.renderer.Shell", /** @lends sap.ushell.renderer.Shell.prototype */ {
         _aDoables: [],
+        _iInitialHistoryLength: window.history.length,
 
         addDoable: function (oDoable) {
             this._aDoables.push(oDoable);
@@ -234,7 +235,7 @@ sap.ui.define([
                 });
         },
 
-        onComponentTargetDisplay: function (oEvent) {
+        _onComponentTargetDisplay: function (oEvent) {
             const oParameters = oEvent.getParameters();
             const oNavContainer = oParameters.control;
             const oComponentContainer = oParameters.object;
@@ -251,16 +252,16 @@ sap.ui.define([
 
             // TODO We still need to think about implementing a custom router to move the display handler from
             // this file to the custom router. Maybe use oRouter.attachBypassed?
-            oRouter.getTarget("home").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("appfinder").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("contentfinder").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("pages").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("workpages").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("runtimeSwitcher").attachDisplay(this.onComponentTargetDisplay, this);
-            oRouter.getTarget("wzsearch").attachDisplay(this.onComponentTargetDisplay, this);
+            oRouter.getTarget("home").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("appfinder").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("contentfinder").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("pages").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("workpages").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("runtimeSwitcher").attachDisplay(this._onComponentTargetDisplay, this);
+            oRouter.getTarget("wzsearch").attachDisplay(this._onComponentTargetDisplay, this);
 
             if (Config.last("/core/homeApp/enabled")) {
-                oRouter.getTarget("homeapp").attachDisplay(this.onComponentTargetDisplay, this);
+                oRouter.getTarget("homeapp").attachDisplay(this._onComponentTargetDisplay, this);
             }
 
             /*
@@ -275,7 +276,7 @@ sap.ui.define([
             oRouter.initialize(true /* tell the router not to parse the current browser hash, and wait for ShellNavigationInternal.init */);
 
             this.bEnableHashChange = true;
-            closeAllDialogs = true;
+            bCloseAllDialogsOnNextNavigation = true;
             const oView = this.getView();
             const oViewData = oView.getViewData() || {};
             const mediaQ = window.matchMedia("(min-width: 600px)");
@@ -300,8 +301,8 @@ sap.ui.define([
             // Bind the translation model to this view
             oView.setModel(ushellResources.i18nModel, "i18n");
 
-            EventBus.getInstance().subscribe("externalSearch", this.externalSearchTriggered, this);
-            EventBus.getInstance().subscribe("sap.ushell", "appOpened", this.onAppOpened, 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)
@@ -311,7 +312,6 @@ sap.ui.define([
             this._registerAndCreateEventHubDoables();
             ShellUIServiceFactory.attachBackNavigationChanged(this._onBackNavigationChanged, this);
 
-            this.history = History;
             this.oNavContainer = Element.getElementById("viewPortContainer");
             AppLifeCycleAI.init(this.oNavContainer, oViewConfig.disableHomeAppCache);
 
@@ -418,7 +418,7 @@ sap.ui.define([
 
             this.oShellNavigationInternal.registerNavigationFilter(this._disableSourceAppRouter.bind(this));
 
-            this.oShellNavigationInternal.registerNavigationFilter(this.handleDataLoss.bind(this));
+            this.oShellNavigationInternal.registerNavigationFilter(this._handleDataLoss.bind(this));
             this.oShellNavigationInternal.registerNavigationFilter(this._unblockUI.bind(this));
             this.oShellNavigationInternal.registerNavigationFilter(fnHandleSmartBusiness);
 
@@ -569,7 +569,7 @@ sap.ui.define([
                 this.addDoable(oDoable);
             });
 
-            this.addDoable(EventHub.on("toggleContentDensity").do(this.toggleContentDensity.bind(this)));
+            this.addDoable(EventHub.on("toggleContentDensity").do(this._toggleContentDensity.bind(this)));
         },
 
         /*
@@ -594,7 +594,7 @@ sap.ui.define([
             }
         },
 
-        toggleContentDensity: function (oData) {
+        _toggleContentDensity: function (oData) {
             const bIsCompact = oData.contentDensity === "compact";
 
             return PostMessageManager.sendRequestToAllApplications(
@@ -651,7 +651,7 @@ sap.ui.define([
                 let oParsedShellHash = UrlParsing.parseShellHash(sTargetIntent);
 
                 try {
-                    const Navigation = await Container.getServiceAsync("Navigation");
+                    const Navigation = await Container.getServiceAsync("ShellNavigationInternal");
                     oParsedShellHash = await SmartBusiness.resolveEvaluationId(oParsedShellHash);
 
                     const oTarget = {
@@ -661,11 +661,11 @@ sap.ui.define([
                             contextRaw: oParsedShellHash.contextRaw
                         },
                         params: oParsedShellHash.params,
-                        appSpecificRoute: oParsedShellHash.appSpecificRoute,
-                        writeHistory: false
+                        appSpecificRoute: oParsedShellHash.appSpecificRoute
                     };
 
-                    Navigation.navigate(oTarget);
+                    // navigation filters with a custom flow need to replace the hash, but without updating UI5 history.
+                    return Navigation.setCustomNavigationFilterHash(oTarget);
                 } catch (oError) {
                     this.bSkipNextDataLossCheck = false;
 
@@ -676,28 +676,27 @@ sap.ui.define([
                     }
 
                     const sEvaluationId = oParsedShellHash.params["sap-ssb-eval-id"] && oParsedShellHash.params["sap-ssb-eval-id"][0];
-                    const sLogMessage = `Failed to execute Smart Business navigation for evaluation ID ${sEvaluationId}`;
 
                     // As this error handling is not part of the normal navigation flow's error handling
                     // this has to be triggered explicitly.
                     NavigationState.endNavigation();
 
                     // If the previous page was dirty the dirty state handler must not interfere with the back navigation
-                    const bEnableHashChange = !bPreviousPageDirty;
+                    const bEnableHashChangeOnBack = !bPreviousPageDirty;
 
-                    this.hashChangeFailure(
-                        this.history.getHistoryLength(),
-                        {
-                            title: ushellResources.i18n.getText("error"),
-                            message: ushellResources.i18n.getText("failed_to_open_app_missing_configuration_or_role_assignment"),
-                            technicalMessage: sLogMessage
-                        },
-                        {
+                    Log.error(`Failed to execute Smart Business navigation for evaluation ID ${sEvaluationId}`, oError, "sap.ushell.renderer.Shell.controller");
+
+                    await this._showErrorMessage({
+                        message: ushellResources.i18n.getText("failed_to_open_app_missing_configuration_or_role_assignment"),
+                        details: {
                             info: ushellResources.i18n.getText("cannot_resolve_navigation_target_details", [sTargetIntent]),
-                            technicalMessage: oError
-                        },
-                        "sap.ushell.renderer.Shell.controller",
-                        bEnableHashChange
+                            technicalMessage: `${oError.message}\n${oError.stack}`
+                        }
+                    });
+
+                    this._doErrorNavigation(
+                        bEnableHashChangeOnBack,
+                        true // bIgnoreUi5Direction
                     );
                 }
             })();
@@ -827,7 +826,7 @@ sap.ui.define([
         },
 
         onExit: function () {
-            closeAllDialogs = true;
+            bCloseAllDialogsOnNextNavigation = true;
 
             this._aDoables.forEach((oDoable) => {
                 oDoable.off();
@@ -846,9 +845,9 @@ sap.ui.define([
             });
             this._aDanglingBindings = [];
 
-            EventBus.getInstance().unsubscribe("externalSearch", this.externalSearchTriggered, this);
+            EventBus.getInstance().unsubscribe("externalSearch", this._externalSearchTriggered, this);
             EventBus.getInstance().unsubscribe("ESHSearchFinished", this._logSearchActivity, this);
-            EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this.onAppOpened, this);
+            EventBus.getInstance().unsubscribe("sap.ushell", "appOpened", this._onAppOpened, this);
 
             // Some qUnits destroy the shell very early, check if oShellNavigationInternal exists
             if (this.oShellNavigationInternal && this.oShellNavigationInternal.hashChanger) {
@@ -925,7 +924,7 @@ sap.ui.define([
          * @returns {string|object} A navigation filter status object or string.
          * @private
          */
-        handleDataLoss: function (targetIntent, currentIntent) {
+        _handleDataLoss: function (targetIntent, currentIntent) {
             /**
              * This should be used if a different navigation filter does a custom navigation after the data loss check,
              * to prevent a second data loss popup.
@@ -1008,7 +1007,7 @@ sap.ui.define([
                     const 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
+                    // 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;
 
@@ -1319,16 +1318,19 @@ sap.ui.define([
 
             // todo [FLPCOREANDUX-10024] where does this oParseError come from?
             if (oParseError) {
-                Log.error(`Error when parsing the hash: '${sFullShellHash}'`, oParseError);
-                this.hashChangeFailure(
-                    this.history.getHistoryLength(),
-                    oParseError.message,
-                    null,
-                    "sap.ushell.renderer.Shell.controller",
+                Log.error(`Error when parsing the hash: '${sFullShellHash}'`, oParseError, "sap.ushell.renderer.Shell.controller");
+
+                this._hashChangeFailure(
+                    {
+                        technicalMessage: oParseError.message
+                    },
                     false
                 )
                     .then(oDeferred.resolve.bind(oDeferred))
-                    .catch(oDeferred.reject.bind(oDeferred));
+                    .catch(oDeferred.reject.bind(oDeferred))
+                    .finally(() => {
+                        this.bErrorOnLastNavigation = true;
+                    });
                 NavigationState.endNavigation();
                 return oDeferred.promise();
             }
@@ -1336,8 +1338,12 @@ sap.ui.define([
             const fnResolveInteraction = this._notifyAsyncStep();
 
             this._doHashChange(oParsedHash, oOldParsedHash)
+                .then(() => {
+                    this.bErrorOnLastNavigation = false;
+                })
                 .catch(() => {
                     EventHub.emit("doHashChangeError", Date.now());
+                    this.bErrorOnLastNavigation = true;
                 })
                 .finally(() => {
                     Log.debug(`${sLogFesrPrefix} Interaction End`, "doHashChange", sModuleName);
@@ -1351,20 +1357,7 @@ sap.ui.define([
         },
 
         _doHashChange: async function (oParsedHash, oOldParsedHash) {
-            // todo: [FLPCOREANDUX-10024] simplify Renderer History
-            // save current history length to handle errors (in case)
-            const iOriginalHistoryLength = this.history.getHistoryLength();
-
-            // track hash change
-            const sShellHashWithoutAppRoute = UrlParsing.constructShellHash({
-                ...oParsedHash,
-                appSpecificRoute: undefined
-            }, true);
-            const sOldShellHashWithoutAppRoute = UrlParsing.constructShellHash({
-                ...oOldParsedHash,
-                appSpecificRoute: undefined
-            }, true);
-            this.history.hashChange(sShellHashWithoutAppRoute, sOldShellHashWithoutAppRoute);
+            ColdStart.trackNavigation();
 
             // 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
@@ -1387,13 +1380,13 @@ sap.ui.define([
                  * If cold start happened (history has only one entry), we go to the shell home.
                  */
                 if (oResolvedHashFragment.navigationMode === null) {
-                    if (ushellUtils.isColdStart()) {
+                    if (ColdStart.isColdStart()) {
                         hasher.setHash("");
                         return;
                     }
 
                     this.bEnableHashChange = false;
-                    this.history.pop();
+                    ColdStart.untrackNavigation();
                     this._windowHistoryBack(1);
                     return;
                 }
@@ -1406,7 +1399,7 @@ sap.ui.define([
 
                 const bOpenedViaNWBC = await this._openAppViaNWBC(oResolvedHashFragment, oOldResolvedHashFragment);
                 if (bOpenedViaNWBC === true) {
-                    this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
+                    this._logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
                         Log.info("NWBC application was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                     });
 
@@ -1416,7 +1409,7 @@ sap.ui.define([
 
                 if (oResolvedHashFragment.navigationMode === NavigationMode.newWindow) {
                     // add the app to application usage log
-                    this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
+                    this._logOpenAppAction(oResolvedHashFragment, oParsedHash).catch(() => {
                         Log.info("Application in new window was not logged.", undefined, "sap.ushell.renderer.Shell.controller");
                     });
                     await this._openAppExplace(oResolvedHashFragment, oOldResolvedHashFragment);
@@ -1439,62 +1432,53 @@ sap.ui.define([
                         await this._openAppInplace(oParsedHash, oResolvedHashFragment, oOldParsedHash, oOldResolvedHashFragment);
                     } catch (oError) {
                         const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
-                        Log.error(`Application initialization for intent "${sShellHash}" failed.`, oError);
+                        Log.error(`Application initialization for intent "${sShellHash}" failed.`, oError, "sap.ushell.renderer.Shell.controller");
 
                         // assumption is that the resolvedHashFragment already contains the componentHandle
                         const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oParsedHash);
                         this.oShellNavigationInternal.setIsInitialNavigation(bPreviousIsInitialNavigation);
-                        await this.hashChangeFailure(
-                            iOriginalHistoryLength,
-                            oError.name,
-                            oError.message,
-                            oMetadata ? oMetadata.title : "",
+
+                        await this._hashChangeFailure(
+                            {
+                                details: {
+                                    appTitle: oMetadata ? oMetadata.title : "",
+                                    technicalMessage: `${oError.message}\n${oError.stack}`
+                                }
+                            },
                             false
                         );
                     }
                 } catch (oError) {
                     const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
-                    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}"`;
+                    Log.error(`Failed to load UI5 component for navigation intent "${sShellHash}"`, oError, "sap.ushell.renderer.Shell.controller");
 
                     AppConfiguration.setCurrentApplication(oOldResolvedHashFragment);
-                    await this.hashChangeFailure(
-                        iOriginalHistoryLength,
+
+                    await this._hashChangeFailure(
                         {
-                            title: ushellResources.i18n.getText("error"),
                             message: ushellResources.i18n.getText("failed_to_open_ui5_component"),
-                            technicalMessage: sErrorReasonEnglish
-                        },
-                        {
-                            info: sErrorReason,
-                            technicalMessage: `${oError.message}\n${oError.stack}`
+                            details: {
+                                info: ushellResources.i18n.getText("cannot_load_ui5_component_details", [sShellHash]),
+                                technicalMessage: `${oError.message}\n${oError.stack}`
+                            }
                         },
-                        "sap.ushell.renderer.Shell.controller",
                         false
                     );
                 }
             } catch (oError) {
                 const sShellHash = UrlParsing.constructShellHash(oParsedHash, true);
-                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 "${sShellHash}". This is most likely caused by an incorrect SAP Fiori launchpad content configuration or by missing role assignment.`;
+                Log.error(`Failed to resolve navigation target "${sShellHash}". This is most likely caused by an incorrect SAP Fiori launchpad content configuration or by missing role assignment.`, oError, "sap.ushell.renderer.Shell.controller");
 
-                await this.hashChangeFailure(
-                    iOriginalHistoryLength,
+                await this._hashChangeFailure(
                     {
-                        title: ushellResources.i18n.getText("error"),
                         message: ushellResources.i18n.getText("failed_to_open_app_missing_configuration_or_role_assignment"),
-                        technicalMessage: sErrorReasonEnglish
-                    },
-                    {
-                        info: sErrorReason,
-                        fixedShellHash: sShellHash,
-                        technicalMessage: oError.message
+                        details: {
+                            info: ushellResources.i18n.getText("cannot_resolve_navigation_target_details", [sShellHash]),
+                            fixedShellHash: sShellHash,
+                            technicalMessage: oError.message
+                        }
                     },
-                    "sap.ushell.renderer.Shell.controller",
                     false
                 );
 
@@ -1541,7 +1525,7 @@ sap.ui.define([
             // 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);
+                this._delayedMessageError(msg);
             }
 
             AppLifeCycleAI.publishAppOpenedEvent(oResolvedHashFragment);
@@ -1549,13 +1533,24 @@ sap.ui.define([
             this._restorePreviousHashAfterOpenNewWindow(oResolvedHashFragment, oOldResolvedHashFragment);
         },
 
+        _delayedMessageError: async function (sMsg) {
+            try {
+                await ushellUtils.awaitTimeout(0);
+
+                const MessageInternal = await Container.getServiceAsync("MessageInternal");
+                MessageInternal.error(sMsg);
+            } catch {
+                // fail silently
+            }
+        },
+
         _closeAllDialogs: function () {
-            if (InstanceManager && closeAllDialogs) {
+            if (InstanceManager && bCloseAllDialogsOnNextNavigation) {
                 InstanceManager.closeAllDialogs();
                 InstanceManager.closeAllPopovers();
             }
 
-            closeAllDialogs = true;
+            bCloseAllDialogsOnNextNavigation = true;
         },
 
         /**
@@ -1649,7 +1644,7 @@ sap.ui.define([
 
             if (sNavigationMode === NavigationMode.newWindowThenEmbedded) {
                 // Implement newWindowThenEmbedded based on current state.
-                if (ushellUtils.isColdStart() || Ui5History.getInstance().getDirection() === Ui5HistoryDirection.Backwards) {
+                if (ColdStart.isColdStart() || Ui5History.getInstance().getDirection() === Ui5HistoryDirection.Backwards) {
                     /*
                      * cold start
                      *   -> always open in place because the new window was opened by the user
@@ -1671,7 +1666,7 @@ sap.ui.define([
                 return;
             }
 
-            if (sNavigationMode === NavigationMode.newWindow && ushellUtils.isColdStart()) {
+            if (sNavigationMode === NavigationMode.newWindow && ColdStart.isColdStart()) {
                 // Workaround for URLs that start an FLP app which needs the shell.
                 if (this._hasAppCapabilitiesNavigationMode(oResolvedHashFragment)
                     && oResolvedHashFragment.appCapabilities.navigationMode === NavigationMode.embedded) {
@@ -1728,11 +1723,10 @@ sap.ui.define([
             if (sEffectiveNavigationMode !== NavigationMode.embedded) {
                 // the navigation mode doesn't match any valid one.
                 // In this case an error message is logged and previous hash is fetched
-                return this.hashChangeFailure(
-                    this.history.getHistoryLength(),
-                    `Navigation mode '${sEffectiveNavigationMode}' was not recognized`,
-                    null,
-                    "sap.ushell.renderer.Shell.controller",
+                return this._hashChangeFailure(
+                    {
+                        details: `Navigation mode '${sEffectiveNavigationMode}' was not recognized`
+                    },
                     false
                 );
             }
@@ -1750,9 +1744,9 @@ sap.ui.define([
              * We need to have this logic, because embedded applications do not
              * check the coldstart condition.
              */
-            oResolvedHashFragment.targetNavigationMode = ushellUtils.isColdStart() ? "explace" : "inplace";
+            oResolvedHashFragment.targetNavigationMode = ColdStart.isColdStart() ? "explace" : "inplace";
 
-            if (!ushellUtils.isColdStart() && !this._bWasHistoryEntryReplaced) {
+            if (!ColdStart.isColdStart() && !this._bWasHistoryEntryReplaced) {
                 this.oShellNavigationInternal.setIsInitialNavigation(false);
             }
 
@@ -1771,10 +1765,16 @@ sap.ui.define([
             if (typeof sNavigationRedirectHash === "string") {
                 Log.warning(`Performing navigation redirect to hash "${sNavigationRedirectHash}"`);
 
-                this.history.pop();
+                ColdStart.untrackNavigation();
 
                 const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
-                return ShellNavigationInternal.toExternal({ target: { shellHash: sNavigationRedirectHash } }, undefined, false);
+                return ShellNavigationInternal.toExternal(
+                    {
+                        target: { shellHash: sNavigationRedirectHash }
+                    },
+                    undefined, // oComponent
+                    false // bWriteHistory
+                );
             }
 
             // this only targets the overwritten rootIntent (e.g. workzone advanced)
@@ -1816,34 +1816,13 @@ sap.ui.define([
                 iMode = iEPCMNavigationMode || oEPCMNavigationMode[NavigationMode.embedded];
             }
 
-            const sUrlWithSapUser = await this._appendUserIdToUrl("sap-user", oResolvedHashFragment.url);
-            const sUrlWithSapUserAndShellParam = await ushellUtils.appendSapShellParam(sUrlWithSapUser);
-
-            const sAppType = oResolvedHashFragment.applicationType;
-            const sFrameworkId = oResolvedHashFragment?.appCapabilities?.appFrameworkId;
-
             let oPostBodyParams;
             try {
-                if (ushellUtils.isSAPLegacyApplicationType(sAppType, sFrameworkId)) {
-                    const oFLPParams = Object.create(null);
-                    const Navigation = await Container.getServiceAsync("Navigation");
-                    const oAppStatesInfo = ushellUtils.getParamKeys(sUrlWithSapUserAndShellParam);
-
-                    if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
-                        const aDataArray = await Navigation.getAppStateData(oAppStatesInfo.aAppStateKeysArray);
-                        oAppStatesInfo.aAppStateNamesArray.forEach((item, index) => {
-                            if (aDataArray[index]) {
-                                oFLPParams[item] = aDataArray[index];
-                            }
-                        });
-                    }
-
-                    oFLPParams["sap-flp-url"] = Container.getFLPUrl(true);
-                    oFLPParams["system-alias"] = oResolvedHashFragment.systemAlias;
-
+                const oFlpParams = await SAPBusinessClient.calculateFlpParams(oResolvedHashFragment);
+                if (oFlpParams) {
                     oPostBodyParams = [{
                         name: "sap-flp-params",
-                        value: JSON.stringify(oFLPParams)
+                        value: JSON.stringify(oFlpParams)
                     }];
                 }
             } catch {
@@ -1851,6 +1830,9 @@ sap.ui.define([
             }
 
             try {
+                const sUrlWithSapUser = await this._appendUserIdToUrl("sap-user", oResolvedHashFragment.url);
+                const sUrlWithSapUserAndShellParam = await ushellUtils.appendSapShellParam(sUrlWithSapUser);
+
                 AppLifeCycleAI.publishAppOpeningEvent(oResolvedHashFragment);
 
                 if (!oEPCM.doNavigate(sUrlWithSapUserAndShellParam, iMode, undefined, undefined, undefined, undefined, undefined, oPostBodyParams)) {
@@ -1875,9 +1857,17 @@ sap.ui.define([
 
                 return true;
             } catch (oError) {
-                Log.error("Application initialization failed due to an Exception:", oError);
+                Log.error("Application initialization failed due to an Exception:", oError, "sap.ushell.renderer.Shell.controller");
 
-                await this.hashChangeFailure(this.history.getHistoryLength(), oError.name, oError.message, oResolvedHashFragment.text, false);
+                await this._hashChangeFailure(
+                    {
+                        details: {
+                            targetMappingTitle: oResolvedHashFragment.text || "",
+                            technicalMessage: `${oError.message}\n${oError.stack}`
+                        }
+                    },
+                    false
+                );
                 return false;
             }
         },
@@ -1896,10 +1886,13 @@ sap.ui.define([
          * @private
          */
         _restoreAfterNwbcNavigation: async function (oResolvedHashFragment, oOldResolvedHashFragment) {
-            if (this.history.getHistoryLength() === 1 && !this._oAppLifeCycleService.getCurrentApplication()) {
-                // Deep link case
+            // Deep link case
+            if (ColdStart.isColdStart() && !this._oAppLifeCycleService.getCurrentApplication()) {
                 const Navigation = await Container.getServiceAsync("Navigation");
-                Navigation.navigate({ target: { shellHash: "#" }, writeHistory: false });
+                Navigation.navigate({
+                    target: { shellHash: "#" },
+                    writeHistory: false
+                });
                 return;
             }
 
@@ -1931,7 +1924,8 @@ sap.ui.define([
          * @param {object} oOldResolvedHashFragment The old resolved hash fragment.
          */
         _restorePreviousHashAfterOpenNewWindow: function (oResolvedHashFragment, oOldResolvedHashFragment) {
-            this.history.pop();
+            ColdStart.untrackNavigation();
+
             const oVarInstance = oResolvedHashFragment.componentHandle && oResolvedHashFragment.componentHandle.getInstance
                 && oResolvedHashFragment.componentHandle.getInstance({});
             if (oVarInstance) {
@@ -1949,61 +1943,92 @@ sap.ui.define([
         /**
          * Shows an error message and navigates to the previous page.
          *
-         * @param {int} iHistoryLength the length of the history <b>before</b> the navigation occurred.
-         * @param {string|object} vMessage the error message
-         * @param {string|object} vDetails the detailed error message
-         * @param {string} sComponent the component that generated the error message
-         * @param {boolean} bEnableHashChange enable hash change
+         * @param {object} oMessage the error message
+         * @param {boolean} bEnableHashChangeOnBack enable hash change
          * @returns {Promise} A promise resolving when the error message is shown.
+         *
+         * @private
          */
-        hashChangeFailure: async function (iHistoryLength, vMessage, vDetails, sComponent, bEnableHashChange) {
+        _hashChangeFailure: async function (oMessage, bEnableHashChangeOnBack) {
             StateManager.discardStalledChanges();
 
-            if (ushellUtils.isPlainObject(vMessage)) {
-                this.reportError(vMessage.technicalMessage, vDetails.technicalMessage, sComponent);
+            await this._showErrorMessage(oMessage);
+            this._doErrorNavigation(bEnableHashChangeOnBack);
+
+            // TODO: [FLPCOREANDUX-10024] fallback, ideally this should be in the error handler
+            this.bErrorOnLastNavigation = true;
+        },
+
+        /**
+         * Displays an error message using the MessageInternal service.
+         * @param {object} oMessage the error message
+         *
+         * @since 1.144.0
+         * @private
+         */
+        _showErrorMessage: async function (oMessage) {
+            const sMessage = oMessage.message ?? ushellResources.i18n.getText("fail_to_start_app_try_later");
+            const sMessageTitle = oMessage.title ?? ushellResources.i18n.getText("error");
+            const sMessageDetails = oMessage.details ?? "";
+
+            try {
                 const MessageInternal = await Container.getServiceAsync("MessageInternal");
                 MessageInternal.show(
                     MessageInternal.Type.ERROR,
-                    vMessage.message,
+                    sMessage,
                     {
-                        title: vMessage.title,
-                        details: vDetails
+                        title: sMessageTitle,
+                        details: sMessageDetails,
+                        callback () {
+                            bCloseAllDialogsOnNextNavigation = true;
+                        }
                     }
                 );
-            } else {
-                this.reportError(vMessage, vDetails, sComponent);
-                // use timeout to avoid "MessageService not initialized.: error
-                this.delayedMessageError(ushellResources.i18n.getText("fail_to_start_app_try_later"));
+                bCloseAllDialogsOnNextNavigation = false;
+            } catch (oError) {
+                Log.error("Failed to show error message via Message service.", oError, "sap.ushell.renderer.Shell.controller");
             }
-            closeAllDialogs = false;
+        },
 
-            this._resumeAppRouterIgnoringCurrentHash();
-            if (iHistoryLength === 0) {
-                // if started with an illegal shell hash (deep link), we just remove the hash
-                hasher.setHash("");
-            } else if (new URLSearchParams(window.location.search).get("bFallbackToShellHome")) {
-                // The previous url is not valid navigation
+        /**
+         * Does the error navigation logic.
+         * - For failures during forward navigation, it goes back to the previous app if there is any.
+         * - Otherwise, it navigates to home.
+         * - For failures during backward navigation, it navigates to home instead of going back.
+         * @param {boolean} bEnableHashChangeOnBack Whether to enable hash change on back navigation
+         * In case the app was already destroyed we need to enable hash change to allow proper navigation.
+         * @param {boolean} [bIgnoreUi5Direction=false] Whether to ignore the UI5 navigation direction and assume always forward navigation
+         * For some scenarios like the navigation filters the directions might be already clear during the filter handling.
+         * However, since the navigation is not settled the UI5 history direction might not be correct at this point.
+         *
+         * @since 1.144.0
+         * @private
+         */
+        _doErrorNavigation: function (bEnableHashChangeOnBack, bIgnoreUi5Direction) {
+            let bIsForwardNavigation = true;
+            if (!bIgnoreUi5Direction) {
+                // Unknown direction is NOT treated as forward navigation
+                bIsForwardNavigation = [Ui5HistoryDirection.Forwards, Ui5HistoryDirection.NewEntry].includes(Ui5History.getInstance().getDirection());
+            }
+            const bHasPreviousHash = typeof Ui5History.getInstance().getPreviousHash() === "string";
+            // for any failing backward navigation we navigate to home instead of trying to go back
+            const bHasHistoryBackTarget = bHasPreviousHash && bIsForwardNavigation;
+            // In some cases of navigation error in WebIDE, navigation done by window.back (called by changeHashFailure) function entered the application to loop.
+            const bWorkaroundForWebIDE = new URLSearchParams(window.location.search).get("bFallbackToShellHome");
+
+            if (
+                this.bErrorOnLastNavigation
+                || !bHasHistoryBackTarget
+                || bWorkaroundForWebIDE
+            ) {
+                this.bEnableHashChange = true;
                 hasher.setHash("");
             } else {
-                // navigate to the previous URL since in this state the hash that has failed to load is in the URL.
-                this.bEnableHashChange = bEnableHashChange;
+                this.bEnableHashChange = bEnableHashChangeOnBack;
+                // navigate to previous app and restore state of app
                 Container.setDirtyFlag(bPreviousPageDirty);
                 this._windowHistoryBack(1);
-            }
-        },
-
-        reportError: function (sMessage, sDetails, sComponent) {
-            Log.error(sMessage, sDetails, sComponent);
-        },
-
-        delayedMessageError: async function (sMsg) {
-            try {
-                await ushellUtils.awaitTimeout(0);
-
-                const MessageInternal = await Container.getServiceAsync("MessageInternal");
-                MessageInternal.error(sMsg);
-            } catch {
-                // fail silently
+                this._resumeAppRouterIgnoringCurrentHash();
             }
         },
 
@@ -2053,7 +2078,7 @@ sap.ui.define([
          * @param {string} sEventId The event id
          * @param {object} oResolvedHashFragment The resolved hash fragment object belonging to the event
          */
-        onAppOpened: function (sChannelId, sEventId, oResolvedHashFragment) {
+        _onAppOpened: function (sChannelId, sEventId, oResolvedHashFragment) {
             if (oResolvedHashFragment.targetNavigationMode !== "explace" && oResolvedHashFragment.targetNavigationMode !== "frameless") {
                 this._setMenuVisible(false);
             }
@@ -2062,14 +2087,14 @@ sap.ui.define([
             const sShellHash = oResolvedHashFragment.sFixedShellHash;
             const oParsedHash = UrlParsing.parseShellHash(sShellHash);
 
-            this.logOpenAppAction(oResolvedHashFragment, oParsedHash).catch((oError) => {
+            this._logOpenAppAction(oResolvedHashFragment, oParsedHash).catch((oError) => {
                 Log.info("Opened application was not logged.", oError, "sap.ushell.renderer.Shell.controller");
             });
 
             this._notifyUITracer(oResolvedHashFragment, oParsedHash);
         },
 
-        externalSearchTriggered: function (sChannelId, sEventId, oData) {
+        _externalSearchTriggered: function (sChannelId, sEventId, oData) {
             Config.emit("/core/shell/model/searchTerm", oData.searchTerm);
             oData.query = oData.searchTerm;
         },
@@ -2095,7 +2120,7 @@ sap.ui.define([
          * @returns {Promise} A promise that is resolved once the action is logged
          * @throws {Error} If the application was not logged.
          */
-        logOpenAppAction: async function (oResolvedHashFragment, oParsedHash) {
+        _logOpenAppAction: async function (oResolvedHashFragment, oParsedHash) {
             const bEnableRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
             if (!bEnableRecentActivity) {
                 throw new Error("Tracking of RecentActivity is disabled.");
@@ -2285,6 +2310,11 @@ sap.ui.define([
             this.addDanglingControl(oSideNavigation);
         },
 
+        setSideNavigationFullWidth: function (bFullWidth) {
+            const oSideNavigation = document.getElementById(ShellArea.SideNavigation);
+            oSideNavigation.classList.toggle("sapUshellShellSideNavigationFullWidth", bFullWidth);
+        },
+
         setShellShapes: function (oShellShapes) {
             if (oShellShapes.placeAt) {
                 oShellShapes.placeAt(ShellArea.ShellShapes, "only");
@@ -2425,17 +2455,10 @@ sap.ui.define([
             });
         },
 
-        _getSessionHandler: function () {
+        getSessionHandler: function () {
             return this.oSessionHandler;
         },
 
-        _navBack: async function () {
-            // set meAria as closed when navigating back
-            this.setUserActionsMenuSelected(false);
-
-            BackNavigation.navigateBack();
-        },
-
         /**
          * Updates the user preferences model with the new entry.
          *
@@ -2550,46 +2573,6 @@ sap.ui.define([
             return aFLPIntents.some((sIntent) => sBasicHash === sIntent);
         },
 
-        // ===================================================================
-        // ================== AppLifeCycleFallback logic =====================
-        // ===================================================================
-
-        _usesNavigationRedirect: async function (oComponentHandle) {
-            if (!oComponentHandle) {
-                return false;
-            }
-
-            const oComponent = oComponentHandle.getInstance({});
-            if (!oComponent) {
-                return false;
-            }
-
-            if (typeof oComponent.navigationRedirect !== "function") {
-                return false;
-            }
-
-            // oComponent refers to a trampoline application
-            const oNavRedirectThenable = oComponent.navigationRedirect();
-            if (!oNavRedirectThenable || typeof oNavRedirectThenable.then !== "function") {
-                return false;
-            }
-
-            try {
-                const sNextHash = await ushellUtils.promisify(oNavRedirectThenable);
-                Log.warning(`Performing navigation redirect to hash "${sNextHash}"`);
-
-                oComponent.destroy();
-                this.history.pop();
-
-                const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
-                ShellNavigationInternal.toExternal({ target: { shellHash: sNextHash } }, undefined, false);
-
-                return true;
-            } catch {
-                return false;
-            }
-        },
-
         /**
          * Method to adapt the CrossApplicationNavigation service method
          * isUrlSupported to the request as issued by the SAP UI5 MessagePopover control