@sapui5/sap.ushell 1.128.1 → 1.129.1

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,14 +1,14 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.128.1
+ * @version 1.129.1
  */
 sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
     "sap/ushell/components/applicationIntegration/Storage",
     "sap/ushell/components/applicationIntegration/application/BlueBoxHandler",
-    "sap/ushell/ui5service/ShellUIService",
     "sap/ushell/components/applicationIntegration/application/Application",
     "sap/ushell/components/applicationIntegration/application/PostMessageUtils",
     "sap/ushell/components/applicationIntegration/application/WebGUIStatefulHandler",
@@ -20,24 +20,23 @@ sap.ui.define([
     "sap/ushell/ApplicationType",
     "sap/base/util/deepExtend",
     "sap/ushell/utils/UriParameters",
-    "sap/ui/thirdparty/jquery",
     "sap/base/Log",
     "sap/ushell/EventHub",
     "sap/ushell/utils/UrlParsing",
-    "sap/ui/core/Core",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/services/MessageBroker/MessageBrokerEngine",
     "sap/ushell/renderer/utils",
     "sap/m/library",
     "sap/ushell/Container",
     "sap/ushell/state/StateManager",
-    "sap/ushell/state/KeepAlive"
-], function (
+    "sap/ushell/state/KeepAlive",
+    "sap/ushell/ui5service/ShellUIServiceFactory",
+    "sap/ui/core/service/ServiceFactoryRegistry"
+], (
     Element,
     EventBus,
     Storage,
     BlueBoxHandler,
-    ShellUIService,
     Application,
     PostMessageUtils,
     WebGUIStatefulHandler,
@@ -49,49 +48,56 @@ sap.ui.define([
     ApplicationType,
     deepExtend,
     UriParameters,
-    jQuery,
     Log,
     EventHub,
     oUrlParsing,
-    Core,
     hasher,
     MessageBrokerEngine,
     RendererUtils,
     mobileLibrary,
     Container,
     StateManager,
-    KeepAlive
-) {
+    KeepAlive,
+    ShellUIServiceFactory,
+    ServiceFactoryRegistry
+) => {
     "use strict";
 
     // shortcut for sap.ushell.state.StateManager.ShellMode
     const ShellMode = StateManager.ShellMode;
 
+    // shortcut for sap.m.URLHelper
+    const URLHelper = mobileLibrary.URLHelper;
+
+    const CACHED_APP_TYPES = ["URL"];
+
+    const KEEP_ALIVE_MODES = {
+        FULL: "true",
+        RESTRICTED: "restricted"
+    };
+
     function AppLifeCycle () {
         //Dangling controls is a queue of requests to change shell elements attributes, requested by the application in the process of createContent before the actual application state was apply.
-        var oViewPortContainer,
-            aCachedAppTypes = ["URL"],
-            sRootIntent,
-            oShellUIService,
-            disableHomeAppCache = false,
-            bEnableRouterRetrigger = true,
-            oCurrentApplication = {},
-            oGlobalShellCommunicationHandlers = [],
-            oGlobalIframeCommunicationHandlers = {},
-            oComponentCreatedPromises = {},
-            isBackNavigationChanged = false,
-            oKeepAliveModes = {
-                FULL: "true",
-                RESTRICTED: "restricted"
-            },
-            fnOldTriggerEmail;
-        var URLHelper = mobileLibrary.URLHelper;
+        let bDisableHomeAppCache = false;
+        let bEnableRouterRetrigger = true;
+        let oCurrentApplication = {};
+        const oGlobalShellCommunicationHandlers = [];
+        const oGlobalIframeCommunicationHandlers = {};
+        const oComponentCreatedPromises = {};
+        let isBackNavigationChanged = false;
+        let sRootIntent,
+            oGlobalShellUIService,
+            fnOldTriggerEmail,
+            oViewPortContainer;
 
         //connect FLP to the message broker
         if (window.QUnit === undefined) {
             MessageBrokerEngine.connect("FLP");
         }
 
+        /**
+         * @returns {object} Returns the RelatedServices API.
+         */
         this.service = function () {
             return RelatedServices;
         };
@@ -99,8 +105,12 @@ sap.ui.define([
         ///////////////////APPLICATION INTEGRATION API///////////////////////////////
         ///////////////////END APPLICATION INTEGRATION API///////////////////////////////
 
-        this.isCurrentApp = function (appId) {
-            return (oCurrentApplication.appId === appId);
+        /**
+         * @param {string} sAppId
+         * @returns {boolean} Returns true if it is the current application
+         */
+        this.isCurrentApp = function (sAppId) {
+            return (oCurrentApplication.appId === sAppId);
         };
 
         /**
@@ -146,7 +156,7 @@ sap.ui.define([
          */
         this.rejectComponentCreatedPromise = function (sAppId) {
             if (!sAppId) { return; }
-            this.setComponentCreatedPromise(sAppId).reject("Component was not created for app " + sAppId);
+            this.setComponentCreatedPromise(sAppId).reject(`Component was not created for app "${sAppId}"`);
         };
 
         /**
@@ -161,8 +171,13 @@ sap.ui.define([
             return this.setComponentCreatedPromise(sAppId).promise;
         };
 
-        this.isAppWithSimilarShellHashInCache = function (appId, sFixedShellHash) {
-            var oAppEntry = Storage.get(appId);
+        /**
+         * @param {string} sAppId
+         * @param {string} sFixedShellHash
+         * @returns {boolean} Returns true if a similar app was found in the cache
+         */
+        this.isAppWithSimilarShellHashInCache = function (sAppId, sFixedShellHash) {
+            const oAppEntry = Storage.get(sAppId);
 
             if (oAppEntry) {
                 if (oAppEntry.shellHash === sFixedShellHash) {
@@ -173,13 +188,21 @@ sap.ui.define([
             return false;
         };
 
-        this.isAppInCache = function (appId) {
-            return !!Storage.get(appId);
+        /**
+         * @param {string} sAppId
+         * @returns {boolean} Returns true if the app is in the cache
+         */
+        this.isAppInCache = function (sAppId) {
+            return !!Storage.get(sAppId);
         };
 
+        /**
+         * @param {string} sAppId
+         * @returns {string} Returns the normalized appId
+         */
         this.normalizeAppId = function (sAppId) {
-            var sCmp = "-component",
-                isCmp = sAppId.endsWith(sCmp);
+            const sCmp = "-component";
+            const isCmp = sAppId.endsWith(sCmp);
 
             if (isCmp) {
                 return sAppId.substring(0, sAppId.length - sCmp.length);
@@ -187,9 +210,14 @@ sap.ui.define([
             return sAppId;
         };
 
+        /**
+         * @param {object} oEvent
+         * @param {string} sChannel
+         * @param {object} oData
+         */
         this.onComponentCreated = function (oEvent, sChannel, oData) {
-            var oApp = oData.component,
-                sAppId = this.normalizeAppId(oApp.getId());
+            const oApp = oData.component;
+            const sAppId = this.normalizeAppId(oApp.getId());
 
             if (this.isAppInCache(sAppId)) {
                 Storage.get(sAppId).app = oApp;
@@ -205,12 +233,20 @@ sap.ui.define([
             this.resolveComponentCreatedPromise(sAppId);
         };
 
+        /**
+         * @param {object} oEvent
+         * @param {string} sChannel
+         * @param {object} oData
+         */
         this.onGetMe = function (oEvent, sChannel, oData) {
             oData.AppLifeCycle = this;
         };
 
+        /**
+         * @param {string} sAppId
+         */
         this.store = function (sAppId) {
-            var oStorageEntry = Storage.get(sAppId);
+            const oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry) {
                 Application.store(oStorageEntry);
@@ -218,9 +254,14 @@ sap.ui.define([
             }
         };
 
-        this.destroyApplication = function (sAppId, oFrom, oDeferred, bHardDestroy) {
-            var oStorageEntry = Storage.get(sAppId),
-                oPromiseAppDestroy;
+        /**
+         * @param {string} sAppId
+         * @param {object} oFrom
+         * @param {boolean} bHardDestroy
+         * @returns {Promise} Resolves when the app is destroyed.
+         */
+        this.destroyApplication = async function (sAppId, oFrom, bHardDestroy) {
+            const oStorageEntry = Storage.get(sAppId);
 
             if (!sAppId || !oFrom) {
                 return;
@@ -233,95 +274,96 @@ sap.ui.define([
                 KeepAlive.destroy(oStorageEntry);
             }
 
-            if (bHardDestroy === true) {
+            if (bHardDestroy) {
                 Storage.removeByContainer(oFrom);
                 this.removeControl(sAppId);
                 doDestroy();
-                if (oDeferred) {
-                    oDeferred.resolve();
-                }
                 return;
             }
 
             if (oStorageEntry) {
                 Storage.removeById(sAppId);
                 if (BlueBoxHandler.isStatefulContainer(oStorageEntry.container)) {
-                    oPromiseAppDestroy = BlueBoxHandler.statefulDestroyApp(oStorageEntry.container, sAppId);
+                    await BlueBoxHandler.statefulDestroyApp(oStorageEntry.container, sAppId);
                 } else if (!BlueBoxHandler.returnUnusedKeepAliveContainer(oStorageEntry.container)) {
                     this.removeControl(sAppId);
                     BlueBoxHandler.deleteBlueBoxByContainer(oStorageEntry.container);
                     oStorageEntry.container.destroy();
-                    oPromiseAppDestroy = Promise.resolve();
                 } else {
-                    oPromiseAppDestroy = this.handleExitStateful(sAppId, oStorageEntry.container, false);
-                }
-                if (oDeferred) {
-                    oPromiseAppDestroy.then(oDeferred.resolve);
-                }
-            } else {
-                this.removeControl(sAppId);
-                // If the application running in an iframe registered for "before close" event,
-                // we first post it a message to prepare for closing (usually, the app will close
-                // its session or release locks held on the server), and only when the iframe send a response
-                // back that it finished processing the event, we will continue to destroy the app (iframe).
-                // If the app in the iframe did not register to the event, we destroy the app immediately exactly
-                // as it was done before.
-                // Note that even if the response from the iframe is not successful, we still destroy the app
-                // because the second app that we navigated to was already created so we can not stop
-                // the actual navigation (this is the same behaviour that we had before).
-                // This mechanism was added to solve the change made in Chrome to disallow Sync XHR on
-                // browser close.
-                var oPromise = oFrom && oFrom.sendBeforeAppCloseEvent && oFrom.sendBeforeAppCloseEvent();
-
-                if (oPromise === undefined) {
-                    doDestroy();
-                    if (oDeferred) {
-                        oDeferred.resolve();
-                    }
-                } else {
-                    oPromise.then(function () {
-                        doDestroy();
-                        if (oDeferred) {
-                            oDeferred.resolve();
-                        }
-                    }, function (sError) {
-                        doDestroy();
-                        if (oDeferred) {
-                            oDeferred.resolve();
-                        }
-                        Log.error(
-                            "FLP got a failed response from the iframe for the 'sap.ushell.services.CrossApplicationNavigation.beforeAppCloseEvent' message sent",
-                            sError,
-                            "sap.ushell.components.applicationIntegration.AppLifeCycle.js");
-                    });
+                    await this.handleExitStateful(sAppId, oStorageEntry.container, false);
                 }
+                return;
+            }
+
+            this.removeControl(sAppId);
+            /**
+             * If the application running in an iframe registered for "before close" event,
+             * we first post it a message to prepare for closing (usually, the app will close
+             * its session or release locks held on the server), and only when the iframe send a response
+             * back that it finished processing the event, we will continue to destroy the app (iframe).
+             * If the app in the iframe did not register to the event, we destroy the app immediately exactly
+             * as it was done before.
+             * Note that even if the response from the iframe is not successful, we still destroy the app
+             * because the second app that we navigated to was already created so we can not stop
+             * the actual navigation (this is the same behaviour that we had before).
+             * This mechanism was added to solve the change made in Chrome to disallow Sync XHR on
+             * browser close.
+             */
+            const oPromise = oFrom?.sendBeforeAppCloseEvent?.() || Promise.resolve();
+
+            try {
+                await ushellUtils.promisify(oPromise);
+            } catch (sError) {
+                Log.error(
+                    "FLP got a failed response from the iframe for the 'sap.ushell.services.CrossApplicationNavigation.beforeAppCloseEvent' message sent",
+                    sError,
+                    "sap.ushell.components.applicationIntegration.AppLifeCycle.js"
+                );
             }
+            doDestroy();
         };
 
+        /**
+         * @param {string} sAppId
+         */
         this.restore = function (sAppId) {
-            var oStorageEntry = Storage.get(sAppId);
+            const oStorageEntry = Storage.get(sAppId);
 
-            if (oStorageEntry && oStorageEntry.stateStored === true) {
+            if (oStorageEntry?.stateStored) {
+                // 1) Extensions
                 RelatedServices.restore(oStorageEntry.service);
                 this.setBackNavigationChanged(true);
                 AppMeta.restore(oStorageEntry.meta);
+                // 2) Extension API
+                ShellUIServiceFactory.restore(oStorageEntry);
+                // 3) Application
                 Application.restore(oStorageEntry);
             }
         };
 
+        /**
+         * @param {string} sAppId
+         */
         this.active = function (sAppId) {
-            var oStorageEntry = Storage.get(sAppId);
+            const oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry) {
                 Application.active(oStorageEntry.app);
             }
         };
 
-        this.handleExitStateful = function (sFromId, oFrom, isHomePage, bForceCloseApp) {
-            var sActualAppFromId = oFrom.getCurrentAppId && oFrom.getCurrentAppId();
+        /**
+         * @param {string} sFromId
+         * @param {object} oFrom
+         * @param {boolean} bIsHomePage
+         * @param {boolean} bForceCloseApp
+         * @returns {Promise} Resolves when the app is closed.
+         */
+        this.handleExitStateful = function (sFromId, oFrom, bIsHomePage, bForceCloseApp) {
+            const sActualAppFromId = oFrom.getCurrentAppId?.();
 
             if (Storage.get(sActualAppFromId)) {
-                if ((RelatedServices.isBackNavigation() === true && !isHomePage) || (bForceCloseApp === true)) {
+                if ((RelatedServices.isBackNavigation() && !bIsHomePage) || (bForceCloseApp)) {
                     EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
                     Storage.removeById(sActualAppFromId);
                     return BlueBoxHandler.statefulDestroyApp(oFrom);
@@ -334,84 +376,84 @@ sap.ui.define([
             return BlueBoxHandler.statefulDestroyApp(oFrom);
         };
 
-        this.handleExitApplication = function (sFromId, oFrom, sToId, oTo, isHomePage, bFromAfterNavigate) {
-            var that = this,
-                bIsAppOfTypeCachable,
-                oPromiseAppClose,
-                oDeferredAppClose;
+        /**
+         * @param {string} sFromId
+         * @param {object} oFrom
+         * @param {string} sToId
+         * @param {object} oTo
+         * @param {boolean} bIsHomePage
+         * @param {boolean} bFromAfterNavigate
+         * @returns {Promise} Resolves when the app is closed.
+         */
+        this.handleExitApplication = async function (sFromId, oFrom, sToId, oTo, bIsHomePage, bFromAfterNavigate) {
+            function fnCloseKeepAliveIfRestricted (oApp) {
+                return (oApp.keepAliveMode === KEEP_ALIVE_MODES.RESTRICTED);
+            }
 
             //this code must be at the beginning of the function to allow it to be processed once in
-            //a cycle of openning an app
-            if (sToId && oTo && oTo.getIframeReusedForApp && oTo.getIframeReusedForApp() === true) {
+            //a cycle of opening an app
+            if (sToId && oTo?.getIframeReusedForApp?.()) {
                 oTo.setProperty("iframeReusedForApp", false, true);
                 PostMessageUtils.postMessageToIframeApp(oTo, "sap.ushell.sessionHandler", "afterApplicationShow", {}, false);
             }
 
             //if called from onAfterNavigate, do nothing if oFrom is stateful container, because
             //application was already closed at the beginning of 'handleControl'
-            if (isHomePage === false && bFromAfterNavigate === true && (BlueBoxHandler.isStatefulContainer(oFrom) || BlueBoxHandler.isStatefulContainerInKeepAlivePool(oFrom))) {
-                return new jQuery.Deferred().resolve().promise();
+            if (!bIsHomePage && bFromAfterNavigate && (BlueBoxHandler.isStatefulContainer(oFrom) || BlueBoxHandler.isStatefulContainerInKeepAlivePool(oFrom))) {
+                return;
             }
 
-            if (oFrom && oFrom.getCurrentAppId && oFrom.getCurrentAppId()) {
+            if (oFrom?.getCurrentAppId?.()) {
                 sFromId = oFrom.getCurrentAppId();
             }
 
             if (sFromId && oFrom) {
                 // STATEFUL
                 if (BlueBoxHandler.isStatefulContainer(oFrom)) {
-                    oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
+                    await this.handleExitStateful(sFromId, oFrom, bIsHomePage);
 
-                //STATELESS
+                    //STATELESS
                 } else if (Storage.get(sFromId)) {
                     // Back Navigation Case
-                    if (RelatedServices.isBackNavigation() === true && !isHomePage) {
+                    if (RelatedServices.isBackNavigation() && !bIsHomePage) {
                         //check if the Iframe needs to be cached instead of destroy
                         if (!BlueBoxHandler.returnUnusedKeepAliveContainer(oFrom)) {
-                            oDeferredAppClose = new jQuery.Deferred();
-                            this.destroyApplication(sFromId, oFrom, oDeferredAppClose);
-                            oPromiseAppClose = oDeferredAppClose.promise();
+                            await this.destroyApplication(sFromId, oFrom);
                         } else {
-                            oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
+                            await this.handleExitStateful(sFromId, oFrom, bIsHomePage);
                         }
 
-                    // Forward Navigation Cases
+                        // Forward Navigation Cases
                     } else if (oFrom.getApplicationType() === "UI5") {
-                        // Wait until navigation's source app has been started completey, so that a later back navigation finds a proper app that
+                        // Wait until navigation's source app has been started completely, so that a later back navigation finds a proper app that
                         // can be re-enabled (keep-alive scenario)
-                        oPromiseAppClose = this.getComponentCreatedPromise(sFromId).then(() => { this.store(sFromId); });
+                        await this.getComponentCreatedPromise(sFromId);
+                        this.store(sFromId);
                     } else {
                         this.store(sFromId);
                     }
                     EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
 
-                // LEGACY STATEFUL (WebGUI)
-                } else if (oFrom.getStatefulType && oFrom.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
-                    if (isHomePage) {
-                        oPromiseAppClose = PostMessageUtils.postMessageToIframeApp(oFrom, "sap.gui", "triggerCloseSessionImmediately");
+                    // LEGACY STATEFUL (WebGUI)
+                } else if (oFrom.getStatefulType?.() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
+                    if (bIsHomePage) {
+                        await PostMessageUtils.postMessageToIframeApp(oFrom, "sap.gui", "triggerCloseSessionImmediately");
                     }
 
-                // THE REST...
+                    // THE REST...
                 } else {
-                    bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oFrom.getApplicationType) >= 0;
+                    const bIsAppOfTypeCachable = CACHED_APP_TYPES.indexOf(oFrom.getApplicationType) >= 0;
 
                     //destroy the application and its resources
-                    var bIsKeepAlive = this.isAppOfTypeCached(sFromId, bIsAppOfTypeCachable);
-                    if (bIsKeepAlive === false) {
-                        oDeferredAppClose = new jQuery.Deferred();
-                        this.destroyApplication(sFromId, oFrom, oDeferredAppClose);
-                        oPromiseAppClose = oDeferredAppClose.promise();
+                    const bIsKeepAlive = this.isAppOfTypeCached(sFromId, bIsAppOfTypeCachable);
+                    if (!bIsKeepAlive) {
+                        await this.destroyApplication(sFromId, oFrom);
                     }
                 }
 
-                if (isHomePage === true) {
-                    if (oPromiseAppClose === undefined) {
-                        this.closeKeepAliveApps(fnCloseKeepAliveIfRestricted);
-                    } else {
-                        oPromiseAppClose.then(function () {
-                            that.closeKeepAliveApps(fnCloseKeepAliveIfRestricted);
-                        });
-                    }
+                if (bIsHomePage) {
+                    // todo: [FLPCOREANDUX-10024] Check whether we need to await the close as well
+                    this.closeKeepAliveApps(fnCloseKeepAliveIfRestricted);
                 }
 
                 //handle the case of appFiner
@@ -421,61 +463,56 @@ sap.ui.define([
             }
 
             EventBus.getInstance().publish("relatedServices", "resetBackNavigation");
-
-            if (oPromiseAppClose === undefined) {
-                oPromiseAppClose = new jQuery.Deferred().resolve().promise();
-            }
-
-            return oPromiseAppClose;
         };
 
-        function fnCloseKeepAliveIfRestricted (oApp) {
-            return (oApp.keepAliveMode === oKeepAliveModes.RESTRICTED);
-        }
-
-        this.closeKeepAliveApps = function (fnFilterApps, arrClosePromises) {
+        /**
+         * @param {function(): boolean} fnFilterApps The filter function
+         * @returns {Promise} Resolves when all keep alive apps are closed.
+         */
+        this.closeKeepAliveApps = function (fnFilterApps) {
             try {
-                var that = this,
-                    arrKeepAliveRestrictedApps = [];
+                const aKeepAliveRestrictedApps = [];
 
-                Storage.forEach(function (oApp) {
-                    if (fnFilterApps.apply(this, [oApp]) === true) {
-                        arrKeepAliveRestrictedApps.push(oApp);
+                Storage.forEach((oApp) => {
+                    if (fnFilterApps(oApp)) {
+                        aKeepAliveRestrictedApps.push(oApp);
                     }
                 });
-                arrKeepAliveRestrictedApps.forEach(function (oRestrictedApp) {
+                const aClosePromises = aKeepAliveRestrictedApps.map((oRestrictedApp) => {
                     //check if it needs to be cached instead of destroy
-                    var oDeferredAppClose;
-                    var bDestroy = !BlueBoxHandler.returnUnusedKeepAliveContainer(oRestrictedApp.container);
+                    const bDestroy = !BlueBoxHandler.returnUnusedKeepAliveContainer(oRestrictedApp.container);
                     if (bDestroy) {
-                        if (arrClosePromises) {
-                            oDeferredAppClose = new jQuery.Deferred();
-                            arrClosePromises.push(oDeferredAppClose.promise());
-                        }
-                        that.destroyApplication(oRestrictedApp.appId, oRestrictedApp.container, oDeferredAppClose);
-                    } else {
-                        oDeferredAppClose = that.handleExitStateful(oRestrictedApp.appId, oRestrictedApp.container, true, true);
-                        if (arrClosePromises) {
-                            arrClosePromises.push(oDeferredAppClose.promise());
-                        }
+                        return this.destroyApplication(oRestrictedApp.appId, oRestrictedApp.container);
                     }
+
+                    return this.handleExitStateful(oRestrictedApp.appId, oRestrictedApp.container, true, true);
                 });
+
+                return Promise.all(aClosePromises);
             } catch (e) {
-                Log.error("Error: sap.ushell.services.appLifeCycle.closeOtherKeepAliveRestrictedApps:" + e);
+                Log.error("closeKeepAliveApps call failed", e);
             }
         };
 
+        /**
+         * @param {string} sFromId
+         * @param {object} oFrom
+         */
         this.onBeforeNavigate = function (sFromId, oFrom) {
-            if (sFromId && oFrom && oFrom._getIFrame && oFrom._getIFrame() &&
-                (oFrom.getStatefulType && oFrom.getStatefulType() > BlueBoxHandler.STATEFUL_TYPES.NOT_SUPPORTED) || Storage.get(sFromId)) {
+            if (sFromId && oFrom?._getIFrame?.() && oFrom?.getStatefulType?.() > BlueBoxHandler.STATEFUL_TYPES.NOT_SUPPORTED || Storage.get(sFromId)) {
                 PostMessageUtils.postMessageToIframeApp(oFrom, "sap.ushell.sessionHandler", "beforeApplicationHide", {}, false);
             }
         };
 
-        //call lifecycle interface "setInitialConfiguration"
-        this.onAfterNavigate = function (sFromId, oFrom, sToId, oTo) {
+        /**
+         * @param {string} sFromId
+         * @param {object} oFrom
+         * @param {string} sToId
+         * @param {object} oTo
+         */
+        this.onAfterNavigate = function (sFromId, oFrom, sToId, oTo) { //call lifecycle interface "setInitialConfiguration"
             //destroy the application if not cached or marked for reuse.
-            var bIsShellApps = sToId.indexOf("Shell-appfinder-component") > 0
+            const bIsShellApps = sToId.indexOf("Shell-appfinder-component") > 0
                 || sToId.indexOf("Shell-home-component") > 0
                 || sToId.indexOf("pages-component-container") > 0
                 || sToId.indexOf("homeApp-component-container") > 0
@@ -483,7 +520,7 @@ sap.ui.define([
                 || sToId.indexOf("runtimeSwitcher-component-container") > 0;
 
             this.handleExitApplication(sFromId, oFrom, sToId, oTo, bIsShellApps, true);
-            if (bIsShellApps === true) {
+            if (bIsShellApps) {
                 Application.setActiveAppContainer(undefined);
             }
 
@@ -498,24 +535,32 @@ sap.ui.define([
             }
         };
 
-        this.storeApp = function (appId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode) {
-            if (!this.isAppInCache(appId)) {
+        /**
+         * @param {string} sAppId
+         * @param {object} oContainer
+         * @param {object} oTarget
+         * @param {string} sFixedShellHash
+         * @param {object} oKeepAliveMode
+         * @returns {boolean} Returns true if the app was stored
+         */
+        this.storeApp = function (sAppId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode) {
+            if (!this.isAppInCache(sAppId)) {
                 if (oContainer.setProperty) {
                     oContainer.setProperty("isKeepAlive", true, true);
                 }
-                Storage.set(appId, {
+                Storage.set(sAppId, {
                     service: {},
                     shellHash: sFixedShellHash,
-                    appId: appId,
+                    appId: sAppId,
                     stt: "loading",
                     currentState: null, // current state is stored before close see: sap/ushell/state/CurrentState
                     controlManager: null, // control manager state is stored before close see: sap/ushell/state/ControlManager
                     container: oContainer,
                     meta: AppConfiguration.getMetadata(oTarget),
                     app: undefined,
-                    keepAliveMode: oKeepAliveMode && (oKeepAliveMode.globalValue || oKeepAliveMode.paramValue),
+                    keepAliveMode: oKeepAliveMode?.globalValue || oKeepAliveMode?.paramValue,
                     appTarget: oTarget,
-                    ui5ComponentName: oTarget && oTarget.ui5ComponentName,
+                    ui5ComponentName: oTarget?.ui5ComponentName,
                     enableRouterRetrigger: bEnableRouterRetrigger,
                     stateStored: false
                 });
@@ -548,7 +593,7 @@ sap.ui.define([
                 return;
             }
 
-            if (oContainer && oContainer.getApplicationType() === "UI5") {
+            if (oContainer?.getApplicationType() === "UI5") {
                 await this.getComponentCreatedPromise(sAppId);
             }
 
@@ -560,26 +605,30 @@ sap.ui.define([
             KeepAlive.store(oStorageEntry);
         };
 
-        this.isAppOfTypeCached = function (appId, bIsAppOfTypeCachable, oKeepAliveMode) {
-            var sKeepAlive;
-
+        /**
+         * @param {string} sAppId
+         * @param {boolean} bIsAppOfTypeCachable
+         * @param {object} oKeepAliveMode
+         * @returns {boolean} Returns true if the app is of type cached.
+         */
+        this.isAppOfTypeCached = function (sAppId, bIsAppOfTypeCachable, oKeepAliveMode) {
             //generic intent currently can never be keep alive
-            if (appId === "application-Shell-startIntent") {
+            if (sAppId === "application-Shell-startIntent") {
                 return false;
             }
 
             //handle the root intent
-            if (!disableHomeAppCache && appId.indexOf(sRootIntent) !== -1) {
+            if (!bDisableHomeAppCache && sAppId.indexOf(sRootIntent) !== -1) {
                 return true;
             }
 
-            if (!disableHomeAppCache && appId.indexOf("Shell-appfinder") !== -1) {
+            if (!bDisableHomeAppCache && sAppId.indexOf("Shell-appfinder") !== -1) {
                 return true;
             }
 
             //In order to enable application to play with the keep alive, we read the keep attribute of the hash, if it is true application is cachable.
-            sKeepAlive = new URLSearchParams(window.location.search).get("sap-keep-alive");
-            if (sKeepAlive === oKeepAliveModes.FULL || sKeepAlive === oKeepAliveModes.RESTRICTED) {
+            const sKeepAlive = new URLSearchParams(window.location.search).get("sap-keep-alive");
+            if (sKeepAlive === KEEP_ALIVE_MODES.FULL || sKeepAlive === KEEP_ALIVE_MODES.RESTRICTED) {
                 if (oKeepAliveMode) {
                     oKeepAliveMode.globalValue = sKeepAlive;
                 }
@@ -588,32 +637,31 @@ sap.ui.define([
             return false;
         };
 
+        /**
+         * @param {object} oShellHash
+         * @param {object} oTarget
+         * @param {object} oKeepAliveMode
+         * @returns {boolean} Returns true if the app should be cached.
+         */
         this.isCachedEnabledAsAppParameter = function (oShellHash, oTarget, oKeepAliveMode) {
-            var sKeepAlive;
+            let sKeepAlive;
 
             //generic intent currently can never be keep alive
-            if (oShellHash && oShellHash.semanticObject === "Shell" && oShellHash.action === "startIntent") {
+            if (oShellHash?.semanticObject === "Shell" && oShellHash?.action === "startIntent") {
                 return false;
             }
 
-            //temporary fix for issue found in keep alive fiori apps when stateful container
-            //is used (meaning - fiori keep alive apps in cFLP). At the moment
-            //it will not be supported until the issue will be solved
-            //if (oTarget && oTarget.appCapabilities && oTarget && oTarget.appCapabilities.appFrameworkId === "UI5") {
-            //    return false;
-            //}
-
-            sKeepAlive = oShellHash && oShellHash.params && oShellHash.params["sap-keep-alive"];
-            if (sKeepAlive === oKeepAliveModes.FULL || sKeepAlive === oKeepAliveModes.RESTRICTED) {
+            sKeepAlive = oShellHash?.params?.["sap-keep-alive"];
+            if (sKeepAlive === KEEP_ALIVE_MODES.FULL || sKeepAlive === KEEP_ALIVE_MODES.RESTRICTED) {
                 if (oKeepAliveMode) {
                     oKeepAliveMode.paramValue = sKeepAlive;
                 }
                 return true;
             }
 
-            if (oTarget && oTarget.url) {
+            if (oTarget?.url) {
                 sKeepAlive = UriParameters.fromURL(oTarget.url).get("sap-keep-alive");
-                if (sKeepAlive === oKeepAliveModes.FULL || sKeepAlive === oKeepAliveModes.RESTRICTED) {
+                if (sKeepAlive === KEEP_ALIVE_MODES.FULL || sKeepAlive === KEEP_ALIVE_MODES.RESTRICTED) {
                     if (oKeepAliveMode) {
                         oKeepAliveMode.paramValue = sKeepAlive;
                     }
@@ -624,51 +672,65 @@ sap.ui.define([
             return false;
         };
 
+        /**
+         * @param {object} oTarget
+         * @returns {string} Returns the application type.
+         */
         this.calculateAppType = function (oTarget) {
-            if (oTarget.applicationType === "URL" && oTarget.additionalInformation && oTarget.additionalInformation.startsWith("SAPUI5.Component=")) {
+            if (oTarget.applicationType === "URL" && oTarget?.additionalInformation?.startsWith?.("SAPUI5.Component=")) {
                 return "SAPUI5";
             }
             return oTarget.applicationType;
         };
 
-        this.reloadCurrentApp = function (oData) {
-            var oTmpAppContainer = BlueBoxHandler.getBlueBoxById(oData.sAppContainerId);
+        /**
+         * @param {object} oData
+         * @returns {Promise} Resolves when the app is reloded.
+         */
+        this.reloadCurrentApp = async function (oData) {
+            const oTmpAppContainer = BlueBoxHandler.getBlueBoxById(oData.sAppContainerId);
             if (oTmpAppContainer) {
-                var sTmpUrl = oTmpAppContainer.getUrl();
+                const sTmpUrl = oTmpAppContainer.getUrl();
                 BlueBoxHandler.removeCapabilities(oTmpAppContainer);
                 Storage.removeByContainer(oTmpAppContainer);
                 this.destroyApplication(oData.sAppContainerId, oTmpAppContainer);
                 BlueBoxHandler.deleteBlueBoxByUrl(sTmpUrl);
             }
-            Container.getServiceAsync("ShellNavigationInternal").then(function (oShellNavigationInternal) {
-                try {
-                    oShellNavigationInternal.hashChanger.treatHashChanged(oData.sCurrentHash);
-                } catch (error) {
-                    Log.error("Error when trying to re-load the current displayed application", error, "sap.ushell.services.AppLifeCycle");
-                }
-            });
+
+            const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
+            try {
+                ShellNavigationInternal.hashChanger.treatHashChanged(oData.sCurrentHash);
+            } catch (error) {
+                Log.error("Error when trying to re-load the current displayed application", error, "sap.ushell.services.AppLifeCycle");
+            }
         };
 
-        this.openApp = function (inAppId, oTarget, oShellHash, sFixedShellHash) {
-            var oContainer,
+        /**
+         * @param {string} sAppId
+         * @param {object} oTarget
+         * @param {object} oShellHash
+         * @param {object} sFixedShellHash
+         */
+        this.openApp = function (sAppId, oTarget, oShellHash, sFixedShellHash) {
+            const bIsAppOfTypeCachable = CACHED_APP_TYPES.indexOf(oTarget.applicationType) >= 0;
+            const oKeepAliveMode = {
+                globalValue: undefined,
+                paramValue: undefined
+            };
+            let oContainer,
                 sIntent,
-                bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oTarget.applicationType) >= 0,
                 oTmpAppContainer,
                 oContainerToUse,
-                sTmpUrl,
-                oKeepAliveMode = {
-                    globalValue: undefined,
-                    paramValue: undefined
-                };
+                sTmpUrl;
 
             //format appId, the is the storage identifier
-            var appId = "application" + inAppId;
+            const appId = `application${sAppId}`;
 
             //this case will handle the stateful containers flow.
             oContainer = BlueBoxHandler.getBlueBoxByUrl(oTarget.url);
 
-            var bIsKeepAlive = this.isAppOfTypeCached(appId, bIsAppOfTypeCachable, oKeepAliveMode);
-            var bIsCachedByParameter = this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode);
+            const bIsKeepAlive = this.isAppOfTypeCached(appId, bIsAppOfTypeCachable, oKeepAliveMode);
+            const bIsCachedByParameter = this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode);
 
             if (BlueBoxHandler.isStatefulContainer(oContainer)) {
                 if (bIsKeepAlive || bIsCachedByParameter) {
@@ -697,15 +759,15 @@ sap.ui.define([
                     if (!oContainerToUse) {
                         //in cFLP, there night me an existing container of the same app from a different server,
                         //so we will need to destroy it to avoid duplicate id
-                        sIntent = oShellHash.semanticObject + "-" + oShellHash.action;
-                        oTmpAppContainer = BlueBoxHandler.getBlueBoxById("application-" + sIntent) || this.getControl(sIntent);
+                        sIntent = `${oShellHash.semanticObject}-${oShellHash.action}`;
+                        oTmpAppContainer = BlueBoxHandler.getBlueBoxById(`application-${sIntent}`) || this.getControl(sIntent);
                         if (oTmpAppContainer) {
                             sTmpUrl = oTmpAppContainer.getUrl();
                             BlueBoxHandler.removeCapabilities(oTmpAppContainer);
-                            this.destroyApplication("application-" + sIntent, oTmpAppContainer);
+                            this.destroyApplication(`application-${sIntent}`, oTmpAppContainer);
                             BlueBoxHandler.deleteBlueBoxByUrl(sTmpUrl);
                         }
-                        oContainer = Application.createApplicationContainer(inAppId, oTarget);
+                        oContainer = Application.createApplicationContainer(sAppId, oTarget);
                     } else {
                         oContainer = oContainerToUse;
                     }
@@ -714,27 +776,27 @@ sap.ui.define([
                 if (this.isAppInCache(appId)) {
                     oCurrentApplication = Storage.get(appId);
                 }
-            } else if (oTarget.applicationType === "TR" || (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "GUI")) {
+            } else if (oTarget.applicationType === "TR" || oTarget?.appCapabilities?.appFrameworkId === "GUI") {
                 oContainer = BlueBoxHandler.getBlueBoxByUrl(oTarget.url);
-                if (oContainer && oContainer.getStatefulType && oContainer.getStatefulType() !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
+                if (oContainer?.getStatefulType && oContainer.getStatefulType() !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
                     oContainer = undefined;
                 }
 
                 //in cFLP, there night me an existing container of the same app from a different server,
                 //so we will need to destroy it to avoid duplicate id
                 if (oShellHash) {
-                    sIntent = oShellHash.semanticObject + "-" + oShellHash.action;
-                    oTmpAppContainer = BlueBoxHandler.getBlueBoxById("application-" + sIntent) || this.getControl(sIntent);
+                    sIntent = `${oShellHash.semanticObject}-${oShellHash.action}`;
+                    oTmpAppContainer = BlueBoxHandler.getBlueBoxById(`application-${sIntent}`) || this.getControl(sIntent);
                     if (oTmpAppContainer && (!oContainer || oTmpAppContainer !== oContainer)) {
                         sTmpUrl = oTmpAppContainer.getUrl();
                         BlueBoxHandler.removeCapabilities(oTmpAppContainer);
-                        this.destroyApplication("application-" + sIntent, oTmpAppContainer);
+                        this.destroyApplication(`application-${sIntent}`, oTmpAppContainer);
                         BlueBoxHandler.deleteBlueBoxByUrl(sTmpUrl);
                     }
                 }
 
                 if (!oContainer) {
-                    oContainer = Application.createApplicationContainer(inAppId, oTarget);
+                    oContainer = Application.createApplicationContainer(sAppId, oTarget);
                 }
                 //create application that is not persisted and not cashed
                 oCurrentApplication = {
@@ -746,7 +808,7 @@ sap.ui.define([
                 };
             } else {
                 if (oContainer) {
-                    sIntent = oShellHash.semanticObject + "-" + oShellHash.action;
+                    sIntent = `${oShellHash.semanticObject}-${oShellHash.action}`;
                     this.removeApplication(sIntent);
                 } else if (oTarget.applicationType === "URL" || oTarget.applicationType === "TR" || oTarget.applicationType === "NWBC") {
                     //Temporary fix - fix duplicate app container id in cFLP
@@ -757,16 +819,16 @@ sap.ui.define([
                     // we delete here the blue box and then create the new one.
                     // In future BLI, we will change the id of the container to be
                     // more unique.
-                    sIntent = oShellHash.semanticObject + "-" + oShellHash.action;
-                    oTmpAppContainer = BlueBoxHandler.getBlueBoxById("application-" + sIntent) || this.getControl(sIntent);
+                    sIntent = `${oShellHash.semanticObject}-${oShellHash.action}`;
+                    oTmpAppContainer = BlueBoxHandler.getBlueBoxById(`application-${sIntent}`) || this.getControl(sIntent);
                     if (oTmpAppContainer) {
                         sTmpUrl = oTmpAppContainer.getUrl();
                         BlueBoxHandler.removeCapabilities(oTmpAppContainer);
-                        this.destroyApplication("application-" + sIntent, oTmpAppContainer, undefined, true);
+                        this.destroyApplication(`application-${sIntent}`, oTmpAppContainer, true);
                         BlueBoxHandler.deleteBlueBoxByUrl(sTmpUrl);
                     }
                 }
-                oContainer = Application.createApplicationContainer(inAppId, oTarget);
+                oContainer = Application.createApplicationContainer(sAppId, oTarget);
 
                 // //create application that is not persisted and not cashed
                 oCurrentApplication = {
@@ -779,25 +841,20 @@ sap.ui.define([
             }
         };
 
-        this.getAppMeta = function () {
-            return AppMeta;
-        };
-
         /**
          * Any event one wishes to subscribe to during the AppLifeCycle.init() call should be added here.
          * Events will only be added the first time AppLifeCycle.init() is called.
          */
         this.addEvents = (function () {
-            var hasBeenCalled = false;
+            let hasBeenCalled = false;
             return function () {
                 if (!hasBeenCalled) {
                     hasBeenCalled = true;
-                    var that = this;
 
                     // Subscribe to events.
-                    EventHub.on("disableKeepAliveRestoreRouterRetrigger").do(function (oData) {
-                        var sIntent = oData.intent.semanticObject + "-" + oData.intent.action;
-                        var sAppId = "application-" + sIntent;
+                    EventHub.on("disableKeepAliveRestoreRouterRetrigger").do((oData) => {
+                        const sIntent = `${oData.intent.semanticObject}-${oData.intent.action}`;
+                        const sAppId = `application-${sIntent}`;
 
                         bEnableRouterRetrigger = oData.disable;
 
@@ -805,47 +862,54 @@ sap.ui.define([
                             Storage.get(sAppId).enableRouterRetrigger = oData.disable;
                         }
                     });
-                    EventHub.on("setApplicationFullWidth").do(function (oData) {
-                        that.setApplicationFullWidth(oData.bValue);
+                    EventHub.on("setApplicationFullWidth").do((oData) => {
+                        this.setApplicationFullWidth(oData.bValue);
                     });
 
-                    EventHub.on("reloadCurrentApp").do(function (oData) {
-                        that.reloadCurrentApp(oData);
+                    EventHub.on("reloadCurrentApp").do((oData) => {
+                        this.reloadCurrentApp(oData);
                     });
                 }
             };
         }());
 
-        this.init = function (oInViewPortContainer, inSRootIntent, inDisableHomeAppCache, oShellUIServiceChange) {
+        /**
+         * @param {object} oInViewPortContainer
+         * @param {string} sInRootIntent
+         * @param {boolean} bInDisableHomeAppCache
+         */
+        this.init = function (oInViewPortContainer, sInRootIntent, bInDisableHomeAppCache) {
             if (Container && Config.last("/core/shell/enablePersistantAppstateWhenSharing")) {
-                Container.getServiceAsync("AppState").then(function (oAppStateService) {
+                Container.getServiceAsync("AppState").then((oAppStateService) => {
                     fnOldTriggerEmail = URLHelper.triggerEmail.bind(URLHelper);
                     URLHelper.triggerEmail = function (sTo, sSubject, sBody, sCc, sBcc) {
-                        var sFLPUrl = document.URL;
+                        const sFLPUrl = document.URL;
                         oAppStateService.setAppStateToPublic(sFLPUrl)
-                            .done(function (sNewURL, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew) {
+                            .done((sNewURL, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew) => {
                                 sSubject = sSubject && sXStateKey && sXStateKeyNew && sSubject.includes(sXStateKey) ? sSubject.replace(sXStateKey, sXStateKeyNew) : sSubject;
                                 sSubject = sSubject && sIStateKey && sIStateKeyNew && sSubject.includes(sIStateKey) ? sSubject.replace(sIStateKey, sIStateKeyNew) : sSubject;
                                 sBody = sBody && sXStateKey && sXStateKeyNew && sBody.includes(sXStateKey) ? sBody.replace(sXStateKey, sXStateKeyNew) : sBody;
                                 sBody = sBody && sIStateKey && sIStateKeyNew && sBody.includes(sIStateKey) ? sBody.replace(sIStateKey, sIStateKeyNew) : sBody;
                                 fnOldTriggerEmail(sTo, sSubject, sBody, sCc, sBcc);
                             })
-                            .fail(function (sTo, sSubject, sBody, sCc, sBcc) {
+                            .fail((sTo, sSubject, sBody, sCc, sBcc) => {
                                 fnOldTriggerEmail(sTo, sSubject, sBody, sCc, sBcc);
                             });
                     };
                 });
             }
 
-            oShellUIService = new ShellUIService({
-                scopeObject: oShellUIServiceChange.ownerComponent,
-                scopeType: "component"
+            ShellUIServiceFactory.init().then(() => {
+                ServiceFactoryRegistry.register(
+                    "sap.ushell.ui5service.ShellUIService",
+                    ShellUIServiceFactory
+                );
             });
+            this._createGlobalShellUIService();
 
             oViewPortContainer = oInViewPortContainer;
-            sRootIntent = inSRootIntent;
-            AppMeta.init(sRootIntent);
-            disableHomeAppCache = inDisableHomeAppCache;
+            sRootIntent = sInRootIntent;
+            bDisableHomeAppCache = bInDisableHomeAppCache;
 
             BlueBoxHandler.init();
             Application.init(BlueBoxHandler, PostMessageUtils);
@@ -874,24 +938,26 @@ sap.ui.define([
                     },
                     oServiceCalls: {
                         subscribe: {
-                            executeServiceCallFn: function (oServiceParams) {
+                            executeServiceCallFn: async function (oServiceParams) {
                                 BlueBoxHandler.addCapabilities(oServiceParams.oContainer, oServiceParams.oMessageData.body);
-                                return new jQuery.Deferred().resolve({}).promise();
+                                return {};
                             }
                         },
                         setup: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                var oSetup = oServiceParams.oMessageData && oServiceParams.oMessageData.body,
-                                    arrCap = [],
-                                    bIgnoreStateful = false;
+                            executeServiceCallFn: async function (oServiceParams) {
+                                const oSetup = oServiceParams?.oMessageData?.body;
+                                const { oContainer } = oServiceParams;
+
+                                const arrCap = [];
+                                let bIgnoreStateful = false;
                                 if (oSetup) {
-                                    if (oServiceParams.oContainer.getIsKeepAlive() === true &&
-                                        ushellUtils.isSAPLegacyApplicationType(oServiceParams.oContainer.getApplicationType(), oServiceParams.oContainer.getFrameworkId())) {
+                                    const bIsSAPLegacyApplicationType = ushellUtils.isSAPLegacyApplicationType(oContainer.getApplicationType(), oContainer.getFrameworkId());
+                                    if (oContainer.getIsKeepAlive() && bIsSAPLegacyApplicationType) {
                                         bIgnoreStateful = true;
                                     }
-                                    if (oSetup.isStateful === true) {
+                                    if (oSetup.isStateful) {
                                         if (bIgnoreStateful) {
-                                            oServiceParams.oContainer.setProperty("statefulType", -BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
+                                            oContainer.setProperty("statefulType", -BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
                                         } else {
                                             arrCap.push({
                                                 action: "create",
@@ -901,20 +967,19 @@ sap.ui.define([
                                                 action: "destroy",
                                                 service: "sap.ushell.services.AppLifeCycle"
                                             });
-                                            oServiceParams.oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
+                                            oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.FLP_V2, true);
                                         }
                                     }
-                                    if (oSetup.isIframeValid === true) {
-                                        arrCap.push({action: "iframeIsValid", service: "sap.ushell.appRuntime"});
+                                    if (oSetup.isIframeValid) {
+                                        arrCap.push({ action: "iframeIsValid", service: "sap.ushell.appRuntime" });
                                     }
-                                    if (oSetup.session && oSetup.session.bLogoutSupport === true) {
-                                        arrCap.push({action: "logout", service: "sap.ushell.sessionHandler"});
+                                    if (oSetup.session?.bLogoutSupport) {
+                                        arrCap.push({ action: "logout", service: "sap.ushell.sessionHandler" });
                                     }
                                     if (arrCap.length > 0) {
-                                        BlueBoxHandler.addCapabilities(oServiceParams.oContainer, arrCap);
+                                        BlueBoxHandler.addCapabilities(oContainer, arrCap);
                                     }
                                 }
-                                return new jQuery.Deferred().resolve().promise();
                             }
                         }
                     }
@@ -922,20 +987,22 @@ sap.ui.define([
                 "sap.gui": {
                     oServiceCalls: {
                         loadFinished: {
-                            executeServiceCallFn: function (oServiceParams) {
-                                if (oServiceParams.oContainer.getIsKeepAlive() === false) {
-                                    oServiceParams.oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.GUI_V1, true);
+                            executeServiceCallFn: async function (oServiceParams) {
+                                const { oContainer } = oServiceParams;
+
+                                if (!oContainer.getIsKeepAlive()) {
+                                    oContainer.setProperty("statefulType", BlueBoxHandler.STATEFUL_TYPES.GUI_V1, true);
                                     oCurrentApplication = {
-                                        appId: oServiceParams.oContainer.getId(),
+                                        appId: oContainer.getId(),
                                         stt: "loading",
-                                        container: oServiceParams.oContainer,
+                                        container: oContainer,
                                         meta: undefined,
                                         app: undefined
                                     };
                                 } else {
-                                    oServiceParams.oContainer.setProperty("statefulType", -BlueBoxHandler.STATEFUL_TYPES.GUI_V1, true);
+                                    oContainer.setProperty("statefulType", -BlueBoxHandler.STATEFUL_TYPES.GUI_V1, true);
                                 }
-                                return new jQuery.Deferred().resolve({}).promise();
+                                return {};
                             }
                         }
                     }
@@ -950,14 +1017,17 @@ sap.ui.define([
             this.addEvents();
         };
 
+        /**
+         * @param {object} oShellNavigationInternal
+         */
         this.registerHandleHashChange = function (oShellNavigationInternal) {
-            oShellNavigationInternal.hashChanger.attachEvent("hashChanged", function (oHashChange) {
+            oShellNavigationInternal.hashChanger.attachEvent("hashChanged", (oHashChange) => {
                 //FIX for internal incident #1980317281 - In general, hash structure in FLP is splitted into 3 parts:
                 //A - application identification & B - Application parameters & C - Internal application area
                 // Now, when an IFrame changes its hash, it sends PostMessage up to the FLP. The FLP does 2 things: Change its URL
                 // and send a PostMessage back to the IFrame. This fix, initiated in the PostMessageAPI.js, blocks only
                 // the message back to the IFrame.
-                if (hasher.disableBlueBoxHashChangeTrigger === true) {
+                if (hasher.disableBlueBoxHashChangeTrigger) {
                     return;
                 }
                 if (oHashChange.mParameters && oShellNavigationInternal.hashChanger.isInnerAppNavigation(oHashChange.mParameters.newHash, oHashChange.mParameters.oldHash)) {
@@ -972,21 +1042,30 @@ sap.ui.define([
             });
         };
 
+        /**
+         * @param {object} oControl
+         */
         this.addControl = function (oControl) {
             oViewPortContainer.addCenterViewPort(oControl);
         };
 
+        /**
+         * @param {string} sId
+         */
         this.removeControl = function (sId) {
-            var oBlueBox = BlueBoxHandler.getBlueBoxById(sId),
-                bIsStateful = BlueBoxHandler.isStatefulContainer(oBlueBox);
+            const oBlueBox = BlueBoxHandler.getBlueBoxById(sId);
+            const bIsStateful = BlueBoxHandler.isStatefulContainer(oBlueBox);
 
             if (!bIsStateful) {
                 oViewPortContainer.removeCenterViewPort(sId, true);
             }
         };
 
+        /**
+         * @param {string} sIntent
+         */
         this.removeApplication = function (sIntent) {
-            var oInnerControl = this.getControl(sIntent);
+            const oInnerControl = this.getControl(sIntent);
 
             if (oInnerControl) {
                 this.removeControl(oInnerControl.getId());
@@ -994,30 +1073,48 @@ sap.ui.define([
             }
         };
 
+        /**
+         * @param {string} sIntent
+         * @returns {object} Returns the control.
+         */
         this.getControl = function (sIntent) {
             return oViewPortContainer
-                && (oViewPortContainer.getViewPortControl("centerViewPort", "application-" + sIntent)
-                    || oViewPortContainer.getViewPortControl("centerViewPort", "applicationShellPage-" + sIntent));
+                && (oViewPortContainer.getViewPortControl("centerViewPort", `application-${sIntent}`)
+                    || oViewPortContainer.getViewPortControl("centerViewPort", `applicationShellPage-${sIntent}`));
         };
 
+        /**
+         * @returns {object} Returns the view port container.
+         */
         this.getViewPortContainer = function () {
             return oViewPortContainer;
         };
 
+        /**
+         * @param {string} sId
+         */
         this.navTo = function (sId) {
             oViewPortContainer.navTo("centerViewPort", sId, "show");
         };
 
+        /**
+         * @returns {object} Returns the current application.
+         */
         this.getCurrentApplication = function () {
             return oCurrentApplication;
         };
 
+        /**
+         */
         this.unsetCurrentApplication = function () {
             oCurrentApplication = {};
         };
 
+        /**
+         * @param {boolean} bIsFull
+         */
         this.setApplicationFullWidth = function (bIsFull) {
-            var oCurrent = this.getCurrentApplication();
+            const oCurrent = this.getCurrentApplication();
 
             //validate that we have a valid applicationContainer
             if (oCurrent.container) {
@@ -1033,31 +1130,31 @@ sap.ui.define([
         // however that is 'not needed' since the loaded component
         // is not used. We should evaluate the possible performance
         // hit taken due to this implicit means to an end.
-        this.createComponent = function (oResolvedHashFragment, oParsedShellHash) {
+        /**
+         * @param {object} oResolvedHashFragment
+         * @param {object} oParsedShellHash
+         * @returns {Promise} Resolves when the component is created.
+         */
+        this.createComponent = async function (oResolvedHashFragment, oParsedShellHash) {
             function fnCloseKeepAliveIfSameUI5App (oApp) {
                 return (oApp.ui5ComponentName === oResolvedHashFragment.ui5ComponentName);
             }
-            var arrClosePromises = [];
-            var oDeferred = new jQuery.Deferred();
-
-            this.closeKeepAliveApps(fnCloseKeepAliveIfSameUI5App, arrClosePromises);
 
-            Promise.all(arrClosePromises)
-                .then(() => {
-                    return ushellUtils.promisify(Application.createComponent(oResolvedHashFragment, oParsedShellHash));
-                })
-                .then((oResult) => {
-                    oDeferred.resolve(oResult);
-                })
-                .catch((oError) => {
-                    oDeferred.reject(oError);
-                });
+            await this.closeKeepAliveApps(fnCloseKeepAliveIfSameUI5App);
 
-            return oDeferred.promise();
+            await Application.createComponent(oResolvedHashFragment, oParsedShellHash);
         };
 
+        /**
+         * @param {string} sAppId
+         * @param {object} oResolvedNavigationTarget
+         * @param {boolean} bIsColdStart
+         * @param {object} oShellHash
+         * @param {string} sFixedShellHash
+         * @returns {object}
+         */
         this.getAppContainer = function (sAppId, oResolvedNavigationTarget, bIsColdStart, oShellHash, sFixedShellHash) {
-            oResolvedNavigationTarget.shellUIService = oShellUIService.getInterface();
+            oResolvedNavigationTarget.shellUIService = oGlobalShellUIService.getInterface();
 
             /*
              * The external navigation mode in the resolution result is calculated
@@ -1082,15 +1179,24 @@ sap.ui.define([
             return oCurrentApplication.container;
         };
 
+        /**
+         * Returns the global ShellUIService instance.
+         * @returns {object} The global ShellUIService instance
+         */
         this.getShellUIService = function () {
-            return oShellUIService;
+            return oGlobalShellUIService;
         };
 
-        this.initShellUIService = function (oShellUIServiceChange) {
-            oShellUIService._attachHierarchyChanged(AppMeta.onHierarchyChange.bind(this));
-            oShellUIService._attachTitleChanged(AppMeta.onTitleChange.bind(this));
-            oShellUIService._attachRelatedAppsChanged(AppMeta.onRelatedAppsChange.bind(this));
-            oShellUIService._attachBackNavigationChanged(oShellUIServiceChange.fnOnBackNavigationChange.bind(this));
+        /**
+         * Creates the ShellUIService instance of the AppLifeCycle in application integration if not already created.
+         *
+         * @returns {Promise} A promise that resolves when the ShellUIService instance is created
+         *
+         * @since 1.127.0
+         * @private
+         */
+        this._createGlobalShellUIService = async function () {
+            oGlobalShellUIService = await ShellUIServiceFactory.createInstanceInternal();
         };
 
         /**
@@ -1114,10 +1220,10 @@ sap.ui.define([
          * @private
          */
         this.activeContainer = function (oApplicationContainer) {
-            BlueBoxHandler.forEach(function (oAppContainer) {
+            BlueBoxHandler.forEach((oAppContainer) => {
                 if (oAppContainer && oAppContainer !== oApplicationContainer) {
                     try {
-                        Log.info("Deactivating container " + oAppContainer.getId());
+                        Log.info(`Deactivating container ${oAppContainer.getId()}`);
                         oAppContainer.setActive(false);
                     } catch (e) {
                         /* empty */
@@ -1126,11 +1232,14 @@ sap.ui.define([
             });
 
             if (oApplicationContainer) {
-                Log.info("Activating container " + oApplicationContainer.getId());
+                Log.info(`Activating container "${oApplicationContainer.getId()}"`);
                 oApplicationContainer.setActive(true);
             }
         };
 
+        /**
+         * @param {object} oApplicationContainer
+         */
         this.showApplicationContainer = function (oApplicationContainer) {
             this.navTo(oApplicationContainer.getId());
             //Added this because in cases when navigating to the same id (can happen when stateful container, I need the on onAfterNavigate)
@@ -1143,54 +1252,38 @@ sap.ui.define([
             Log.info("New application context opened successfully in an existing transaction UI session.");
         };
 
-        this.initAppMetaParams = function () {
-            if (!this.getAppMeta().getIsHierarchyChanged()) {
-                oShellUIService.setHierarchy();
-            }
-            if (!this.getAppMeta().getIsTitleChanged()) {
-                var sHash = hasher.getHash();
-                if (sHash && sHash.indexOf("Shell-startIntent") === 0) {
-                    oShellUIService.setTitle("", true);
-                } else {
-                    oShellUIService.setTitle();
-                }
-            }
-            if (!this.getAppMeta().getIsRelatedAppsChanged()) {
-                oShellUIService.setRelatedApps();
-            }
-            if (!isBackNavigationChanged) {
-                oShellUIService.setBackNavigation();
-            }
-        };
-
+        /**
+         * @param {object} oAppContainer
+         * @param {object} oApplication
+         * @param {function} fnOnAfterRendering
+         */
         this.publishNavigationStateEvents = function (oAppContainer, oApplication, fnOnAfterRendering) {
             //after the app container is rendered, publish an event to notify
             //that an app was opened
-            var origExit,
-                sId = oAppContainer.getId ? oAppContainer.getId() : "",
-                that = this;
-            var appMetaData = AppConfiguration.getMetadata(),
-                sIcon = appMetaData.icon,
-                sTitle = appMetaData.title;
+            const sId = oAppContainer.getId ? oAppContainer.getId() : "";
+            const appMetaData = AppConfiguration.getMetadata();
+            const sIcon = appMetaData.icon;
+            const sTitle = appMetaData.title;
 
             //Attach an event handler which will be called onAfterRendering
             oAppContainer.addEventDelegate({ onAfterRendering: fnOnAfterRendering });
 
             //after the app container exit, publish an event to notify
             //that an app was closed
-            origExit = oAppContainer.exit;
+            const that = this;
+            const origExit = oAppContainer.exit;
             oAppContainer.exit = function () {
                 if (origExit) {
                     origExit.apply(this, arguments);
                 }
                 //apply the original density settings
-                that.getAppMeta()._applyContentDensityByPriority();
+                AppMeta._applyContentDensityByPriority();
 
                 //wrapped in setTimeout since "publish" is not async
-                setTimeout(function () {
+                setTimeout(() => {
                     // TODO: do not mutate an internal structure (in a Timeout!),
                     // create a new object
-                    var oEventData = deepExtend({}, oApplication);
+                    const oEventData = deepExtend({}, oApplication);
                     delete oEventData.componentHandle;
                     oEventData.appId = sId;
                     oEventData.usageIcon = sIcon;
@@ -1202,7 +1295,7 @@ sap.ui.define([
                 // the former code leaked an *internal* data structure, making it part of a public API
                 // restrict hte public api to the minimal set of precise documented properties which can be retained under
                 // under future evolutions
-                var oPublicEventData = that._publicEventDataFromResolutionResult(oApplication);
+                const oPublicEventData = that._publicEventDataFromResolutionResult(oApplication);
                 //publish the event externally
                 RendererUtils.publishExternalEvent("appClosed", oPublicEventData);
             };
@@ -1215,23 +1308,30 @@ sap.ui.define([
          * @returns {object} an object exposing certain information to external stakeholders
          */
         this._publicEventDataFromResolutionResult = function (oApplication) {
-            var oPublicEventData = {};
+            const oPublicEventData = {};
             if (!oApplication) {
                 return oApplication;
             }
-            ["applicationType", "ui5ComponentName", "url", "additionalInformation", "text"].forEach(function (sProp) {
+            ["applicationType", "ui5ComponentName", "url", "additionalInformation", "text"].forEach((sProp) => {
                 oPublicEventData[sProp] = oApplication[sProp];
             });
             Object.freeze(oPublicEventData);
             return oPublicEventData;
         };
 
+        /**
+         * @param {string} sIntent
+         * @param {string} sFixedShellHash
+         * @param {string} sAppPart
+         * @param {string} sOldShellHash
+         * @returns {object}
+         */
         this.getInMemoryInstance = function (sIntent, sFixedShellHash, sAppPart, sOldShellHash) {
-            var sFullAppId = "application-" + sIntent,
-                oAppEntry = Storage.get(sFullAppId),
-                sOldShellHashLowerCase = "",
-                bNavigateToHomepage = false,
-                bNavigatingFromHomeWithAppState;
+            const sFullAppId = `application-${sIntent}`;
+            const oAppEntry = Storage.get(sFullAppId);
+            let sOldShellHashLowerCase = "";
+            let bNavigateToHomepage = false;
+            let bNavigatingFromHomeWithAppState;
 
             //remove application from cache if has different parameters
             if (oAppEntry) {
@@ -1271,29 +1371,40 @@ sap.ui.define([
             };
         };
 
-        this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode,
-                                            bNavigationInSameStatefullContainer, bReturnedFromKeepAlivePoolFLPV2) {
-            var that = this,
-                oPromise;
+        /**
+         * @param {boolean} bIsInitial
+         * @param {boolean} bIsInCache
+         * @param {string} sToId
+         * @param {object} oInnerControl
+         * @param {object} oTarget
+         * @param {string} sFixedShellHash
+         * @param {object} oKeepAliveMode
+         * @param {boolean} bNavigationInSameStatefulContainer
+         * @param {boolean} bReturnedFromKeepAlivePoolFLPV2
+         * @returns {Promise} Resolves when the stateful app was opened.
+         */ // eslint-disable-next-line max-len
+        this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefulContainer, bReturnedFromKeepAlivePoolFLPV2) {
+            let oPromise;
 
             oInnerControl.setProperty("iframeReusedForApp", true, true);
-            if (Storage.get(sToId) && bIsInitial === false && !bReturnedFromKeepAlivePoolFLPV2) {
-                oPromise = BlueBoxHandler.statefulRestoreKeepAliveApp(oInnerControl, oTarget.url, sToId, oTarget, bNavigationInSameStatefullContainer)
-                    .then(function () {
-                        that.showApplicationContainer(oInnerControl);
-                    }, function (vError) {
-                        Log.error(vError && vError.message || vError);
+            if (Storage.get(sToId) && !bIsInitial && !bReturnedFromKeepAlivePoolFLPV2) {
+                oPromise = BlueBoxHandler.statefulRestoreKeepAliveApp(oInnerControl, oTarget.url, sToId, oTarget, bNavigationInSameStatefulContainer)
+                    .then(() => {
+                        this.showApplicationContainer(oInnerControl);
+                    })
+                    .catch((vError) => {
+                        Log.error(vError?.message || vError);
                     });
             } else {
-                this.initAppMetaParams();
-                oPromise = BlueBoxHandler.statefulCreateApp(oInnerControl, oTarget.url, sToId, oTarget, bNavigationInSameStatefullContainer)
-                    .then(function (oResult) {
-                        if (oResult && oResult.deletedKeepAliveId) {
+                oPromise = BlueBoxHandler.statefulCreateApp(oInnerControl, oTarget.url, sToId, oTarget, bNavigationInSameStatefulContainer)
+                    .then((oResult) => {
+                        if (oResult?.deletedKeepAliveId) {
                             Storage.removeById(oResult.deletedKeepAliveId);
                         }
-                        that.showApplicationContainer(oInnerControl);
-                    }, function (vError) {
-                        Log.error(vError && vError.message || vError);
+                        this.showApplicationContainer(oInnerControl);
+                    })
+                    .catch((vError) => {
+                        Log.error(vError?.message || vError);
                     });
 
                 //creating a new application check if needs to be keep (for the keep alive), and if so store the application
@@ -1305,37 +1416,38 @@ sap.ui.define([
             return oPromise;
         };
 
-        this.handleControl = function (sIntent, sAppId, oShellHash, oTarget, fnWrapper, sFixedShellHash, sOldFixedShellHash) {
-            var that = this,
-                oInnerControl,
+        /**
+         * @param {string} sIntent
+         * @param {string} sAppId
+         * @param {object} oShellHash
+         * @param {object} oTarget
+         * @param {function} fnWrapper
+         * @param {string} sFixedShellHash
+         * @param {string} sOldFixedShellHash
+         * @returns {Promise} Resolves when the control is handled
+         */
+        this.handleControl = async function (sIntent, sAppId, oShellHash, oTarget, fnWrapper, sFixedShellHash, sOldFixedShellHash) {
+            let bReturnedFromKeepAlivePoolFLPV2 = false;
+            let bReturnedFromKeepAlivePoolGuiV1 = false;
+            const bIsAppOfTypeCachable = CACHED_APP_TYPES.indexOf(oTarget.applicationType) >= 0;
+            const sFullAppId = `application-${sIntent}`;
+            let bIsInitial = false;
+            const oKeepAliveMode = {
+                globalValue: undefined,
+                paramValue: undefined
+            };
+            let bNavigationInSameStatefulContainer = false;
+            let oInnerControl,
                 bReuseStatefulContainer,
-                bReturnedFromKeepAlivePoolFLPV2 = false,
-                bReturnedFromKeepAlivePoolGuiV1 = false,
-                bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oTarget.applicationType) >= 0,
-                sFullAppId = "application-" + sIntent,
-                oCachedEntry,
-                bIsInCache,
-                sAppType,
-                bIsInitial = false,
-                bDefaultFullWidth,
-                bKeptAliveApp,
-                oDeferredDestroyApp,
-                oDeferredOpenApp = new jQuery.Deferred(),
-                oDeffedControlCreation,
-                oMetadata,
                 oCurrentAppContainer,
                 oOldAppStorageEntry,
                 oTargetAppContainer,
-                oPromiseAppClose = new jQuery.Deferred().resolve().promise(),
-                oKeepAliveMode = {
-                    globalValue: undefined,
-                    paramValue: undefined
-                },
                 iLastValidTimeDelta,
                 oOldHash,
                 sOldFullAppId,
                 sCurrentPageId,
-                bNavigationInSameStatefullContainer = false;
+                bKeptAliveApp,
+                oCachedEntry;
 
             //get the potential target stateful container and check if it's valid. if not, destroy it
             //before we try to create the new application
@@ -1343,14 +1455,13 @@ sap.ui.define([
             if (BlueBoxHandler.isStatefulContainer(oTargetAppContainer)) {
                 iLastValidTimeDelta = new Date().getTime() - oTargetAppContainer.getIsIframeValidTime().time;
                 if ((BlueBoxHandler.isIframeIsValidSupported(oTargetAppContainer) && iLastValidTimeDelta >= 3500) ||
-                    oTargetAppContainer.getIsInvalidIframe() === true) {
-                    var sReason = oTargetAppContainer.getIsInvalidIframe() === true ?
-                        "iframe did not ping in the last '" + iLastValidTimeDelta + "' ms" :
-                        "iframe is in invalid state";
+                    oTargetAppContainer.getIsInvalidIframe()) {
+                    const sReason = oTargetAppContainer.getIsInvalidIframe() ? `iframe did not ping in the last '${iLastValidTimeDelta}' ms` : "iframe is in invalid state";
                     Log.warning(
-                        "Destroying statefull container iframe due to unresponsiveness (" + oTargetAppContainer.getId() + ")",
-                        "reason: " + sReason,
-                        "sap.ushell.components.applicationIntegration.AppLifeCycle");
+                        `Destroying stateful container iframe due to unresponsiveness (${oTargetAppContainer.getId()})`,
+                        `reason: ${sReason}`,
+                        "sap.ushell.components.applicationIntegration.AppLifeCycle"
+                    );
                     BlueBoxHandler.removeCapabilities(oTargetAppContainer);
                     this.destroyApplication(sFullAppId, oTargetAppContainer);
                     BlueBoxHandler.deleteBlueBoxByUrl(oTarget.url);
@@ -1365,7 +1476,7 @@ sap.ui.define([
             if (typeof sOldFixedShellHash === "string") {
                 oOldHash = oUrlParsing.parseShellHash(sOldFixedShellHash);
                 if (oOldHash) {
-                    sOldFullAppId = "application-" + oOldHash.semanticObject + "-" + oOldHash.action;
+                    sOldFullAppId = `application-${oOldHash.semanticObject}-${oOldHash.action}`;
                     oOldAppStorageEntry = Storage.get(sOldFullAppId);
                 }
                 if (oOldAppStorageEntry) {
@@ -1381,104 +1492,62 @@ sap.ui.define([
             //we will close the application we are leaving when:
             // 1. the application is running in a stateful container
             // 2. this is a legacy keep alive app, and we navigate back (this in order to return the container to the pool
-            //    of containers to it can be used again for the upcomming opened app)
+            //    of containers to it can be used again for the upcoming opened app)
             bReuseStatefulContainer = BlueBoxHandler.isStatefulContainer(oCurrentAppContainer);
-            var bSourceIsKeepAliveFromPool = BlueBoxHandler.isStatefulContainerInKeepAlivePool(oCurrentAppContainer) &&
-                    oCurrentAppContainer.getCurrentAppId && (oCurrentAppContainer.getCurrentAppId().length > 0);
+            const bSourceIsKeepAliveFromPool = BlueBoxHandler.isStatefulContainerInKeepAlivePool(oCurrentAppContainer) && oCurrentAppContainer.getCurrentAppId?.().length > 0;
             if (bReuseStatefulContainer || bSourceIsKeepAliveFromPool) {
-                oPromiseAppClose = this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false, false);
+                await this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false, false);
                 if (oCurrentAppContainer === oTargetAppContainer) {
-                    bNavigationInSameStatefullContainer = true;
+                    bNavigationInSameStatefulContainer = true;
                 }
             }
 
             //now, we can open the new application
-            oPromiseAppClose.then(function () {
-                bIsInCache = that.isAppOfTypeCached(sFullAppId, bIsAppOfTypeCachable, oKeepAliveMode) || that.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode);
-                //set the default full width value
-                sAppType = that.calculateAppType(oTarget);
-                bDefaultFullWidth = ApplicationType.getDefaultFullWidthSetting(sAppType);
-
-                oInnerControl = BlueBoxHandler.getBlueBoxByUrl(oTarget.url);
-                bReuseStatefulContainer = BlueBoxHandler.isStatefulContainer(oInnerControl);
-
-                if (!bReuseStatefulContainer) {
-                    // only clear oInnerControl in case it is not a navigation from an application to the same application
-                    if (oCurrentApplication && sFullAppId !== oCurrentApplication.appId) {
-                        oInnerControl = undefined;
-                    }
-                    oCachedEntry = Storage.get("application" + sAppId);
-
-                    if (oCachedEntry) {
-                        oInnerControl = oCachedEntry.container;
-                        if (!bReuseStatefulContainer && bIsInCache && oInnerControl !== undefined) {
-                            bKeptAliveApp = true;
-                        }
-                    }
+            const bIsInCache = this.isAppOfTypeCached(sFullAppId, bIsAppOfTypeCachable, oKeepAliveMode) || this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode);
+            //set the default full width value
+            const sAppType = this.calculateAppType(oTarget);
+            const bDefaultFullWidth = ApplicationType.getDefaultFullWidthSetting(sAppType);
+
+            oInnerControl = BlueBoxHandler.getBlueBoxByUrl(oTarget.url);
+            bReuseStatefulContainer = BlueBoxHandler.isStatefulContainer(oInnerControl);
+
+            if (!bReuseStatefulContainer) {
+                // only clear oInnerControl in case it is not a navigation from an application to the same application
+                if (oCurrentApplication && sFullAppId !== oCurrentApplication.appId) {
+                    oInnerControl = undefined;
                 }
+                oCachedEntry = Storage.get(`application${sAppId}`);
 
-                var bFullWidthCapability, bFullWidth;
-                bFullWidthCapability = oTarget.appCapabilities && oTarget.appCapabilities.fullWidth;
-                oMetadata = AppConfiguration.getMetadata(oTarget);
-                //Here there's a double check for the fullwidth - once as a type of boolean and one as a string.
-                //This is because we found that developers configured this variable in the manifest also as a string,
-                //so the checks of the oMetadata and the oTarget are to avoid regression with the use of this field.
-                if (bDefaultFullWidth === true) {
-                    if (oTarget.fullWidth === false || oTarget.fullWidth === "false" ||
-                        oMetadata.fullWidth === false || oMetadata.fullWidth === "false" || bFullWidthCapability === false) {
-                        bFullWidth = false;
+                if (oCachedEntry) {
+                    oInnerControl = oCachedEntry.container;
+                    if (!bReuseStatefulContainer && bIsInCache && oInnerControl !== undefined) {
+                        bKeptAliveApp = true;
                     }
-                } else if (oTarget.fullWidth === true || oTarget.fullWidth === "true" ||
-                    oMetadata.fullWidth === true || oMetadata.fullWidth === "true") {
-                    bFullWidth = true;
                 }
+            }
 
-                if (bFullWidth === undefined) {
-                    bFullWidth = bDefaultFullWidth;
+            let bFullWidth;
+            const bFullWidthCapability = oTarget?.appCapabilities?.fullWidth;
+            const oMetadata = AppConfiguration.getMetadata(oTarget);
+            //Here there's a double check for the fullwidth - once as a type of boolean and one as a string.
+            //This is because we found that developers configured this variable in the manifest also as a string,
+            //so the checks of the oMetadata and the oTarget are to avoid regression with the use of this field.
+            if (bDefaultFullWidth) {
+                if (oTarget.fullWidth === false || oTarget.fullWidth === "false" ||
+                    oMetadata.fullWidth === false || oMetadata.fullWidth === "false" || bFullWidthCapability === false) {
+                    bFullWidth = false;
                 }
+            } else if (oTarget.fullWidth || oTarget.fullWidth === "true" ||
+                oMetadata.fullWidth || oMetadata.fullWidth === "true") {
+                bFullWidth = true;
+            }
 
-                if (bReuseStatefulContainer) {
-                    if (!oInnerControl) {
-                        oInnerControl = fnWrapper(
-                            sIntent,
-                            oMetadata,
-                            oShellHash,
-                            oTarget,
-                            sAppId,
-                            bFullWidth,
-                            sFixedShellHash
-                        );
-                        if (this.isAppInCache(oInnerControl.getId())) {
-                            oCurrentApplication = Storage.get(oInnerControl.getId());
-                        }
-                        that.navTo(oInnerControl.getId());
-                        bIsInitial = true;
-                    }
-                } else if (BlueBoxHandler.getStatefulContainerType(oTarget.url, true) !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1 && oInnerControl && !bIsInCache) {
-                    //this case this controler cant be reused and we need it to be embed, so delete it.
-                    oDeferredDestroyApp = new jQuery.Deferred();
-                    that.destroyApplication(oInnerControl.getId(), oInnerControl, oDeferredDestroyApp);
-
-                    // The immediately following method call internally calls
-                    // `this.oViewPortContainer.addCenterViewPort(oAppContainer)`
-                    // when Gui V1 Stateful Container is true, and in that case
-                    // `oInnerControl` will be the component control of an existing session.
-                    oDeferredDestroyApp.then(function () {
-                        oInnerControl = fnWrapper(
-                            sIntent,
-                            oMetadata,
-                            oShellHash,
-                            oTarget,
-                            sAppId,
-                            bFullWidth,
-                            sFixedShellHash
-                        );
-                    });
-                } else if (!oInnerControl) {
-                    // The immediately following method call internally calls
-                    // `this.oViewPortContainer.addCenterViewPort(oAppContainer)`
-                    // when Gui V1 Stateful Container is true, and in that case
-                    // `oInnerControl` will be the component control of an existing session.
+            if (bFullWidth === undefined) {
+                bFullWidth = bDefaultFullWidth;
+            }
+
+            if (bReuseStatefulContainer) {
+                if (!oInnerControl) {
                     oInnerControl = fnWrapper(
                         sIntent,
                         oMetadata,
@@ -1488,119 +1557,135 @@ sap.ui.define([
                         bFullWidth,
                         sFixedShellHash
                     );
-
-                    //if we got an iframe from cache, simulate statefull container
-                    //open that should happen later here
-                    // if (oInnerControl && oInnerControl.getProperty && oInnerControl.getProperty("fetchedFromCache") === true) {
-                    //     InnerControl.getProperty("fetchedFromIframeCache", false, true);
-                    // }
-                    if (oInnerControl.getIsFetchedFromCache && oInnerControl.getIsFetchedFromCache() && oInnerControl.getStatefulType) {
-                        if (oInnerControl.getStatefulType() === -BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
-                            bReturnedFromKeepAlivePoolGuiV1 = true;
-                        } else {
-                            bReuseStatefulContainer = true;
-                            bReturnedFromKeepAlivePoolFLPV2 = true;
-                        }
+                    if (this.isAppInCache(oInnerControl.getId())) {
+                        oCurrentApplication = Storage.get(oInnerControl.getId());
                     }
+                    this.navTo(oInnerControl.getId());
+                    bIsInitial = true;
                 }
-
-                if (oDeferredDestroyApp === undefined) {
-                    oDeferredDestroyApp = new jQuery.Deferred().resolve();
+            } else if (BlueBoxHandler.getStatefulContainerType(oTarget.url, true) !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1 && oInnerControl && !bIsInCache) {
+                //this case this controller cant be reused and we need it to be embed, so delete it.
+                await this.destroyApplication(oInnerControl.getId(), oInnerControl);
+
+                // The immediately following method call internally calls
+                // `this.oViewPortContainer.addCenterViewPort(oAppContainer)`
+                // when Gui V1 Stateful Container is true, and in that case
+                // `oInnerControl` will be the component control of an existing session.
+                oInnerControl = fnWrapper(
+                    sIntent,
+                    oMetadata,
+                    oShellHash,
+                    oTarget,
+                    sAppId,
+                    bFullWidth,
+                    sFixedShellHash
+                );
+            } else if (!oInnerControl) {
+                // The immediately following method call internally calls
+                // `this.oViewPortContainer.addCenterViewPort(oAppContainer)`
+                // when Gui V1 Stateful Container is true, and in that case
+                // `oInnerControl` will be the component control of an existing session.
+                oInnerControl = fnWrapper(
+                    sIntent,
+                    oMetadata,
+                    oShellHash,
+                    oTarget,
+                    sAppId,
+                    bFullWidth,
+                    sFixedShellHash
+                );
+
+                //if we got an iframe from cache, simulate stateful container
+                //open that should happen later here
+                // if (oInnerControl && oInnerControl.getProperty && oInnerControl.getProperty("fetchedFromCache") === true) {
+                //     InnerControl.getProperty("fetchedFromIframeCache", false, true);
+                // }
+                if (oInnerControl?.getIsFetchedFromCache?.() && oInnerControl.getStatefulType) {
+                    if (oInnerControl.getStatefulType() === -BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
+                        bReturnedFromKeepAlivePoolGuiV1 = true;
+                    } else {
+                        bReuseStatefulContainer = true;
+                        bReturnedFromKeepAlivePoolFLPV2 = true;
+                    }
                 }
+            }
 
-                if (oInnerControl && oInnerControl.getDeffedControlCreation) {
-                    oDeffedControlCreation = oInnerControl.getDeffedControlCreation();
-                } else {
-                    oDeffedControlCreation = Promise.resolve();
+            if (oInnerControl?.getDeffedControlCreation) {
+                await ushellUtils.promisify(oInnerControl.getDeffedControlCreation());
+            }
+
+            //here, we simply show (turning to visible) the container of the new opened application in case it is not stateful container
+            //and not old gui v1 stateful
+            if (oInnerControl.getStatefulType && oInnerControl.getStatefulType() !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1 && !bReuseStatefulContainer) {
+                if (bKeptAliveApp) {
+                    EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
+                }
+                if (this.isAppInCache(oInnerControl.getId())) {
+                    oCurrentApplication = Storage.get(oInnerControl.getId());
                 }
+                this.navTo(oInnerControl.getId());
+                if (bKeptAliveApp) {
+                    EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
+                }
+            }
 
-                /**
-                 * The code below should have been written with Promise.all, but as a result
-                 * of a failure in shell.qunit.js, it was written in the way below (the only way that the
-                 * qunit works.
-                 * Later, the qunit should be analyzed to check how to fix it (the main issue is that the
-                 * tests run in parallel and there is a dependency between them.
-                 */
-                oDeferredDestroyApp.then(function () {
-                    oDeffedControlCreation.then(function () {
-                        //here, we simply show (turning to visible) the container of the new opened application in case it is not stateful container
-                        //and not old gui v1 statefull
-                        if (oInnerControl.getStatefulType && oInnerControl.getStatefulType() !== BlueBoxHandler.STATEFUL_TYPES.GUI_V1 && !bReuseStatefulContainer) {
-                            if (bKeptAliveApp === true) {
-                                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
-                            }
-                            if (that.isAppInCache(oInnerControl.getId())) {
-                                oCurrentApplication = Storage.get(oInnerControl.getId());
-                            }
-                            that.navTo(oInnerControl.getId());
-                            if (bKeptAliveApp === true) {
-                                that.initAppMetaParams();
-                                EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
-                            }
-                        }
+            // Assuming a previously existing TR container existed and is now
+            // going to be reused, we prompt the container to load the new application context.
 
-                        // Assuming a previously existing TR container existed and is now
-                        // going to be reused, we prompt the container to load the new application context.
-                        var oPromiseAsyncAppCreate = new jQuery.Deferred().resolve().promise();
-                        //  SAP GUI is sending post messages for back navigation as soon the create application event is sent to the iframe,
-                        // so this makes sure the container is active before sending the event.
-                        // For WD applications, the application is active only after the application is created.
-                        // So it is not navigated twice.
-                        if (oInnerControl.getApplicationType() === ApplicationType.TR.type) {
-                            that.activeContainer(oInnerControl);
-                        }
-                        //here, we create the application in case this is a stateful container (meaning, using the existing iframe)
-                        if (bReuseStatefulContainer) {
-                            //for scube - make sure the container is active before we open the app
-                            //to allow post messages form the iframe to flp that are sent
-                            //as part of the target resolution process
-                            if (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "UI5") {
-                                oInnerControl.setProperty("active", true, true);
-                            }
-                            oPromiseAsyncAppCreate = that.handleOpenStateful(
-                                bIsInitial, bIsInCache, "application" + sAppId, oInnerControl, oTarget,
-                                sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefullContainer, bReturnedFromKeepAlivePoolFLPV2);
-                        } else if (oInnerControl.getStatefulType && oInnerControl.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1 || bReturnedFromKeepAlivePoolGuiV1) {
-                            //here, we create the application in case this is old gui v1 statefull
-                            oPromiseAsyncAppCreate = WebGUIStatefulHandler.guiStatefulCreateApp(that, oInnerControl, oTarget);
-                        }
-
-                        //for case of stateful container or gui v1 stateful, show the application view (make it visible)
-                        oPromiseAsyncAppCreate.then(function () {
-                            ushellUtils.setPerformanceMark("FLP -- centerViewPort");
-                            if (oInnerControl.getApplicationType() !== ApplicationType.TR.type) {
-                                // Activate container before showing it (start reacting to postMessage calls)
-                                that.activeContainer(oInnerControl);
-                            }
+            //  SAP GUI is sending post messages for back navigation as soon the create application event is sent to the iframe,
+            // so this makes sure the container is active before sending the event.
+            // For WD applications, the application is active only after the application is created.
+            // So it is not navigated twice.
+            if (oInnerControl.getApplicationType() === ApplicationType.TR.type) {
+                this.activeContainer(oInnerControl);
+            }
+            //here, we create the application in case this is a stateful container (meaning, using the existing iframe)
+            if (bReuseStatefulContainer) {
+                //for scube - make sure the container is active before we open the app
+                //to allow post messages form the iframe to flp that are sent
+                //as part of the target resolution process
+                if (oTarget.appCapabilities?.appFrameworkId === "UI5") {
+                    oInnerControl.setProperty("active", true, true);
+                }
+                // eslint-disable-next-line max-len
+                await this.handleOpenStateful(bIsInitial, bIsInCache, `application${sAppId}`, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefulContainer, bReturnedFromKeepAlivePoolFLPV2);
+            } else if (oInnerControl.getStatefulType?.() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1 || bReturnedFromKeepAlivePoolGuiV1) {
+                //here, we create the application in case this is old gui v1 stateful
+                await WebGUIStatefulHandler.guiStatefulCreateApp(this, oInnerControl, oTarget);
+            }
 
-                            /*
-                             * Workaround:
-                             * The oCurrentApplication object does not reflect the currently opened application.
-                             * This leads to store/restore calls on the wrong application.
-                             * Create application that is not persisted and not cashed as a fallback.
-                             *
-                             * This issue occurs for iframe applications reusing the iframe.
-                             */
-                            if (oCurrentApplication.appId !== sFullAppId) {
-                                oCurrentApplication = {
-                                    appId: sFullAppId,
-                                    stt: "loading",
-                                    container: oInnerControl,
-                                    meta: AppConfiguration.getMetadata(oTarget),
-                                    app: undefined
-                                };
-                            }
-                            oDeferredOpenApp.resolve();
-                        });
-                    });
-                });
-            });
+            //for case of stateful container or gui v1 stateful, show the application view (make it visible)
+            ushellUtils.setPerformanceMark("FLP -- centerViewPort");
+            if (oInnerControl.getApplicationType() !== ApplicationType.TR.type) {
+                // Activate container before showing it (start reacting to postMessage calls)
+                this.activeContainer(oInnerControl);
+            }
 
-            return oDeferredOpenApp.promise();
+            /*
+                * Workaround:
+                * The oCurrentApplication object does not reflect the currently opened application.
+                * This leads to store/restore calls on the wrong application.
+                * Create application that is not persisted and not cashed as a fallback.
+                *
+                * This issue occurs for iframe applications reusing the iframe.
+                */
+            if (oCurrentApplication.appId !== sFullAppId) {
+                oCurrentApplication = {
+                    appId: sFullAppId,
+                    stt: "loading",
+                    container: oInnerControl,
+                    meta: AppConfiguration.getMetadata(oTarget),
+                    app: undefined
+                };
+            }
         };
 
         /**
          * New app was created and we now have to switch the state
+         * @param {string} sLaunchpadState
+         * @param {string} sAppId
+         * @param {string} sAppType
+         * @param {boolean} bIsExplaceNavigation
          */
         this.switchViewState = function (sLaunchpadState, sAppId, sAppType, bIsExplaceNavigation) {
             // Store state before creating a new one
@@ -1610,7 +1695,6 @@ sap.ui.define([
                 StateManager.destroyManagedControls();
             }
 
-
             const sShellMode = StateManager.getShellMode();
             // GUI Applications need a back button to work properly
             const oShellModeOverrides = {
@@ -1626,7 +1710,7 @@ sap.ui.define([
             StateManager.switchState(sLaunchpadState, sShellModeOverride);
 
             // Restore state if it already exists
-            const oToStorageEntry = Storage.get("application" + sAppId);
+            const oToStorageEntry = Storage.get(`application${sAppId}`);
             if (oToStorageEntry) {
                 KeepAlive.restore(oToStorageEntry);
             } else {
@@ -1637,18 +1721,31 @@ sap.ui.define([
             StateManager.applyStalledChanges();
         };
 
+        /**
+         * @param {object} oCommunicationHandler
+         */
         this.registerShellCommunicationHandler = function (oCommunicationHandler) {
             Application.registerShellCommunicationHandler(oCommunicationHandler);
         };
 
+        /**
+         * @param {string} sHandlers
+         * @param {string} sType
+         */
         this.registerIframeCommunicationHandler = function (sHandlers, sType) {
             oGlobalIframeCommunicationHandlers[sType] = sHandlers;
         };
 
-        this.setBackNavigationChanged = function (isBackNavigationChangedValue) {
-            isBackNavigationChanged = isBackNavigationChangedValue;
+        /**
+         * @param {boolean} bIsBackNavigationChangedValue
+         */
+        this.setBackNavigationChanged = function (bIsBackNavigationChangedValue) {
+            isBackNavigationChanged = bIsBackNavigationChangedValue;
         };
 
+        /**
+         * @returns {boolean} Whether the back navigation was changed.
+         */
         this.getBackNavigationChanged = function () {
             return isBackNavigationChanged;
         };