@sapui5/sap.ushell 1.129.1 → 1.130.1

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.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.129.1
+ * @version 1.130.1
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -26,7 +26,7 @@ sap.ui.define([
 ) {
     "use strict";
 
-    var oActiveApplication,
+    var oActiveApplicationContainer,
         BlueBoxHandler,
         PostMessageUtils,
         oApplicationContainerProps = ApplicationContainer.getMetadata().getJSONKeys();
@@ -416,32 +416,32 @@ sap.ui.define([
             return domainUrl;
         };
 
-        this.createApplicationContainer = function (sAppId, oResolvedNavigationTarget) {
+        this.createApplicationContainer = function (sStorageAppId, oResolvedHashFragment) {
             var oTempTarget = {};
 
-            this._cleanTargetResolution(oResolvedNavigationTarget, oTempTarget);
-            oActiveApplication = new ApplicationContainer("application" + sAppId, oResolvedNavigationTarget);
-            this._restoreTargetResolution(oResolvedNavigationTarget, oTempTarget);
+            this._cleanTargetResolution(oResolvedHashFragment, oTempTarget);
+            oActiveApplicationContainer = new ApplicationContainer(sStorageAppId, oResolvedHashFragment);
+            this._restoreTargetResolution(oResolvedHashFragment, oTempTarget);
 
-            if (oActiveApplication.setBlueBoxCapabilities) {
-                oActiveApplication.setProperty("blueBoxCapabilities", {}, true);
+            if (oActiveApplicationContainer.setBlueBoxCapabilities) {
+                oActiveApplicationContainer.setProperty("blueBoxCapabilities", {}, true);
             }
-            if (oActiveApplication.setCurrentAppId) {
-                oActiveApplication.setProperty("currentAppId", "application" + sAppId, true);
+            if (oActiveApplicationContainer.setCurrentAppId) {
+                oActiveApplicationContainer.setProperty("currentAppId", sStorageAppId, true);
             }
-            if (oActiveApplication.setCurrentAppUrl) {
-                oActiveApplication.setProperty("currentAppUrl", oResolvedNavigationTarget.url, true);
+            if (oActiveApplicationContainer.setCurrentAppUrl) {
+                oActiveApplicationContainer.setProperty("currentAppUrl", oResolvedHashFragment.url, true);
             }
-            if (oResolvedNavigationTarget.appCapabilities) {
-                oActiveApplication.setProperty("frameworkId", oResolvedNavigationTarget.appCapabilities.appFrameworkId, true);
+            if (oResolvedHashFragment.appCapabilities) {
+                oActiveApplicationContainer.setProperty("frameworkId", oResolvedHashFragment.appCapabilities.appFrameworkId, true);
             }
-            if (oActiveApplication.setCurrentAppTargetResolution) {
-                oActiveApplication.setProperty("currentAppTargetResolution", oResolvedNavigationTarget, true);
+            if (oActiveApplicationContainer.setCurrentAppTargetResolution) {
+                oActiveApplicationContainer.setProperty("currentAppTargetResolution", oResolvedHashFragment, true);
             }
 
-            oActiveApplication.setHandleMessageEvent(this.handleMessageEvent);
-            BlueBoxHandler.AddNewBlueBox(oActiveApplication, oResolvedNavigationTarget);
-            return oActiveApplication;
+            oActiveApplicationContainer.setHandleMessageEvent(this.handleMessageEvent);
+            BlueBoxHandler.addNewBlueBox(oActiveApplicationContainer, oResolvedHashFragment);
+            return oActiveApplicationContainer;
         };
 
         this.active = function (oApp) {
@@ -466,15 +466,15 @@ sap.ui.define([
                 if (oApp.app.getUrl) {
                     //send post message restore
                     sDomainEnd = oApp.app.getUrl();
-                    oActiveApplication = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
+                    oActiveApplicationContainer = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
 
-                    if (oActiveApplication) {
-                        BlueBoxHandler.restoreApp(oActiveApplication.sApplication);
+                    if (oActiveApplicationContainer) {
+                        BlueBoxHandler.restoreApp(oActiveApplicationContainer.sApplication);
                     }
                 }
 
                 if (oApp.app.isKeepAliveSupported && oApp.app.isKeepAliveSupported() === true) {
-                    oApp.app.activate();
+                    oApp.app.activate(); // todo: [FLPCOREANDUX-10024] clarify this case
                 } else {
                     if (oApp.app.restore) {
                         oApp.app.restore();
@@ -492,7 +492,7 @@ sap.ui.define([
                     }
                 }
 
-                oActiveApplication = oApp.app;
+                oActiveApplicationContainer = oApp.app;
             }
         };
 
@@ -512,10 +512,10 @@ sap.ui.define([
                 if (oApp.app.getUrl) {
                     //send post message restore
                     sDomainEnd = oApp.app.getUrl();
-                    oActiveApplication = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
+                    oActiveApplicationContainer = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
 
-                    if (oActiveApplication) {
-                        BlueBoxHandler.storeApp(oActiveApplication.sApplication);
+                    if (oActiveApplicationContainer) {
+                        BlueBoxHandler.storeApp(oActiveApplicationContainer.sApplication);
                     }
                 }
 
@@ -533,40 +533,40 @@ sap.ui.define([
         };
 
         this.destroy = function (oApp) {
-            var sDomainEnd,
-                oActiveApplication,
-                bDestroyByPost = false;
-
-            if (oApp) {
-                if (oApp.getUrl) {
-                    sDomainEnd = oApp.getUrl();
-                    oActiveApplication = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
+            if (!oApp) {
+                return;
+            }
+            if (oApp.getUrl) {
+                const sDomainEnd = oApp.getUrl();
+                const oActiveApplication = BlueBoxHandler.getBlueBoxByUrl(this.stripURL(sDomainEnd));
 
-                    if (BlueBoxHandler.isStatefulContainer(oActiveApplication)) {
-                        bDestroyByPost = true;
-                        BlueBoxHandler.destroyApp(oActiveApplication.sApplication);
-                    }
+                if (BlueBoxHandler.isStatefulContainer(oActiveApplication)) {
+                    BlueBoxHandler.destroyApp(oActiveApplication.sApplication);
+                    return;
                 }
+            }
 
-                if (oApp.destroy && bDestroyByPost === false) {
-                    try {
-                        oApp.destroy();
-                    } catch (e) {
-                        Log.error("exception when trying to close sapui5 application with id '" + (oApp.sId || "<unknown>") +
-                            "'. This error must be fixed in order for FLP to operate properly.\n",
-                            e.stack,
-                            "sap.ushell.components.applicationIntegration.application.Application::destroy");
-                    }
+            if (oApp.destroy) {
+                try {
+                    oApp.destroy();
+                } catch (e) {
+                    Log.error("exception when trying to close sapui5 application with id '" + (oApp.sId || "<unknown>") +
+                        "'. This error must be fixed in order for FLP to operate properly.\n",
+                        e.stack,
+                        "sap.ushell.components.applicationIntegration.application.Application::destroy");
                 }
             }
         };
 
+        // todo: [FLPCOREANDUX-10024] check: this does not seem to be always the actual current/active AppContainer
+        // seems to be set directly when created and for stateful open case
+        // reuse of nonKeepAlive gui is probably not set correctly
         this.setActiveAppContainer = function (oContainer) {
-            oActiveApplication = oContainer;
+            oActiveApplicationContainer = oContainer;
         };
 
         this.getActiveAppContainer = function () {
-            return oActiveApplication;
+            return oActiveApplicationContainer;
         };
 
 

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.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.129.1
+ * @version 1.130.1
  */
 sap.ui.define([
     "sap/base/util/Deferred",
@@ -45,14 +45,14 @@ sap.ui.define([
             BlueBoxesCache.init();
         };
 
-        this.AddNewBlueBox = function (oBlueBox, oTarget, oInitialCapabilities) {
-            oBlueBoxContainer[oBlueBox] = oBlueBox;
-            BlueBoxesCache.add(oTarget.url, oBlueBox);
-            if (oBlueBox.setBlueBoxCapabilities) {
-                oBlueBox.setProperty("blueBoxCapabilities", {}, true);
+        this.addNewBlueBox = function (oApplicationContainer, oResolvedHashFragment, oInitialCapabilities) {
+            oBlueBoxContainer[oApplicationContainer] = oApplicationContainer;
+            BlueBoxesCache.add(oResolvedHashFragment.url, oApplicationContainer);
+            if (oApplicationContainer.setBlueBoxCapabilities) {
+                oApplicationContainer.setProperty("blueBoxCapabilities", {}, true);
             }
             if (oInitialCapabilities) {
-                this.addCapabilities(oBlueBox, oInitialCapabilities);
+                this.addCapabilities(oApplicationContainer, oInitialCapabilities);
             }
         };
 
@@ -66,10 +66,10 @@ sap.ui.define([
             }
         };
 
-        this.deleteBlueBoxByContainer = function (oContainer) {
-            if (oContainer && oBlueBoxContainer[oContainer]) {
-                delete oBlueBoxContainer[oContainer];
-                BlueBoxesCache.removeByContainer(oContainer);
+        this.deleteBlueBoxByContainer = function (oApplicationContainer) {
+            if (oApplicationContainer && oBlueBoxContainer[oApplicationContainer]) {
+                delete oBlueBoxContainer[oApplicationContainer];
+                BlueBoxesCache.removeByContainer(oApplicationContainer);
             }
         };
 
@@ -85,12 +85,12 @@ sap.ui.define([
             return BlueBoxesCache.getById(sId);
         };
 
-        this.addCapabilities = function (oBlueBox, oCapabilities) {
-            if (!oBlueBoxContainer[oBlueBox] || !oBlueBox.getBlueBoxCapabilities) {
+        this.addCapabilities = function (oApplicationContainer, oCapabilities) {
+            if (!oBlueBoxContainer[oApplicationContainer] || !oApplicationContainer.getBlueBoxCapabilities) {
                 return;
             }
 
-            var oCapMap = oBlueBox.getBlueBoxCapabilities();
+            var oCapMap = oApplicationContainer.getBlueBoxCapabilities();
             oCapabilities.forEach(function (oCap) {
                 if (oCap.service === "sap.ushell.services.appLifeCycle") {
                     oCap.service = "sap.ushell.services.AppLifeCycle";
@@ -98,104 +98,95 @@ sap.ui.define([
                 oCapMap[oCap.service + "." + oCap.action] = true;
             });
             if (oCapMap["sap.ushell.services.AppLifeCycle.create"]) {
-                oBlueBox.setProperty("statefulType", this.STATEFUL_TYPES.FLP_V2, true);
+                oApplicationContainer.setProperty("statefulType", this.STATEFUL_TYPES.FLP_V2, true);
             }
         };
 
-        this.removeCapabilities = function (oBlueBox, oCapabilities) {
-            if (!oBlueBoxContainer[oBlueBox] || !oBlueBox.getBlueBoxCapabilities) {
+        this.removeCapabilities = function (oApplicationContainer, oCapabilities) {
+            if (!oBlueBoxContainer[oApplicationContainer] || !oApplicationContainer.getBlueBoxCapabilities) {
                 return;
             }
 
             if (!oCapabilities) {
-                oBlueBox.setProperty("blueBoxCapabilities", {}, true);
+                oApplicationContainer.setProperty("blueBoxCapabilities", {}, true);
             } else {
-                var oCapMap = oBlueBox.getBlueBoxCapabilities();
+                var oCapMap = oApplicationContainer.getBlueBoxCapabilities();
                 oCapabilities.forEach(function (oCap) {
                     delete oCapMap[oCap.service + "." + oCap.action];
                     if (oCap.service + "." + oCap.action === "sap.ushell.services.AppLifeCycle.create") {
-                        oBlueBox.setProperty("statefulType", 0 - oBlueBox.getStatefulType(), true);
+                        oApplicationContainer.setProperty("statefulType", 0 - oApplicationContainer.getStatefulType(), true);
                     }
                 });
             }
         };
 
-        this.statefulCreateApp = function (oInnerControl, sUrl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
-            var oDeferred = new Deferred(),
-                oFLPParams,
-                oPostParams;
+        this.statefulCreateApp = async function (oApplicationContainer, sUrl, sStorageKey, oResolvedHashFragment, bNavigationInSameStatefulContainer) {
+            let oFLPParams;
 
-            function callPostMessage () {
-                if (oFLPParams) {
-                    oFLPParams["sap-flp-url"] = Container.getFLPUrl(true);
-                    oFLPParams["system-alias"] = oInnerControl.getSystemAlias();
-                    oPostParams["sap-flp-params"] = oFLPParams;
-                }
+            oApplicationContainer.setProperty("reservedParameters", oResolvedHashFragment.reservedParameters, true);
+            oApplicationContainer.setProperty("currentAppUrl", sUrl, true);
+            oApplicationContainer.setProperty("currentAppId", sStorageKey, true);
+            oApplicationContainer.setProperty("currentAppTargetResolution", oResolvedHashFragment, true);
 
-                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
-                PostMessageUtils.postMessageToIframeApp(
-                    oInnerControl, "sap.ushell.services.appLifeCycle", "create", oPostParams, true)
-                    .then(function (oResult) {
-                        Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
-                            if (bNavigationInSameStatefullContainer === true) {
-                                oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
-                            }
-                            EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
-                            oDeferred.resolve(oResult && oResult.body && oResult.body.result);
-                        });
-                    });
+            if (oApplicationContainer._checkNwbcUrlAdjustment) {
+                sUrl = oApplicationContainer._checkNwbcUrlAdjustment(oApplicationContainer, oResolvedHashFragment.applicationType, sUrl);
             }
-            oInnerControl.setProperty("reservedParameters", oTarget.reservedParameters, true);
-            oInnerControl.setProperty("currentAppUrl", sUrl, true);
-            oInnerControl.setProperty("currentAppId", sStorageKey, true);
-            oInnerControl.setProperty("currentAppTargetResolution", oTarget, true);
 
-            if (oInnerControl._checkNwbcUrlAdjustment) {
-                sUrl = oInnerControl._checkNwbcUrlAdjustment(oInnerControl, oTarget.applicationType, sUrl);
-            }
-            oPostParams = {
+            const oPostParams = {
                 sCacheId: sStorageKey,
                 sUrl: sUrl,
                 sHash: hasher.getHash()
             };
+
             if (sUrl.indexOf("sap-iframe-hint=GUI") > 0 || sUrl.indexOf("sap-iframe-hint=WDA") > 0 || sUrl.indexOf("sap-iframe-hint=WCF") > 0) {
                 var oAppStatesInfo = utils.getParamKeys(sUrl);
 
                 if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
-                    Container.getServiceAsync("Navigation").then(function (oNavService) {
-                        oNavService.getAppStateData(oAppStatesInfo.aAppStateKeysArray).then(function (aDataArray) {
-                            oFLPParams = {};
-                            oAppStatesInfo.aAppStateNamesArray.forEach(function (item, index) {
-                                if (aDataArray[index]) {
-                                    oFLPParams[item] = aDataArray[index];
-                                }
-                            });
-                            callPostMessage();
-                        }, function () {
-                            callPostMessage();
+                    try {
+                        const Navigation = await Container.getServiceAsync("Navigation");
+                        const aDataArray = await Navigation.getAppStateData(oAppStatesInfo.aAppStateKeysArray);
+                        oFLPParams = {};
+                        oAppStatesInfo.aAppStateNamesArray.forEach((item, index) => {
+                            if (aDataArray[index]) {
+                                oFLPParams[item] = aDataArray[index];
+                            }
                         });
-                    });
+                    } catch {
+                        // fail silently
+                    }
                 } else {
                     oFLPParams = {};
-                    callPostMessage();
                 }
-            } else {
-                callPostMessage();
             }
 
-            return oDeferred.promise;
+            if (oFLPParams) {
+                oFLPParams["sap-flp-url"] = Container.getFLPUrl(true);
+                oFLPParams["system-alias"] = oApplicationContainer.getSystemAlias();
+                oPostParams["sap-flp-params"] = oFLPParams;
+            }
+
+            EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+            const oResult = await PostMessageUtils.postMessageToIframeApp(oApplicationContainer, "sap.ushell.services.appLifeCycle", "create", oPostParams, true);
+            const AppLifeCycle = await Container.getServiceAsync("AppLifeCycle");
+
+            if (bNavigationInSameStatefulContainer === true) {
+                AppLifeCycle.prepareCurrentAppObject("URL", undefined, false, oApplicationContainer);
+            }
+            EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
+
+            return oResult?.body?.result;
         };
 
-        this.statefulDestroyApp = function (oInnerControl, sStorageKey) {
+        this.statefulDestroyApp = function (oApplicationContainer, sStorageKey) {
             var oPromise,
                 oAppTarget;
 
-            oInnerControl.setProperty("currentAppUrl", "", true);
-            oInnerControl.setProperty("currentAppId", "", true);
-            oAppTarget = oInnerControl.getCurrentAppTargetResolution();
-            oInnerControl.setProperty("currentAppTargetResolution", undefined, true);
+            oApplicationContainer.setProperty("currentAppUrl", "", true);
+            oApplicationContainer.setProperty("currentAppId", "", true);
+            oAppTarget = oApplicationContainer.getCurrentAppTargetResolution();
+            oApplicationContainer.setProperty("currentAppTargetResolution", undefined, true);
             Container.setAsyncDirtyStateProvider(undefined);
-            oPromise = PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "destroy", {
+            oPromise = PostMessageUtils.postMessageToIframeApp(oApplicationContainer, "sap.ushell.services.appLifeCycle", "destroy", {
                 sCacheId: sStorageKey
             }, true);
 
@@ -205,16 +196,16 @@ sap.ui.define([
             return oPromise;
         };
 
-        this.statefulStoreKeepAliveApp = function (oInnerControl, sStorageKey) {
+        this.statefulStoreKeepAliveApp = function (oApplicationContainer, sStorageKey) {
             var oPromise,
                 oAppTarget;
 
-            oInnerControl.setProperty("currentAppUrl", "", true);
-            oInnerControl.setProperty("currentAppId", "", true);
-            oAppTarget = oInnerControl.getCurrentAppTargetResolution();
-            oInnerControl.setProperty("currentAppTargetResolution", undefined, true);
+            oApplicationContainer.setProperty("currentAppUrl", "", true);
+            oApplicationContainer.setProperty("currentAppId", "", true);
+            oAppTarget = oApplicationContainer.getCurrentAppTargetResolution();
+            oApplicationContainer.setProperty("currentAppTargetResolution", undefined, true);
             Container.setAsyncDirtyStateProvider(undefined);
-            oPromise = PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "store", {
+            oPromise = PostMessageUtils.postMessageToIframeApp(oApplicationContainer, "sap.ushell.services.appLifeCycle", "store", {
                 sCacheId: sStorageKey
             }, true);
 
@@ -224,80 +215,80 @@ sap.ui.define([
             return oPromise;
         };
 
-        this.statefulRestoreKeepAliveApp = function (oInnerControl, sUrl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
+        this.statefulRestoreKeepAliveApp = function (oApplicationContainer, sUrl, sStorageKey, oResolvedHashFragment, bNavigationInSameStatefullContainer) {
             return new Promise(function (fnResolve) {
-                oInnerControl.setProperty("currentAppUrl", sUrl, true);
-                oInnerControl.setProperty("currentAppId", sStorageKey, true);
-                oInnerControl.setProperty("currentAppTargetResolution", oTarget, true);
-                EventBus.getInstance().publish("launchpad", "appOpening", oTarget);
-                PostMessageUtils.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "restore", {
+                oApplicationContainer.setProperty("currentAppUrl", sUrl, true);
+                oApplicationContainer.setProperty("currentAppId", sStorageKey, true);
+                oApplicationContainer.setProperty("currentAppTargetResolution", oResolvedHashFragment, true);
+                EventBus.getInstance().publish("launchpad", "appOpening", oResolvedHashFragment);
+                PostMessageUtils.postMessageToIframeApp(oApplicationContainer, "sap.ushell.services.appLifeCycle", "restore", {
                     sCacheId: sStorageKey,
-                    sUrl: oTarget.url,
+                    sUrl: oResolvedHashFragment.url,
                     sHash: hasher.getHash()
                 }, true).then(function () {
                     Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                         if (bNavigationInSameStatefullContainer === true) {
-                            oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
+                            oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oApplicationContainer);
                         }
-                        EventBus.getInstance().publish("sap.ushell", "appOpened", oTarget);
+                        EventBus.getInstance().publish("sap.ushell", "appOpened", oResolvedHashFragment);
                         fnResolve();
                     });
                 });
             });
         };
 
-        this.isCapabilitySupported = function (oBlueBox, sServiceName, sInterface) {
-            if (oBlueBox && oBlueBox.getBlueBoxCapabilities && oBlueBox.getBlueBoxCapabilities()[sServiceName + "." + sInterface]) {
+        this.isCapabilitySupported = function (oApplicationContainer, sServiceName, sInterface) {
+            if (oApplicationContainer && oApplicationContainer.getBlueBoxCapabilities && oApplicationContainer.getBlueBoxCapabilities()[sServiceName + "." + sInterface]) {
                 return true;
             }
             return false;
         };
 
-        this.isStatefulContainer = function (oBlueBox) {
-            return this.isCapabilitySupported(oBlueBox, "sap.ushell.services.AppLifeCycle", "create");
+        this.isStatefulContainer = function (oApplicationContainer) {
+            return this.isCapabilitySupported(oApplicationContainer, "sap.ushell.services.AppLifeCycle", "create");
         };
 
-        this.isIframeIsValidSupported = function (oBlueBox) {
-            return this.isCapabilitySupported(oBlueBox, "sap.ushell.appRuntime", "iframeIsValid");
+        this.isIframeIsValidSupported = function (oApplicationContainer) {
+            return this.isCapabilitySupported(oApplicationContainer, "sap.ushell.appRuntime", "iframeIsValid");
         };
 
-        this.isStatefulContainerInKeepAlivePool = function (oBlueBox) {
-            return !!(oBlueBox && oBlueBox.getStatefulType && oBlueBox.getStatefulType() < this.STATEFUL_TYPES.NOT_SUPPORTED);
+        this.isStatefulContainerInKeepAlivePool = function (oApplicationContainer) {
+            return !!(oApplicationContainer && oApplicationContainer.getStatefulType && oApplicationContainer.getStatefulType() < this.STATEFUL_TYPES.NOT_SUPPORTED);
         };
 
-        this.findFreeContainerForNewKeepAliveApp = function (oTarget) {
-            if (!oTarget) {
+        this.findFreeContainerForNewKeepAliveApp = function (oResolvedHashFragment) {
+            if (!oResolvedHashFragment) {
                 return undefined;
             }
-            if (!utils.isSAPLegacyApplicationType(oTarget.applicationType, oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId)) {
+            if (!utils.isSAPLegacyApplicationType(oResolvedHashFragment.applicationType, oResolvedHashFragment.appCapabilities && oResolvedHashFragment.appCapabilities.appFrameworkId)) {
                 return undefined;
             }
 
-            var oFreeContainer;
-            var sTmpUrl = oTarget.url.replaceAll("sap-keep-alive", "sap-temp");
+            var oFreeApplicationContainer;
+            var sTmpUrl = oResolvedHashFragment.url.replaceAll("sap-keep-alive", "sap-temp");
 
-            oFreeContainer = BlueBoxesCache.get(sTmpUrl, true);
-            if (oFreeContainer) {
-                oBlueBoxContainer[oFreeContainer] = oFreeContainer;
+            oFreeApplicationContainer = BlueBoxesCache.get(sTmpUrl, true);
+            if (oFreeApplicationContainer) {
+                oBlueBoxContainer[oFreeApplicationContainer] = oFreeApplicationContainer;
             } else {
-                oFreeContainer = BlueBoxesCache.get(sTmpUrl);
-                if (oFreeContainer && oFreeContainer.getStatefulType() > this.STATEFUL_TYPES.NOT_SUPPORTED) {
-                    if (oFreeContainer.getStatefulType() === this.STATEFUL_TYPES.FLP_V2) {
-                        this.removeCapabilities(oFreeContainer, oBasicStatefulCapabilities);
+                oFreeApplicationContainer = BlueBoxesCache.get(sTmpUrl);
+                if (oFreeApplicationContainer && oFreeApplicationContainer.getStatefulType() > this.STATEFUL_TYPES.NOT_SUPPORTED) {
+                    if (oFreeApplicationContainer.getStatefulType() === this.STATEFUL_TYPES.FLP_V2) {
+                        this.removeCapabilities(oFreeApplicationContainer, oBasicStatefulCapabilities);
                     } else {
-                        oFreeContainer.setProperty("statefulType", 0 - oFreeContainer.getStatefulType(), true);
+                        oFreeApplicationContainer.setProperty("statefulType", 0 - oFreeApplicationContainer.getStatefulType(), true);
                     }
                     BlueBoxesCache.remove(sTmpUrl);
                 }
             }
 
-            if (oFreeContainer) {
-                BlueBoxesCache.add(oTarget.url, oFreeContainer);
-                oFreeContainer.setProperty("currentAppUrl", "", true);
-                oFreeContainer.setProperty("isFetchedFromCache", true, true);
+            if (oFreeApplicationContainer) {
+                BlueBoxesCache.add(oResolvedHashFragment.url, oFreeApplicationContainer);
+                oFreeApplicationContainer.setProperty("currentAppUrl", "", true);
+                oFreeApplicationContainer.setProperty("isFetchedFromCache", true, true);
             }
 
-            return oFreeContainer;
+            return oFreeApplicationContainer;
         };
 
         this.returnUnusedKeepAliveContainer = function (oAppContainer) {
@@ -338,9 +329,9 @@ sap.ui.define([
             if (bIgnoreKeepAlive === true) {
                 sUrl = sUrl.replaceAll("sap-keep-alive", "sap-temp");
             }
-            var oContainer = BlueBoxesCache.get(sUrl);
-            if (oContainer) {
-                return oContainer.getStatefulType();
+            var oApplicationContainer = BlueBoxesCache.get(sUrl);
+            if (oApplicationContainer) {
+                return oApplicationContainer.getStatefulType();
             }
             return this.STATEFUL_TYPES.NOT_SUPPORTED;
         };
@@ -378,6 +369,20 @@ sap.ui.define([
                 oBlueBoxesCache: BlueBoxesCache._getStorageForDebug()
             };
         };
+
+        /**
+         * For testing purposes only.
+         * Destroys all the application containers.
+         *
+         * @since 1.130.0
+         * @private
+         */
+        this._destroyAllApplicationContainer = function () {
+            this.forEach((oApplicationContainer) => {
+                this.deleteBlueBoxByContainer(oApplicationContainer);
+                oApplicationContainer.destroy();
+            });
+        };
     }
 
     return new BlueBoxHandler();

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxesCache.js

@@ -37,23 +37,27 @@ sap.ui.define([
     }
 
     function remove (sUrl) {
-        if (sUrl) {
-            var sKey = getBlueBoxCacheKeyValues(sUrl).sKey;
-            if (oCacheStorage[sKey]) {
-                delete oCacheStorage[sKey];
-            }
+        if (!sUrl) {
+            return;
+        }
+
+        var sKey = getBlueBoxCacheKeyValues(sUrl).sKey;
+        if (oCacheStorage[sKey]) {
+            delete oCacheStorage[sKey];
         }
     }
 
     function removeByContainer (oContainer) {
-        if (oContainer) {
-            var aKeys = Object.keys(oCacheStorage);
-            aKeys.forEach(function (sKey) {
-                if (oCacheStorage[sKey].oContainer === oContainer) {
-                    delete oCacheStorage[sKey];
-                }
-            });
+        if (!oContainer) {
+            return;
         }
+
+        var aKeys = Object.keys(oCacheStorage);
+        aKeys.forEach(function (sKey) {
+            if (oCacheStorage[sKey].oContainer === oContainer) {
+                delete oCacheStorage[sKey];
+            }
+        });
     }
 
     function get (sUrl, bFromKeepAlivePool) {

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.129.1
+ * @version 1.130.1
  * @private
  */
 sap.ui.define([
@@ -1938,9 +1938,7 @@ sap.ui.define([
                         const { aReferences } = oServiceParams.oMessageData.body;
                         const ReferenceResolver = await Container.getServiceAsync("ReferenceResolver");
 
-                        const oDeferred = ReferenceResolver.resolveReferences(aReferences);
-
-                        return ushellUtils.promisify(oDeferred);
+                        return ReferenceResolver.resolveReferences(aReferences);
                     }
                 }
             }