@sapui5/sap.ushell 1.143.3 → 1.144.0

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

@@ -1,26 +1,20 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/base/Log",
     "sap/ui/core/Renderer",
-    "sap/ui/core/RenderManager",
     "sap/ui/thirdparty/URI",
     "sap/ushell/appIntegration/ApplicationContainerRenderer",
     "sap/ushell/ApplicationType/systemAlias",
     "sap/ushell/Config",
-    "sap/ushell/Container",
     "sap/ushell/resources",
     "sap/ushell/utils",
     "sap/ushell/utils/UriParameters"
 ], (
-    Log,
     Renderer,
-    RenderManager,
     URI,
     ApplicationContainerRenderer,
     systemAliasUtils,
     Config,
-    Container,
     ushellResources,
     ushellUtils,
     UriParameters
@@ -42,17 +36,11 @@ sap.ui.define([
         }
 
         if (oContainer.getProperty("iframeWithPost")) {
-            const sIframeUrl = oContainer.getProperty("iframeUrl");
-            this._renderIframeWithPOST(oRenderManager, oContainer, sIframeUrl, ++iIframeIdx).then(() => {
-                // mark the rendering as complete, this will suppress any further invalidation
-                oContainer.setRenderComplete(true);
-            });
-
-            return;
+            this._renderIframeWithPOST(oRenderManager, oContainer);
+        } else {
+            this._renderIframe(oRenderManager, oContainer);
         }
 
-        this._renderIframe(oRenderManager, oContainer);
-
         // mark the rendering as complete, this will suppress any further invalidation
         oContainer.setRenderComplete(true);
     };
@@ -83,15 +71,8 @@ sap.ui.define([
         oRenderManager.close("iframe");
     };
 
-    IframeApplicationContainerRenderer._renderIframeWithPOST = async function (oRenderManager, oContainer, sIframeUrl, iIframeIdx) {
-        const sAdaptedIframeUrl = ushellUtils.filterOutParamsFromLegacyAppURL(sIframeUrl);
-
-        // render the wrapper; we need to to do some async calculation and then rerender
-        this._renderPostWrapper(oRenderManager, oContainer);
-
-        const oFLPParams = await this._getAdditionalDataForPost(oContainer, sAdaptedIframeUrl);
-        // we are now running async and need to use a new RenderManager
-        const oRenderManagerNew = new RenderManager();
+    IframeApplicationContainerRenderer._renderIframeWithPOST = function (oRenderManager, oContainer) {
+        this._openPostWrapper(oRenderManager, oContainer);
 
         // When sending a POST request, we concatenate the string "-iframe" to the 'id' attribute of the <iframe> node.
         // The reason is that in POST request the IFRAME element is a child of a new 'div' element, that holds the
@@ -99,45 +80,32 @@ sap.ui.define([
         const sFormId = `${oContainer.getId()}-form`;
         const sIframeId = `${oContainer.getId()}-iframe`;
 
-        const oUrls = this._calculatePostUrls(oContainer, sAdaptedIframeUrl);
+        const sUrlWithoutSystemAlias = ushellUtils.filterOutParamsFromLegacyAppURL(oContainer.getProperty("iframeUrl"));
+        const aParameters = this._getPostParameters(oContainer, sUrlWithoutSystemAlias);
+        const oUrls = this._calculatePostUrls(oContainer, sUrlWithoutSystemAlias, aParameters);
 
         this._renderPostForm(
-            oRenderManagerNew,
-            oContainer,
+            oRenderManager,
             sFormId,
             sIframeId,
-            oFLPParams,
             oUrls.form,
             `${oContainer.getDataHelpId()}-form`,
-            oUrls.iframeWithoutSystemAlias
+            aParameters
         );
 
         this._renderPostIframe(
-            oRenderManagerNew,
+            oRenderManager,
             oContainer,
             sIframeId,
             oUrls.iframe,
             oUrls.form,
-            `${oContainer.getDataHelpId()}-iframe`,
-            iIframeIdx
+            `${oContainer.getDataHelpId()}-iframe`
         );
 
-        // now finally apply the changes
-        oRenderManagerNew.flush(oContainer.getDomRef());
-        oRenderManagerNew.destroy();
-
-        ushellUtils.awaitTimeout(0)
-            .then(() => {
-                const oForm = document.getElementById(sFormId);
-                if (oForm) {
-                    oForm.submit();
-                } else {
-                    Log.error("Form element not found");
-                }
-            });
+        this._closePostWrapper(oRenderManager);
     };
 
-    IframeApplicationContainerRenderer._renderPostWrapper = function (oRenderManager, oContainer) {
+    IframeApplicationContainerRenderer._openPostWrapper = function (oRenderManager, oContainer) {
         // generate the <div> element that wraps the <form> and the <iframe>
         oRenderManager.openStart("div", oContainer);
         oRenderManager.attr("data-help-id", oContainer.getDataHelpId());
@@ -151,77 +119,40 @@ sap.ui.define([
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());
         oRenderManager.openEnd();
+    };
+
+    IframeApplicationContainerRenderer._closePostWrapper = function (oRenderManager) {
         oRenderManager.close("div");
     };
 
-    IframeApplicationContainerRenderer._calculatePostUrls = function (oContainer, sUrl) {
-        const oIframeUriParams = UriParameters.fromURL(sUrl);
-        const sIframeWithoutSystemAlias = sUrl;
-        const sIframeUrl = systemAliasUtils.addSystemAlias(sIframeWithoutSystemAlias, oContainer);
-        let sFormAction = sUrl;
-
-        if (oContainer.getIframePostAllParams()) {
-            if (this._getPostParameters(oContainer, sIframeWithoutSystemAlias).length) {
-                // trim url
-                const sHint = oIframeUriParams.get("sap-iframe-hint");
-                const sKeepAlive = oIframeUriParams.get("sap-keep-alive");
-                const oNewURI = new URI(sUrl).query("");
-
-                if (typeof sHint === "string") {
-                    oNewURI.addSearch("sap-iframe-hint", sHint);
-                }
-                if (typeof sKeepAlive === "string") {
-                    oNewURI.addSearch("sap-keep-alive", sKeepAlive);
-                }
+    IframeApplicationContainerRenderer._calculatePostUrls = function (oContainer, sIframeUrlWithoutSystemAlias, aParameters) {
+        const sIframeUrlWithSystemAlias = systemAliasUtils.addSystemAlias(sIframeUrlWithoutSystemAlias, oContainer);
+        let sFormAction = sIframeUrlWithoutSystemAlias;
 
-                sFormAction = oNewURI.toString();
+        if (oContainer.getIframePostAllParams() && aParameters.length > 1) { // aParameters always contains at least sap-flp-params
+            // trim url
+            const oIframeUriParams = UriParameters.fromURL(sIframeUrlWithoutSystemAlias);
+            const sHint = oIframeUriParams.get("sap-iframe-hint");
+            const sKeepAlive = oIframeUriParams.get("sap-keep-alive");
+            const oNewURI = new URI(sIframeUrlWithoutSystemAlias).query("");
+
+            if (typeof sHint === "string") {
+                oNewURI.addSearch("sap-iframe-hint", sHint);
+            }
+            if (typeof sKeepAlive === "string") {
+                oNewURI.addSearch("sap-keep-alive", sKeepAlive);
             }
+
+            sFormAction = oNewURI.toString();
         }
 
         return {
-            iframeWithoutSystemAlias: sIframeWithoutSystemAlias,
-            iframe: sIframeUrl,
+            iframe: sIframeUrlWithSystemAlias,
             form: sFormAction
         };
     };
 
-    IframeApplicationContainerRenderer._getAdditionalDataForPost = async function (oContainer, sIframeUrl) {
-        let aKeys = [];
-        let aValues = [];
-
-        const oAppStatesInfo = ushellUtils.getParamKeys(sIframeUrl);
-        if (oAppStatesInfo.aAppStateNamesArray.length) {
-            const Navigation = await Container.getServiceAsync("Navigation");
-            try {
-                const aDataArray = await Navigation.getAppStateData(oAppStatesInfo.aAppStateKeysArray);
-                if (aDataArray) {
-                    aKeys = [...oAppStatesInfo.aAppStateNamesArray];
-                    aValues = [...aDataArray];
-                }
-            } catch {
-                // fail silently
-            }
-        }
-
-        aKeys.push("sap-flp-url");
-        aValues.push(Container.getFLPUrl(true));
-
-        aKeys.push("system-alias");
-        aValues.push(oContainer.getSystemAlias());
-
-        const oFLPParams = {};
-        aKeys.forEach((item, index) => {
-            if (aValues[index] || item === "system-alias") {
-                oFLPParams[item] = aValues[index];
-            }
-        });
-
-        return oFLPParams;
-    };
-
-    IframeApplicationContainerRenderer._renderPostForm = function (oRenderManager, oContainer, sFormId, sIframeId, oFLPParams, sFormAction, sFormHelpId, sUrlWithoutSystemAlias) {
-        const sFLPParams = JSON.stringify(oFLPParams);
-
+    IframeApplicationContainerRenderer._renderPostForm = function (oRenderManager, sFormId, sIframeId, sFormAction, sFormHelpId, aParameters) {
         oRenderManager.openStart("form");
         oRenderManager.attr("id", sFormId);
         oRenderManager.attr("method", "post");
@@ -232,32 +163,24 @@ sap.ui.define([
         oRenderManager.style("display", "none");
         oRenderManager.openEnd();
 
-        oRenderManager.voidStart("input");
-        oRenderManager.attr("name", "sap-flp-params");
-        oRenderManager.attr("value", sFLPParams);
-        oRenderManager.voidEnd();
-
-        if (oContainer.getIframePostAllParams()) {
-            const aParameters = this._getPostParameters(oContainer, sUrlWithoutSystemAlias);
-            aParameters.forEach((oParam) => {
-                oRenderManager.voidStart("input");
-                oRenderManager.attr("name", oParam.key);
-                oRenderManager.attr("value", oParam.value);
-                oRenderManager.voidEnd();
-            });
-        }
+        aParameters.forEach((oParam) => {
+            oRenderManager.voidStart("input");
+            oRenderManager.attr("name", oParam.key);
+            oRenderManager.attr("value", oParam.value);
+            oRenderManager.voidEnd();
+        });
 
         oRenderManager.close("form");
     };
 
-    IframeApplicationContainerRenderer._renderPostIframe = function (oRenderManager, oContainer, sIframeId, sIframeUrl, sFormAction, sIframeHelpId, iIframeIdx) {
+    IframeApplicationContainerRenderer._renderPostIframe = function (oRenderManager, oContainer, sIframeId, sIframeUrl, sFormAction, sIframeHelpId) {
         oRenderManager.openStart("iframe", sIframeId);
         oRenderManager.attr("name", sIframeId);
         oRenderManager.accessibilityState(oContainer);
         oRenderManager.attr("sap-orig-src", sIframeUrl);
         oRenderManager.attr("title", ushellResources.i18n.getText("AppilcationContainer.IframeTitle"));
         oRenderManager.attr("data-help-id", sIframeHelpId);
-        oRenderManager.attr("data-sap-ushell-iframe-idx", iIframeIdx);
+        oRenderManager.attr("data-sap-ushell-iframe-idx", ++iIframeIdx);
         oRenderManager.class("sapUShellApplicationContainer");
         oRenderManager.style("height", oContainer.getHeight());
         oRenderManager.style("width", oContainer.getWidth());
@@ -270,10 +193,21 @@ sap.ui.define([
         oRenderManager.close("iframe");
     };
 
-    IframeApplicationContainerRenderer._getPostParameters = function (oContainer, sUrl) {
-        const oIframeUriParams = UriParameters.fromURL(sUrl);
+    IframeApplicationContainerRenderer._getPostParameters = function (oContainer, sUrlWithoutSystemAlias) {
+        const oIframeUriParams = UriParameters.fromURL(sUrlWithoutSystemAlias);
+
+        const sFLPParams = JSON.stringify(oContainer.getIframePostFlpParams());
+
+        // always include sap-flp-params
+        const aResult = [{
+            key: "sap-flp-params",
+            value: sFLPParams
+        }];
+
+        if (!oContainer.getIframePostAllParams()) {
+            return aResult;
+        }
 
-        const aResult = [];
         let sSapIframeHintVal = "";
         if (oIframeUriParams.has("sap-iframe-hint")) {
             sSapIframeHintVal = oIframeUriParams.get("sap-iframe-hint");
@@ -283,7 +217,7 @@ sap.ui.define([
         // Verify that it's a WD app (in local FLP or cFLP)
         if (oContainer.getApplicationType() === "TR" || sSapIframeHintVal === "GUI") {
             for (const sKey in oParams) {
-                if (sKey === "sap-iframe-hint" || sKey === "sap-keep-alive") {
+                if (sKey === "sap-iframe-hint" || sKey === "sap-keep-alive" || sKey === "sap-flp-params") {
                     continue;
                 }
                 aResult.push({

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 sap.ui.define([
 ], (
 ) => {

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the AppInfoHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the AppStateHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the BookmarkHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the EnvironmentHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the ExtensionHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the ExtensionItems class.
  */

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the LifecycleHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the MessageBrokerHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the NWBCHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the NavigationHandler class.
  *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the SessionHandler class.
  *
@@ -52,7 +52,7 @@ sap.ui.define([
         "sap.ushell.sessionHandler.notifyUserActive": {
             async handler (oMessageBody, oMessageEvent) {
                 const oShellController = Container.getRenderer().getShellController();
-                const oSessionHandler = oShellController._getSessionHandler();
+                const oSessionHandler = oShellController.getSessionHandler();
 
                 if (oSessionHandler?.isInitialized?.()) {
                     oSessionHandler.userActivityHandler();
@@ -65,7 +65,7 @@ sap.ui.define([
         "sap.ushell.sessionHandler.extendSessionEvent": {
             async handler (oMessageBody, oMessageEvent) {
                 const oShellController = Container.getRenderer().getShellController();
-                const oSessionHandler = oShellController._getSessionHandler();
+                const oSessionHandler = oShellController.getSessionHandler();
 
                 if (oSessionHandler?.isInitialized?.()) {
                     oSessionHandler.userActivityHandler();

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains the references to all "common" postMessage handlers.
  */

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 /**
  * @file This file contains the PostMessageManager class.
@@ -90,6 +90,13 @@ sap.ui.define([
      * @property {ParsedMessage} message the preprocessed message
      */
 
+    /**
+     * @typedef {object} ResponseHandler
+     * @property {string} requestId the request id to handle
+     * @property {Window} expectedContentWindow the expected content window to receive the response from
+     * @property {function(MessageEvent, PostMessageResponse)} handler the handler function for the response
+     */
+
     const DoNotReply = Symbol("DoNotReply");
     const oLogger = Log.getLogger("sap.ushell.appIntegration.PostMessageManager");
 
@@ -117,6 +124,10 @@ sap.ui.define([
         #bSkipSourceValidation = false;
 
         #aEventPreprocessor = [];
+        /**
+         * The list of pending expected responses.
+         * @type {ResponseHandler[]}
+         */
         #aResponseHandlers = [];
         #oRequestHandlers = {};
         #oDistributionPolicies = {};
@@ -212,10 +223,7 @@ sap.ui.define([
 
             // first check if the message is a response to a request
             if (oMessage.type === "response") {
-                const bWasHandled = this.#handleResponseHandlers(oMessageEvent, oMessage);
-                if (bWasHandled) {
-                    oLogger.debug(`Response for ${oMessage.service} (${oMessage.request_id}) was handled by a response handler.`);
-                }
+                this.#handleResponseMessage(oMessageEvent, oMessage);
                 return;
             }
 
@@ -337,22 +345,36 @@ sap.ui.define([
          * Handles the response handlers for the postMessage event.
          * @param {MessageEvent} oMessageEvent The incoming message event.
          * @param {PostMessageResponse} oMessage The parsed message from the postMessage event.
-         * @returns {boolean} Whether the response was handled by a response handler.
          *
          * @since 1.134.0
          * @private
          */
-        #handleResponseHandlers (oMessageEvent, oMessage) {
-            let bWasHandled = false;
-            this.#aResponseHandlers.forEach((fnResponseHandler) => {
-                if (bWasHandled) {
-                    return;
+        #handleResponseMessage (oMessageEvent, oMessage) {
+            const iIndex = this.#aResponseHandlers.findIndex((oResponseHandler) => {
+                if (oResponseHandler.requestId !== oMessage.request_id) {
+                    return false;
+                }
+
+                if (oResponseHandler.expectedContentWindow !== oMessageEvent.source) {
+                    return false;
                 }
 
-                bWasHandled = fnResponseHandler(oMessageEvent, oMessage);
+                return true;
             });
 
-            return bWasHandled;
+            if (iIndex < 0) {
+                return;
+            }
+
+            const oResponseHandler = this.#aResponseHandlers.splice(iIndex, 1)[0];
+
+            try {
+                oResponseHandler.handler(oMessageEvent, oMessage);
+
+                oLogger.debug(`Response for ${oMessage.service} (${oMessage.request_id}) was handled by a response handler.`);
+            } catch (oError) {
+                oLogger.error(`Error while handling response for ${oMessage.service} (${oMessage.request_id}).`, oError);
+            }
         }
 
         /**
@@ -666,64 +688,52 @@ sap.ui.define([
          */
         #waitForClientResponse (sRequestId, oExpectedContentWindow) {
             const oDeferred = new Deferred();
-            const fnResponseHandler = this.#handleClientResponse.bind(this, oDeferred, sRequestId, oExpectedContentWindow);
 
-            this.#aResponseHandlers.push(fnResponseHandler);
+            this.#aResponseHandlers.push({
+                requestId: sRequestId,
+                expectedContentWindow: oExpectedContentWindow,
 
-            return oDeferred.promise;
-        }
-
-        /**
-         * Generic handler for client responses.
-         * It is called on every response and has to match the request ID and content window.
-         * @param {sap.base.util.Deferred} oDeferred The deferred object to resolve or reject based on the response.
-         * @param {string} sRequestId The request ID to match the response against.
-         * @param {Window} oExpectedContentWindow The expected content window to receive the response from.
-         * @param {MessageEvent} oMessageEvent The incoming message event.
-         * @param {PostMessageResponse} oMessage The parsed message from the postMessage event.
-         * @returns {boolean} Whether the response was handled successfully.
-         *
-         * @since 1.134.0
-         * @private
-         */
-        #handleClientResponse (oDeferred, sRequestId, oExpectedContentWindow, oMessageEvent, oMessage) {
-            if (oExpectedContentWindow !== oMessageEvent.source) {
-                return false;
-            }
-
-            // only handle messages that have the expected request_id
-            if (oMessage?.request_id !== sRequestId) {
-                return false;
-            }
-
-            oLogger.debug(`Received response for ${oMessage.service} (${oMessage.request_id}) from iframe with domain '${oMessageEvent.origin}'`);
-
-            if (oMessage.status === "success") {
-                oDeferred.resolve(oMessage.body);
-            } else {
-                let oError;
-                if (oMessage.body?.message) {
-                    oError = new Error(oMessage.body.message);
-                } else {
-                    oError = new Error("Unknown error");
-                }
-
-                if (oMessage.body?.stack) {
-                    oError.stack = oMessage.body.stack;
+                /**
+                 * Generic handler for client responses.
+                 * It is called on every response and has to match the request ID and content window.
+                 * @param {MessageEvent} oMessageEvent The incoming message event.
+                 * @param {PostMessageResponse} oMessage The parsed message from the postMessage event.
+                 *
+                 * @since 1.134.0
+                 * @private
+                 */
+                handler (oMessageEvent, oMessage) {
+                    oLogger.debug(`Received response for ${oMessage.service} (${oMessage.request_id}) from iframe with domain '${oMessageEvent.origin}'`);
+
+                    if (oMessage.status === "success") {
+                        oDeferred.resolve(oMessage.body);
+                    } else {
+                        let oError;
+                        if (oMessage.body?.message) {
+                            oError = new Error(oMessage.body.message);
+                        } else {
+                            oError = new Error("Unknown error");
+                        }
+
+                        if (oMessage.body?.stack) {
+                            oError.stack = oMessage.body.stack;
+                        }
+                        oDeferred.reject(oError);
+                    }
                 }
-                oDeferred.reject(oError);
-            }
+            });
 
-            return true;
+            return oDeferred.promise;
         }
 
         /**
          * Sends a request to the specified application container.
          * Applies the distribution policy for the service request and checks if the application container is a valid target.
+         * Helper method to implement {@link sap.ushell.appIntegration.ApplicationContainer#sendRequest}
          *
          * @param {string} sServiceRequest The service request name to send the request to.
          * @param {any} oMessageBody The message body to send with the request.
-         * @param {sap.ushell.appIntegration.IframeApplicationContainer} oApplicationContainer The application container to send the request to.
+         * @param {sap.ushell.appIntegration.ApplicationContainer} oApplicationContainer The application container to send the request to.
          * @param {boolean} bWaitForResponse Whether to wait for a response from the service request.
          * @returns {Promise<any>} A promise that resolves with the response from the service request.
          *

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 /**
  * @fileOverview The Application Container for UI5 applications.
@@ -93,11 +93,23 @@ sap.ui.define([
 
         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 is a permanent workaround for poorly written apps.
+             *
+             * Some apps rely on a early rendering in their component and
+             * routing logic. However, the UI5 lifecycle only guarantees
+             * access to the DOM in the onAfterRendering phase.
+             *
+             * With I2f977331657a6b897c1214f74d8e01514e343a01 we separated
+             * the component creation from its rendering by some additional ms.
+             * This caused issues especially with the route matching handling of
+             * apps. The route matching already starts in the init phase of the
+             * component. Before the change, the creation and rendering was
+             * already separated, but the rendering happened faster. Therefore,
+             * access to DOM succeeded (by accident) within the route matched
+             * handlers.
+             *
+             * As a workaround, we enforce a sync rendering here.
+             */
             this.rerender();
         }
 

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 
 sap.ui.define([
     "sap/ui/core/Renderer",

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

@@ -1,7 +1,7 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.143.3
+ * @version 1.144.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2025 SAP SE, All Rights Reserved
+// Copyright (c) 2009-2026 SAP SE, All Rights Reserved
 /**
  * @file This file contains miscellaneous utility functions for WebGui stateful container V1
  */