@sapui5/sap.ushell 1.115.0 → 1.116.0

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.115.0
+ * @version 1.116.0
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -25,7 +25,9 @@ sap.ui.define([
     "sap/ushell/utils/UrlParsing",
     "sap/ui/core/Core",
     "sap/ui/thirdparty/hasher",
-    "sap/ushell/services/_MessageBroker/MessageBrokerEngine"
+    "sap/ushell/services/_MessageBroker/MessageBrokerEngine",
+    "sap/ushell/renderers/fiori2/utils",
+    "sap/m/library"
 ], function (
     ElementsModel,
     Storage,
@@ -48,7 +50,9 @@ sap.ui.define([
     oUrlParsing,
     Core,
     hasher,
-    MessageBrokerEngine
+    MessageBrokerEngine,
+    RendererUtils,
+    mobileLibrary
 ) {
     "use strict";
 
@@ -59,7 +63,6 @@ sap.ui.define([
             sRootIntent,
             oShellUIService,
             appState,
-            oIntentToStorageId = {},
             disableHomeAppCache = false,
             oCurrentApplication = {},
             oActualElementsModelStateMap = {
@@ -81,14 +84,15 @@ sap.ui.define([
                     lean: "lean"
                 }
             },
-            oWebGuiV1StatefulCache,
             oGlobalShellCommunicationHandlers = [],
             oGlobalIframeCommunicationHandlers = {},
             isBackNavigationChanged = false,
             oKeepAliveModes = {
                 FULL: "true",
                 RESTRICTED: "restricted"
-            };
+            },
+            fnOldTriggerEmail;
+        var URLHelper = mobileLibrary.URLHelper;
 
         //connect FLP to the message broker
         if (window.QUnit === undefined) {
@@ -187,12 +191,7 @@ sap.ui.define([
                 oInnerControl = BlueBoxHandler.getStateFul(oFrom.getUrl());
 
                 if (oInnerControl && BlueBoxHandler.isStatefulContainerSupported(oInnerControl)) {
-                    var oHandler = BlueBoxHandler.getHandler();
-
-                    //in case this is a stateful container
-                    //invoke destroy the application with the ID.
-                    oPromiseAppDestroy = oHandler.destroy(oInnerControl, sAppId);
-                    //TODO: then(check number instances === 0 evict BlueBox?????Think/plugins)
+                    oPromiseAppDestroy = BlueBoxHandler.statefulDestroyApp(oInnerControl, sAppId);
                 } else {
                     //Once we destroy the container the application destroy will be create, no need to call Application.destroy(oStorageEntry.app)
                     oStorageEntry.container.destroy();
@@ -263,23 +262,21 @@ sap.ui.define([
         };
 
         this.handleExitStateful = function (sFromId, oFrom, isHomePage) {
-            var sBBStorageId,
-                oHandlers = BlueBoxHandler.getHandler();
+            var sKeepAliveAppId = oFrom.getCurrentAppId && oFrom.getCurrentAppId();
 
-            if (Storage.get(sFromId)) {
-                sBBStorageId = BlueBoxHandler.getStorageKey(oFrom);
+            if (Storage.get(sKeepAliveAppId)) {
                 if (RelatedServices.isBackNavigation() === true && !isHomePage) {
                     Core.getEventBus().publish("sap.ushell", "appClosed", oFrom);
-                    Storage.remove(sBBStorageId);
-                    return oHandlers.destroy(oFrom);
+                    Storage.remove(sKeepAliveAppId);
+                    return BlueBoxHandler.statefulDestroyApp(oFrom);
                 } else {
                     // in this case the store of the currently running application, so we do not need to pass the sCacheId
                     Core.getEventBus().publish("sap.ushell", "appClosed", oFrom);
-                    return oHandlers.store(oFrom, sBBStorageId);
+                    return BlueBoxHandler.statefulStoreKeepAliveApp(oFrom, sKeepAliveAppId);
                 }
             }
             // in this case the destroy of the currently running application, so we do not need to pass the sCacheId
-            return oHandlers.destroy(oFrom);
+            return BlueBoxHandler.statefulDestroyApp(oFrom);
         };
 
         this.handleExitApplication = function (sFromId, oFrom, sToId, oTo, isHomePage, bFromAfterNavigate) {
@@ -298,9 +295,12 @@ sap.ui.define([
                     oPromiseAppClose = (!bFromAfterNavigate ? this.handleExitStateful(sFromId, oFrom, isHomePage) : undefined);
                 } else if (Storage.get(sFromId)) {
                     if (RelatedServices.isBackNavigation() === true && !isHomePage) {
-                        oDeferredAppClose = new jQuery.Deferred();
-                        this.destroy(sFromId, oFrom, oDeferredAppClose);
-                        oPromiseAppClose = oDeferredAppClose.promise();
+                        //check if the Iframe needs to be cached instead of destroy
+                        if (!BlueBoxHandler.returnUnusedKeepAliveContainer(oFrom)) {
+                            oDeferredAppClose = new jQuery.Deferred();
+                            this.destroy(sFromId, oFrom, oDeferredAppClose);
+                            oPromiseAppClose = oDeferredAppClose.promise();
+                        }
                     } else {
                         this.store(sFromId);
                     }
@@ -316,7 +316,8 @@ sap.ui.define([
                     bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oFrom.getApplicationType) >= 0;
 
                     //distroy the application and its resources
-                    if (this.isAppOfTypeCached(sFromId, bIsAppOfTypeCachable) === false) {
+                    var bIsKeepAlive = this.isAppOfTypeCached(sFromId, bIsAppOfTypeCachable);
+                    if (bIsKeepAlive === false) {
                         oDeferredAppClose = new jQuery.Deferred();
                         this.destroy(sFromId, oFrom, oDeferredAppClose);
                         oPromiseAppClose = oDeferredAppClose.promise();
@@ -349,7 +350,7 @@ sap.ui.define([
         };
 
         function fnCloseKeepAliveIfRestricted (oApp) {
-            return (oApp.value.keepAliveMode === oKeepAliveModes.RESTRICTED);
+            return (oApp.keepAliveMode === oKeepAliveModes.RESTRICTED);
         }
 
         this.closeKeepAliveApps = function (fnFilterApps, arrClosePromises) {
@@ -359,16 +360,21 @@ sap.ui.define([
 
                 Storage.forEach(function (oApp) {
                     if (fnFilterApps.apply(this, [oApp]) === true) {
-                        arrKeepAliveRestrictedApps.push(oApp.value);
+                        arrKeepAliveRestrictedApps.push(oApp);
                     }
                 });
                 arrKeepAliveRestrictedApps.forEach(function (oRestrictedApp) {
+                    //check if needs to be cached instead of destroy
                     var oDeferredAppClose;
-                    if (arrClosePromises) {
-                        oDeferredAppClose = new jQuery.Deferred();
-                        arrClosePromises.push(oDeferredAppClose.promise());
+                    if (that.isLegacyApplication(oRestrictedApp.container)) {
+                        BlueBoxHandler.returnUnusedKeepAliveContainer(oRestrictedApp.container);
+                    } else {
+                        if (arrClosePromises) {
+                            oDeferredAppClose = new jQuery.Deferred();
+                            arrClosePromises.push(oDeferredAppClose.promise());
+                        }
+                        that.destroy(oRestrictedApp.appId, oRestrictedApp.container, oDeferredAppClose);
                     }
-                    that.destroy(oRestrictedApp.appId, oRestrictedApp.container, oDeferredAppClose);
                 });
             } catch (e) {
                 Log.error("Error: sap.ushell.services.appLifeCycle.closeOtherKeepAliveRestrictedApps:" + e);
@@ -379,8 +385,8 @@ sap.ui.define([
             if (sFromId && oFrom) {
                 if (oFrom._getIFrame && oFrom._getIFrame() &&
                     (BlueBoxHandler.isStatefulContainerSupported(BlueBoxHandler.getStateFul(oFrom.getUrl())) ||
-                     Storage.get(sFromId) ||
-                     (oFrom.getIsStateful && oFrom.getIsStateful()))) {
+                        Storage.get(sFromId) ||
+                        (oFrom.getIsStateful && oFrom.getIsStateful()))) {
                     Application.postMessageToIframeApp(oFrom, "sap.ushell.sessionHandler", "beforeApplicationHide", {}, false);
                 }
             }
@@ -432,29 +438,34 @@ sap.ui.define([
                     enableRouterRetrigger: true,
                     stateStored: false
                 });
-                oIntentToStorageId[sFixedShellHash] = appId;
-                // if (BlueBoxHandler.isStatefulContainerSupported(oContainer)) {
-                //in case of stateful container - map BlueBox to storageKey
-                BlueBoxHandler.setStorageKey(oContainer, appId);
-                // }
-
                 return true;
             }
             return false;
         };
 
-        this.restoreApp = function (appId) {
-            if (this.isAppInCache(appId)) {
-                oCurrentApplication = Storage.get(appId);
-
-                if (BlueBoxHandler.getStorageKey(oCurrentApplication.container)) {
-                    //in case of stateful container - override BlueBox to storageKey
-                    BlueBoxHandler.setStorageKey(oCurrentApplication.container, appId);
+        this.changeAppKeepAliveStatus = function (oContainer, oEventData) {
+            var sAppType = oContainer.getApplicationType(),
+                sFrameworkId = oContainer.getFrameworkId(),
+                oCurrentHash,
+                sCurrAppId;
+
+            if (sAppType === "GUI" || sAppType === "TR" || sAppType === "NWBC" || sAppType === "WDA" || sAppType === "WCF" ||
+                sFrameworkId === "GUI" || sFrameworkId === "WDA" || sFrameworkId === "NWBC" || sFrameworkId === "WCF") {
+                if (oEventData.bKeepAlive !== oContainer.getIsKeepAlive()) {
+                    if (oEventData.bKeepAlive === true) {
+                        oCurrentHash = oUrlParsing.parseShellHash(hasher.getHash());
+                        sCurrAppId = "application-" + oCurrentHash.semanticObject + "-" + oCurrentHash.action;
+                        if (!Storage.get(sCurrAppId)) {
+                            this.storeApp(sCurrAppId, oContainer, oContainer.getCurrentAppTargetResolution(), hasher.getHash(), {
+                                paramValue: oKeepAliveModes.RESTRICTED
+                            });
+                            BlueBoxHandler.removeCapabilities(oContainer, [
+                                {"action":"create","service":"sap.ushell.services.appLifeCycle"},
+                                {"action":"destroy","service":"sap.ushell.services.appLifeCycle"}
+                            ]);
+                        }
+                    }
                 }
-                // TODO restore meta
-                // restore elements model
-                // restore appState
-                // restore all related application resources
             }
         };
 
@@ -471,12 +482,7 @@ sap.ui.define([
                 return true;
             }
 
-            if (!disableHomeAppCache && (appId.indexOf("Shell-appfinder-component") > 0
-                || appId.indexOf("Shell-home-component") > 0
-                || appId.indexOf("pages-component-container") > 0
-                || appId.indexOf("homeApp-component-container") > 0
-                || appId.indexOf("workPageRuntime-component-container") > 0
-                || appId.indexOf("runtimeSwitcher-component-container") > 0)) {
+            if (!disableHomeAppCache && appId.indexOf("Shell-appfinder") !== -1) {
                 return true;
             }
 
@@ -534,60 +540,15 @@ sap.ui.define([
             return oTarget.applicationType;
         };
 
-        this.getStatefulCapabilities = function (oTarget) {
-            if (oTarget.appCapabilities && oTarget.appCapabilities &&
-                oTarget.appCapabilities.statefulContainer) {
-                return oTarget.appCapabilities.statefulContainer;
-            }
-
-            return undefined;
-        };
-
-        this.isNotifyInnerAppRouteChangeEnabled = function (oTarget) {
-            if (oTarget.appCapabilities && oTarget.appCapabilities.notifyInnerAppRouteChange) {
-                return true;
-            }
-
-            return false;
-        };
-
-        this.isStatefulCapabilityEnabled = function (oTarget) {
-            var oStatefulCap = this.getStatefulCapabilities(oTarget);
-
-            if (oStatefulCap && (oStatefulCap.enabled === true || oStatefulCap === true)) {
-                return true;
-            }
-
-            return false;
-        };
-
-        this.isGUICapabilityEnabled = function (oTarget) {
-            var oStatefulCap = this.getStatefulCapabilities(oTarget);
-
-            if (oStatefulCap && oStatefulCap.protocol === "GUI") {
-                return true;
-            }
-
-            return false;
-        };
-
-        this.isFLPCapabilityEnabled = function (oTarget) {
-            return !this.isGUICapabilityEnabled(oTarget) && this.isStatefulCapabilityEnabled(oTarget);
-        };
-
-        this.isGUIStatefulCapabilityEnabled = function (oTarget) {
-            return this.isGUICapabilityEnabled(oTarget) && this.isStatefulCapabilityEnabled(oTarget);
-        };
-
         this.reloadCurrentApp = function(oData) {
             var oTmpAppContainer = BlueBoxHandler.getById(oData.sAppContainerId);
             if (oTmpAppContainer) {
                 var sTmpUrl = oTmpAppContainer.getUrl();
                 BlueBoxHandler.removeCapabilities(oTmpAppContainer);
                 var arrKeepAliveApps = [];
-                Storage.forEach(function (oApp) {
-                    if (oApp.value.container === oTmpAppContainer) {
-                        arrKeepAliveApps.push(oApp.key);
+                Storage.forEach(function (oApp, sKey) {
+                    if (oApp.container === oTmpAppContainer) {
+                        arrKeepAliveApps.push(sKey);
                     }
                 });
                 arrKeepAliveApps.forEach(Storage.remove);
@@ -608,6 +569,7 @@ sap.ui.define([
                 sIntent,
                 bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oTarget.applicationType) >= 0,
                 oTmpAppContainer,
+                oContainerToUse,
                 sTmpUrl,
                 oKeepAliveMode = {
                     globalValue: undefined,
@@ -620,6 +582,9 @@ sap.ui.define([
             //this case will handle the stateful containers flow.
             oContainer = BlueBoxHandler.getStateFul(oTarget.url);
 
+            var bIsKeepAlive = this.isAppOfTypeCached(appId, bIsAppOfTypeCachable, oKeepAliveMode);
+            var bIsCachedByParameter = this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode);
+
             if (oContainer && BlueBoxHandler.isStatefulContainerSupported(oContainer)) {
                 if (this.isAppOfTypeCached(appId, bIsAppOfTypeCachable, oKeepAliveMode) ||
                     this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode)) {
@@ -628,8 +593,9 @@ sap.ui.define([
                     if (!this.isAppInCache(appId)) {
                         this.storeApp(appId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode);
                     }
-
-                    this.restoreApp(appId);
+                    if (this.isAppInCache(appId)) {
+                        oCurrentApplication = Storage.get(appId);
+                    }
                 } else {
                     //create application that is not persisted and not cashed
                     oCurrentApplication = {
@@ -640,7 +606,7 @@ sap.ui.define([
                         app: undefined
                     };
                 }
-            } else if (this.isAppOfTypeCached(appId, bIsAppOfTypeCachable, oKeepAliveMode) || this.isCachedEnabledAsAppParameter(oShellHash, oTarget, oKeepAliveMode)) {
+            } else if (bIsKeepAlive || bIsCachedByParameter) {
                 //is cached application
                 if (!this.isAppInCache(appId)) {
                     //in cFLP, there night me an existing container of the same app from a different server,
@@ -653,15 +619,22 @@ sap.ui.define([
                         this.destroy("application-" + sIntent, oTmpAppContainer);
                         BlueBoxHandler.deleteStateFul(sTmpUrl);
                     }
-
-                    oContainer = this.createApplicationContainer(inAppId, oTarget);
-                    this.storeApp(appId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode);
-                    BlueBoxHandler.set(oTarget.url, oContainer);
+                    if (this.isLegacyApplication(oTarget)) {
+                        oContainerToUse = BlueBoxHandler.findFreeContainerForNewKeepAliveApp(oTarget.url);
+                    }
+                    if (!oContainerToUse) {
+                        oContainer = this.createApplicationContainer(inAppId, oTarget);
+                        this.storeApp(appId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode);
+                        BlueBoxHandler.set(oTarget.url, oContainer);
+                    } else {
+                        oContainer = oContainerToUse;
+                    }
+                }
+                if (this.isAppInCache(appId)) {
+                    oCurrentApplication = Storage.get(appId);
                 }
-
-                this.restoreApp(appId);
             } else if (oTarget.applicationType === "TR" || (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "GUI")) {
-                oContainer = this.getWebGuiV1StatefulContainer(oTarget.url);
+                oContainer = BlueBoxHandler.getWebGuiV1StatefulContainer(oTarget.url);
 
                 //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
@@ -673,7 +646,7 @@ sap.ui.define([
                         BlueBoxHandler.removeCapabilities(oTmpAppContainer);
                         this.destroy("application-" + sIntent, oTmpAppContainer);
                         BlueBoxHandler.deleteStateFul(sTmpUrl);
-                        this.removeWebGuiV1StatefulContainer(sTmpUrl);
+                        BlueBoxHandler.removeWebGuiV1StatefulContainer(sTmpUrl);
                     }
                 }
 
@@ -714,19 +687,6 @@ sap.ui.define([
                 oContainer = this.createApplicationContainer(inAppId, oTarget);
                 BlueBoxHandler.set(oTarget.url, oContainer);
 
-                if (BlueBoxHandler.isCapUT(oContainer, "isFLP")) {
-                    BlueBoxHandler.setCapabilities(oContainer, [
-                        {
-                            service: "sap.ushell.services.appLifeCycle",
-                            action: "create"
-                        },
-                        {
-                            service: "sap.ushell.services.appLifeCycle",
-                            action: "destroy"
-                        }
-                    ]);
-                }
-
                 // //create application that is not persisted and not cashed
                 oCurrentApplication = {
                     appId: appId,
@@ -738,32 +698,28 @@ sap.ui.define([
             }
         };
 
-        this.getAppMeta = function () {
-            return AppMeta;
+        // eslint-disable-next-line no-unused-vars
+        this.isLegacyApplication = function (oAppContainer) {
+            return false;
+            /*
+                        if (oAppContainer.applicationType === "TR" ||
+                            oAppContainer.applicationType === "GUI" ||
+                            oAppContainer.applicationType === "NWBC" ||
+                            oAppContainer.applicationType === "WDA" ||
+                            oAppContainer.applicationType === "WCF" ||
+                            (oAppContainer.appCapabilities && oAppContainer.appCapabilities.appFrameworkId === "TR") ||
+                            (oAppContainer.appCapabilities && oAppContainer.appCapabilities.appFrameworkId === "GUI") ||
+                            (oAppContainer.appCapabilities && oAppContainer.appCapabilities.appFrameworkId === "NWBC") ||
+                            (oAppContainer.appCapabilities && oAppContainer.appCapabilities.appFrameworkId === "WDA") ||
+                            (oAppContainer.appCapabilities && oAppContainer.appCapabilities.appFrameworkId === "WCF")) {
+                            return true;
+                        }
+                        return false;
+             */
         };
 
-        this.evict = function (oEntry) {
-            var oInnerControl,
-                oStorageEntry = oEntry.value,
-                sAppId = oEntry.key;
-
-            this.removeControl(sAppId);
-
-            if (oStorageEntry.container.getUrl && oStorageEntry.container.getUrl()) {
-                oInnerControl = BlueBoxHandler.getStateFul(oStorageEntry.container.getUrl());
-            }
-
-            if (oInnerControl) {
-                var oHandler = BlueBoxHandler.getHandler();
-
-                //in case this is a stateful container
-                //invoke destroy the application with the ID.
-                oHandler.destroy(oInnerControl, sAppId);
-                //TODO: then(check number instances === 0 evict BlueBox?????Think/plugins)
-            } else {
-                //Once we destroy the container the application destroy will be create, no need to call Application.destroy(oStorageEntry.app)
-                oStorageEntry.container.destroy();
-            }
+        this.getAppMeta = function () {
+            return AppMeta;
         };
 
         /**
@@ -797,32 +753,28 @@ sap.ui.define([
         }());
 
         this.init = function (inAppState, oInViewPortContainer, inSRootIntent, inDisableHomeAppCache, oShellUIServiceChange, aActions, oCacheConfigurations) {
-            var that = this,
-                nCacheSize;
-
-            // calculate Cache size
-            if (Device.system.phone) {
-                nCacheSize = 10;
-
-                if (oCacheConfigurations && oCacheConfigurations.limit && oCacheConfigurations.limit.phone) {
-                    nCacheSize = oCacheConfigurations.limit.phone;
-                }
-            } else if (Device.system.tablet) {
-                nCacheSize = 10;
-
-                if (oCacheConfigurations && oCacheConfigurations.limit && oCacheConfigurations.limit.tablet) {
-                    nCacheSize = oCacheConfigurations.limit.tablet;
-                }
-            } else if (Device.system.desktop) {
-                nCacheSize = 15;
-
-                if (oCacheConfigurations && oCacheConfigurations.limit && oCacheConfigurations.limit.desktop) {
-                    nCacheSize = oCacheConfigurations.limit.desktop;
-                }
-            } else {
-                nCacheSize = 10;
+            if (sap.ushell && sap.ushell.Container) {
+                sap.ushell.Container.getServiceAsync("AppState").then(function (oAppStateService) {
+                    var bAppStateConfigPersistent = oAppStateService.getPersistentWhenShared();
+                    if (bAppStateConfigPersistent === true) {
+                        fnOldTriggerEmail = URLHelper.triggerEmail.bind(URLHelper);
+                        URLHelper.triggerEmail = function (sTo, sSubject, sBody, sCc, sBcc) {
+                            var sFLPUrl = document.URL;
+                            oAppStateService.setAppStateToPublic(sFLPUrl)
+                                .done(function (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) {
+                                    fnOldTriggerEmail(sTo, sSubject, sBody, sCc, sBcc);
+                                });
+                        };
+                    }
+                });
             }
-
             oShellUIService = new ShellUIService({
                 scopeObject: oShellUIServiceChange.ownerComponent,
                 scopeType: "component"
@@ -834,14 +786,7 @@ sap.ui.define([
             AppMeta.init(sRootIntent);
             disableHomeAppCache = inDisableHomeAppCache;
 
-            BlueBoxHandler.init({
-                oShellUIService: oShellUIService
-            }, oCacheConfigurations, this);
-
-            //Init storage, and register evict functionality.
-            Storage.init(nCacheSize, function (evictObj) {
-                this.evict(evictObj);
-            }.bind(this));
+            BlueBoxHandler.init(this);
 
             //setup & register communication
             this.registerShellCommunicationHandler({
@@ -941,8 +886,8 @@ sap.ui.define([
                                 var sAppType = oServiceParams.oContainer.getApplicationType(),
                                     sFrameworkId = oServiceParams.oContainer.getFrameworkId();
                                 if ((sAppType === "GUI" || sAppType === "TR" || sAppType === "NWBC" ||
-                                       sFrameworkId === "GUI" || sFrameworkId === "NWBC") && oServiceParams.oContainer.getIsKeepAlive() === false) {
-                                    that.setWebGuiV1StatefulContainer(oServiceParams.oContainer);
+                                    sFrameworkId === "GUI" || sFrameworkId === "NWBC") && oServiceParams.oContainer.getIsKeepAlive() === false) {
+                                    BlueBoxHandler.setWebGuiV1StatefulContainer(oServiceParams.oContainer);
                                     oServiceParams.oContainer.setIsStateful(true);
                                     //create application that is not persisted and not cashed
                                     oCurrentApplication = {
@@ -1028,7 +973,7 @@ sap.ui.define([
         // hit taken due to this implicit means to an end.
         this.createComponent = function (oResolvedHashFragment, oParsedShellHash) {
             function fnCloseKeepAliveIfSameUI5App (oApp) {
-                return (oApp.value.ui5ComponentName === oResolvedHashFragment.ui5ComponentName);
+                return (oApp.ui5ComponentName === oResolvedHashFragment.ui5ComponentName);
             }
             var arrClosePromises = [],
                 oDeferred = new jQuery.Deferred();
@@ -1108,7 +1053,7 @@ sap.ui.define([
          * @private
          */
         this.activeContainer = function (oApplicationContainer) {
-            var aAllApplicationContainers = this.getWebGuiV1AllApplicationContainers();
+            var aAllApplicationContainers = BlueBoxHandler.getWebGuiV1AllApplicationContainers();
 
             // deactivate all
             aAllApplicationContainers.forEach(function (oApplicationContainerToDeactivate) {
@@ -1145,18 +1090,11 @@ sap.ui.define([
             Log.info("New application context opened successfully in an existing transaction UI session.");
         };
 
-        this.reuseStateFulContainerAndRestore = function (oApplicationContainer, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
-            var that = this,
-                //Get the real Storage Id according to the hash maps for the restore
-                sStorageId = oIntentToStorageId[sFixedShellHash];
-
-            if (BlueBoxHandler.getStorageKey(oApplicationContainer)) {
-                //in case of stateful container - map BlueBox to storageKey
-                BlueBoxHandler.setStorageKey(oApplicationContainer, sStorageId);
-            }
+        this.reuseStateFulContainerAndRestore = function (oApplicationContainer, sUrl, sToId, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
+            var that = this;
 
             // invoke the life cycle interface "setInitialConfiguration" for the restored application
-            return oHandler.restore(oApplicationContainer, sStorageId, oTarget, bNavigationInSameStatefullContainer)
+            return BlueBoxHandler.statefulRestoreKeepAliveApp(oApplicationContainer, sUrl, sToId, oTarget, bNavigationInSameStatefullContainer)
                 .then(function () {
                     that.showApplicationContainer(oApplicationContainer);
                 }, function (vError) {
@@ -1164,21 +1102,11 @@ sap.ui.define([
                 });
         };
 
-        this.reuseStateFulContainer = function (oApplicationContainer, url, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
+        this.reuseStateFulContainer = function (oApplicationContainer, url, sToId, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
             var that = this;
 
-            //Store the storage id associated with the hash
-            oIntentToStorageId[sFixedShellHash] = sToId;
-
-            if (BlueBoxHandler.getStorageKey(oApplicationContainer)) {
-                //in case of stateful container - map BlueBox to storageKey
-                BlueBoxHandler.setStorageKey(oApplicationContainer, sToId);
-            }
-
             this.initAppMetaParams();
-
-            // invoke the life cycle interface "setInitialConfiguration" for the restored application
-            return oHandler.create(oApplicationContainer, url, sToId, oTarget, bNavigationInSameStatefullContainer)
+            return BlueBoxHandler.statefulCreateApp(oApplicationContainer, url, sToId, oTarget, bNavigationInSameStatefullContainer)
                 .then(function (oResult) {
                     if (oResult && oResult.deletedKeepAliveId) {
                         Storage.remove(oResult.deletedKeepAliveId);
@@ -1209,11 +1137,11 @@ sap.ui.define([
             }
         };
 
-        this.reuseApplicationContainer = function (oApplicationContainer, applicationType, url) {
+        this.reuseApplicationContainer = function (oApplicationContainer, applicationType, oTarget) {
             var that = this;
             oApplicationContainer.setProperty("iframeReusedForApp", true, true);
             return oApplicationContainer
-                .setNewApplicationContext(applicationType, url)
+                .setNewApplicationContext(applicationType, oTarget)
                 .then(function () {
                     that.navTo(oApplicationContainer.getId());
                     if (oApplicationContainer.hasStyleClass("sapUShellApplicationContainerShiftedIframe")) {
@@ -1272,7 +1200,7 @@ sap.ui.define([
                 // under future evolutions
                 var oPublicEventData = that._publicEventDataFromResolutionResult(oApplication);
                 //publish the event externally
-                sap.ushell.renderers.fiori2.utils.publishExternalEvent("appClosed", oPublicEventData);
+                RendererUtils.publishExternalEvent("appClosed", oPublicEventData);
             };
         };
 
@@ -1340,20 +1268,16 @@ sap.ui.define([
         };
 
         this.handleOpenStateful = function (bIsInitial, bIsInCache, sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefullContainer) {
-            var oHandler = BlueBoxHandler.getHandler(),
-                oPromise;
+            var oPromise;
 
             oInnerControl.setProperty("iframeReusedForApp", true, true);
             if (Storage.get(sToId) && bIsInitial === false) {
-                oPromise = this.reuseStateFulContainerAndRestore(oInnerControl, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
+                oPromise = this.reuseStateFulContainerAndRestore(oInnerControl, oTarget.url, sToId, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
             } else {
-                oPromise = this.reuseStateFulContainer(oInnerControl, oTarget.url, sToId, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
-
+                oPromise = this.reuseStateFulContainer(oInnerControl, oTarget.url, sToId, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
                 //creating a new application check if needs to be keep (for the keep alive), and if so store the application
-                if (bIsInCache) {
-                    if (!this.isAppInCache(sToId)) {
-                        this.storeApp(sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode);
-                    }
+                if (bIsInCache && !this.isAppInCache(sToId)) {
+                    this.storeApp(sToId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode);
                 }
             }
 
@@ -1496,13 +1420,13 @@ sap.ui.define([
                             bFullWidth,
                             sFixedShellHash
                         );
-
-                        that.restoreApp(oInnerControl.getId());
+                        if (this.isAppInCache(oInnerControl.getId())) {
+                            oCurrentApplication = Storage.get(oInnerControl.getId());
+                        }
                         that.navTo(oInnerControl.getId());
-
                         bIsInitial = true;
                     }
-                } else if (!that.isWebGuiV1StatefulContainer(oTarget.url) && oInnerControl && !bIsInCache) {
+                } else if (!BlueBoxHandler.isWebGuiV1StatefulContainer(oTarget.url) && oInnerControl && !bIsInCache) {
                     //this case this controler cant be reused and we need it to be embed, so delete it.
                     oDeferredDestroyApp = new jQuery.Deferred();
                     that.destroy(oInnerControl.getId(), oInnerControl, oDeferredDestroyApp);
@@ -1536,6 +1460,15 @@ 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()) {
+                        bReuseStatefulContainer = true;
+                    }
                 }
 
                 if (oDeferredDestroyApp === undefined) {
@@ -1557,11 +1490,13 @@ sap.ui.define([
                  */
                 oDeferredDestroyApp.then(function () {
                     oDeffedControlCreation.then(function () {
-                        if (!that.isWebGuiV1StatefulContainer(oTarget.url) && !bReuseStatefulContainer) {
+                        if (!BlueBoxHandler.isWebGuiV1StatefulContainer(oTarget.url) && !bReuseStatefulContainer) {
                             if (bKeptAliveApp === true) {
                                 Core.getEventBus().publish("launchpad", "appOpening", oTarget);
                             }
-                            that.restoreApp(oInnerControl.getId());
+                            if (that.isAppInCache(oInnerControl.getId())) {
+                                oCurrentApplication = Storage.get(oInnerControl.getId());
+                            }
                             that.navTo(oInnerControl.getId());
                             if (bKeptAliveApp === true) {
                                 that.initAppMetaParams();
@@ -1573,6 +1508,8 @@ sap.ui.define([
                         // going to be reused, we prompt the container to load the new application context.
                         var oPromiseAsyncAppCreate = new jQuery.Deferred().resolve().promise();
                         if (bReuseStatefulContainer) {
+                            //we should reach here to create the app
+
                             //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
@@ -1581,8 +1518,8 @@ sap.ui.define([
                             }
                             oPromiseAsyncAppCreate = that.handleOpenStateful(
                                 bIsInitial, bIsInCache, "application" + sAppId, oInnerControl, oTarget, sFixedShellHash, oKeepAliveMode, bNavigationInSameStatefullContainer);
-                        } else if (that.isWebGuiV1StatefulContainer(oTarget.url)) {
-                            oPromiseAsyncAppCreate = that.reuseApplicationContainer(oInnerControl, "TR", oTarget.url);
+                        } else if (BlueBoxHandler.isWebGuiV1StatefulContainer(oTarget.url)) {
+                            oPromiseAsyncAppCreate = that.reuseApplicationContainer(oInnerControl, "TR", oTarget);
                         }
 
                         oPromiseAsyncAppCreate.then(function () {
@@ -1743,75 +1680,6 @@ sap.ui.define([
         this.getBackNavigationChanged = function () {
             return isBackNavigationChanged;
         };
-
-        /* Start Stateful API */
-
-        //new stateful functions
-
-        this.parseStatefulContainerConfiguration = function () {
-            oWebGuiV1StatefulCache = {};
-        };
-
-        this.isWebGuiV1StatefulContainer = function (sUrl) {
-            var sKey;
-
-            if (sUrl) {
-                sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
-                return (oWebGuiV1StatefulCache[sKey] !== undefined);
-            } else {
-                return false;
-            }
-        };
-
-        this.getWebGuiV1StatefulContainer = function (sUrl) {
-            var sKey;
-
-            if (sUrl) {
-                sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
-                return oWebGuiV1StatefulCache[sKey];
-            } else {
-                return undefined;
-            }
-        };
-
-        this.setWebGuiV1StatefulContainer = function (oApplicationContainer) {
-            var sUrl = oApplicationContainer.getUrl(),
-                sKey;
-
-            if (sUrl) {
-                sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
-                oWebGuiV1StatefulCache[sKey] = oApplicationContainer;
-            }
-        };
-
-        this.removeWebGuiV1StatefulContainer = function (oApplicationContainer) {
-            var sUrl = oApplicationContainer.getUrl(),
-                sKey;
-
-            if (sUrl) {
-                sKey = BlueBoxHandler._getBlueBoxCacheKey(sUrl);
-                delete oWebGuiV1StatefulCache[sKey];
-            }
-        };
-
-        /**
-         * Finds and returns all existing application containers.
-         *
-         * @param {object} oWebGuiV1StatefulCache
-         *  All stateful application containers
-         *
-         * @return {array}
-         *  An array containing all the application container objects.
-         */
-        this.getWebGuiV1AllApplicationContainers = function () {
-            return Object.keys(oWebGuiV1StatefulCache).map(function (sKey) {
-                return oWebGuiV1StatefulCache[sKey];
-            }).filter(function (oApplicationContainer) {
-                return !!oApplicationContainer;
-            });
-        };
-
-        /* End Stateful API */
     }
 
     return new AppLifeCycle();