@sapui5/sap.ushell 1.139.0 → 1.141.0

package/src/main/js/sap/ushell/plugins/BaseRTAPlugin.js

@@ -1,13 +1,17 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
     "sap/ui/core/Component",
-    "sap/ui/core/Element",
     "sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
     "sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
     "sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger"
+    /*
+     * Be careful with new dependencies.
+     * Only include dependencies that are already bundled in
+     * core-min/core-ext, appruntime or the flex-plugins bundle
+     * otherwise load the library lazily before use.
+     */
 ], (
     Component,
-    Element,
     AppLifeCycleUtils,
     CheckConditions,
     Trigger
@@ -83,8 +87,10 @@ sap.ui.define([
             }
             if (bVisible) {
                 this.oActionButton.showForAllApps();
+                this.oActionButton.showOnHome();
             } else {
                 this.oActionButton.hideForAllApps();
+                this.oActionButton.hideOnHome();
             }
         },
 

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         const sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.139.0",
+                version: "1.141.0",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/plugins/rta/i18n/i18n_de.properties

@@ -10,4 +10,4 @@ TIT_UNSUPPORTED_BROWSER=Ihr Browser wird nicht unterst\u00FCtzt.
 
 HEADER_FLEX_DISABLED=Informationen
 
-MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie unter (https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).
+MSG_FLEX_DISABLED=Diese Anwendung ist nicht f\u00FCr die Anpassung aktiviert. Weitere Informationen finden Sie [hier](https\://help.sap.com/viewer/4fc8d03390c342da8a60f8ee387bca1a/latest/de-DE/ef97b2485aa34a8890f4d51e5c2b15a8.html).

package/src/main/js/sap/ushell/plugins/rta/i18n/i18n_vi.properties

@@ -1,6 +1,6 @@
 
 RTA_BUTTON_TEXT=Thi\u0301ch \u01B0\u0301ng UI
-ERROR_TITLE=Kh\u00F4ng th\u00EA\u0309 b\u0103\u0301t \u0111\u00E2\u0300u thi\u0301ch \u01B0\u0301ng UI
+ERROR_TITLE=Kh\u00F4ng th\u00EA\u0309 b\u0103\u0301t \u0111\u00E2\u0300u \u0111i\u1EC1u ch\u1EC9nh UI
 
 APP_TITLE=RTA FLP Plugin
 

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

@@ -57,7 +57,7 @@ sap.ui.define([
         this.oConfigModel = ShellModel.getConfigModel();
         // prevent browser event ctrl+up/down from scrolling page
         // created by user `keydown` native event needs to be cancelled so browser will not make default action, which is scroll.
-        // Instead we clone same event and dispatch it programmatic, so all handlers expecting to this event will still work
+        // Instead, we clone same event and dispatch it programmatic, so all handlers expecting to this event will still work
 
         document.addEventListener("keydown", (oEvent) => {
             // if Shift key was pressed alone, don't perform any action
@@ -95,9 +95,9 @@ sap.ui.define([
             if (this.fnExternalShortcuts) {
                 this.fnExternalShortcuts(oEvent);
             }
-        }, true); // End of event handler
+        }, true);
 
-        // save the bound function so that it can be deregistered later
+        // Save the bound function so that it can be deregistered later
         this._cancelHelpEvent = this._cancelHelpEvent.bind(this);
     };
 
@@ -162,11 +162,6 @@ sap.ui.define([
         const bEnableAppFinder = Config.last("/core/catalog/enabled");
         const bEnableNotifications = Config.last("/core/shell/model/enableNotifications");
 
-        if (Device.browser.msie) {
-            // the Internet Explorer would display its F1 help also on CTRL + F1 if the help event wasn't cancelled
-            document.addEventListener("help", this._cancelHelpEvent);
-        }
-
         let aShortCuts = [];
         aShortCuts = aShortCuts.concat(this.aShortcutsDescriptions);
 
@@ -270,6 +265,11 @@ sap.ui.define([
             return;
         }
 
+        if (Config.last("/core/shellBar/enabled")) {
+            Element.getElementById("shell-header").setFocusToAppFinderButton();
+            return;
+        }
+
         const oAppFinderBtn = window.document.getElementById("openCatalogBtn");
 
         if (oAppFinderBtn) {
@@ -346,7 +346,7 @@ sap.ui.define([
             if (bAdvancedShellActions) {
                 if (oEvent.keyCode === 65) { // ALT + A
                     this._blockBrowserDefault(oEvent).then(this._focusAppFinderButton.bind(this));
-                } else if (oEvent.keyCode === 83) {
+                } else if (oEvent.keyCode === 83) { // ALT + S
                     this._blockBrowserDefault(oEvent).then(this._focusSettingsButton.bind(this));
                 }
             }
@@ -372,10 +372,13 @@ sap.ui.define([
                         return;
                     }
 
-                    const oLogo = document.getElementById("shell-header-logo");
-                    if (oLogo) {
-                        oLogo.focus();
-                        return;
+                    if (Config.last("/core/shellBar/enabled")) {
+                        oShellHeader.setFocusToLogo();
+                    } else {
+                        const oLogo = document.getElementById("shell-header-logo");
+                        if (oLogo) {
+                            oLogo.focus();
+                        }
                     }
                 });
             } else if (oEvent.keyCode === 77) { // ALT + M
@@ -402,6 +405,7 @@ sap.ui.define([
         }
     };
 
+    // eslint-disable-next-line complexity
     AccessKeysHandler.prototype._handleCtrlShortcutKeys = function (oEvent, bAdvancedShellActions) {
         if (oEvent.shiftKey) {
             if (oEvent.keyCode === 70) { // CTRL + SHIFT + F

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

@@ -67,6 +67,11 @@ sap.ui.define([
         renderer: NavContainerRenderer
     });
 
+    NavContainer.prototype.init = function () {
+        Control.prototype.init.apply(this, arguments);
+        this.setBusyIndicatorDelay(4000);
+    };
+
     /**
      * Overrides the default implementation of the addAggregation method.
      * Adds a page to the NavContainer. The page is initially hidden.
@@ -184,6 +189,7 @@ sap.ui.define([
             from: oCurrentPage
         });
 
+        this.setBusy(false);
         this.getPages().forEach((oPage) => {
             this._setPageVisibility(oPage, oPage.getId() === sPageId);
         });
@@ -232,6 +238,7 @@ sap.ui.define([
      * Restores the last focused element.
      *
      * @private
+     * @param {string} sPageId The ID of the page to restore focus for.
      * @deprecated since 1.120. Only relevant for classic homepage.
      */
     NavContainer.prototype._restoreFocus = async function (sPageId) {

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

@@ -106,9 +106,9 @@ sap.ui.define([
      */
     const Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.139.0",
+            version: "1.141.0",
             dependencies: {
-                version: "1.139.0",
+                version: "1.141.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -1126,13 +1126,13 @@ sap.ui.define([
 
         if (!controlType) {
             Log.warning("You must specify control type in order to create it");
-            oDeferred.reject("You must specify control type in order to create it");
+            oDeferred.reject(new Error("You must specify control type in order to create it"));
             return oDeferred.promise();
         }
 
         if (!oControlProperties) {
             Log.warning("You must specify control properties in order to create it");
-            oDeferred.reject("You must specify control properties in order to create it");
+            oDeferred.reject(new Error("You must specify control properties in order to create it"));
             return oDeferred.promise();
         }
 
@@ -1477,13 +1477,13 @@ sap.ui.define([
 
         if (!controlType) {
             Log.warning("You must specify control type in order to create it");
-            oDeferred.reject("You must specify control type in order to create it");
+            oDeferred.reject(new Error("You must specify control type in order to create it"));
             return oDeferred.promise();
         }
 
         if (!oControlProperties) {
             Log.warning("You must specify control properties in order to create it");
-            oDeferred.reject("You must specify control properties in order to create it");
+            oDeferred.reject(new Error("You must specify control properties in order to create it"));
             return oDeferred.promise();
         }
 
@@ -1635,7 +1635,7 @@ sap.ui.define([
             } else {
                 const sNoControlTypeErrorMessage = "You must specify control type in order to create it";
                 Log.warning(sNoControlTypeErrorMessage);
-                oDeferred.reject(sNoControlTypeErrorMessage);
+                oDeferred.reject(new Error(sNoControlTypeErrorMessage));
                 return oDeferred.promise();
             }
         }
@@ -1643,7 +1643,7 @@ sap.ui.define([
         if (!oControlProperties) {
             const sNoControlPropertiesErrorMessage = "You must specify control properties in order to create it";
             Log.warning(sNoControlPropertiesErrorMessage);
-            oDeferred.reject(sNoControlPropertiesErrorMessage);
+            oDeferred.reject(new Error(sNoControlPropertiesErrorMessage));
             return oDeferred.promise();
         }
 
@@ -1667,7 +1667,7 @@ sap.ui.define([
         }, () => {
             const sControlTypeErrorMessage = `The control type ${sControlType} is not available.`;
             Log.error(sControlTypeErrorMessage);
-            oDeferred.reject(sControlTypeErrorMessage);
+            oDeferred.reject(new Error(sControlTypeErrorMessage));
         });
 
         return oDeferred.promise();
@@ -1787,7 +1787,7 @@ sap.ui.define([
 
         if (!oControlProperties) {
             Log.warning("You must specify control properties in order to create it");
-            oDeferred.reject("You must specify control properties in order to create it");
+            oDeferred.reject(new Error("You must specify control properties in order to create it"));
             return oDeferred.promise();
         }
 
@@ -1933,13 +1933,13 @@ sap.ui.define([
 
         if (!controlType) {
             Log.warning("You must specify control type in order to create it");
-            oDeferred.reject("You must specify control type in order to create it");
+            oDeferred.reject(new Error("You must specify control type in order to create it"));
             return oDeferred.promise();
         }
 
         if (!oControlProperties) {
             Log.warning("You must specify control properties in order to create it");
-            oDeferred.reject("You must specify control properties in order to create it");
+            oDeferred.reject(new Error("You must specify control properties in order to create it"));
             return oDeferred.promise();
         }
 
@@ -2302,7 +2302,7 @@ sap.ui.define([
 
                 delete oProperties.press;
                 delete oProperties.ariaLabel;
-                //TODO Move to async import once the infrastructure gets updated with the latest browser version
+                // TODO Move to async import once the infrastructure gets updated with the latest browser version
                 const ShellBarItem = sap.ui.require("sap/ushell/gen/ui5/webcomponents-fiori/dist/ShellBarItem");
                 return new ShellBarItem(oProperties);
             }

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

@@ -140,13 +140,13 @@ sap.ui.define([
      * @since 1.136.0
      * @private
      */
-    RendererAppContainer.prototype.loadChild = function () {
+    RendererAppContainer.prototype.loadChild = async function () {
         if (!this._hasValidConfig()) {
-            return Promise.reject("The RenderAppContainer does not yet have all of the required properties set, and thus can not be loaded.");
+            throw new Error("The RenderAppContainer does not yet have all of the required properties set, and thus can not be loaded.");
         }
 
         if (this._getChild()) {
-            return Promise.reject("The RenderAppContainer already has a Component loaded. A Component is not allowed to be loaded twice!");
+            throw new Error("The RenderAppContainer already has a Component loaded. A Component is not allowed to be loaded twice!");
         }
 
         if (!this._oComponentPromise) {

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

@@ -0,0 +1,194 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+/**
+ * @fileOverview
+ * This module contains the list of renderer managed components for the SAP Fiori renderer.
+ */
+
+sap.ui.define([
+    "sap/ushell/Config"
+], (
+    Config
+) => {
+    "use strict";
+
+    /**
+     * A type definition for the renderer managed components.
+     * @typedef {object} sap.ushell.renderer.RendererManagedComponents
+     * @property {string} id The unique identifier of the renderer managed component.
+     * @property {string} [componentName] The name of the component managed by the renderer.
+     * @property {string} [componentInstanceId] The instance id of the component managed by the renderer.
+     * @property {sap.ushell.renderer.RendererManagedComponents.ComponentCategory} [category] The category of the component managed by the renderer.
+     * @since 1.139.0
+     *
+     */
+
+    /**
+     * @alias sap.ushell.renderer.RendererManagedComponents.ComponentCategory
+     * @enum {string}
+     *
+     * @since 1.141.0
+     * @private
+     */
+    const ComponentCategory = {
+        /**
+         * Category for components that are part of the home page.
+         */
+        Home: "Home",
+
+        /**
+         * Category for components that are part of the app discovery (app finder or content finder).
+         */
+        AppDiscovery: "AppDiscovery"
+    };
+
+    /**
+     * @class
+     * @classdesc Class for renderer managed components.
+     * This class provides methods to manage the array of renderer managed components
+     * It will provide the default values for the component names, instance ids, and ids.
+     *
+     * @since 1.139.0
+     * @private
+     */
+    class RendererManagedComponents {
+        /**
+         * The list of renderer managed components
+         * It will be completed with default values.
+         * @type {sap.ushell.renderer.RendererManagedComponents[]}
+         * @private
+         * @since 1.139.0
+         */
+        #aRendererManagedComponents;
+
+        constructor () {
+            this.#init();
+        }
+
+        #init () {
+            this.#aRendererManagedComponents = [
+                {
+                    id: "home",
+                    componentName: "sap.ushell.components.homepage",
+                    componentInstanceId: "Shell-home-component",
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "pages",
+                    componentName: "sap.ushell.components.pages",
+                    componentInstanceId: "pages-component",
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "workPageRuntime",
+                    componentName: "sap.ushell.components.workPageRuntime",
+                    componentInstanceId: "workPageRuntime-component",
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "appFinder",
+                    componentName: "sap.ushell.components.appfinder",
+                    componentInstanceId: "Shell-appfinder-component",
+                    category: ComponentCategory.AppDiscovery
+                },
+                {
+                    id: "contentFinder",
+                    componentName: "sap.ushell.components.contentFinderStandalone",
+                    componentInstanceId: "Shell-appfinder-component",
+                    category: ComponentCategory.AppDiscovery
+                },
+                {
+                    // e.g. the error view, "regular" home apps are always wrapped,
+                    // but still should evaluate to true
+                    id: "homeApp",
+                    componentName: Config.last("/core/homeApp/component")?.name,
+                    componentInstanceId: "homeApp-component", // error is prefixed with renderer id but home apps are not
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "runtimeSwitcher",
+                    componentName: "sap.ushell.components.runtimeSwitcher",
+                    componentInstanceId: "runtimeSwitcher-component",
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "homeAppComponentWrapper",
+                    componentName: "sap.ushell.renderer.rendererTargetWrapper",
+                    componentInstanceId: "homeApp-component-wrapper",
+                    category: ComponentCategory.Home
+                },
+                {
+                    id: "ShellBar",
+                    componentName: "sap.ushell.components.shell.ShellBar",
+                    componentInstanceId: null, // id is unstable, as it is not created by the renderer
+                    category: null // ShellBar is not managed by the Renderer explicitly it is only created as a side effect
+                }
+            ];
+        }
+
+        // Expose enum
+        ComponentCategory = ComponentCategory;
+
+        /**
+         * Returns true if the component name is managed by the renderer.
+         * @param {string|null} [sComponentName] The component name to check.
+         *
+         * @returns {boolean} True if the FLP name is managed by the renderer, false otherwise.
+         *
+         * @private
+         * @since 1.139.0
+         */
+        isManagedComponentName (sComponentName) {
+            if (!sComponentName) {
+                return false;
+            }
+
+            return this.#aRendererManagedComponents.some((oComponent) => oComponent.componentName === sComponentName);
+        }
+
+        /**
+         * Returns true is component instance id is managed by the renderer.
+         * @param {sap.ui.core.Component|sap.ui.core.ComponentContainer} vComponentOrContainer The component or component container to check.
+         * @param {string[]} [aCategory] Optional array of category to filter the managed components. By default no filtering is applied.
+         *
+         * @returns {boolean} True if the component instance id is managed by the renderer, false otherwise.
+         *
+         * @private
+         * @since 1.139.0
+         */
+        isManagedComponentInstance (vComponentOrContainer, aCategory = []) {
+            let oComponentInstance;
+            if (vComponentOrContainer.isA("sap.ui.core.ComponentContainer")) {
+                oComponentInstance = vComponentOrContainer.getComponentInstance();
+            } else if (vComponentOrContainer.isA("sap.ui.core.Component")) {
+                oComponentInstance = vComponentOrContainer;
+            }
+
+            if (!oComponentInstance) {
+                return false;
+            }
+
+            return this.#aRendererManagedComponents
+                .filter((oComponentData) => {
+                    if (!aCategory.length) {
+                        return true; // no category filtering
+                    }
+                    return aCategory.includes(oComponentData.category);
+                })
+                .some((oComponentData) => {
+                    return oComponentInstance.getId().endsWith(oComponentData.componentInstanceId);
+                });
+        }
+
+        /**
+         * Only for testing.
+         *
+         * @since 1.141.0
+         * @private
+         */
+        reset () {
+            this.#init();
+        }
+    }
+
+    return new RendererManagedComponents();
+});

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

@@ -23,6 +23,7 @@ sap.ui.define([
     "sap/ushell/appIntegration/PostMessageManager",
     "sap/ushell/ApplicationType/UrlPostProcessing",
     "sap/ushell/bootstrap/SchedulingAgent",
+    "sap/ushell/components/SharedComponentUtils",
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/library",
@@ -40,6 +41,7 @@ sap.ui.define([
     "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/NavigationState"
 ], (
@@ -62,6 +64,7 @@ sap.ui.define([
     PostMessageManager,
     UrlPostProcessing,
     SchedulingAgent,
+    SharedComponentUtils,
     Config,
     EventHub,
     ushellLibrary,
@@ -79,11 +82,15 @@ sap.ui.define([
     StateManager,
     DeprecatedLogonFrameProvider, // restore deprecated globals
     DeprecatedHistory, // restore deprecated globals
+    RendererManagedComponents,
     ShellUIServiceFactory,
     NavigationState
 ) => {
     "use strict";
 
+    // shortcut for sap.ushell.renderer.RendererManagedComponents.ComponentCategory
+    const ComponentCategory = RendererManagedComponents.ComponentCategory;
+
     // shortcut for sap.ushell.renderer.ShellLayout.ShellArea
     const ShellArea = ShellLayout.ShellArea;
 
@@ -684,9 +691,9 @@ sap.ui.define([
                 }
                 this._getConfigModel().setProperty("/enableTrackingActivity", bEnableTrackingActivity);
                 EventHub.emit("StepDone", eventData.stepName);
-            } catch (error) {
+            } catch (oError) {
                 Log.error(
-                    "Failed to load tracking activities state from the personalization, tracking activities is disabled", error,
+                    "Failed to load tracking activities state from the personalization, tracking activities is disabled", oError,
                     "sap.ushell.components.flp.settings.FlpSettings");
                 // if the personalization cannot be read disable the functionality
                 // but don't prevent the FLP scheduler from triggering further steps
@@ -1174,6 +1181,7 @@ sap.ui.define([
         doHashChange: function (sShellHash, sInnerAppRoute, sOldShellHash, sOldInnerAppRoute, oParseError) {
             Log.debug(`${sLogFesrPrefix} Interaction Start`, "doHashChange", sModuleName);
             ushellUtils.setPerformanceMark("FLP-ShellController-doHashChange-begin");
+            SharedComponentUtils.toggleUserActivityLog();
             EventHub.emit("trackHashChange", sShellHash);
 
             const oDeferred = new jQuery.Deferred();
@@ -1218,12 +1226,6 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(true);
-                oDashboard.setBusy(true);
-            }
-
             const fnResolveInteraction = this._notifyAsyncStep();
 
             this._doHashChange(sFixedShellHash, sInnerAppRoute, sFixedOldShellHash)
@@ -1234,11 +1236,6 @@ sap.ui.define([
                     Log.debug(`${sLogFesrPrefix} Interaction End`, "doHashChange", sModuleName);
                     fnResolveInteraction();
 
-                    if (oDashboard) {
-                        oDashboard.setBlocked(false);
-                        oDashboard.setBusy(false);
-                    }
-
                     NavigationState.endNavigation();
 
                     oDeferred.resolve();
@@ -1259,7 +1256,7 @@ sap.ui.define([
 
             try {
                 // NOTE: AppConfiguration.setCurrentApplication was called with the currently resolved target.
-                const oResult = await this._resolveHashFragment(sShellHash);
+                const oResult = await this._resolveHashFragment(sShellHash, sInnerAppRoute);
 
                 // Only for testing
                 if (!oResult && window.QUnit !== undefined) {
@@ -1447,12 +1444,13 @@ sap.ui.define([
          * Callback registered with NavService. Triggered on navigation requests
          *
          * @param {string} sShellHash the hash fragment to parse (must start with "#")
+         * @param {string|null} sInnerAppRoute the inner app route starting with '&/'
          * @returns {Promise<{ resolvedHashFragment: object , parsedShellHash: object }>} Resolves with an object containing the resolved hash fragment (i.e., the result of
          *   {@link sap.ushell.services.NavTargetResolutionInternal#resolveHashFragment}), the parsed shell hash obtained via
          *   {@link sap.ushell.services.URLParsing#parseShellHash}, and a boolean value indicating whether application dependencies
          *   <b>and</b> core-ext-light were loaded earlier. The promise is rejected with an error message in case errors occur.
          */
-        _resolveHashFragment: async function (sShellHash) {
+        _resolveHashFragment: async function (sShellHash, sInnerAppRoute) {
             const oParsedShellHash = UrlParsing.parseShellHash(sShellHash) || {}; // might be empty in tests
             const oConfig = this._getConfig(); // for testing
             let oResolvedHashFragment;
@@ -1471,7 +1469,7 @@ sap.ui.define([
             } else {
                 // Perform target resolution as normal...
                 const NavTargetResolutionInternal = await Container.getServiceAsync("NavTargetResolutionInternal");
-                oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash));
+                oResolvedHashFragment = await ushellUtils.promisify(NavTargetResolutionInternal.resolveHashFragment(sShellHash + (sInnerAppRoute ?? "")));
             }
 
             // Only for testing: return without result if the NavTargetResolutionInternal resolved nothing
@@ -1597,6 +1595,12 @@ sap.ui.define([
          * @returns {Promise} Navigation Promise
          */
         _openAppInplace: async function (oParsedShellHash, sShellHash, oResolvedHashFragment, sOldShellHash, sInnerAppRoute) {
+            // The url template resolution allows to set the appSpecificRoute to be set via parameter.
+            // Therefore we need to update the innerAppRoute before actually opening the app.
+            if (oResolvedHashFragment.replaceHashBeforeOpenAppInplace) {
+                hasher.replaceHash(oResolvedHashFragment.replaceHashBeforeOpenAppInplace);
+            }
+
             // Close dialogs only for inplace navigation
             this._closeAllDialogs();
 
@@ -1763,11 +1767,10 @@ sap.ui.define([
                 }
 
                 return true;
-            } catch (e) {
-                if (e.stack) {
-                    Log.error(`Application initialization failed due to an Exception:\n${e.stack}`);
-                }
-                await this.hashChangeFailure(this.history.getHistoryLength(), e.name, e.message, oResolvedHashFragment.text, false);
+            } catch (oError) {
+                Log.error("Application initialization failed due to an Exception:", oError);
+
+                await this.hashChangeFailure(this.history.getHistoryLength(), oError.name, oError.message, oResolvedHashFragment.text, false);
                 return false;
             }
         },
@@ -1970,27 +1973,14 @@ sap.ui.define([
 
         onBeforeNavigate: function (oEvent) {
             const oToView = oEvent.getParameter("to");
-            const oOwnerComponent = this.getOwnerComponent();
 
-            const bToDashboardView = oToView === oOwnerComponent.byId("Shell-home-component-container");
-            const bToPagesView = oToView === oOwnerComponent.byId("pages-component-container");
-            const bToHomeAppWrapperView = oToView === oOwnerComponent.byId("homeApp-component-wrapper-container");
-            const bToHomeAppView = oToView === oOwnerComponent.byId("homeApp-component-container");
-            const bToWorkpagesView = oToView === oOwnerComponent.byId("workPageRuntime-component-container");
-            const bToSwitcherView = oToView === oOwnerComponent.byId("runtimeSwitcher-component-container");
-            const bMenuVisible = bToDashboardView || bToPagesView || bToHomeAppWrapperView || bToHomeAppView || bToWorkpagesView || bToSwitcherView;
+            const bMenuVisible = RendererManagedComponents.isManagedComponentInstance(oToView, [ComponentCategory.Home]);
 
             this._setMenuVisible(bMenuVisible);
             this._setSideNavigationVisible(bMenuVisible);
         },
 
         onAfterNavigate: function (oEvent) {
-            const oDashboard = Element.getElementById("sapUshellDashboardPage");
-            if (oDashboard) {
-                oDashboard.setBlocked(false);
-                oDashboard.setBusy(false);
-            }
-
             EventBus.getInstance().publish("sap.ushell", "navigated", {});
         },
 
@@ -2074,8 +2064,8 @@ sap.ui.define([
                         targetUrl: oResolvedHashFragment.url || ""
                     }
                 });
-            } catch (ex) {
-                Log.warning("Could not emit UITracer.trace event", ex, "sap.ushell.renderer.Shell.controller");
+            } catch (oError) {
+                Log.warning("Could not emit UITracer.trace event", oError, "sap.ushell.renderer.Shell.controller");
             }
         },
 
@@ -2087,8 +2077,8 @@ sap.ui.define([
                 let sTitle = "";
                 try {
                     sTitle = Element.getElementById("searchFieldInShell-input").getModel().getLastSearchTerm();
-                } catch (ex) {
-                    Log.error("Shell: last search term is not available to log a recent activity");
+                } catch (oError) {
+                    Log.error("Shell: last search term is not available to log a recent activity", oError);
                 }
                 this._logRecentActivity({
                     appId: "#Action-search",