@sapui5/sap.ushell 1.114.0 → 1.114.2

package/src/main/js/sap/ushell/appRuntime/ui5/services/CrossApplicationNavigation.js

@@ -138,8 +138,19 @@ sap.ui.define([
             );
         };
 
-        this.isNavigationSupported = function (aIntents, oComponent) {
-            //ready also for scube
+        this.isNavigationSupported = function (aIntents, oComponent, bCheckInOuterShellOnly) {
+            var fnCheckInShell = function (aIntentsTmp) {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.CrossApplicationNavigation.isNavigationSupported", {
+                        aIntents: aIntentsTmp
+                    }
+                );
+            };
+
+            if (bCheckInOuterShellOnly === true) {
+                return fnCheckInShell(aIntents);
+            }
+
             if (AppRuntimeContext.getIsScube()) {
                 var oDeferred = new jQuery.Deferred(),
                     aFilteredIntents;
@@ -161,11 +172,7 @@ sap.ui.define([
                 return oDeferred.promise();
             }
 
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.CrossApplicationNavigation.isNavigationSupported", {
-                    aIntents: aIntents
-                }
-            );
+            return fnCheckInShell(aIntents);
         };
 
         this.toExternal = function (oArgs, oComponent) {

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellUIService.js

@@ -24,6 +24,9 @@ sap.ui.define([
     var ShellUIServiceProxy = oService.extend("sap.ushell.appRuntime.services.ShellUIService", {
 
         setTitle: function (sTitle) {
+            if (!sTitle) {
+                return;
+            }
             sLastSetTitle = sTitle;
             return AppRuntimeService.sendMessageToOuterShell(
                 "sap.ushell.services.ShellUIService.setTitle", {
@@ -36,17 +39,21 @@ sap.ui.define([
         },
 
         setHierarchy: function (aHierarchyLevels) {
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.ShellUIService.setHierarchy", {
-                    aHierarchyLevels: aHierarchyLevels
-                });
+            return AppRuntimeContext.checkIntentsConversionForScube(aHierarchyLevels).then(function (aNewHierarchyLevels) {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.ShellUIService.setHierarchy", {
+                        aHierarchyLevels: aNewHierarchyLevels
+                    });
+            });
         },
 
         setRelatedApps: function (aRelatedApps) {
-            return AppRuntimeService.sendMessageToOuterShell(
-                "sap.ushell.services.ShellUIService.setRelatedApps", {
-                    aRelatedApps: aRelatedApps
-                });
+            return AppRuntimeContext.checkIntentsConversionForScube(aRelatedApps).then(function (aNewRelatedApps) {
+                return AppRuntimeService.sendMessageToOuterShell(
+                    "sap.ushell.services.ShellUIService.setRelatedApps", {
+                        aRelatedApps: aNewRelatedApps
+                    });
+            });
         },
 
         setBackNavigation: function (fnCallback) {

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserInfo.js

@@ -23,6 +23,11 @@ sap.ui.define([
         this.getLanguageList = function () {
             return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getLanguageList");
         };
+
+
+        this.getShellUserInfo = function () {
+            return AppRuntimeService.sendMessageToOuterShell("sap.ushell.services.UserInfo.getShellUserInfo");
+        };
     }
 
     ObjectPath.set("sap.ushell.services.UserInfo", UserInfoProxy);

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the application runtime platform
  *
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.114.0
+ * @version 1.114.2
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/_SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.114.0
+ * @version 1.114.2
  * @namespace
  */
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/bootstrap/common/common.create.configcontract.core.js

@@ -106,6 +106,21 @@ sap.ui.define([
             return false;
         }
 
+        /**
+         * Converts a string with comma-separated values into a string array
+         * @param {string} sCsv comma-separated values
+         * @returns {string[]} values as array
+         */
+        function csvToArray (sCsv) {
+            if (typeof sCsv !== "string") {
+                return [];
+            }
+
+            return sCsv.split(",").map(function (entry) {
+                return entry.trim();
+            });
+        }
+
         var oConfigDefinition = {
             core: { // the unified shell core
                 site: {
@@ -129,6 +144,7 @@ sap.ui.define([
                     }
                 },
                 navigation: {
+
                     enableInPlaceForClassicUIs: {
                         GUI: getConfigValue("services/ClientSideTargetResolution/config/enableInPlaceForClassicUIs/GUI", false),
                         WDA: getConfigValue("services/ClientSideTargetResolution/config/enableInPlaceForClassicUIs/WDA", false),
@@ -246,6 +262,7 @@ sap.ui.define([
                     sessionTimeoutIntervalInMinutes: getConfigValue("renderers/fiori2/componentData/config/sessionTimeoutIntervalInMinutes", -1),
                     enableFeaturePolicyInIframes: getConfigValue("renderers/fiori2/componentData/config/enableFeaturePolicyInIframes", true),
                     favIcon: getConfigValue("renderers/fiori2/componentData/config/favIcon", undefined),
+                    useAppTitleFromNavTargetResolution: csvToArray(getConfigValue("ushell/useAppTitleFromNavTargetResolution")),
                     model: {
                         enableSAPCopilotWindowDocking: undefined,
                         enableBackGroundShapes: getEnableBackGroundShapes(),

package/src/main/js/sap/ushell/components/appfinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.114.0"
+            "version": "1.114.2"
         },
         "i18n": {
             "bundleUrl": "../../renderers/fiori2/resources/resources.properties",

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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/elements/model",
@@ -25,7 +25,8 @@ 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/m/library"
 ], function (
     ElementsModel,
     Storage,
@@ -48,7 +49,8 @@ sap.ui.define([
     oUrlParsing,
     Core,
     hasher,
-    MessageBrokerEngine
+    MessageBrokerEngine,
+    mobileLibrary
 ) {
     "use strict";
 
@@ -59,7 +61,6 @@ sap.ui.define([
             sRootIntent,
             oShellUIService,
             appState,
-            oIntentToStorageId = {},
             disableHomeAppCache = false,
             oCurrentApplication = {},
             oActualElementsModelStateMap = {
@@ -88,7 +89,9 @@ sap.ui.define([
             oKeepAliveModes = {
                 FULL: "true",
                 RESTRICTED: "restricted"
-            };
+            },
+            fnOldTriggerEmail;
+        var URLHelper = mobileLibrary.URLHelper;
 
         //connect FLP to the message broker
         if (window.QUnit === undefined) {
@@ -263,26 +266,25 @@ sap.ui.define([
         };
 
         this.handleExitStateful = function (sFromId, oFrom, isHomePage) {
-            var sBBStorageId,
+            var sKeepAliveAppId = oFrom.getCurrentAppId && oFrom.getCurrentAppId(),
                 oHandlers = BlueBoxHandler.getHandler();
 
-            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);
+                    Storage.remove(sKeepAliveAppId);
                     return oHandlers.destroy(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 oHandlers.store(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);
         };
 
-        this.handleExitApplication = function (sFromId, oFrom, sToId, oTo, isHomePage) {
+        this.handleExitApplication = function (sFromId, oFrom, sToId, oTo, isHomePage, bFromAfterNavigate) {
             var that = this,
                 bIsAppOfTypeCachable,
                 oPromiseAppClose,
@@ -295,8 +297,7 @@ sap.ui.define([
 
             if (sFromId && oFrom) { // FIXME oFrom.getApplicationType is not defined for Homepage and AppFinder in case disableHomeAppCache is true
                 if (oFrom.getUrl() && BlueBoxHandler.isStatefulContainerSupported(BlueBoxHandler.getStateFul(oFrom.getUrl()))) {
-                    // Update the code to load stateful according
-                    oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
+                    oPromiseAppClose = (!bFromAfterNavigate ? this.handleExitStateful(sFromId, oFrom, isHomePage) : undefined);
                 } else if (Storage.get(sFromId)) {
                     if (RelatedServices.isBackNavigation() === true && !isHomePage) {
                         oDeferredAppClose = new jQuery.Deferred();
@@ -397,7 +398,7 @@ sap.ui.define([
                 || sToId.indexOf("workPageRuntime-component-container") > 0
                 || sToId.indexOf("runtimeSwitcher-component-container") > 0;
 
-            this.handleExitApplication(sFromId, oFrom, sToId, oTo, bIsShellApps);
+            this.handleExitApplication(sFromId, oFrom, sToId, oTo, bIsShellApps, !bIsShellApps);
             if (bIsShellApps === true) {
                 Application.setActiveAppContainer(undefined);
             }
@@ -433,43 +434,27 @@ 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);
-                }
-                // TODO restore meta
-                // restore elements model
-                // restore appState
-                // restore all related application resources
-            }
-        };
-
         this.isAppOfTypeCached = function (appId, bIsAppOfTypeCachable, oKeepAliveMode) {
             var sKeepAlive;
 
+            //generic intent currently can never be keep alive
+            if (appId === "application-Shell-startIntent") {
+                return false;
+            }
+
             //handle the root intent
             if (!disableHomeAppCache && appId.indexOf(sRootIntent) !== -1) {
                 return true;
             }
-            if (!disableHomeAppCache && appId.indexOf("Shell-appfinder") !== -1) { // TODO consider to make intent configurable
+
+            if (!disableHomeAppCache && appId.indexOf("Shell-appfinder") !== -1) {
                 return true;
             }
-            //TODO add by configuration a list of persisted applications
 
             //In order to enable application to play with the keep alive, we read the keep attribute of the hash, if it is true application is cachable.
             sKeepAlive = UriParameters.fromURL(window.location.href).get("sap-keep-alive");
@@ -485,6 +470,11 @@ sap.ui.define([
         this.isCachedEnabledAsAppParameter = function (oShellHash, oTarget, oKeepAliveMode) {
             var sKeepAlive;
 
+            //generic intent currently can never be keep alive
+            if (oShellHash && oShellHash.semanticObject === "Shell" && oShellHash.action === "startIntent") {
+                return false;
+            }
+
             //temporary fix for issue found in keep alive fiori apps when stateful container
             //is used (meaning - fiori keep alive apps in cFLP). At the moment
             //it will not be supported until the issue will be solved
@@ -614,8 +604,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 = {
@@ -644,8 +635,9 @@ sap.ui.define([
                     this.storeApp(appId, oContainer, oTarget, sFixedShellHash, oKeepAliveMode);
                     BlueBoxHandler.set(oTarget.url, oContainer);
                 }
-
-                this.restoreApp(appId);
+                if (this.isAppInCache(appId)) {
+                    oCurrentApplication = Storage.get(appId);
+                }
             } else if (oTarget.applicationType === "TR" || (oTarget.appCapabilities && oTarget.appCapabilities.appFrameworkId === "GUI")) {
                 oContainer = this.getWebGuiV1StatefulContainer(oTarget.url);
 
@@ -785,7 +777,28 @@ sap.ui.define([
         this.init = function (inAppState, oInViewPortContainer, inSRootIntent, inDisableHomeAppCache, oShellUIServiceChange, aActions, oCacheConfigurations) {
             var that = this,
                 nCacheSize;
-
+            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);
+                                });
+                        };
+                    }
+                });
+            }
             // calculate Cache size
             if (Device.system.phone) {
                 nCacheSize = 10;
@@ -1131,18 +1144,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, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer) {
+            var that = this;
 
             // invoke the life cycle interface "setInitialConfiguration" for the restored application
-            return oHandler.restore(oApplicationContainer, sStorageId, oTarget, bNavigationInSameStatefullContainer)
+            return oHandler.restore(oApplicationContainer, sUrl, sToId, oTarget, bNavigationInSameStatefullContainer)
                 .then(function () {
                     that.showApplicationContainer(oApplicationContainer);
                 }, function (vError) {
@@ -1153,19 +1159,12 @@ sap.ui.define([
         this.reuseStateFulContainer = function (oApplicationContainer, url, sToId, oHandler, 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)
-                .then(function () {
+                .then(function (oResult) {
+                    if (oResult && oResult.deletedKeepAliveId) {
+                        Storage.remove(oResult.deletedKeepAliveId);
+                    }
                     that.showApplicationContainer(oApplicationContainer);
                 }, function (vError) {
                     Log.error(vError && vError.message || vError);
@@ -1328,15 +1327,12 @@ sap.ui.define([
 
             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, oHandler, sFixedShellHash, oTarget, bNavigationInSameStatefullContainer);
             } else {
                 oPromise = this.reuseStateFulContainer(oInnerControl, oTarget.url, sToId, oHandler, 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);
                 }
             }
 
@@ -1414,12 +1410,14 @@ sap.ui.define([
             }
 
             bReuseStatefulContainer = oCurrentAppContainer ? BlueBoxHandler.isStatefulContainerSupported(oCurrentAppContainer) : false;
-            if (oCurrentAppContainer && oCurrentAppContainer === oTargetAppContainer && bReuseStatefulContainer) {
+            if (oCurrentAppContainer && bReuseStatefulContainer) {
                 if (oOldAppStorageEntry) {
                     RelatedServices.store(oOldAppStorageEntry.service);
                 }
-                oPromiseAppClose = this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false);
-                bNavigationInSameStatefullContainer = true;
+                oPromiseAppClose = this.handleExitApplication(sOldFullAppId, oCurrentAppContainer, undefined, undefined, false, false);
+                if (oCurrentAppContainer === oTargetAppContainer) {
+                    bNavigationInSameStatefullContainer = true;
+                }
             }
 
             oPromiseAppClose.then(function () {
@@ -1477,10 +1475,10 @@ 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) {
@@ -1542,7 +1540,9 @@ sap.ui.define([
                             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();

package/src/main/js/sap/ushell/components/applicationIntegration/Storage.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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([], function () {
     "use strict";

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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/container/ApplicationContainer",
@@ -421,6 +421,9 @@ sap.ui.define([
             oActiveApplication = new ApplicationContainer("application" + sAppId, oResolvedNavigationTarget);
             this._restoreTargetResolution(oResolvedNavigationTarget, oTempTarget);
 
+            if (oActiveApplication.setCurrentAppId) {
+                oActiveApplication.setProperty("currentAppId", "application" + sAppId, true);
+            }
             if (oResolvedNavigationTarget.appCapabilities) {
                 oActiveApplication.setProperty("frameworkId", oResolvedNavigationTarget.appCapabilities.appFrameworkId, true);
             }

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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/BlueBoxesCache",
@@ -74,17 +74,19 @@ sap.ui.define([
                             oPostParams["sap-flp-params"] = oFLPParams;
                         }
 
+                        oInnerControl.setProperty("currentAppUrl", sUrl, true);
+                        oInnerControl.setProperty("currentAppId", sStorageKey, true);
                         Core.getEventBus().publish("launchpad", "appOpening", oTarget);
                         Application.postMessageToIframeApp(
                             oInnerControl, "sap.ushell.services.appLifeCycle", "create", oPostParams, true)
-                            .then(function () {
+                            .then(function (oResult) {
                                 oBlueBoxContainer[oInnerControl].currentAppTarget = oTarget;
                                 sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycleService) {
                                     if (bNavigationInSameStatefullContainer === true) {
                                         oAppLifeCycleService.prepareCurrentAppObject("URL", undefined, false, oInnerControl);
                                     }
                                     Core.getEventBus().publish("sap.ushell", "appOpened", oTarget);
-                                    oDeferred.resolve();
+                                    oDeferred.resolve(oResult && oResult.body && oResult.body.result);
                                 });
                             });
                     }
@@ -126,6 +128,8 @@ sap.ui.define([
                 destroy: function (oInnerControl, sStorageKey) {
                     var oPromise;
 
+                    oInnerControl.setProperty("currentAppUrl", "", true);
+                    oInnerControl.setProperty("currentAppId", "", true);
                     sap.ushell.Container.setAsyncDirtyStateProvider(undefined);
                     oPromise = Application.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "destroy", {
                         sCacheId: sStorageKey
@@ -140,6 +144,8 @@ sap.ui.define([
                 store: function (oInnerControl, sStorageKey) {
                     var oPromise;
 
+                    oInnerControl.setProperty("currentAppUrl", "", true);
+                    oInnerControl.setProperty("currentAppId", "", true);
                     sap.ushell.Container.setAsyncDirtyStateProvider(undefined);
                     oPromise = Application.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "store", {
                         sCacheId: sStorageKey
@@ -151,8 +157,10 @@ sap.ui.define([
                     });
                     return oPromise;
                 },
-                restore: function (oInnerControl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
+                restore: function (oInnerControl, sUrl, sStorageKey, oTarget, bNavigationInSameStatefullContainer) {
                     return new Promise(function (fnResolve) {
+                        oInnerControl.setProperty("currentAppUrl", sUrl, true);
+                        oInnerControl.setProperty("currentAppId", sStorageKey, true);
                         Core.getEventBus().publish("launchpad", "appOpening", oTarget);
                         Application.postMessageToIframeApp(oInnerControl, "sap.ushell.services.appLifeCycle", "restore", {
                             sCacheId: sStorageKey,
@@ -298,7 +306,13 @@ sap.ui.define([
 
             oBlueBoxContainer[oBlueBox].currentAppTarget = oTarget;
             oBlueBoxContainer[oBlueBox].appCapabilities = oTarget.appCapabilities;
-            if (oTarget.appCapabilities && oTarget.appCapabilities.statefulContainer === true) {
+
+
+            var bCheckTemplateCapabilities = true;
+            if (oTarget.url && oTarget.url.indexOf("/ui5appruntimescube") > 0) {
+                bCheckTemplateCapabilities = false;
+            }
+            if (bCheckTemplateCapabilities && oTarget.appCapabilities && oTarget.appCapabilities.statefulContainer === true) {
                 this.setCapabilities(oBlueBox, oBasicStatefulContainerCapabilities);
             }
         };

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.114.0
+ * @version 1.114.2
  * @private
  */
 sap.ui.define([
@@ -482,6 +482,21 @@ sap.ui.define([
                         sap.ushell.Container.getFLPPlatform().then(oDeferred.resolve);
                         return oDeferred.promise();
                     }
+                },
+                attachLogoutEvent: {
+                    executeServiceCallFn: function (oServiceParams) {
+                        sap.ushell.Container.attachLogoutEvent(function () {
+                            var oMessage = {
+                                type: "request",
+                                request_id: Date.now().toString(),
+                                service: "sap.ushell.appRuntime.executeLogoutFunctions",
+                                body: {}
+                            };
+                            return oServiceParams.oContainer.postMessageToCurrentIframe(oMessage, true);
+                        }, true);
+
+                        return new jQuery.Deferred().resolve().promise();
+                    }
                 }
             }
         },

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.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.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.114.0
+ * @version 1.114.2
  */
 sap.ui.define([
     "sap/ushell/EventHub",