@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/Container.js

@@ -56,8 +56,9 @@ sap.ui.define([
     "sap/ushell/renderer/ShellLayout",
     "sap/base/util/Deferred",
     "sap/base/util/ObjectPath",
-    "sap/ushell/api/BootstrapObserver"
-], function (
+    "sap/ushell/api/BootstrapObserver",
+    "sap/ushell/resources"
+], (
     assert,
     Log,
     deepExtend,
@@ -80,22 +81,24 @@ sap.ui.define([
     ShellLayout,
     Deferred,
     ObjectPath,
-    BootstrapObserver
-) {
+    BootstrapObserver,
+    ushellResources
+) => {
     "use strict";
 
     /* global OData */
 
-    var S_COMPONENT_NAME = "sap.ushell.Container";
-    var S_DIRTY_STATE_PREFIX = "sap.ushell.Container.dirtyState.";
+    const S_COMPONENT_NAME = "sap.ushell.Container";
+    const S_DIRTY_STATE_PREFIX = "sap.ushell.Container.dirtyState.";
     // The configuration as read from window["sap-ushell-config"]
-    var oConfigSetting = {};
-    var oConfig;
+    const oConfigSetting = {};
+    let oConfig;
     // Map with platform-specific packages for the service adapters.
     // This map is passed in bootstrap and is valid for the given logon platform
-    var mPlatformPackages;
-    var aAsyncLogoutEventFunctions = []; //async logout even functions that return a promise
-    var oContainerInstance;
+    let mPlatformPackages;
+    const aAsyncLogoutEventFunctions = []; // async logout even functions that return a promise
+    // eslint-disable-next-line prefer-const
+    let oContainerInstance;
     const aRegisteredLogoutHandlers = [];
 
     // Try to close window. Note: Most browsers do NOT allow closing windows by JS if they were opened manually.
@@ -118,7 +121,7 @@ sap.ui.define([
         if (mPlatformPackages && mPlatformPackages[sPlatform]) {
             return mPlatformPackages[sPlatform];
         }
-        return "sap.ushell.adapters." + sPlatform;
+        return `sap.ushell.adapters.${sPlatform}`;
     }
 
     /**
@@ -129,7 +132,7 @@ sap.ui.define([
      * @returns {object} the service configuration
      */
     function getServiceConfig (sServiceName) {
-        var oServices = oConfig.services;
+        const oServices = oConfig.services;
         if (!oServices) {
             return {};
         }
@@ -154,8 +157,8 @@ sap.ui.define([
      * @returns {object|Promise} the adapter or, in asynchronous mode, a Promise that returns the adapter
      */
     function createAdapter (sName, oSystem, sParameter, bAsync, bUseConfiguredAdapterOnly) {
-        var oAdapterConfig = getServiceConfig(sName).adapter || {};
-        var sAdapterName;
+        const oAdapterConfig = getServiceConfig(sName).adapter || {};
+        let sAdapterName;
 
         async function getAdapterInstance (AdapterModule) {
             let AdapterClass;
@@ -172,7 +175,7 @@ sap.ui.define([
                 }
                 throw oError;
             }
-            var oAdapterInstance = new AdapterClass(oSystem, sParameter, { config: oAdapterConfig.config || {} });
+            const oAdapterInstance = new AdapterClass(oSystem, sParameter, { config: oAdapterConfig.config || {} });
             return oAdapterInstance;
         }
 
@@ -182,17 +185,19 @@ sap.ui.define([
                 return (bAsync ? Promise.resolve() : undefined);
             }
         } else {
-            sAdapterName = oAdapterConfig.module || getPlatformPackage(oSystem.getPlatform()) + "." + sName + "Adapter";
+            sAdapterName = oAdapterConfig.module || `${getPlatformPackage(oSystem.getPlatform())}.${sName}Adapter`;
         }
 
-        var sModule = sAdapterName.replace(/\./g, "/");
+        const sModule = sAdapterName.replace(/\./g, "/");
 
         /**
+         * @param {string} AdapterModule adapter path.
+         * @returns {object} a new instance of an adapter.
          * @deprecated since 1.100
          * @private
          */
         function getAdapterInstanceSync (AdapterModule) {
-            var AdapterClass;
+            let AdapterClass;
             try {
                 AdapterClass = sap.ui.requireSync(AdapterModule); // LEGACY API (deprecated)
             } catch (oError) {
@@ -218,6 +223,25 @@ sap.ui.define([
         return getAdapterInstance(sModule);
     }
 
+    /**
+     * Creates and registers injectable ui5services.
+     *
+     * @param {string[]} aServicesToRegister An array of service names to register.
+     * @param {boolean} bAddCallProtection Whether to add call protection check.
+     *   This may not be wanted in case the service is created via:
+     *   ServiceFactoryRegistry#get("sap.ushell.ui5service.<service>").createInstance().
+     * @private
+     */
+    function registerInjectableUi5Services (aServicesToRegister, bAddCallProtection) {
+        aServicesToRegister.forEach((sUshellServiceName) => {
+            // create registerable factory
+            const oServiceFactory = oUi5ServiceFactory.createServiceFactory(sUshellServiceName, bAddCallProtection);
+
+            // register factory to allow UI5 to create the service
+            ServiceFactoryRegistry.register(`sap.ushell.ui5service.${sUshellServiceName}`, oServiceFactory);
+        });
+    }
+
     /**
      * @alias sap.ushell.Container
      * @namespace
@@ -233,24 +257,65 @@ sap.ui.define([
      * @public
      */
     function Container () {
-        var oEventProvider = new EventProvider();
-        var isDirty = false;
-        var aRegisteredDirtyMethods = [];
-        var oRenderers = {};
-        var sRemoteSystemPrefix;
-        var mRemoteSystems = {};
-        var oGlobalDirtyDeferred;
-        var fnStorageEventListener;
-        var oLocalStorage = ushellUtils.getLocalStorage();
-        var mServicesByName = new ushellUtils.Map();
-        var mServicesByNamePromise = new ushellUtils.Map();
-        var sSessionTerminationKey;
-        var that = this;
-
-        var oAdapter;
-        var bInitialized = false;
-
-        var oContainerReadyDeferred = new Deferred();
+        const oEventProvider = new EventProvider();
+        let isDirty = false;
+        let aRegisteredDirtyMethods = [];
+        let oRenderers = {};
+        let sRemoteSystemPrefix;
+        const mRemoteSystems = {};
+        let oGlobalDirtyDeferred;
+        let fnStorageEventListener;
+        let oLocalStorage = ushellUtils.getLocalStorage();
+        let mServicesByName = new ushellUtils.Map();
+        let mServicesByNamePromise = new ushellUtils.Map();
+        let sSessionTerminationKey;
+        const that = this;
+
+        let oAdapter;
+        let bInitialized = false;
+
+        let oContainerReadyDeferred = new Deferred();
+
+        function afterInit () {
+            // register event handler for storage events issued by other UShell windows
+            if (typeof oAdapter.logoutRedirect === "function") {
+                fnStorageEventListener = function (oStorageEvent) {
+                    function closeAndRedirectWindow () {
+                        // Most browsers do not allow closing windows via JS that aren't opened via JS
+                        // hence we additionally redirect to get these manually opened windows redirected at least.
+                        // NOTE: It is important to NOT redirect to  "/sap/public/bc/icf/logoff"
+                        // because on iPad Safari e.g. the event is not processed until the window gets the focus.
+                        // This would terminate any new session opened in between.
+                        that._closeWindow();
+                        that._redirectWindow();
+                    }
+
+                    if (oContainerInstance !== that) {
+                        // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
+                        // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
+                        return;
+                    }
+                    // IE9 seems to get the events, but not the values in another window!?
+                    if (oStorageEvent.key.indexOf(sRemoteSystemPrefix) === 0
+                        && oStorageEvent.newValue
+                        && oStorageEvent.newValue !== oLocalStorage.getItem(oStorageEvent.key)) {
+                        ushellUtils.localStorageSetItem(oStorageEvent.key, oStorageEvent.newValue);
+                    }
+                    if (oStorageEvent.key === sSessionTerminationKey) {
+                        if (oStorageEvent.newValue === "pending") {
+                            that._suppressOData();
+                            if (oEventProvider.fireEvent("Logout", true)) {
+                                closeAndRedirectWindow();
+                            } else {
+                                // defer UShell closeWindow to let NWBC receive message asynchronously
+                                setTimeout(closeAndRedirectWindow, 1000);
+                            }
+                        }
+                    }
+                };
+                window.addEventListener("storage", fnStorageEventListener);
+            }
+        }
 
         /**
          * @param {string} sPlatform The platform to initialize
@@ -260,27 +325,26 @@ sap.ui.define([
          * @private
          * @alias sap.ushell.Container#init
          */
-        this.init = function (sPlatform, mAdapterPackagesByPlatform) {
-
+        this.init = async function (sPlatform, mAdapterPackagesByPlatform) {
             /**
              * No globals anymore in 2.0...
              * @deprecated since 1.120
              */
             ObjectPath.set("sap.ushell.Container", oContainerInstance);
 
-            return this._init(sPlatform, mAdapterPackagesByPlatform)
-                .then((oCreatedAdapter) => {
-                    oAdapter = oCreatedAdapter;
-                })
-                .then(() => {
-                    sRemoteSystemPrefix = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".remoteSystem.";
-                    sSessionTerminationKey = "sap.ushell.Container." + oAdapter.getSystem().getPlatform() + ".sessionTermination";
-                    afterInit();
-                    bInitialized = true;
-                    oContainerReadyDeferred.resolve();
-                    BootstrapObserver.resolveBootstrappedContainer(this);
-                    return;
-                });
+            const aResult = await Promise.all([
+                this._init(sPlatform, mAdapterPackagesByPlatform),
+                ushellResources.awaitResourceBundle()
+            ]);
+
+            oAdapter = aResult[0];
+
+            sRemoteSystemPrefix = `sap.ushell.Container.${oAdapter.getSystem().getPlatform()}.remoteSystem.`;
+            sSessionTerminationKey = `sap.ushell.Container.${oAdapter.getSystem().getPlatform()}.sessionTermination`;
+            afterInit();
+            bInitialized = true;
+            oContainerReadyDeferred.resolve();
+            BootstrapObserver.resolveBootstrappedContainer(this);
         };
 
         /**
@@ -356,9 +420,8 @@ sap.ui.define([
                 sRendererName = undefined;
             }
 
-            var oComponentData = { async: !!bAsync };
-            var sComponentName;
-            var oRendererConfig;
+            const oComponentData = { async: !!bAsync };
+            let sComponentName;
 
             Measurement.start("FLP:Container.InitLoading", "Initial Loading", "FLP");
             ushellUtils.setPerformanceMark("FLP - renderer created");
@@ -366,9 +429,9 @@ sap.ui.define([
             if (!sRendererName) {
                 throw new Error("Missing renderer name");
             }
-            oRendererConfig = (oConfig && oConfig.renderers && oConfig.renderers[sRendererName]) || {};
+            const oRendererConfig = (oConfig && oConfig.renderers && oConfig.renderers[sRendererName]) || {};
             sComponentName = oRendererConfig.module || (sRendererName.indexOf(".") < 0
-                ? "sap.ushell.renderers." + sRendererName + ".Renderer"
+                ? `sap.ushell.renderers.${sRendererName}.Renderer`
                 : sRendererName);
 
             // this migration only fails for launchpads overwriting the resource path of the renderer
@@ -380,21 +443,67 @@ sap.ui.define([
                 oComponentData.config = oRendererConfig.componentData.config;
             }
 
+            function replacePlaceAt (RendererControl) {
+                // Some applications place the shell directly into the body element.
+                // However, this breaks the layout with separate UI Areas.
+                // Wrap the control into the #canvas div in this case.
+                RendererControl.placeAt = function (sRef, vPosition) {
+                    let oContainer = sRef;
+                    const canvasId = "canvas";
+                    const body = document.body;
+                    if (sRef === body.id) {
+                        oContainer = document.createElement("div");
+                        oContainer.setAttribute("id", canvasId);
+                        oContainer.classList.add("sapUShellFullHeight");
+                        switch (vPosition) {
+                            case "first":
+                                if (body.firstChild) {
+                                    body.insertBefore(oContainer, body.firstChild);
+                                    break;
+                                }
+                            /* falls through */
+                            case "only":
+                                body.innerHTML = "";
+                            /* falls through */
+                            default:
+                                body.appendChild(oContainer);
+                        }
+                        sRef = canvasId;
+                        vPosition = "";
+                    }
+                    ShellLayout.applyLayout(sRef);
+                    EventHub.emit("ShellLayoutApplied", Date.now());
+                    Control.prototype.placeAt.call(this, sRef, vPosition);
+                };
+            }
+
+            function replaceDestroy (oControl) {
+                const fnOriginalDestroy = oControl.destroy;
+                oControl.destroy = function () {
+                    if (oControl.isA("sap.ui.core.ComponentContainer")) {
+                        return Promise.resolve(oControl.getComponentInstance().destroy()).then(function () {
+                            return fnOriginalDestroy.apply(oControl, arguments);
+                        });
+                    }
+                    return Promise.resolve(fnOriginalDestroy.apply(oControl, arguments));
+                };
+            }
+
             function getRendererInstance (Module) {
-                var ModuleClass = sap.ui.requireSync(Module); // LEGACY API (deprecated)
-                var oRenderer = new ModuleClass({ componentData: oComponentData });
-                var oShellControl;
-                var UIComponent = sap.ui.requireSync("sap/ui/core/UIComponent"); // LEGACY API (deprecated)
+                const ModuleClass = sap.ui.requireSync(Module); // LEGACY API (deprecated)
+                const oRenderer = new ModuleClass({ componentData: oComponentData });
+                let oShellControl;
+                const UIComponent = sap.ui.requireSync("sap/ui/core/UIComponent"); // LEGACY API (deprecated)
 
                 if (oRenderer instanceof UIComponent) {
-                    var ComponentContainer = sap.ui.requireSync("sap/ui/core/ComponentContainer"); // LEGACY API (deprecated)
+                    const ComponentContainer = sap.ui.requireSync("sap/ui/core/ComponentContainer"); // LEGACY API (deprecated)
                     oShellControl = new ComponentContainer({ component: oRenderer, height: "100%", width: "100%" });
                 } else {
                     oShellControl = oRenderer;
                 }
 
                 if (!(oShellControl instanceof Control)) {
-                    throw new Error("Unsupported renderer type for name " + sRendererName);
+                    throw new Error(`Unsupported renderer type for name ${sRendererName}`);
                 }
 
                 replacePlaceAt(oShellControl);
@@ -408,17 +517,17 @@ sap.ui.define([
             }
 
             function getRendererInstanceAsync (Module) {
-                return new Promise(function (resolve, reject) {
+                return new Promise((resolve, reject) => {
                     sap.ui.require([
                         Module,
                         "sap/ui/core/ComponentContainer",
                         "sap/ui/core/UIComponent",
                         "sap/ui/core/routing/Router" // As ushell.Renderer does not use manifest-first the router needs to be loaded async beforehand
-                    ], function (RendererClass, ComponentContainer, UIComponent) {
-                        var oRenderer = new RendererClass({ componentData: oComponentData });
+                    ], (RendererClass, ComponentContainer, UIComponent) => {
+                        const oRenderer = new RendererClass({ componentData: oComponentData });
 
                         if (oRenderer instanceof UIComponent) {
-                            var oComponentContainer = new ComponentContainer({
+                            const oComponentContainer = new ComponentContainer({
                                 component: oRenderer,
                                 height: "100%",
                                 width: "100%",
@@ -427,7 +536,7 @@ sap.ui.define([
                             replacePlaceAt(oComponentContainer);
                             replaceDestroy(oComponentContainer);
                             oRenderers[sRendererName] = oRenderer;
-                            oRenderer.rootControlLoaded().then(function () {
+                            oRenderer.rootControlLoaded().then(() => {
                                 oEventProvider.fireEvent("rendererCreated", { renderer: oRenderer });
                                 resolve(oComponentContainer);
                             });
@@ -444,53 +553,7 @@ sap.ui.define([
                 });
             }
 
-            function replacePlaceAt (RendererControl) {
-                // Some applications place the shell directly into the body element.
-                // However, this breaks the layout with separate UI Areas.
-                // Wrap the control into the #canvas div in this case.
-                RendererControl.placeAt = function (sRef, vPosition) {
-                    var oContainer = sRef;
-                    var canvasId = "canvas";
-                    var body = document.body;
-                    if (sRef === body.id) {
-                        oContainer = document.createElement("div");
-                        oContainer.setAttribute("id", canvasId);
-                        oContainer.classList.add("sapUShellFullHeight");
-                        switch (vPosition) {
-                            case "first":
-                                if (body.firstChild) {
-                                    body.insertBefore(oContainer, body.firstChild);
-                                    break;
-                                }
-                            /* falls through */
-                            case "only":
-                                body.innerHTML = "";
-                            /* falls through */
-                            default:
-                                body.appendChild(oContainer);
-                        }
-                        sRef = canvasId;
-                        vPosition = "";
-                    }
-                    ShellLayout.applyLayout(sRef);
-                    EventHub.emit("ShellLayoutApplied", Date.now());
-                    Control.prototype.placeAt.call(this, sRef, vPosition);
-                };
-            }
-
-            function replaceDestroy (oControl) {
-                var fnOriginalDestroy = oControl.destroy;
-                oControl.destroy = function () {
-                    if (oControl.isA("sap.ui.core.ComponentContainer")) {
-                        return Promise.resolve(oControl.getComponentInstance().destroy()).then(function () {
-                            return fnOriginalDestroy.apply(oControl, arguments);
-                        });
-                    }
-                    return Promise.resolve(fnOriginalDestroy.apply(oControl, arguments));
-                };
-            }
-
-            var sModule = sComponentName.replace(/\./g, "/");
+            const sModule = sComponentName.replace(/\./g, "/");
             if (bAsync) {
                 return getRendererInstanceAsync(sModule);
             }
@@ -528,9 +591,8 @@ sap.ui.define([
          * @alias sap.ushell.Container#createRendererInternal
          */
         this.createRendererInternal = async function (sRendererName) {
-            var oComponentData = { async: true };
-            var sComponentName;
-            var oRendererConfig;
+            const oComponentData = { async: true };
+            let sComponentName;
 
             Measurement.start("FLP:Container.InitLoading", "Initial Loading", "FLP");
             ushellUtils.setPerformanceMark("FLP - renderer created");
@@ -538,9 +600,9 @@ sap.ui.define([
             if (!sRendererName) {
                 throw new Error("Missing renderer name");
             }
-            oRendererConfig = (oConfig.renderers && oConfig.renderers[sRendererName]) || {};
+            const oRendererConfig = (oConfig.renderers && oConfig.renderers[sRendererName]) || {};
             sComponentName = oRendererConfig.module || (sRendererName.indexOf(".") < 0
-                ? "sap.ushell.renderers." + sRendererName + ".Renderer"
+                ? `sap.ushell.renderers.${sRendererName}.Renderer`
                 : sRendererName);
 
             // this migration only fails for launchpads overwriting the resource path of the renderer
@@ -557,9 +619,9 @@ sap.ui.define([
                 // However, this breaks the layout with separate UI Areas.
                 // Wrap the control into the #canvas div in this case.
                 RendererControl.placeAt = function (sRef, vPosition) {
-                    var oContainer = sRef;
-                    var canvasId = "canvas";
-                    var body = document.body;
+                    let oContainer = sRef;
+                    const canvasId = "canvas";
+                    const body = document.body;
                     if (sRef === body.id) {
                         oContainer = document.createElement("div");
                         oContainer.setAttribute("id", canvasId);
@@ -587,7 +649,7 @@ sap.ui.define([
             }
 
             function replaceDestroy (oControl) {
-                var fnOriginalDestroy = oControl.destroy;
+                const fnOriginalDestroy = oControl.destroy;
                 oControl.destroy = function () {
                     if (oControl.isA("sap.ui.core.ComponentContainer")) {
                         return Promise.resolve(oControl.getComponentInstance().destroy()).then(function () {
@@ -598,7 +660,7 @@ sap.ui.define([
                 };
             }
 
-            var sModule = sComponentName.replace(/\./g, "/");
+            const sModule = sComponentName.replace(/\./g, "/");
             const [
                 RendererClass,
                 ComponentContainer,
@@ -609,10 +671,10 @@ sap.ui.define([
                 "sap/ui/core/UIComponent",
                 "sap/ui/core/routing/Router" // As ushell.Renderer does not use manifest-first the router needs to be loaded async beforehand
             ]);
-            var oRenderer = new RendererClass({ componentData: oComponentData });
+            const oRenderer = new RendererClass({ componentData: oComponentData });
 
             if (oRenderer instanceof UIComponent) {
-                var oComponentContainer = new ComponentContainer({
+                const oComponentContainer = new ComponentContainer({
                     component: oRenderer,
                     height: "100%",
                     width: "100%",
@@ -653,14 +715,14 @@ sap.ui.define([
          * @alias sap.ushell.Container#getRenderer
          */
         this.getRenderer = function (sRendererName) {
-            var oRendererControl;
+            let oRendererControl;
 
             sRendererName = sRendererName || oConfig.defaultRenderer;
 
             if (sRendererName) {
                 oRendererControl = oRenderers[sRendererName];
             } else {
-                var aRendererNames = Object.keys(oRenderers);
+                const aRendererNames = Object.keys(oRenderers);
                 if (aRendererNames.length === 1) {
                     oRendererControl = oRenderers[aRendererNames[0]];
                 } else {
@@ -695,14 +757,14 @@ sap.ui.define([
          * @alias sap.ushell.Container#getRendererInternal
          */
         this.getRendererInternal = function (sRendererName) {
-            var oRendererControl;
+            let oRendererControl;
 
             sRendererName = sRendererName || oConfig.defaultRenderer;
 
             if (sRendererName) {
                 oRendererControl = oRenderers[sRendererName];
             } else {
-                var aRendererNames = Object.keys(oRenderers);
+                const aRendererNames = Object.keys(oRenderers);
                 if (aRendererNames.length === 1) {
                     oRendererControl = oRenderers[aRendererNames[0]];
                 } else {
@@ -802,17 +864,17 @@ sap.ui.define([
          * @alias sap.ushell.Container#getGlobalDirty
          */
         this.getGlobalDirty = function () {
-            var oDeferred = new jQuery.Deferred();
-            var sUid = uid();
-            var iPending = 0;
-            var oDirtyState = this.DirtyState.CLEAN;
+            const oDeferred = new jQuery.Deferred();
+            const sUid = uid();
+            let iPending = 0;
+            let oDirtyState = this.DirtyState.CLEAN;
 
             function tryResolve () {
                 if (iPending === 0 || oDirtyState === that.DirtyState.DIRTY) {
                     // no PENDING or already dirty, so we can end the process
                     oDeferred.resolve(oDirtyState);
                     Log.debug(
-                        "getGlobalDirty() Resolving: " + oDirtyState,
+                        `getGlobalDirty() Resolving: ${oDirtyState}`,
                         null,
                         "sap.ushell.Container"
                     );
@@ -824,8 +886,8 @@ sap.ui.define([
                     && oStorageEvent.newValue !== that.DirtyState.INITIAL
                     && oStorageEvent.newValue !== that.DirtyState.PENDING) {
                     Log.debug(
-                        "getGlobalDirty() Receiving event key: " + oStorageEvent.key
-                        + " value: " + oStorageEvent.newValue,
+                        `getGlobalDirty() Receiving event key: ${oStorageEvent.key
+                        } value: ${oStorageEvent.newValue}`,
                         null,
                         "sap.ushell.Container"
                     );
@@ -843,7 +905,7 @@ sap.ui.define([
                 oLocalStorage.setItem(sUid, "CHECK");
                 oLocalStorage.removeItem(sUid);
             } catch (e) {
-                Log.warning("Error calling localStorage.setItem(): " + e, null,
+                Log.warning(`Error calling localStorage.setItem(): ${e}`, null,
                     "sap.ushell.Container");
                 return oDeferred.resolve(this.DirtyState.MAYBE_DIRTY).promise();
             }
@@ -854,19 +916,19 @@ sap.ui.define([
 
             oGlobalDirtyDeferred = oDeferred;
             window.addEventListener("storage", onStorageEvent);
-            oDeferred.always(function () {
+            oDeferred.always(() => {
                 window.removeEventListener("storage", onStorageEvent);
                 oGlobalDirtyDeferred = undefined;
             });
 
-            for (var i = oLocalStorage.length - 1; i >= 0; i -= 1) {
-                var sStorageKey = oLocalStorage.key(i);
+            for (let i = oLocalStorage.length - 1; i >= 0; i -= 1) {
+                const sStorageKey = oLocalStorage.key(i);
                 if (sStorageKey.indexOf(S_DIRTY_STATE_PREFIX) === 0) {
                     if (oLocalStorage.getItem(sStorageKey) === "PENDING") {
                         // cleanup unanswered PENDINGS from call before
                         oLocalStorage.removeItem(sStorageKey);
                         Log.debug(
-                            "getGlobalDirty() Cleanup of unresolved 'PENDINGS':" + sStorageKey,
+                            `getGlobalDirty() Cleanup of unresolved 'PENDINGS':${sStorageKey}`,
                             null,
                             "sap.ushell.Container"
                         );
@@ -875,7 +937,7 @@ sap.ui.define([
                         ushellUtils.localStorageSetItem(sStorageKey,
                             this.DirtyState.PENDING, true);
                         Log.debug(
-                            "getGlobalDirty() Requesting status for: " + sStorageKey,
+                            `getGlobalDirty() Requesting status for: ${sStorageKey}`,
                             null,
                             "sap.ushell.Container"
                         );
@@ -884,9 +946,9 @@ sap.ui.define([
             }
             tryResolve();
 
-            //Timeout to resolve the deferred
-            //If deferred is not resolved during iPending * 2000, resolve with "MAYBE_DIRTY" status
-            setTimeout(function () {
+            // Timeout to resolve the deferred
+            // If deferred is not resolved during iPending * 2000, resolve with "MAYBE_DIRTY" status
+            setTimeout(() => {
                 if (oDeferred.state() !== "resolved") {
                     // no use of constants because the Container may not exist anymore
                     oDeferred.resolve("MAYBE_DIRTY");
@@ -961,9 +1023,9 @@ sap.ui.define([
          * @alias sap.ushell.Container#getDirtyFlag
          */
         this.getDirtyFlag = function () {
-            var bDirty = isDirty; // in case it was set
-            var oNavigationContext = this._oShellNavigationInternal.getNavigationContext();
-            for (var i = 0; i < aRegisteredDirtyMethods.length; i++) {
+            let bDirty = isDirty; // in case it was set
+            const oNavigationContext = this._oShellNavigationInternal.getNavigationContext();
+            for (let i = 0; i < aRegisteredDirtyMethods.length; i++) {
                 bDirty = bDirty || aRegisteredDirtyMethods[i](oNavigationContext);
             }
             return bDirty;
@@ -988,11 +1050,11 @@ sap.ui.define([
                 return Promise.resolve(this.getDirtyFlag());
             }
 
-            var oNavigationContext = this._oShellNavigationInternal.getNavigationContext();
+            const oNavigationContext = this._oShellNavigationInternal.getNavigationContext();
             return this.fnAsyncDirtyStateProvider(oNavigationContext)
-                .then(function (bIsDirty) {
+                .then((bIsDirty) => {
                     return bIsDirty || this.getDirtyFlag();
-                }.bind(this));
+                });
         };
 
         // TODO: Remove this API once the OPA test iframe issue is solved. see Shell-controller.js@handleDataLoss
@@ -1110,8 +1172,8 @@ sap.ui.define([
                 throw new Error("fnDirty must be a function");
             }
 
-            var nIndex = -1;
-            for (var i = aRegisteredDirtyMethods.length - 1; i >= 0; i--) {
+            let nIndex = -1;
+            for (let i = aRegisteredDirtyMethods.length - 1; i >= 0; i--) {
                 if (aRegisteredDirtyMethods[i] === fnDirty) {
                     nIndex = i;
                     break;
@@ -1284,7 +1346,7 @@ sap.ui.define([
          * @alias sap.ushell.Container#_getServiceSync
          */
         this._getServiceSync = function (sServiceName, sParameter, bAsync) {
-            var oContainerInterface = {};
+            const oContainerInterface = {};
 
             /**
              * For the given remote system,
@@ -1297,7 +1359,7 @@ sap.ui.define([
              * @name sap.ushell.services.ContainerInterface#createAdapter
              */
             function createRemoteAdapter (oSystem) {
-                var oDeferred = new jQuery.Deferred();
+                const oDeferred = new jQuery.Deferred();
                 if (!oSystem) {
                     throw new Error("Missing system");
                 }
@@ -1315,10 +1377,10 @@ sap.ui.define([
                 // TODO support this once we have some configuration and can thus find adapters
                 throw new Error("Unsupported service name");
             }
-            var oServiceConfig = getServiceConfig(sServiceName);
-            var sModuleName = oServiceConfig.module || "sap.ushell.services." + sServiceName;
-            var sKey = sModuleName + "/" + (sParameter || "");
-            var oServiceProperties = { config: oServiceConfig.config || {} };
+            const oServiceConfig = getServiceConfig(sServiceName);
+            const sModuleName = oServiceConfig.module || `sap.ushell.services.${sServiceName}`;
+            const sKey = `${sModuleName}/${sParameter || ""}`;
+            const oServiceProperties = { config: oServiceConfig.config || {} };
 
             function createService (ServiceClass, Adapter) {
                 oContainerInterface.createAdapter = createRemoteAdapter;
@@ -1326,7 +1388,7 @@ sap.ui.define([
             }
 
             function getServiceInstance (ServiceClass, Async) {
-                var oService;
+                let oService;
 
                 // Check again if the service has already been created to prevent re-instantiation during race conditions
                 if (mServicesByName.containsKey(sKey)) {
@@ -1336,11 +1398,11 @@ sap.ui.define([
                     oService = new ServiceClass(oContainerInterface, sParameter, oServiceProperties);
                 } else {
                     // create and pass adapter for logon system as first parameter
-                    var oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
+                    const oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
                         sParameter, Async, ServiceClass.useConfiguredAdapterOnly);
                     if (Async) {
-                        return oServiceAdapter.then(function (serviceAdapter) {
-                            var oServiceInstance = createService(ServiceClass, serviceAdapter);
+                        return oServiceAdapter.then((serviceAdapter) => {
+                            const oServiceInstance = createService(ServiceClass, serviceAdapter);
                             mServicesByName.put(sKey, oServiceInstance);
                             return oServiceInstance;
                         });
@@ -1363,14 +1425,14 @@ sap.ui.define([
                         null,
                         "sap.ushell.Container"
                     );
-                    var Service = sap.ui.requireSync(sModuleName.replace(/[.]/g, "/")); // LEGACY API (deprecated)
+                    const Service = sap.ui.requireSync(sModuleName.replace(/[.]/g, "/")); // LEGACY API (deprecated)
                     return getServiceInstance(Service);
                 }
 
                 // extract information about the requested service
                 if (!mServicesByNamePromise.containsKey(sKey)) {
-                    var oServicePromise = new Promise(function (resolve, reject) {
-                        sap.ui.require([sModuleName.replace(/[.]/g, "/")], function (ServiceClass) {
+                    const oServicePromise = new Promise((resolve, reject) => {
+                        sap.ui.require([sModuleName.replace(/[.]/g, "/")], (ServiceClass) => {
                             resolve(getServiceInstance(ServiceClass, true));
                         }, reject);
                     });
@@ -1401,7 +1463,7 @@ sap.ui.define([
          * @alias sap.ushell.Container#_getServiceAsync
          */
         this._getServiceAsync = function (sServiceName, sParameter) {
-            var oContainerInterface = {};
+            const oContainerInterface = {};
 
             /**
              * For the given remote system,
@@ -1414,7 +1476,7 @@ sap.ui.define([
              * @name sap.ushell.services.ContainerInterface#createAdapter
              */
             function createRemoteAdapter (oSystem) {
-                var oDeferred = new jQuery.Deferred();
+                const oDeferred = new jQuery.Deferred();
                 if (!oSystem) {
                     throw new Error("Missing system");
                 }
@@ -1432,10 +1494,10 @@ sap.ui.define([
                 // TODO support this once we have some configuration and can thus find adapters
                 throw new Error("Unsupported service name");
             }
-            var oServiceConfig = getServiceConfig(sServiceName);
-            var sModuleName = oServiceConfig.module || "sap.ushell.services." + sServiceName;
-            var sKey = sModuleName + "/" + (sParameter || "");
-            var oServiceProperties = { config: oServiceConfig.config || {} };
+            const oServiceConfig = getServiceConfig(sServiceName);
+            const sModuleName = oServiceConfig.module || `sap.ushell.services.${sServiceName}`;
+            const sKey = `${sModuleName}/${sParameter || ""}`;
+            const oServiceProperties = { config: oServiceConfig.config || {} };
 
             function createService (ServiceClass, Adapter) {
                 oContainerInterface.createAdapter = createRemoteAdapter;
@@ -1443,7 +1505,7 @@ sap.ui.define([
             }
 
             function getServiceInstance (ServiceClass) {
-                var oService;
+                let oService;
 
                 // Check again if the service has already been created to prevent re-instantiation during race conditions
                 if (mServicesByName.containsKey(sKey)) {
@@ -1453,10 +1515,10 @@ sap.ui.define([
                     oService = new ServiceClass(oContainerInterface, sParameter, oServiceProperties);
                 } else {
                     // create and pass adapter for logon system as first parameter
-                    var oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
+                    const oServiceAdapter = createAdapter(sServiceName, oAdapter.getSystem(),
                         sParameter, true, ServiceClass.useConfiguredAdapterOnly);
-                    return oServiceAdapter.then(function (serviceAdapter) {
-                        var oServiceInstance = createService(ServiceClass, serviceAdapter);
+                    return oServiceAdapter.then((serviceAdapter) => {
+                        const oServiceInstance = createService(ServiceClass, serviceAdapter);
                         mServicesByName.put(sKey, oServiceInstance);
                         return oServiceInstance;
                     });
@@ -1469,8 +1531,8 @@ sap.ui.define([
             if (!mServicesByName.containsKey(sKey)) {
                 // extract information about the requested service
                 if (!mServicesByNamePromise.containsKey(sKey)) {
-                    var oServicePromise = new Promise(function (resolve, reject) {
-                        sap.ui.require([sModuleName.replace(/[.]/g, "/")], function (ServiceClass) {
+                    const oServicePromise = new Promise((resolve, reject) => {
+                        sap.ui.require([sModuleName.replace(/[.]/g, "/")], (ServiceClass) => {
                             resolve(getServiceInstance(ServiceClass));
                         }, reject);
                     });
@@ -1478,7 +1540,6 @@ sap.ui.define([
                     return oServicePromise;
                 }
                 return mServicesByNamePromise.get(sKey);
-
             }
             // If the service was first called sync and then async, there will be no
             // promise in mServicesByNamePromise, so we return wrap mServicesByName
@@ -1489,18 +1550,18 @@ sap.ui.define([
         /**
          * Get list of remote systems currently in use.
          *
-         * @returns {Object<string, sap.ushell.System>} map of sap.ushell.System
+         * @returns {object<string, sap.ushell.System>} map of sap.ushell.System
          *
          * @since 1.17.1
          * @private
          */
         function getRemoteSystems () {
-            for (var i = oLocalStorage.length - 1; i >= 0; i -= 1) {
-                var sKey = oLocalStorage.key(i);
+            for (let i = oLocalStorage.length - 1; i >= 0; i -= 1) {
+                const sKey = oLocalStorage.key(i);
                 if (sKey.indexOf(sRemoteSystemPrefix) === 0) {
                     try {
-                        var sSystemAlias = sKey.substring(sRemoteSystemPrefix.length);
-                        var oSystemData = JSON.parse(oLocalStorage.getItem(sKey));
+                        const sSystemAlias = sKey.substring(sRemoteSystemPrefix.length);
+                        const oSystemData = JSON.parse(oLocalStorage.getItem(sKey));
                         mRemoteSystems[sSystemAlias] = new System(oSystemData);
                     } catch (e) {
                         // local storage contained garbage (non-parsable)
@@ -1538,14 +1599,14 @@ sap.ui.define([
             }
 
             OData.read = function (oRequest, fnSuccess, fnFailure) {
-                return stub("OData.read('" +
-                    (oRequest && oRequest.Uri ? oRequest.requestUri : oRequest) +
-                    "') disabled during logout processing",
-                    fnSuccess, fnFailure);
+                return stub(`OData.read('${
+                    oRequest && oRequest.Uri ? oRequest.requestUri : oRequest
+                }') disabled during logout processing`,
+                fnSuccess, fnFailure);
             };
             OData.request = function (oRequest, fnSuccess, fnFailure) {
-                return stub("OData.request('" + (oRequest ? oRequest.requestUri : "") +
-                    "') disabled during logout processing", fnSuccess, fnFailure);
+                return stub(`OData.request('${oRequest ? oRequest.requestUri : ""
+                }') disabled during logout processing`, fnSuccess, fnFailure);
             };
         }
 
@@ -1580,8 +1641,8 @@ sap.ui.define([
              *     '<protocol://host:port>/sap/public/bc/icf/logoff;o=MY_SYSTEM_ALIAS'
              * Note: Cases 2. and 3. require a corresponding Web Dispatcher rule.
              */
-            var sAlias = oRemoteSystem.getAlias();
-            var oOldSystem = mRemoteSystems[sAlias];
+            const sAlias = oRemoteSystem.getAlias();
+            const oOldSystem = mRemoteSystems[sAlias];
 
             if (this._isLocalSystem(oRemoteSystem)) {
                 return;
@@ -1591,10 +1652,10 @@ sap.ui.define([
                 if (oOldSystem.toString() === oRemoteSystem.toString()) { // --> JSON.stringify
                     return;
                 }
-                Log.warning("Replacing " + oOldSystem + " by " + oRemoteSystem,
+                Log.warning(`Replacing ${oOldSystem} by ${oRemoteSystem}`,
                     null, "sap.ushell.Container");
             } else {
-                Log.debug("Added " + oRemoteSystem, null, "sap.ushell.Container");
+                Log.debug(`Added ${oRemoteSystem}`, null, "sap.ushell.Container");
             }
             mRemoteSystems[sAlias] = oRemoteSystem;
             ushellUtils.localStorageSetItem(sRemoteSystemPrefix + sAlias, oRemoteSystem);
@@ -1610,12 +1671,12 @@ sap.ui.define([
          * @alias sap.ushell.Container#_isLocalSystem
          */
         this._isLocalSystem = function (oSystem) {
-            var sAlias = oSystem.getAlias();
+            const sAlias = oSystem.getAlias();
             if (sAlias && sAlias.toUpperCase() === "LOCAL") {
                 return true;
             }
-            var oURI = new URI(ushellUtils.getLocationHref());
-            var sClient = this.getLogonSystem().getClient() || "";
+            const oURI = new URI(ushellUtils.getLocationHref());
+            const sClient = this.getLogonSystem().getClient() || "";
             if (oSystem.getBaseUrl() === oURI.origin() && oSystem.getClient() === sClient) {
                 return true;
             }
@@ -1635,14 +1696,14 @@ sap.ui.define([
          * @alias sap.ushell.Container#addRemoteSystemForServiceUrl
          */
         this.addRemoteSystemForServiceUrl = function (sServiceUrl) {
-            var oSystemInfo = { baseUrl: ";o=" };
+            const oSystemInfo = { baseUrl: ";o=" };
 
             if (!sServiceUrl || sServiceUrl.charAt(0) !== "/" || sServiceUrl.indexOf("//") === 0) {
                 return;
             }
 
             // extract system alias from segment parameter named "o"
-            var aMatches = /^[^?]*;o=([^/;?]*)/.exec(sServiceUrl);
+            const aMatches = /^[^?]*;o=([^/;?]*)/.exec(sServiceUrl);
             if (aMatches && aMatches.length >= 2) {
                 oSystemInfo.alias = aMatches[1];
             }
@@ -1674,10 +1735,10 @@ sap.ui.define([
          * @alias sap.ushell.Container#attachLogoutEvent
          */
         this.attachLogoutEvent = function (fnFunction, bAsyncFunction) {
-            var bFound = false;
+            let bFound = false;
             if (bAsyncFunction === true) {
                 assert(typeof (fnFunction) === "function", "Container.attachLogoutEvent: fnFunction must be a function");
-                for (var i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
+                for (let i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
                     if (aAsyncLogoutEventFunctions[i] === fnFunction) {
                         bFound = true;
                         break;
@@ -1702,7 +1763,7 @@ sap.ui.define([
          */
         this.detachLogoutEvent = function (fnFunction) {
             oEventProvider.detachEvent("Logout", fnFunction);
-            for (var i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
+            for (let i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
                 if (aAsyncLogoutEventFunctions[i] === fnFunction) {
                     aAsyncLogoutEventFunctions.splice(i, 1);
                     break;
@@ -1753,35 +1814,35 @@ sap.ui.define([
          * @alias sap.ushell.Container#defaultLogout
          */
         this.defaultLogout = function () {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             this.callRegisteredLogoutHandlers().then(() => {
                 function resolve () {
-                    ushellUtils.promisify(oAdapter.logout(true)).finally(function () {
+                    ushellUtils.promisify(oAdapter.logout(true)).finally(() => {
                         oLocalStorage.removeItem(sSessionTerminationKey);
                         oDeferred.resolve();
                     });
                 }
 
                 function logoutLogonSystem () {
-                    var oDeferredAsyncLogoutEvent = new jQuery.Deferred();
-                    var oPromiseAsyncLogoutEvent = oDeferredAsyncLogoutEvent.promise();
-                    var arrLogoutEventsPromises = [];
+                    const oDeferredAsyncLogoutEvent = new jQuery.Deferred();
+                    const oPromiseAsyncLogoutEvent = oDeferredAsyncLogoutEvent.promise();
+                    const arrLogoutEventsPromises = [];
 
                     if (aAsyncLogoutEventFunctions.length > 0) {
-                        for (var i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
+                        for (let i = 0; i < aAsyncLogoutEventFunctions.length; i++) {
                             arrLogoutEventsPromises.push(aAsyncLogoutEventFunctions[i]());
                         }
                         Promise.all(arrLogoutEventsPromises).then(oDeferredAsyncLogoutEvent.resolve);
 
-                        //if after 4 seconds we did not get all the async callbacks
-                        //promises resolved, we will continue with the logout process
+                        // if after 4 seconds we did not get all the async callbacks
+                        // promises resolved, we will continue with the logout process
                         setTimeout(oDeferredAsyncLogoutEvent.resolve, 4000);
                     } else {
                         oDeferredAsyncLogoutEvent.resolve();
                     }
 
-                    oPromiseAsyncLogoutEvent.done(function () {
+                    oPromiseAsyncLogoutEvent.done(() => {
                         if (oEventProvider.fireEvent("Logout", true)) {
                             resolve();
                         } else {
@@ -1792,7 +1853,7 @@ sap.ui.define([
                 }
 
                 function federatedLogout () {
-                    var aRemoteLogoutPromises = [];
+                    const aRemoteLogoutPromises = [];
 
                     if (fnStorageEventListener) {
                         // IE sends localStorage events also to the issuing window, -
@@ -1802,8 +1863,8 @@ sap.ui.define([
 
                     ushellUtils.localStorageSetItem(sSessionTerminationKey, "pending");
                     that._suppressOData();
-                    var mSystems = that._getRemoteSystems();
-                    Object.keys(mSystems).forEach(function (sAlias) {
+                    const mSystems = that._getRemoteSystems();
+                    Object.keys(mSystems).forEach((sAlias) => {
                         try {
                             aRemoteLogoutPromises.push(
                                 // Promisify is used to ensure that the promise is handled for all platform adapters which
@@ -1811,7 +1872,7 @@ sap.ui.define([
                                 ushellUtils.promisify(createAdapter("Container", mSystems[sAlias]).logout(false))
                             );
                         } catch (e) {
-                            Log.warning("Could not create adapter for " + sAlias,
+                            Log.warning(`Could not create adapter for ${sAlias}`,
                                 e.toString(), "sap.ushell.Container");
                         }
                         oLocalStorage.removeItem(sRemoteSystemPrefix + sAlias);
@@ -2006,14 +2067,14 @@ sap.ui.define([
          * @alias sap.ushell.Container#getFLPConfig
          */
         this.getFLPConfig = function () {
-            var oPromise = new Promise(function (resolve, reject) {
-                var oRespObj = {
+            const oPromise = new Promise((resolve, reject) => {
+                const oRespObj = {
                     URL: this.getFLPUrl()
                 };
-                //get site scope
+                // get site scope
                 if (oConfigSetting.CDMPromise) {
-                    oConfigSetting.CDMPromise.then(function (oCommonDataModel) {
-                        oCommonDataModel.getSiteWithoutPersonalization().then(function (oSite) {
+                    oConfigSetting.CDMPromise.then((oCommonDataModel) => {
+                        oCommonDataModel.getSiteWithoutPersonalization().then((oSite) => {
                             oRespObj.scopeId = oSite.site.identification.id;
                             resolve(oRespObj);
                         });
@@ -2021,7 +2082,7 @@ sap.ui.define([
                 } else {
                     resolve(oRespObj);
                 }
-            }.bind(this));
+            });
 
             return oPromise;
         };
@@ -2037,8 +2098,8 @@ sap.ui.define([
          * @alias sap.ushell.Container#getFLPUrl
          */
         this.getFLPUrl = function (bIncludeHash) {
-            var sUrl = ushellUtils.getLocationHref();
-            var iHashPosition = sUrl.indexOf(UrlParsing.getShellHash(sUrl));
+            const sUrl = ushellUtils.getLocationHref();
+            const iHashPosition = sUrl.indexOf(UrlParsing.getShellHash(sUrl));
 
             if (iHashPosition === -1 || bIncludeHash === true) {
                 return sUrl;
@@ -2121,7 +2182,7 @@ sap.ui.define([
         // constructor code -------------------------------------------------------
         // loose coupling to allow re-use from sap.ushell_abap.pbServices.ui2.Catalog#addSystemToServiceUrl
         EventBus.getInstance().subscribe("sap.ushell.Container",
-            "addRemoteSystemForServiceUrl", function (sChannelId, sEventId, oData) {
+            "addRemoteSystemForServiceUrl", (sChannelId, sEventId, oData) => {
                 that.addRemoteSystemForServiceUrl(oData);
             });
 
@@ -2138,7 +2199,7 @@ sap.ui.define([
          * @alias sap.ushell.Container#_init
          */
         this._init = function (sPlatform, mAdapterPackagesByPlatform) {
-            var oPromise = new Promise(function (fnResolve) {
+            const oPromise = new Promise((fnResolve) => {
                 // Init mobile support for the case when sap.m.App is not used
                 MobileSupport.init();
                 // remember the configuration independently of window["sap-ushell-config"]
@@ -2164,159 +2225,119 @@ sap.ui.define([
                 //   2. Load "PluginManager" and "CommonDataModel" services
                 //   3. Load plugins
                 //   4. Register plugins
-                var system = new System({
+                const system = new System({
                     // this is the initial logon system object
                     alias: "",
                     platform: oConfig.platform || sPlatform
                 });
+
+                function handlePlugins (aServices) {
+                    const oPluginManager = aServices[0];
+                    const oCDM = aServices[1];
+                    const getPlugins = oCDM ? oCDM.getPlugins() : jQuery.when({});
+
+                    getPlugins.then((oCDMSitePlugins) => {
+                        const oAllPlugins = deepExtend({}, oConfig.bootstrapPlugins, oCDMSitePlugins);
+                        oPluginManager.registerPlugins(oAllPlugins);
+                    });
+                }
+
+                function prepareNWBC () {
+                    if (ushellUtils.hasFLPReady2NotificationCapability()) {
+                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used and
+                        // send additional interface
+                        sap.ui.require(["sap/ushell/NWBCInterface"], (oNWBCInterface) => {
+                            ushellUtils.getPrivateEpcm().doEventFlpReady2(oNWBCInterface);
+                        });
+                    } else if (ushellUtils.hasFLPReadyNotificationCapability()) {
+                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used.
+                        ushellUtils.getPrivateEpcm().doEventFlpReady();
+                    }
+                }
+
+                function handleDarkMode (Config) {
+                    if (Config.last("/core/darkMode/enabled")) {
+                        oContainerInstance.getServiceAsync("DarkModeSupport").then((DarkModeSupportService) => {
+                            if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
+                                DarkModeSupportService.setup();
+                            }
+                        });
+                    }
+                }
+
+                function initUITracer (Config) {
+                    const bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
+                    if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
+                        oContainerInstance.getServiceAsync("UITracer");
+                    }
+                }
+
+                function lastSteps () {
+                    prepareNWBC();
+
+                    // Config should be required after bootstrap when sap-ushell-config is calculated
+                    sap.ui.require(["sap/ushell/Config"], (Config) => {
+                        handleDarkMode(Config);
+                        initUITracer(Config);
+                    });
+                }
+
                 createAdapter("Container", system, null, true /* async */)
-                    .then(function (oCreatedAdapter) {
+                    .then((oCreatedAdapter) => {
                         oAdapter = oCreatedAdapter;
                         return oAdapter.load();
                     })
-                    .then(function () {
+                    .then(() => {
                         // returns true if CDM Plugins are to be loaded
                         function _bLoadCDM () {
-                            var oUshellConfig = window["sap-ushell-config"];
+                            const oUshellConfig = window["sap-ushell-config"];
                             if (!oUshellConfig || !oUshellConfig.services) {
                                 return false;
                             }
-                            var oUShellPluginManagerConfig = oUshellConfig.services.PluginManager;
-                            var oPluginManagerConfig = oUShellPluginManagerConfig && oUShellPluginManagerConfig.config;
+                            const oUShellPluginManagerConfig = oUshellConfig.services.PluginManager;
+                            const oPluginManagerConfig = oUShellPluginManagerConfig && oUShellPluginManagerConfig.config;
                             return oPluginManagerConfig && oPluginManagerConfig.loadPluginsFromSite;
                         }
 
                         // Load CommonDataModel and PluginManager in parallel
-                        var asyncServices = [this.getServiceAsync("PluginManager")];
+                        const asyncServices = [this.getServiceAsync("PluginManager")];
                         if (_bLoadCDM()) {
-                            //If we have CDM add the scope id to the response configuration
+                            // If we have CDM add the scope id to the response configuration
                             oConfigSetting.CDMPromise = this.getServiceAsync("CommonDataModel");
                             asyncServices.push(oConfigSetting.CDMPromise);
                         }
                         Promise.all(asyncServices)
-                            .then(function (aServices) {
+                            .then((aServices) => {
                                 handlePlugins(aServices);
                             })
                             .then(lastSteps);
 
                         // preload given UI Services to allow sync access (via getService()) w/o triggering a sync request (CSP safeguarding of Neo Platform)
-                        var servicesForPreloading = [];
+                        const servicesForPreloading = [];
                         if (oConfig.preloadServices !== undefined && Array.isArray(oConfig.preloadServices)) {
-                            oConfig.preloadServices.forEach(function (serviceName) {
+                            oConfig.preloadServices.forEach((serviceName) => {
                                 servicesForPreloading.push(this.getServiceAsync(serviceName));
-                            }.bind(this));
+                            });
                             Log.error("Ushell Config's preloadServices should not be used!");
                         }
 
-                        var oShellNavigationInternalPromise = this.getServiceAsync("ShellNavigationInternal")
-                            .then(function (oShellNavigationInternal) {
+                        const oShellNavigationInternalPromise = this.getServiceAsync("ShellNavigationInternal")
+                            .then((oShellNavigationInternal) => {
                                 this._oShellNavigationInternal = oShellNavigationInternal;
-                            }.bind(this));
+                            });
 
                         servicesForPreloading.push(oShellNavigationInternalPromise);
 
                         Promise.all(servicesForPreloading)
-                            .then(function () {
+                            .then(() => {
                                 fnResolve(oAdapter); // Note that resolve might be called before the plugins are registered
                             });
-                    }.bind(this));
-
-                function handlePlugins (aServices) {
-                    var oPluginManager = aServices[0];
-                    var oCDM = aServices[1];
-                    var getPlugins = oCDM ? oCDM.getPlugins() : jQuery.when({});
-
-                    getPlugins.then(function (oCDMSitePlugins) {
-                        var oAllPlugins = deepExtend({}, oConfig.bootstrapPlugins, oCDMSitePlugins);
-                        oPluginManager.registerPlugins(oAllPlugins);
                     });
-                }
-
-                function lastSteps () {
-                    prepareNWBC();
-
-                    // Config should be required after bootstrap when sap-ushell-config is calculated
-                    sap.ui.require(["sap/ushell/Config"], function (Config) {
-                        handleDarkMode(Config);
-                        initUITracer(Config);
-                    });
-                }
-
-                function prepareNWBC () {
-                    if (ushellUtils.hasFLPReady2NotificationCapability()) {
-                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used and
-                        // send additional interface
-                        sap.ui.require(["sap/ushell/NWBCInterface"], function (oNWBCInterface) {
-                            ushellUtils.getPrivateEpcm().doEventFlpReady2(oNWBCInterface);
-                        });
-                    } else if (ushellUtils.hasFLPReadyNotificationCapability()) {
-                        // Notify SAP Business Client (NWBC), that the Container and its Services, are ready to be used.
-                        ushellUtils.getPrivateEpcm().doEventFlpReady();
-                    }
-                }
-
-                function handleDarkMode (Config) {
-                    if (Config.last("/core/darkMode/enabled")) {
-                        oContainerInstance.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
-                            if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
-                                DarkModeSupportService.setup();
-                            }
-                        });
-                    }
-                }
-
-                function initUITracer (Config) {
-                    var bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
-                    if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
-                        oContainerInstance.getServiceAsync("UITracer");
-                    }
-                }
-            }.bind(this));
+            });
 
             return oPromise;
         };
 
-        function afterInit () {
-            // register event handler for storage events issued by other UShell windows
-            if (typeof oAdapter.logoutRedirect === "function") {
-                fnStorageEventListener = function (oStorageEvent) {
-                    function closeAndRedirectWindow () {
-                        // Most browsers do not allow closing windows via JS that aren't opened via JS
-                        // hence we additionally redirect to get these manually opened windows redirected at least.
-                        // NOTE: It is important to NOT redirect to  "/sap/public/bc/icf/logoff"
-                        // because on iPad Safari e.g. the event is not processed until the window gets the focus.
-                        // This would terminate any new session opened in between.
-                        that._closeWindow();
-                        that._redirectWindow();
-                    }
-
-                    if (oContainerInstance !== that) {
-                        // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
-                        // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
-                        return;
-                    }
-                    // IE9 seems to get the events, but not the values in another window!?
-                    if (oStorageEvent.key.indexOf(sRemoteSystemPrefix) === 0
-                        && oStorageEvent.newValue
-                        && oStorageEvent.newValue !== oLocalStorage.getItem(oStorageEvent.key)) {
-                        ushellUtils.localStorageSetItem(oStorageEvent.key, oStorageEvent.newValue);
-                    }
-                    if (oStorageEvent.key === sSessionTerminationKey) {
-                        if (oStorageEvent.newValue === "pending") {
-                            that._suppressOData();
-                            if (oEventProvider.fireEvent("Logout", true)) {
-                                closeAndRedirectWindow();
-                            } else {
-                                // defer UShell closeWindow to let NWBC receive message asynchronously
-                                setTimeout(closeAndRedirectWindow, 1000);
-                            }
-                        }
-                    }
-                };
-                window.addEventListener("storage", fnStorageEventListener);
-            }
-        }
-
         /**
          * Expose functions for unit testing.
          * Internal use only.
@@ -2366,25 +2387,6 @@ sap.ui.define([
         };
     }
 
-    /**
-     * Creates and registers injectable ui5services.
-     *
-     * @param {string[]} aServicesToRegister An array of service names to register.
-     * @param {boolean} bAddCallProtection Whether to add call protection check.
-     *   This may not be wanted in case the service is created via:
-     *   ServiceFactoryRegistry#get("sap.ushell.ui5service.<service>").createInstance().
-     * @private
-     */
-    function registerInjectableUi5Services (aServicesToRegister, bAddCallProtection) {
-        aServicesToRegister.forEach(function (sUshellServiceName) {
-            // create registerable factory
-            var oServiceFactory = oUi5ServiceFactory.createServiceFactory(sUshellServiceName, bAddCallProtection);
-
-            // register factory to allow UI5 to create the service
-            ServiceFactoryRegistry.register("sap.ushell.ui5service." + sUshellServiceName, oServiceFactory);
-        });
-    }
-
     oContainerInstance = new Container();
 
     /**
@@ -2453,9 +2455,9 @@ sap.ui.define([
             commonUtils.migrateV2ServiceConfig(window["sap-ushell-config"]);
         }
 
-        var oDeferred = new jQuery.Deferred();
+        const oDeferred = new jQuery.Deferred();
         oContainerInstance.init(sPlatform, mAdapterPackagesByPlatform)
-            .then(function () {
+            .then(() => {
                 oDeferred.resolve();
             });
         return oDeferred.promise();