@sapui5/sap.ushell 1.134.1 → 1.136.0

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/PostMessageManager.js

@@ -7,22 +7,18 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/Deferred",
+    "sap/base/util/isPlainObject",
     "sap/base/util/ObjectPath",
-    "sap/base/util/uid",
-    "sap/ushell/Config"
+    "sap/base/util/uid"
 ], (
     Log,
     Deferred,
+    isPlainObject,
     ObjectPath,
-    uid,
-    Config
+    uid
 ) => {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     /**
      * @typedef {object} PostMessageRequest
      * @property {string} type the type of the message
@@ -43,11 +39,13 @@ sap.ui.define([
     /**
      * @typedef {object} RequestHandlerOptions
      * @property {boolean} [provideApplicationContext=false] flag to indicate if the application context should be used.
+     * @property {boolean} [allowInactive=false] flag to indicate if the request should be allowed from inactive applications.
      * @property {function} [isValidRequest] a function to validate the request
      */
 
     const oDefaultRequestHandlerOptions = {
-        provideApplicationContext: false
+        provideApplicationContext: false,
+        allowInactive: false
     };
 
     /**
@@ -63,8 +61,7 @@ sap.ui.define([
     };
 
     const DoNotReply = Symbol("DoNotReply");
-
-    const oLogger = Log.getLogger("sap.ushell.components.applicationIntegration.PostMessageManager");
+    const oLogger = Log.getLogger("sap.ushell.appIntegration.PostMessageManager");
 
     class PostMessageManager {
         #fnPostMessageEventHandler = () => {
@@ -109,6 +106,10 @@ sap.ui.define([
             const fnGetAllApplications = oOptions.getAllApplications || function () { return []; };
             this.#fnGetAllApplications = fnGetAllApplications;
 
+            if (oOptions.skipReplay) {
+                this.#bKeepMessagesForLaterProcessing = false;
+            }
+
             this.#fnPostMessageEventHandler = this.#handlePostMessageEvent.bind(this);
             addEventListener("message", this.#fnPostMessageEventHandler);
             this.#bInitialized = true;
@@ -121,7 +122,17 @@ sap.ui.define([
         async #handlePostMessageEvent (oEvent) {
             let oMessage;
             try {
-                oMessage = JSON.parse(oEvent.data);
+                // we support stringified JSON and plain objects
+                if (typeof oEvent.data === "string") {
+                    oMessage = JSON.parse(oEvent.data);
+                } else if (isPlainObject(oEvent.data)) {
+                    oMessage = oEvent.data;
+                } else {
+                    // e.g. Error, transferable objects, ...
+                    throw new Error("Invalid message format");
+                }
+                // Initialize the body. It can be undefined which is unexpected for the service request handlers.
+                oMessage.body = oMessage.body || {};
             } catch {
                 oLogger.debug("Received Post Message with invalid JSON. Ignoring the message.", oEvent.data);
                 return;
@@ -140,24 +151,20 @@ sap.ui.define([
             const sSourceDomain = oEvent.origin;
             oLogger.debug(`Received postMessage ${oMessage.service} (${oMessage.request_id}) from iframe with domain '${sSourceDomain}'`, JSON.stringify(oMessage, null, 2));
 
-            // first check if the message is a response to a request
-            const bWasHandled = this.#handleResponseHandlers(oEvent);
-            if (bWasHandled) {
-                oLogger.debug(`Response for ${oMessage.service} (${oMessage.request_id}) was handled by a response handler.`);
+            if (!["response", "request"].includes(oMessage.type)) {
+                oLogger.warning(`Received Post Message with an invalid type: '${oMessage.type}'. Ignoring the message.`);
                 return;
             }
 
-            if (oMessage.type !== "request") {
-                if (oMessage.type !== "response") {
-                    oLogger.warning(`Received Post Message with an invalid type: '${oMessage.type}'. Ignoring the message.`);
-                } else {
-                    // response is probably valid, but not awaited by requestor
+            // first check if the message is a response to a request
+            if (oMessage.type === "response") {
+                const bWasHandled = this.#handleResponseHandlers(oEvent);
+                if (bWasHandled) {
+                    oLogger.debug(`Response for ${oMessage.service} (${oMessage.request_id}) was handled by a response handler.`);
                 }
                 return;
             }
-
-            // Initialise the body. It can be undefined which is unexpected for the service request handlers.
-            oMessage.body = oMessage.body || {};
+            // handle the message as requests
 
             let oResponseMessageBody;
             let bSuccess = true;
@@ -286,6 +293,10 @@ sap.ui.define([
                     throw new Error("Cannot find the related application for the service request.");
                 }
 
+                if (!oApplicationContainer.getActive() && !oRequestHandlerOptions?.allowInactive) {
+                    throw new Error("Received Post Message from an inactive application.");
+                }
+
                 if (!oApplicationContainer.isTrustedPostMessageSource(oMessageEvent)) {
                     throw new Error("Received Post Message from an untrusted source.");
                 }
@@ -318,12 +329,12 @@ sap.ui.define([
 
         /**
          * @param {Window} oSourceWindow
-         * @returns {sap.ushell.components.applicationIntegration.IframeApplicationContainer}
+         * @returns {sap.ushell.appIntegration.IframeApplicationContainer}
          */
         #getApplicationContainerContext (oSourceWindow) {
             let oApplicationContainer;
             this.#fnGetAllApplications().forEach((oContainer) => {
-                if (oApplicationContainer || !oContainer.isA("sap.ushell.components.applicationIntegration.IframeApplicationContainer")) {
+                if (oApplicationContainer || !oContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
                     return;
                 }
 
@@ -340,7 +351,7 @@ sap.ui.define([
             oLogger.error("Cannot find the related application for the service request; using the current application as fallback. This fallback will be removed in future");
 
             const oCurrentApplicationContainer = this.#fnGetCurrentApplication();
-            if (oCurrentApplicationContainer && oCurrentApplicationContainer.isA("sap.ushell.components.applicationIntegration.IframeApplicationContainer")) {
+            if (oCurrentApplicationContainer && oCurrentApplicationContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
                 return oCurrentApplicationContainer;
             }
         }
@@ -546,7 +557,7 @@ sap.ui.define([
                         return false;
                     }
 
-                    if (!oContainer.isA("sap.ushell.components.applicationIntegration.IframeApplicationContainer")) {
+                    if (!oContainer.isA("sap.ushell.appIntegration.IframeApplicationContainer")) {
                         return false;
                     }
 

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/PostMessagePluginInterface.js

@@ -2,19 +2,13 @@
 
 sap.ui.define([
     "sap/base/util/deepExtend",
-    "sap/ui/thirdparty/jquery",
-    "sap/ushell/Config"
+    "sap/ui/thirdparty/jquery"
 ], (
     deepExtend,
-    jQuery,
-    Config
+    jQuery
 ) => {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     const USER_API_PREFIX = "user.postapi.";
 
     /**
@@ -118,7 +112,7 @@ sap.ui.define([
 
         if (bRunsInOuterShell) {
             // todo: [FLPCOREANDUX-10024] Resolve this
-            sap.ui.require(["sap/ushell/components/applicationIntegration/PostMessageManager"], (PostMessageManager) => {
+            sap.ui.require(["sap/ushell/appIntegration/PostMessageManager"], (PostMessageManager) => {
                 const sServiceRequest = `${sServiceName}.${sInterface}`;
 
                 PostMessageManager.sendRequestToAllApplications(sServiceRequest, oParams, true)

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/UI5ApplicationContainer.js

@@ -7,9 +7,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/ComponentContainer",
     "sap/ui/core/EventBus",
-    "sap/ushell/components/applicationIntegration/ApplicationContainer",
-    "sap/ushell/components/applicationIntegration/UI5ApplicationContainerRenderer",
-    "sap/ushell/Config",
+    "sap/ushell/appIntegration/ApplicationContainer",
+    "sap/ushell/appIntegration/UI5ApplicationContainerRenderer",
     "sap/ushell/Container",
     "sap/ushell/library", // css style dependency
     "sap/ushell/utils"
@@ -19,28 +18,24 @@ sap.ui.define([
     EventBus,
     ApplicationContainer,
     UI5ApplicationContainerRenderer,
-    Config,
     Container,
     ushellLibrary,
     ushellUtils
 ) => {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     /**
-     * @alias sap.ushell.components.applicationIntegration.UI5ApplicationContainer
+     * @alias sap.ushell.appIntegration.UI5ApplicationContainer
      * @class
      *
-     * @extends sap.ushell.components.applicationIntegration.ApplicationContainer
+     * @extends sap.ushell.appIntegration.ApplicationContainer
      *
      * @since 1.134.0
      * @private
      */ // eslint-disable-next-line max-len
-    const UI5ApplicationContainer = ApplicationContainer.extend("sap.ushell.components.applicationIntegration.UI5ApplicationContainer", /** @lends sap.ushell.components.applicationIntegration.IframeApplicationContainer.prototype */ {
+    const UI5ApplicationContainer = ApplicationContainer.extend("sap.ushell.appIntegration.UI5ApplicationContainer", /** @lends sap.ushell.appIntegration.IframeApplicationContainer.prototype */ {
         metadata: {
+            library: "sap.ushell",
             properties: {
                 /**
                  * The component handle - for SAPUI5 components, this contains a handle to the
@@ -48,6 +43,7 @@ sap.ui.define([
                  */
                 componentHandle: { type: "object" },
                 // todo: [FLPCOREANDUX-10024] Remove this
+                ui5ComponentId: { type: "string" },
                 ui5ComponentName: { type: "string" }
             },
             aggregations: {
@@ -62,6 +58,10 @@ sap.ui.define([
     };
 
     UI5ApplicationContainer.prototype.onBeforeRendering = function () {
+        if (!this.getReadyForRendering()) {
+            return;
+        }
+
         this._createComponentContainer();
     };
 
@@ -75,7 +75,7 @@ sap.ui.define([
             "sap.ushell.components.container.ApplicationContainer",
             "_prior.newUI5ComponentInstantion",
             {
-               name: this.getUi5ComponentName()
+                name: this.getUi5ComponentName()
             }
         );
 
@@ -83,7 +83,7 @@ sap.ui.define([
 
         this.fireEvent("applicationConfiguration", { configuration: oComponent.getManifestEntry("/sap.ui5/config") });
         const oComponentContainer = new ComponentContainer({
-            id: `${this.getId()}-content`,
+            id: this.getUi5ComponentId().replace("-component", "-content"),
             component: oComponent
         });
 
@@ -103,6 +103,23 @@ sap.ui.define([
         return this._publishAppComponentLoaded(oComponent);
     };
 
+    UI5ApplicationContainer.prototype.setReadyForRendering = function (bReadyForRendering) {
+        ApplicationContainer.prototype.setReadyForRendering.apply(this, arguments);
+
+        if (!this.getRenderComplete()) {
+            /*
+             * rendering is a tick too slow for embedded UI5 components
+             * component init is already started and router initialized,
+             * some apps require a rendering for this phase.
+             * So we need to trigger the rendering manually.
+             */ // todo: [FLPCOREANDUX-10024] fix this conceptually
+            this.rerender();
+        }
+
+        return this;
+    };
+
+    // todo: [FLPCOREANDUX-10024] Check whether this might be publicly used
     UI5ApplicationContainer.prototype._publishAppComponentLoaded = async function (oComponent) {
         const PluginManager = await Container.getServiceAsync("PluginManager");
         await ushellUtils.promisify(PluginManager.getPluginLoadingPromise("RendererExtensions"));
@@ -140,7 +157,7 @@ sap.ui.define([
         }
 
         const sComponentName = oChild.getComponentInstance().getMetadata().getComponentName();
-        Log.debug(`unloading component ${sComponentName}`, null, "sap.ushell.components.applicationIntegration.ApplicationContainer");
+        Log.debug(`unloading component ${sComponentName}`, null, "sap.ushell.appIntegration.ApplicationContainer");
         this.destroyAggregation("child");
     };
 

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/UI5ApplicationContainerRenderer.js

@@ -3,22 +3,21 @@
 
 sap.ui.define([
     "sap/ui/core/Renderer",
-    "sap/ushell/components/applicationIntegration/ApplicationContainerRenderer",
-    "sap/ushell/Config"
+    "sap/ushell/appIntegration/ApplicationContainerRenderer"
 ], (
     Renderer,
-    ApplicationContainerRenderer,
-    Config
+    ApplicationContainerRenderer
 ) => {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     const UI5ApplicationContainerRenderer = Renderer.extend(ApplicationContainerRenderer);
 
     UI5ApplicationContainerRenderer.render = function (oRenderManager, oContainer) {
+        if (!oContainer.getReadyForRendering()) {
+            ApplicationContainerRenderer.render(oRenderManager, oContainer);
+            return;
+        }
+
         const oChild = oContainer.getAggregation("child");
 
         if (!oChild) {
@@ -27,6 +26,12 @@ sap.ui.define([
 
         oRenderManager.openStart("div", oContainer);
         oRenderManager.accessibilityState(oContainer);
+        oRenderManager.attr("data-help-id", oContainer.getDataHelpId());
+        oRenderManager.attr("data-sap-ushell-active", oContainer.getActive());
+        oRenderManager.attr("data-sap-ushell-initial-app-id", oContainer.getInitialAppId());
+        oRenderManager.attr("data-sap-ushell-current-app-id", oContainer.getCurrentAppId());
+        oRenderManager.attr("data-sap-ushell-stateful-type", oContainer.getStatefulType());
+        oRenderManager.attr("data-sap-ushell-framework-id", oContainer.getFrameworkId());
         oRenderManager.class("sapUShellApplicationContainer");
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());
@@ -35,6 +40,9 @@ sap.ui.define([
         oRenderManager.renderControl(oChild);
 
         oRenderManager.close("div");
+
+        // mark the rendering as complete, this will suppress any further invalidation
+        oContainer.setRenderComplete(true);
     };
 
     return UI5ApplicationContainerRenderer;

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/contracts/EmbeddedUI5Handler.js

@@ -1,31 +1,27 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.134.1
+ * @version 1.136.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/Deferred",
     "sap/ui/core/EventBus",
-    "sap/ushell/Config",
     "sap/ushell/Container",
     "sap/ushell/UI5ComponentType",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell/utils/UrlParsing"
 ], function (
     Log,
     Deferred,
     EventBus,
-    Config,
     Container,
     UI5ComponentType,
-    ushellUtils
+    ushellUtils,
+    UrlParsing
 ) {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     class EmbeddedUI5Handler {
         async createApp (oApplicationContainer, oResolvedHashFragment, oParsedShellHash) {
             const sTargetUi5ComponentName = oResolvedHashFragment?.ui5ComponentName;
@@ -55,17 +51,16 @@ sap.ui.define([
             // load ui5 component via shell service; core-ext-light will be loaded as part of the asyncHints
             const Ui5ComponentLoader = await Container.getServiceAsync("Ui5ComponentLoader");
 
-            const oDeferred = Ui5ComponentLoader.createComponent(
+            const sBasicHash = UrlParsing.getBasicHash(oResolvedHashFragment.sFixedShellHash);
+            oResolvedHashFragment.ui5ComponentId = `application-${sBasicHash}-component`;
+            oApplicationContainer.setUi5ComponentId(oResolvedHashFragment.ui5ComponentId);
+
+            await Ui5ComponentLoader.createComponent(
                 oResolvedHashFragment,
                 oParsedShellHash,
                 [this.#getRenderCreatedPromise()],
                 UI5ComponentType.Application
             );
-            await ushellUtils.promisify(oDeferred);
-
-            const oComponentHandle = oResolvedHashFragment.componentHandle;
-
-            oApplicationContainer.setProperty("componentHandle", oComponentHandle, true);
         }
 
         #getRenderCreatedPromise () {

package/src/main/js/sap/ushell/{components/applicationIntegration → appIntegration}/contracts/StatefulContainerV1Handler.js

@@ -4,41 +4,22 @@
  */
 sap.ui.define([
     "sap/ushell/utils",
-    "sap/ushell/Config",
     "sap/ushell/Container"
 ], function (
     ushellUtils,
-    Config,
     Container
 ) {
     "use strict";
 
-    if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-        return {};
-    }
-
     class StatefulContainerV1Handler {
         async createApp (oApplicationContainer, sStorageAppId, oResolvedHashFragment) {
-            if (oApplicationContainer.setCurrentAppId) {
-                oApplicationContainer.setProperty("currentAppId", sStorageAppId, true);
-            }
-            if (oApplicationContainer.setCurrentAppUrl) {
-                oApplicationContainer.setProperty("currentAppUrl", oResolvedHashFragment.url, true);
-            }
-            if (oApplicationContainer.setCurrentAppTargetResolution) {
-                oApplicationContainer.setProperty("currentAppTargetResolution", oResolvedHashFragment, true);
-            }
-            oApplicationContainer.setProperty("iframeReusedForApp", true, true);
+            oApplicationContainer.setCurrentAppId(sStorageAppId);
+            oApplicationContainer.setCurrentAppUrl(oResolvedHashFragment.url);
+            oApplicationContainer.setCurrentAppTargetResolution(oResolvedHashFragment);
+            oApplicationContainer.setIframeReusedForApp(true);
 
             const oPostParams = await this.#createPostParams(oApplicationContainer, oResolvedHashFragment);
             await oApplicationContainer.sendRequest("sap.its.startService", oPostParams, true);
-
-            // todo: [FLPCOREANDUX-10024] Move styles into control? or at least out of here
-            if (oApplicationContainer.hasStyleClass("sapUShellApplicationContainerShiftedIframe")) {
-                oApplicationContainer.toggleStyleClass("sapUShellApplicationContainerIframeHidden", false);
-            } else {
-                oApplicationContainer.toggleStyleClass("hidden", false);
-            }
         }
 
         async #createPostParams (oApplicationContainer, oResolvedHashFragment) {
@@ -52,7 +33,7 @@ sap.ui.define([
                 url: sUrl
             };
             if (oApplicationContainer.getIframeWithPost && oApplicationContainer.getIframeWithPost() === true) {
-                var oAppStatesInfo = ushellUtils.getParamKeys(sUrl);
+                const oAppStatesInfo = ushellUtils.getParamKeys(sUrl);
 
                 if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
                     const Navigation = await Container.getServiceAsync("Navigation");
@@ -82,7 +63,7 @@ sap.ui.define([
         }
 
         async destroyApp (oApplicationContainer) {
-            oApplicationContainer.setProperty("currentAppId", "", true);
+            oApplicationContainer.setCurrentAppId("");
             await oApplicationContainer.sendRequest("sap.gui.triggerCloseSession", {}, false);
         }
     }

package/src/main/js/sap/ushell/appIntegration/contracts/StatefulContainerV2Handler.js

@@ -0,0 +1,136 @@
+// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+/**
+ * @fileOverview handle all the resources for the different applications.
+ * @version 1.136.0
+ */
+sap.ui.define([
+    "sap/ushell/ApplicationType/UrlPostProcessing",
+    "sap/ui/thirdparty/hasher",
+    "sap/ushell/utils",
+    "sap/ushell/Container"
+], (
+    UrlPostProcessing,
+    hasher,
+    utils,
+    Container
+) => {
+    "use strict";
+
+    class StatefulContainerV2Handler {
+        async createApp (oApplicationContainer, sUrl, sStorageAppId, oResolvedHashFragment) {
+            let oFLPParams;
+
+            oApplicationContainer.setReservedParameters(oResolvedHashFragment.reservedParameters);
+            oApplicationContainer.setCurrentAppUrl(sUrl);
+            oApplicationContainer.setCurrentAppId(sStorageAppId);
+            oApplicationContainer.setCurrentAppTargetResolution(oResolvedHashFragment);
+            oApplicationContainer.setIframeReusedForApp(true);
+
+            sUrl = UrlPostProcessing.processUrl(sUrl, oResolvedHashFragment.applicationType, false, oApplicationContainer);
+
+            const oPostParams = {
+                sCacheId: sStorageAppId,
+                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) {
+                const oAppStatesInfo = utils.getParamKeys(sUrl);
+
+                if (oAppStatesInfo.aAppStateNamesArray.length > 0) {
+                    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 = {};
+                }
+            }
+
+            if (oFLPParams) {
+                oFLPParams["sap-flp-url"] = Container.getFLPUrl(true);
+                oFLPParams["system-alias"] = oApplicationContainer.getSystemAlias();
+                oPostParams["sap-flp-params"] = oFLPParams;
+            }
+
+            const oResult = await oApplicationContainer.sendRequest("sap.ushell.services.appLifeCycle.create", oPostParams, true);
+
+            return oResult?.result;
+        }
+
+        async destroyApp (oApplicationContainer, sStorageKey) {
+            const bIsActiveApp = oApplicationContainer.getCurrentAppId() === sStorageKey;
+
+            if (bIsActiveApp) {
+                oApplicationContainer.setCurrentAppUrl("");
+                oApplicationContainer.setCurrentAppId("");
+                oApplicationContainer.setCurrentAppTargetResolution(undefined);
+                Container.setAsyncDirtyStateProvider(undefined);
+            }
+
+            await oApplicationContainer.sendRequest("sap.ushell.services.appLifeCycle.destroy", {
+                sCacheId: sStorageKey
+            }, true);
+        }
+
+        async storeAppWithinSameFrame (oApplicationContainer, sStorageKey) {
+            oApplicationContainer.setCurrentAppUrl("");
+            oApplicationContainer.setCurrentAppId("");
+            oApplicationContainer.setCurrentAppTargetResolution(undefined);
+            Container.setAsyncDirtyStateProvider(undefined);
+
+            await oApplicationContainer.sendRequest("sap.ushell.services.appLifeCycle.store", {
+                sCacheId: sStorageKey
+            }, true);
+        }
+
+        async restoreAppWithinSameFrame (oApplicationContainer, sUrl, sStorageKey, oResolvedHashFragment) {
+            oApplicationContainer.setCurrentAppUrl(sUrl);
+            oApplicationContainer.setCurrentAppId(sStorageKey);
+            oApplicationContainer.setCurrentAppTargetResolution(oResolvedHashFragment);
+            oApplicationContainer.setIframeReusedForApp(true);
+
+            await oApplicationContainer.sendRequest("sap.ushell.services.appLifeCycle.restore", {
+                sCacheId: sStorageKey,
+                sUrl: oResolvedHashFragment.url,
+                sHash: hasher.getHash()
+            }, true);
+        }
+
+        isStatefulContainerSupportingKeepAlive (oApplicationContainer) {
+            if (!oApplicationContainer) {
+                return false;
+            }
+
+            return oApplicationContainer.supportsCapabilities([
+                // stateful capabilities
+                "sap.ushell.services.AppLifeCycle.create",
+                "sap.ushell.services.appLifeCycle.destroy",
+                // keep alive capabilities
+                "sap.ushell.services.appLifeCycle.store",
+                "sap.ushell.services.appLifeCycle.restore"
+            ]);
+        }
+
+        isIframeIsValidSupported (oApplicationContainer) {
+            if (!oApplicationContainer) {
+                return false;
+            }
+
+            return oApplicationContainer.supportsCapabilities([
+                "sap.ushell.services.appRuntime.iframeIsValid"
+            ]);
+        }
+    }
+
+    return new StatefulContainerV2Handler();
+
+});

package/src/main/js/sap/ushell/appRuntime/neo/AppInfoService.js

@@ -61,7 +61,7 @@ sap.ui.define([
                 type: DialogType.Message,
                 title: oI18nAppModel.getProperty("ERROR_DIALOG_TITLE"),
                 state: ValueState.Error,
-                content: new Text({ text: oI18nAppModel.getProperty("MISSING_PARAMETERS_ERROR")}),
+                content: new Text({ text: oI18nAppModel.getProperty("MISSING_PARAMETERS_ERROR") }),
                 contentWidth: "30%",
                 beginButton: new Button({
                     type: ButtonType.Emphasized,

package/src/main/js/sap/ushell/appRuntime/neo/ProxyAppUtils.js

@@ -11,7 +11,7 @@ sap.ui.define([], function () {
     };
 
     // For the neo appruntime scenario in cFLP we will set the localAccess to External(false).
-    var siteProperty = {localAccess: false};
+    var siteProperty = { localAccess: false };
 
     if (!window.sap) {
         window.sap = {};
@@ -35,7 +35,7 @@ sap.ui.define([], function () {
         };
     }
     window.sap.hana.uis.flp.SessionTimeoutHandler = {
-        resetLastServerPing: function () {}
+        resetLastServerPing: function () { }
     };
     window["sap-hana-uis-fiori-model"] = {};
 

package/src/main/js/sap/ushell/appRuntime/ui5/AppCommunicationMgr.js

@@ -5,14 +5,12 @@ sap.ui.define([
     "sap/base/util/Deferred",
     "sap/base/util/ObjectPath",
     "sap/base/Log",
-    "sap/ushell/Config",
     "sap/ushell/utils"
 ], function (
     deepExtend,
     Deferred,
     ObjectPath,
     Log,
-    Config,
     ushellUtils
 ) {
     "use strict";
@@ -41,12 +39,7 @@ sap.ui.define([
         };
 
         this._getPostMessageInterface = async function () {
-            if (Config.last("/core/navigation/enableAppLifeCycleFallback")) {
-                const [PostMessageAPIInterface] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/application/PostMessageAPIInterface"]);
-                return PostMessageAPIInterface;
-            }
-
-            const [PostMessagePluginInterface] = await ushellUtils.requireAsync(["sap/ushell/components/applicationIntegration/PostMessagePluginInterface"]);
+            const [PostMessagePluginInterface] = await ushellUtils.requireAsync(["sap/ushell/appIntegration/PostMessagePluginInterface"]);
             return PostMessagePluginInterface;
         };