@sapui5/sap.ushell 1.140.0 → 1.141.0

package/src/main/js/sap/ushell/appIntegration/AppLifeCycle.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/util/Deferred",
@@ -34,7 +34,6 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/utils/UrlParsing",
     "sap/ui/thirdparty/hasher",
-    "sap/ushell/services/MessageBroker/MessageBrokerEngine",
     "sap/ushell/renderer/utils",
     "sap/m/library",
     "sap/ushell/AppInfoParameters",
@@ -77,7 +76,6 @@ sap.ui.define([
     EventHub,
     UrlParsing,
     hasher,
-    MessageBrokerEngine,
     RendererUtils,
     mobileLibrary,
     AppInfoParameters,
@@ -108,13 +106,6 @@ sap.ui.define([
     // shortcut for sap.m.URLHelper
     const URLHelper = mobileLibrary.URLHelper;
 
-    const oRendererManagedComponents = new RendererManagedComponents();
-
-    // todo: [FLPCOREANDUX-10024] cleanup
-    // const CACHED_APP_TYPES = ["URL"];
-
-    const iValidIframeTimeout = 3500;
-
     function AppLifeCycle () {
         // Dangling controls is a queue of requests to change shell elements attributes, requested by the application in the process of createContent before the actual application state was apply.
         this._bDisableHomeAppCache = false;
@@ -129,11 +120,6 @@ sap.ui.define([
         // base appId to counter
         this._oStorageAppIdNextIndex = {};
         this._aDoables = [];
-
-        // connect FLP to the message broker
-        if (window.QUnit === undefined) {
-            MessageBrokerEngine.connect("FLP");
-        }
     }
 
     // Expose Enums
@@ -363,17 +349,14 @@ sap.ui.define([
             return; // no actual navigation happening; might be a navigation into the same container
         }
 
-        if (sFromId && oFrom && oFrom.isA("sap.ushell.appIntegration.ApplicationContainer")) {
+        if (sFromId && oFrom && oFrom.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
             const oApplicationContainer = oFrom;
             const sStorageAppId = oApplicationContainer.getCurrentAppId();
 
-            const bHasIframe = !!oApplicationContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer"); // todo: [FLPCOREANDUX-10024] is this really required?
-            const bIsSupportedType = oApplicationContainer.getStatefulType() > StatefulType.NotSupported;
-
+            const bSessionHandlingSupported = oApplicationContainer.getStatefulType() !== StatefulType.NotSupported;
             const bCached = !!KeepAliveApps.get(sStorageAppId);
-            const bSessionHandlingSupported = bHasIframe && bIsSupportedType;
 
-            if (bHasIframe && (bCached || bSessionHandlingSupported)) {
+            if (bCached || bSessionHandlingSupported) {
                 oApplicationContainer.sendRequest("sap.ushell.sessionHandler.beforeApplicationHide", {}, false);
             }
         }
@@ -382,14 +365,14 @@ sap.ui.define([
     /**
      * @param {object} oEvent the UI5 event object.
      */
-    AppLifeCycle.prototype.onAfterNavigate = async function (oEvent) { // call lifecycle interface "setInitialConfiguration"
+    AppLifeCycle.prototype.onAfterNavigate = async function (oEvent) {
         const sFromId = oEvent.getParameter("fromId") || "";
         const oFrom = oEvent.getParameter("from");
         const sToId = oEvent.getParameter("toId") || "";
         const oTo = oEvent.getParameter("to");
 
         const bNavWithinSameContainer = sFromId === sToId;
-        const bNavigationToFlpComponent = oRendererManagedComponents.isComponentId(sToId);
+        const bNavigationToFlpComponent = RendererManagedComponents.isManagedComponentInstance(oTo);
 
         // first cleanup
         if (sFromId && oFrom) {
@@ -433,13 +416,9 @@ sap.ui.define([
                 const oApplicationContainer = oTo;
                 const sStorageAppId = oApplicationContainer.getCurrentAppId();
 
-                // this code must be at the beginning of the function to allow it to be processed once in
-                // a cycle of opening an app
-                if (oApplicationContainer.getIframeReusedForApp()) {
-                    oApplicationContainer.setIframeReusedForApp(false);
-                    if (oApplicationContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
-                        oApplicationContainer.sendRequest("sap.ushell.sessionHandler.afterApplicationShow", {}, false);
-                    }
+                const bIsFetchedFromCache = oApplicationContainer.getIsFetchedFromCache();
+                if (bIsFetchedFromCache && oApplicationContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
+                    oApplicationContainer.sendRequest("sap.ushell.sessionHandler.afterApplicationShow", {}, false);
                 }
 
                 if (KeepAliveApps.get(sStorageAppId)) {
@@ -512,7 +491,12 @@ sap.ui.define([
      * @param {boolean} [bHardDestroy=false] whether the application should be hard destroyed.
      * @returns {Promise} Resolves when the app is destroyed.
      */
-    AppLifeCycle.prototype._destroyApplication = async function (sStorageAppId, oApplicationContainer, bHardDestroy) {
+    AppLifeCycle.prototype.destroyApplication = async function (sStorageAppId, oApplicationContainer, bHardDestroy) {
+        // storageAppId can be omitted hard destroy
+        if (typeof sStorageAppId !== "string" && bHardDestroy) {
+            sStorageAppId = "dummy-id";
+        }
+
         if (typeof sStorageAppId !== "string" || !oApplicationContainer) {
             return;
         }
@@ -588,10 +572,10 @@ sap.ui.define([
         try {
             const oThenable = oApplicationContainer.sendBeforeAppCloseEvent();
             await ushellUtils.promisify(oThenable);
-        } catch (sError) {
+        } catch (oError) {
             Log.error(
                 "FLP got a failed response from the iframe for the 'sap.ushell.services.CrossApplicationNavigation.beforeAppCloseEvent' message sent",
-                sError,
+                oError,
                 "sap.ushell.appIntegration.AppLifeCycle.js"
             );
         }
@@ -655,7 +639,7 @@ sap.ui.define([
 
         // Back Navigation Case
         if (bNavigationBackToApp) {
-            await this._destroyApplication(sOldStorageAppId, oOldApplicationContainer); // todo: [FLPCOREANDUX-10024] new marker
+            await this.destroyApplication(sOldStorageAppId, oOldApplicationContainer);
 
         // Forward Navigation Case
         //      (and back navigation to FLP component)
@@ -663,7 +647,7 @@ sap.ui.define([
             if (oOldApplicationContainer.getIsKeepAlive()) {
                 return this._storeApplication(sOldStorageAppId);
             }
-            return this._destroyApplication(sOldStorageAppId, oOldApplicationContainer);
+            return this.destroyApplication(sOldStorageAppId, oOldApplicationContainer);
         }
     };
 
@@ -682,12 +666,12 @@ sap.ui.define([
                 }
             });
             const aClosePromises = aFilteredApps.map((oFilteredApp) => {
-                return this._destroyApplication(oFilteredApp.appId, oFilteredApp.container, bHardDestroy);
+                return this.destroyApplication(oFilteredApp.appId, oFilteredApp.container, bHardDestroy);
             });
 
             await Promise.allSettled(aClosePromises);
-        } catch (e) {
-            Log.error("_destroyKeepAliveApps call failed", e);
+        } catch (oError) {
+            Log.error("_destroyKeepAliveApps call failed", oError);
         }
     };
 
@@ -825,14 +809,14 @@ sap.ui.define([
     AppLifeCycle.prototype._reloadCurrentApp = async function (oData) {
         const oTargetApplicationContainer = ApplicationContainerCache.getById(oData.sAppContainerId);
         if (oTargetApplicationContainer) {
-            await this._destroyApplication(oTargetApplicationContainer.getCurrentAppId(), oTargetApplicationContainer);
+            await this.destroyApplication(oTargetApplicationContainer.getCurrentAppId(), oTargetApplicationContainer);
         }
 
         const ShellNavigationInternal = await Container.getServiceAsync("ShellNavigationInternal");
         try {
             ShellNavigationInternal.hashChanger.treatHashChanged(oData.sCurrentHash);
-        } catch (error) {
-            Log.error("Error when trying to re-load the current displayed application", error, "sap.ushell.services.AppLifeCycle");
+        } catch (oError) {
+            Log.error("Error when trying to re-load the current displayed application", oError, "sap.ushell.services.AppLifeCycle");
         }
     };
 
@@ -938,13 +922,13 @@ sap.ui.define([
      *
      * @private
      */
-    AppLifeCycle.prototype._setApplicationContainerActive = function (oTargetApplicationContainer) {
+    AppLifeCycle.prototype._setApplicationContainerActive = async function (oTargetApplicationContainer) {
         ApplicationContainerCache.forEach((oApplicationContainer) => {
             if (oApplicationContainer && oApplicationContainer !== oTargetApplicationContainer) {
                 try {
                     Log.info(`Deactivating container ${oApplicationContainer.getId()}`);
                     oApplicationContainer.setActive(false);
-                } catch (e) {
+                } catch {
                     /* empty */
                 }
             }
@@ -1024,21 +1008,8 @@ sap.ui.define([
                 AppConfiguration.setApplicationInInitMode();
 
                 await EmbeddedUI5Handler.createApp(oApplicationContainer, oResolvedHashFragment, oParsedShellHash);
-
-                // todo: [FLPCOREANDUX-10024] check whether the issue still persists
-                // the activation of user activity logging must be done after the app component is fully loaded
-                // otherwise the module loading sequence causes race conditions on firefox
-                const bContactSupportEnabled = Config.last("/core/extension/SupportTicket");
-                if (bContactSupportEnabled) {
-                    ushellUtils.awaitTimeout(0)
-                        .then(() => {
-                            return ushellUtils.requireAsync(["sap/ushell/UserActivityLog"]);
-                        })
-                        .then(([UserActivityLog]) => {
-                            UserActivityLog.activate();
-                        });
-                }
             }
+
             // todo: [FLPCOREANDUX-10024] rework abap direct app start
             const oComponentHandle = oResolvedHashFragment.componentHandle;
             const oComponentInstance = oComponentHandle.getInstance();
@@ -1051,7 +1022,7 @@ sap.ui.define([
             // The trampoline application subsequently gets destroyed after it's used to enable the redirection.
             const sNavigationRedirectHash = await EmbeddedUI5Handler.getNavigationRedirectHash(oApplicationContainer);
             if (typeof sNavigationRedirectHash === "string") {
-                await this._destroyApplication(sStorageAppId, oApplicationContainer);
+                await this.destroyApplication(sStorageAppId, oApplicationContainer);
                 return sNavigationRedirectHash;
             }
 
@@ -1351,7 +1322,7 @@ sap.ui.define([
             if (bNewAppWasAlreadySet) {
                 const oApplicationContainer = this._oCurrentApplication.container;
                 if (oApplicationContainer) {
-                    await this._destroyApplication(oApplicationContainer.getCurrentAppId(), oApplicationContainer, true); // force destroy
+                    await this.destroyApplication(oApplicationContainer.getCurrentAppId(), oApplicationContainer, true); // force destroy
                 }
 
                 // restore the old application or stash it
@@ -1519,13 +1490,13 @@ sap.ui.define([
             // Case: different app
             if (!bSameTarget) {
                 Log.warning(`The keepAlive app '${sStorageAppId}' has to be destroyed because of id clashes.`);
-                await this._destroyApplication(sStorageAppId, oStoredApplicationContainer);
+                await this.destroyApplication(sStorageAppId, oStoredApplicationContainer);
 
             // Case: Navigating from homepage to a keepAlive application via deep link (bookmark).
             // In this case, although keepAlive is active we need to destroy the application and re-open it.
             } else if (bNavigationFromHome && bNavigationWithInnerAppRoute) {
                 Log.warning(`The keepAlive app '${sStorageAppId}' has to be destroyed because of a bookmark start.`);
-                await this._destroyApplication(sStorageAppId, oStoredApplicationContainer);
+                await this.destroyApplication(sStorageAppId, oStoredApplicationContainer);
             }
 
             // => we are navigating to the right keep alive app, so we keep it alive
@@ -1539,10 +1510,10 @@ sap.ui.define([
             if (oCurrentApplicationContainer && oCurrentApplicationContainer.isA("sap.ushell.appIntegration.UI5ApplicationContainer")) {
                 if (oCurrentApplicationContainer.getUi5ComponentName() === oResolvedHashFragment.ui5ComponentName) {
                     Log.warning(`The app '${oCurrentApplicationContainer.getCurrentAppId()}' has to be destroyed because of component name clashes.`);
-                    await this._destroyApplication(oCurrentApplicationContainer.getCurrentAppId(), oCurrentApplicationContainer, true); // force destroy
+                    await this.destroyApplication(oCurrentApplicationContainer.getCurrentAppId(), oCurrentApplicationContainer, true); // force destroy
                 } else if (oCurrentApplicationContainer.getUi5ComponentId() === sTargetUi5ComponentId) {
                     Log.warning(`The app '${oCurrentApplicationContainer.getCurrentAppId()}' has to be destroyed because of component id clashes.`);
-                    await this._destroyApplication(oCurrentApplicationContainer.getCurrentAppId(), oCurrentApplicationContainer, true); // force destroy
+                    await this.destroyApplication(oCurrentApplicationContainer.getCurrentAppId(), oCurrentApplicationContainer, true); // force destroy
                 }
             }
 
@@ -1567,34 +1538,30 @@ sap.ui.define([
             }, true); // force destroy
         }
 
-        // ====== Handle invalid iframes ======
-        // get the potential target stateful container and check if it's valid. if not, destroy it
-        // before we try to create the new application within the same stateful container
-        const oPotentialApplicationContainer = ApplicationContainerCache.findFreeContainerByUrl(oResolvedHashFragment.url);
-        if (oPotentialApplicationContainer && oPotentialApplicationContainer.getStatefulType() === StatefulType.ContractV2) {
-            let bIframeInvalid = false;
-            let sReason;
-            if (oPotentialApplicationContainer.getIsInvalidIframe()) {
-                bIframeInvalid = true;
-                sReason = "iframe is in invalid state";
-            } else if (oPotentialApplicationContainer.supportsIframeInvalidation()) {
-                const iLastValidTimeDelta = new Date().getTime() - oPotentialApplicationContainer.getIsIframeValidTime().time;
-                bIframeInvalid = iLastValidTimeDelta >= iValidIframeTimeout;
-                sReason = `iframe did not ping in the last '${iLastValidTimeDelta}' ms`;
+        // ====== Cleanup invalid iframes ======
+        // check all stateful containers whether they're still valid. if not, destroy them
+        // before we try to create the new application within the invalid stateful container
+        await ApplicationContainerCache.forEach(async (oPotentialApplicationContainer) => {
+            if (oPotentialApplicationContainer.getStatefulType() !== StatefulType.ContractV2) {
+                return;
             }
 
-            if (bIframeInvalid) {
+            try {
+                oPotentialApplicationContainer.isValid();
+                return;
+            } catch (oError) {
                 Log.warning(
                     `Destroying stateful container iframe due to unresponsiveness (${oPotentialApplicationContainer.getId()})`,
-                    `reason: ${sReason}`,
+                    `reason: ${oError.message}`,
                     "sap.ushell.appIntegration.AppLifeCycle"
                 );
 
                 // not able to exit gracefully, destroy the container directly forcefully
-                return this._destroyApplication(sStorageAppId, oPotentialApplicationContainer, true); // force destroy
+                return this.destroyApplication(sStorageAppId, oPotentialApplicationContainer, true); // force destroy
             }
-        }
+        });
     };
+
     /**
      * Only for testing
      * @param {sap.ui.core.Control} oNewNavContainer the new navigation container.

package/src/main/js/sap/ushell/appIntegration/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.140.0
+ * @version 1.141.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -69,13 +69,6 @@ sap.ui.define([
                 isFetchedFromCache: { defaultValue: false, type: "boolean" },
                 capabilities: { defaultValue: {}, type: "object" },
 
-                // todo: [FLPCOREANDUX-10024] rework this
-                iframeReusedForApp: { defaultValue: false, type: "boolean" },
-
-                // todo: [FLPCOREANDUX-10024] rework this
-                isInvalidIframe: { defaultValue: false, type: "boolean" },
-                isIframeValidTime: { defaultValue: { time: 0 }, type: "object" },
-
                 currentAppTargetResolution: { type: "object" },
 
                 /**
@@ -129,26 +122,6 @@ sap.ui.define([
                  */
                 dataHelpId: { type: "string", defaultValue: "" }
             },
-            events: {
-                /**
-                 * Event which is fired when the <code>ApplicationContainer</code> control is rendered. The
-                 * event holds a technology specific configuration object for the embedded application.
-                 * As of now, only configuration for an embedded <em>SAPUI5 component</em> is supported.
-                 */
-                applicationConfiguration: { // todo: [FLPCOREANDUX-10024] remove this
-                    parameters: {
-                        /**
-                         * The technology specific configuration object of the embedded application.
-                         * <code>undefined</code>, if the <code>ApplicationContainer</code> control does not
-                         * provide a configuration for the technology of the embedded application or if there is a
-                         * rendering issue with the application.<br/>
-                         * For SAPUI5 components, the <code>config</code> property of the component metadata is
-                         * provided.
-                         */
-                        configuration: { type: "object" }
-                    }
-                }
-            },
             interfaces: [
                 "sap.ushell.renderer.INavContainerPage"
             ]
@@ -424,16 +397,15 @@ sap.ui.define([
     };
 
     /**
-     * Shortcut to check if the application container supports the iframe invalidation.
-     * @returns {boolean} Whether the application container supports the iframe invalidation.
+     * Checks if the iframe is valid and responsive.
+     * @returns {boolean} Whether the iframe is valid.
+     * @throws {Error} If the iframe is not valid.
      *
-     * @since 1.139.0
+     * @since 1.141.0
      * @private
      */
-    ApplicationContainer.prototype.supportsIframeInvalidation = function () {
-        return this.supportsCapabilities([
-            "sap.ushell.services.appRuntime.iframeIsValid"
-        ]);
+    ApplicationContainer.prototype.isValid = function () {
+        return true;
     };
 
     // helper for tests

package/src/main/js/sap/ushell/appIntegration/ApplicationContainerCache.js

@@ -127,13 +127,16 @@ sap.ui.define([
         }
 
         forEach (fnCallback) {
-            this.#aActiveContainers.forEach((oApplicationContainer) => {
-                fnCallback(oApplicationContainer);
-            });
+            const aPromises = [];
+            for (const oApplicationContainer of this.#aActiveContainers) {
+                aPromises.push(fnCallback(oApplicationContainer));
+            }
 
-            this.#aReusableContainers.forEach((oEntry) => {
-                fnCallback(oEntry.container);
-            });
+            for (const oEntry of this.#aReusableContainers) {
+                aPromises.push(fnCallback(oEntry.container));
+            }
+
+            return Promise.allSettled(aPromises);
         }
 
         /**

package/src/main/js/sap/ushell/appIntegration/IframeApplicationContainer.js

@@ -38,6 +38,8 @@ sap.ui.define([
 ) => {
     "use strict";
 
+    const iValidIframeTimeout = 3500;
+
     /**
      * @alias sap.ushell.appIntegration.IframeApplicationContainer
      * @class
@@ -55,7 +57,10 @@ sap.ui.define([
                 globalDirtyStorageKey: { defaultValue: "", type: "string" },
                 iframeUrl: { defaultValue: "", type: "string", visibility: "hidden" },
                 iframePostAllParams: { defaultValue: false, type: "boolean" },
-                iframeWithPost: { defaultValue: false, type: "boolean" }
+                iframeWithPost: { defaultValue: false, type: "boolean" },
+
+                iframeIsValidSupport: { defaultValue: false, type: "boolean" },
+                lastIframeIsValidTime: { defaultValue: 0, type: "int" }
             },
             interfaces: [
                 "sap.ushell.renderer.INavContainerPage"
@@ -69,8 +74,7 @@ sap.ui.define([
 
         this._aPendingRequestsWaitingForResponse = [];
 
-        // set object default values again to prevent them from being "synced"
-        this.setProperty("isIframeValidTime", { time: 0 }, true);
+        this.setProperty("lastIframeIsValidTime", Date.now(), true);
 
         const sDirtyStateStorageKey = `sap.ushell.Container.dirtyState.${uid()}`;
         this.setProperty("globalDirtyStorageKey", sDirtyStateStorageKey, true);
@@ -368,10 +372,6 @@ sap.ui.define([
             const sFormId = `${oIFrame.getAttribute("id").replace("-iframe", "-form")}`;
             const oForm = document.getElementById(sFormId);
             sIframeUrl = oForm?.action;
-            // todo: [FLPCOREANDUX-10024] check whether this is still required
-            if (sIframeUrl === undefined && (new URI()).query(true).hasOwnProperty("sap-isolation-enabled")) {
-                sIframeUrl = oIFrame.src;
-            }
         } else {
             sIframeUrl = oIFrame.src;
         }
@@ -459,6 +459,30 @@ sap.ui.define([
         }
     };
 
+    /**
+     * Checks if the iframe is valid and responsive.
+     * @returns {boolean} Whether the iframe is valid.
+     * @throws {Error} If the iframe is not valid.
+     *
+     * @since 1.141.0
+     * @private
+     */
+    IframeApplicationContainer.prototype.isValid = function () {
+        if (!this.getIframeIsValidSupport()) {
+            return true;
+        }
+
+        const iLastValidTimeDelta = Date.now() - this.getLastIframeIsValidTime();
+        const bIframeInvalid = iLastValidTimeDelta >= iValidIframeTimeout;
+        const sReason = `iframe did not ping in the last '${iLastValidTimeDelta}' ms`;
+
+        if (bIframeInvalid) {
+            throw new Error(sReason);
+        }
+
+        return true;
+    };
+
     IframeApplicationContainer.prototype.exit = function () {
         // remove container from list of NWBC-containing containers; if this container was an NWBC container before
         localStorage.removeItem(this.getGlobalDirtyStorageKey());

package/src/main/js/sap/ushell/appIntegration/IframeApplicationContainerRenderer.js

@@ -54,7 +54,6 @@ sap.ui.define([
 
     IframeApplicationContainerRenderer._renderIframe = function (oRenderManager, oContainer) {
         const sIframeUrl = oContainer.getProperty("iframeUrl");
-        oContainer.fireEvent("applicationConfiguration");
 
         oRenderManager.openStart("iframe", oContainer);
         oRenderManager.accessibilityState(oContainer);
@@ -123,8 +122,6 @@ sap.ui.define([
                 oRenderManagerNew.flush(oContainer.getDomRef());
                 oRenderManagerNew.destroy();
 
-                oContainer.fireEvent("applicationConfiguration");
-
                 await ushellUtils.awaitTimeout(0);
 
                 return sFormId;

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/AppInfoHandler.js

@@ -34,14 +34,17 @@ sap.ui.define([
 
                 let fnCallback;
                 if (oMessageBody.callbackMessage?.service) {
-                    oApplicationContainer.addCapabilities([
-                        oMessageBody.callbackMessage.service
-                    ]);
-
                     fnCallback = () => {
-                        oApplicationContainer.sendRequest(
+                        // The original message could have been sent from an iframe nested
+                        // within the application container's iframe.
+                        // Therefore the callback has to be sent to the source of
+                        // the original request.
+                        // Example: a Web Dynpro in compatibility mode with an NWBC around
+                        PostMessageManager.sendRequest(
                             oMessageBody.callbackMessage.service,
                             null, // oMessageBody
+                            oMessageEvent.source,
+                            oMessageEvent.origin,
                             false // bWaitForResponse
                         );
                     };

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/AppStateHandler.js

@@ -137,7 +137,7 @@ sap.ui.define([
                 if (sData !== undefined) {
                     try {
                         oValue = JSON.parse(sData);
-                    } catch (e) {
+                    } catch {
                         oValue = sData;
                     }
                 } else {

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/BookmarkHandler.js

@@ -80,17 +80,21 @@ sap.ui.define([
 
         if (bSetAppStateToPublic) {
             const oAppStateService = await Container.getServiceAsync("AppState");
-            oAppStateService.setAppStateToPublic(sIFrameURL).then((sNewURL, sXStateKey, sIStateKey, sXStateKeyNew = "", sIStateKeyNew = "") => {
-                if (sXStateKeyNew) {
-                    sFLPUrl = sFLPUrl.replace(sXStateKey, sXStateKeyNew);
-                }
-                if (sIStateKeyNew) {
-                    sFLPUrl = sFLPUrl.replace(sIStateKey, sIStateKeyNew);
-                }
-                // check if the subject or the body of the email contain the IFrame URL
-                replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew);
-                URLHelper.triggerEmail(sTo, sSubject, sBody, sCc, sBcc);
-            }, Log.error);
+            oAppStateService.setAppStateToPublic(sIFrameURL)
+                .then((sNewURL, sXStateKey, sIStateKey, sXStateKeyNew = "", sIStateKeyNew = "") => {
+                    if (sXStateKeyNew) {
+                        sFLPUrl = sFLPUrl.replace(sXStateKey, sXStateKeyNew);
+                    }
+                    if (sIStateKeyNew) {
+                        sFLPUrl = sFLPUrl.replace(sIStateKey, sIStateKeyNew);
+                    }
+                    // check if the subject or the body of the email contain the IFrame URL
+                    replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl, sXStateKey, sIStateKey, sXStateKeyNew, sIStateKeyNew);
+                    URLHelper.triggerEmail(sTo, sSubject, sBody, sCc, sBcc);
+                })
+                .catch((oError) => {
+                    Log.error("Failed to set app state to public:", oError);
+                });
         } else {
             // check if the subject or the body of the email contain the IFrame URL
             replaceIframeUrlToFLPUrl(sIFrameURL, sFLPUrl);

package/src/main/js/sap/ushell/appIntegration/PostMessageHandler/LifecycleHandler.js

@@ -138,7 +138,7 @@ sap.ui.define([
                     }
 
                     if (oSetup.isIframeValid) {
-                        aNewCapabilities.push("sap.ushell.appRuntime.iframeIsValid");
+                        oApplicationContainer.setIframeIsValidSupport(true);
                     }
 
                     if (oSetup.session?.bLogoutSupport) {
@@ -187,6 +187,26 @@ sap.ui.define([
                     date: Date.now()
                 });
             }
+        },
+        /**
+         * The request is originally documented as "sap.ushell.services.appLifeCycle.destroy".
+         * However, "sap.ushell.services.appLifeCycle.*" messages are transformed to "sap.ushell.AppLifeCycle.*" in the PostMessageHandler.
+         * Therefore, the handler is registered as "sap.ushell.AppLifeCycle.destroy" and supports both cases.
+         * @private
+         * @ui5-restricted SAP internally documented (e.g. for WebGui, WebDynpro, ...)
+         */
+        "sap.ushell.services.AppLifeCycle.destroy": {
+            async handler (oMessageBody, oApplicationContainer, oMessageEvent) {
+                // prevent circular dependencies
+                const [AppLifeCycle] = await ushellUtils.requireAsync(["sap/ushell/appIntegration/AppLifeCycle"]);
+
+                const sCurrentAppId = oApplicationContainer.getCurrentAppId();
+                await AppLifeCycle.destroyApplication(sCurrentAppId, oApplicationContainer);
+            },
+            options: {
+                provideApplicationContext: true,
+                allowInactive: true
+            }
         }
     };