@sapui5/sap.ushell 1.141.3 → 1.143.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.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/util/Deferred",
@@ -184,7 +184,7 @@ sap.ui.define([
 
     /**
      * @param {object} oEvent the UI5 event object.
-     * @param {string} sChannel the eventbus channel.
+     * @param {string} sChannel the event bus channel.
      * @param {object} oData the send data.
      */
     AppLifeCycle.prototype._onGetAppLifeCycle = function (oEvent, sChannel, oData) {
@@ -196,7 +196,6 @@ sap.ui.define([
      * Events will only be added the first time AppLifeCycle.init() is called.
      */
     AppLifeCycle.prototype._addEvents = function () {
-        this._aDoables.push(EventHub.on("disableKeepAliveRestoreRouterRetrigger").do(this._useLegacyRestoreFlowForCurrentApplication.bind(this)));
         this._aDoables.push(EventHub.on("setApplicationFullWidth").do((oData) => {
             this._setApplicationFullWidth(oData.bValue);
         }));
@@ -282,7 +281,7 @@ sap.ui.define([
      * @since 1.138.0
      * @private
      */
-    AppLifeCycle.prototype._useLegacyRestoreFlowForCurrentApplication = function () {
+    AppLifeCycle.prototype.useLegacyRestoreFlowForCurrentApplication = function () {
         // for direct app start the app creation and this call might be faster than the app life cycle flow
         if (!this.getCurrentApplication()?.appId) {
             this._bUseLegacyRestoreFlowForNextApp = true;
@@ -679,11 +678,11 @@ sap.ui.define([
      * @param {string} sStorageAppId the storage app id.
      * @param {sap.ushell.appIntegration.ApplicationContainer} oApplicationContainer the application container.
      * @param {object} oResolvedHashFragment the resolved hash fragment object.
-     * @param {string} oParsedShellHash the parsed shell hash.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash.
      * @param {string} sKeepAliveMode the keep alive mode.
      * @returns {object} Returns the storage entry.
      */
-    AppLifeCycle.prototype._addStorageEntry = function (sStorageAppId, oApplicationContainer, oResolvedHashFragment, oParsedShellHash, sKeepAliveMode) {
+    AppLifeCycle.prototype._addStorageEntry = function (sStorageAppId, oApplicationContainer, oResolvedHashFragment, oParsedHash, sKeepAliveMode) {
         const oOldStorageEntry = KeepAliveApps.get(sStorageAppId);
         if (oOldStorageEntry) {
             return oOldStorageEntry;
@@ -691,7 +690,7 @@ sap.ui.define([
 
         const oNewStorageEntry = {
             service: {},
-            shellHash: `#${UrlParsing.constructShellHash(oParsedShellHash)}`,
+            shellHash: UrlParsing.constructShellHash(oParsedHash, true),
             appId: sStorageAppId,
             stt: "loading",
             currentState: null, // current state is stored before close see: sap/ushell/state/CurrentState
@@ -745,10 +744,10 @@ sap.ui.define([
     /**
      * @param {string} sStorageAppId the storage app id.
      * @param {object} oResolvedHashFragment the resolved hash fragment object.
-     * @param {object} oParsedShellHash the parsed shell hash object.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash object.
      * @returns {string} Returns the keep alive mode.
      */
-    AppLifeCycle.prototype._calculateKeepAliveMode = function (sStorageAppId, oResolvedHashFragment, oParsedShellHash) {
+    AppLifeCycle.prototype._calculateKeepAliveMode = function (sStorageAppId, oResolvedHashFragment, oParsedHash) {
         const aKeepAliveModes = Object.values(KeepAliveMode);
 
         // generic intent currently can never be keep alive
@@ -767,7 +766,7 @@ sap.ui.define([
         }
 
         // App override in intent parameters
-        sKeepAlive = oParsedShellHash.params?.["sap-keep-alive"];
+        sKeepAlive = oParsedHash.params?.["sap-keep-alive"]?.[0];
         if (aKeepAliveModes.includes(sKeepAlive)) {
             return sKeepAlive;
         }
@@ -782,8 +781,7 @@ sap.ui.define([
 
         // if the app is a root intent, it should be kept alive (e.g. workzone advanced)
         // can be overridden by the above checks
-        const sShellHash = UrlParsing.constructShellHash(oParsedShellHash);
-        if (sShellHash && ushellUtils.isRootIntent(sShellHash)) {
+        if (UrlParsing.isRootIntent(oParsedHash)) {
             return KeepAliveMode.True;
         }
 
@@ -854,6 +852,9 @@ sap.ui.define([
             // Add new ShellUIService instance of the interface to the application container
             // this will only be used by iframe applications
             oResolvedHashFragment.shellUIService = this._oGlobalShellUIService.getInterface();
+
+            // for SAPUI5 apps, the application type is still "URL" due to backwards compatibility, but the
+            // NavTargetResolutionInternal service already extracts the component name, so this can directly be used as indicator
             const sTargetUi5ComponentName = oResolvedHashFragment?.ui5ComponentName;
             const bIsUI5App = !!sTargetUi5ComponentName;
 
@@ -944,70 +945,72 @@ sap.ui.define([
      * @param {string} sStorageAppId the storage app id.
      * @param {sap.ushell.appIntegration.ApplicationContainer} oApplicationContainer the application container.
      * @param {object} oResolvedHashFragment the resolved hash fragment.
-     * @param {object} oParsedShellHash the parsed shell hash.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash.
      * @param {boolean} bWasKeptAlive whether the app should be kept alive.
      * @returns {Promise} after the application was opened.
      */
-    AppLifeCycle.prototype._openApp = async function (sStorageAppId, oApplicationContainer, oResolvedHashFragment, oParsedShellHash, bWasKeptAlive) {
-        const bWasFetchedFromCache = oApplicationContainer.getIsFetchedFromCache();
-        if (bWasKeptAlive && bWasFetchedFromCache && StatefulContainerV2Handler.isStatefulContainerSupportingKeepAlive(oApplicationContainer)) {
-            return StatefulContainerV2Handler.restoreAppWithinSameFrame(
-                oApplicationContainer,
-                sStorageAppId,
-                oResolvedHashFragment
-            );
-        }
+    AppLifeCycle.prototype._openApp = async function (sStorageAppId, oApplicationContainer, oResolvedHashFragment, oParsedHash, bWasKeptAlive) {
+        // ===============================================================================
+        // ApplicationContainer Reuse Scenario - e.g StatefulContainer or KeepAlive App
 
-        if (oApplicationContainer.getStatefulType() === StatefulType.ContractV2) {
-            if (bWasFetchedFromCache && oApplicationContainer.getCurrentAppId() === sStorageAppId) {
+        if (oApplicationContainer.getIsFetchedFromCache()) {
+            if (oApplicationContainer.getCurrentAppId() === sStorageAppId) {
                 // application is already running within container
                 return;
             }
-            const oResult = await StatefulContainerV2Handler.createApp(
-                oApplicationContainer,
-                sStorageAppId,
-                oResolvedHashFragment
-            );
-            if (oResult?.deletedKeepAliveId) {
-                /*
-                 * The app was already destroyed within the iframe
-                 * We _only_ need to destroy the remaining data in the outer shell
-                 * Calling destroy on the iframe again will destroy the current app in the iframe
-                 */
-                const oStorageEntryToDestroy = KeepAliveApps.get(oResult.deletedKeepAliveId);
-                if (oStorageEntryToDestroy) {
-                    KeepAliveApps.removeById(oResult.deletedKeepAliveId);
-                    KeepAlive.destroy(oStorageEntryToDestroy);
+
+            if (oApplicationContainer.getStatefulType() === StatefulType.ContractV2) {
+                if (bWasKeptAlive && StatefulContainerV2Handler.isStatefulContainerSupportingKeepAlive(oApplicationContainer)) {
+                    return StatefulContainerV2Handler.restoreAppWithinSameFrame(
+                        oApplicationContainer,
+                        sStorageAppId,
+                        oResolvedHashFragment
+                    );
                 }
-            }
-            return;
-        }
 
-        if (oApplicationContainer.getStatefulType() === StatefulType.ContractV1) {
-            if (bWasFetchedFromCache && oApplicationContainer.getCurrentAppId() === sStorageAppId) {
-                // application is already running within container
+                const oResult = await StatefulContainerV2Handler.createApp(
+                    oApplicationContainer,
+                    sStorageAppId,
+                    oResolvedHashFragment
+                );
+
+                if (oResult?.deletedKeepAliveId) {
+                    /*
+                     * The app was already destroyed within the iframe
+                     * We _only_ need to destroy the remaining data in the outer shell
+                     * Calling destroy on the iframe again will destroy the current app in the iframe
+                     */
+                    const oStorageEntryToDestroy = KeepAliveApps.get(oResult.deletedKeepAliveId);
+                    if (oStorageEntryToDestroy) {
+                        KeepAliveApps.removeById(oResult.deletedKeepAliveId);
+                        KeepAlive.destroy(oStorageEntryToDestroy);
+                    }
+                }
                 return;
             }
-            await StatefulContainerV1Handler.createApp(
-                oApplicationContainer,
-                sStorageAppId,
-                oResolvedHashFragment
-            );
-            return;
+
+            if (oApplicationContainer.getStatefulType() === StatefulType.ContractV1) {
+                return StatefulContainerV1Handler.createApp(
+                    oApplicationContainer,
+                    sStorageAppId,
+                    oResolvedHashFragment
+                );
+            }
+
+            // ApplicationContainer should be reused but does not supports StatefulContainer or already contains the app
+            throw new Error("Unknown Application scenario. Cannot open app.");
         }
 
-        // for SAPUI5 apps, the application type is still "URL" due to backwards compatibility, but the
-        // NavTargetResolutionInternal service already extracts the component name, so this can directly be used as indicator
-        const sTargetUi5ComponentName = oResolvedHashFragment?.ui5ComponentName;
-        const bIsUI5App = !!sTargetUi5ComponentName;
+        // ===============================================================================
+        // New ApplicationContainer Scenario
 
-        if (bIsUI5App && !bWasKeptAlive) { // UI5 Application
+        if (oApplicationContainer.isA("sap.ushell.appIntegration.UI5ApplicationContainer")) {
             // happens for direct app start scenario on the abap platform (sap/ushell_abap/bootstrap/evo/boottask)
             const bComponentLoadedInDirectAppStart = !!oResolvedHashFragment?.componentHandle;
             if (!bComponentLoadedInDirectAppStart) {
                 AppConfiguration.setApplicationInInitMode();
 
-                await EmbeddedUI5Handler.createApp(oApplicationContainer, oResolvedHashFragment, oParsedShellHash);
+                await EmbeddedUI5Handler.createApp(oApplicationContainer, oResolvedHashFragment, oParsedHash);
             }
 
             // todo: [FLPCOREANDUX-10024] rework abap direct app start
@@ -1029,7 +1032,17 @@ sap.ui.define([
             if (typeof oComponentInstance.active === "function") {
                 oComponentInstance.active();
             }
+
+            return;
         }
+
+        /**
+         * Initial ApplicationContainers for iframe applications.
+         *
+         * The openApp steps happens as part of the rendering.
+         * The response cannot be awaited. Therefore, we just continue under the assumption that
+         * the app will be opened successfully.
+         */
     };
 
     /**
@@ -1118,7 +1131,7 @@ sap.ui.define([
         const bDefaultFullWidth = ApplicationType.getDefaultFullWidthSetting(sAppType);
 
         const bFullWidthCapability = oResolvedHashFragment.appCapabilities?.fullWidth;
-        // Here there's a double check for the fullwidth - once as a type of boolean and one as a string.
+        // Here there's a double check for the fullWidth - once as a type of boolean and one as a string.
         // This is because we found that developers configured this variable in the manifest also as a string,
         // so the checks of the oMetadata and the oResolvedHashFragment are to avoid regression with the use of this field.
         if (bDefaultFullWidth) {
@@ -1137,16 +1150,15 @@ sap.ui.define([
         return bFullWidth;
     };
 
-    AppLifeCycle.prototype._getBaseAppId = function (sFixedShellHash) {
-        const sStableHash = UrlParsing.getStableIntent(sFixedShellHash);
-        const sBasicHash = UrlParsing.getBasicHash(sStableHash);
+    AppLifeCycle.prototype._getBaseAppId = function (oParsedHash) {
+        const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
         const sBaseAppId = `application-${sBasicHash}`;
 
         return sBaseAppId;
     };
 
-    AppLifeCycle.prototype._getStorageAppId = function (sFixedShellHash, sBaseAppId) {
-        const sStableHash = UrlParsing.getStableIntent(sFixedShellHash);
+    AppLifeCycle.prototype._getStorageAppId = function (oParsedHash, sBaseAppId) {
+        const sStableHash = UrlParsing.constructStableHash(oParsedHash);
 
         if (this._oStorageAppIdMap[sStableHash]) {
             return this._oStorageAppIdMap[sStableHash];
@@ -1184,21 +1196,19 @@ sap.ui.define([
     };
 
     /**
-     * @param {object} oParsedShellHash the parsed shell hash.
      * @param {object} oResolvedHashFragment the resolved hash fragment.
-     * @param {string} sInnerAppRoute the innerAppRoute which is used to start the application.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash.
      * @param {boolean} bNavigationFromHome whether the navigation occurred from the home page.
      * @returns {Promise} the application handle.
      */
-    AppLifeCycle.prototype._startApplication = async function (oParsedShellHash, oResolvedHashFragment, sInnerAppRoute, bNavigationFromHome) {
-        const sBaseAppId = this._getBaseAppId(oResolvedHashFragment.sFixedShellHash);
-        const sStorageAppId = this._getStorageAppId(oResolvedHashFragment.sFixedShellHash, sBaseAppId);
+    AppLifeCycle.prototype._startApplication = async function (oResolvedHashFragment, oParsedHash, bNavigationFromHome) {
+        const sBaseAppId = this._getBaseAppId(oParsedHash);
+        const sStorageAppId = this._getStorageAppId(oParsedHash, sBaseAppId);
 
         await this._cleanupBeforeNewApp(
             sStorageAppId,
-            oParsedShellHash,
             oResolvedHashFragment,
-            sInnerAppRoute,
+            oParsedHash,
             bNavigationFromHome
         );
 
@@ -1206,7 +1216,7 @@ sap.ui.define([
         this.publishAppOpeningEvent(oResolvedHashFragment);
         this._announceAppOpening(oResolvedHashFragment);
 
-        const sKeepAliveMode = this._calculateKeepAliveMode(sStorageAppId, oResolvedHashFragment, oParsedShellHash);
+        const sKeepAliveMode = this._calculateKeepAliveMode(sStorageAppId, oResolvedHashFragment, oParsedHash);
         const bShouldBeCached = sKeepAliveMode !== KeepAliveMode.False;
 
         const oApplicationContainer = this._createOrReuseApplicationContainer(sStorageAppId, sBaseAppId, oResolvedHashFragment, bShouldBeCached);
@@ -1220,7 +1230,7 @@ sap.ui.define([
                 sStorageAppId,
                 oApplicationContainer,
                 oResolvedHashFragment,
-                oParsedShellHash,
+                oParsedHash,
                 sKeepAliveMode
             );
         } else {
@@ -1254,7 +1264,7 @@ sap.ui.define([
             sStorageAppId,
             oApplicationContainer,
             oResolvedHashFragment,
-            oParsedShellHash,
+            oParsedHash,
             bWasKeptAlive
         );
         const oApplicationHandle = new ApplicationHandle(
@@ -1271,7 +1281,7 @@ sap.ui.define([
 
         // todo: [FLPCOREANDUX-10024] fix this
         // initialize now because the app is required for additional information
-        this._initializeAppWithMetadata(oApplicationContainer, oResolvedHashFragment);
+        this._initializeAppWithMetadata(oApplicationContainer, oResolvedHashFragment, oParsedHash);
 
         /*
          * finally allow the application container to be rendered
@@ -1292,13 +1302,12 @@ sap.ui.define([
     };
 
     /**
-     * @param {object} oParsedShellHash the parsed shell hash.
      * @param {object} oResolvedHashFragment the resolved hash fragment.
-     * @param {string} sInnerAppRoute  the innerAppRoute which is used to start the application.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash the parsed shell hash.
      * @param {boolean} bNavigationFromHome whether the navigation occurred from the home page.
      * @returns {Promise} the application handle.
      */
-    AppLifeCycle.prototype.startApplication = async function (oParsedShellHash, oResolvedHashFragment, sInnerAppRoute, bNavigationFromHome) {
+    AppLifeCycle.prototype.startApplication = async function (oResolvedHashFragment, oParsedHash, bNavigationFromHome) {
         const oDeferred = await this._awaitLastApplicationStart();
 
         const oApplicationBefore = this._oCurrentApplication;
@@ -1306,9 +1315,8 @@ sap.ui.define([
 
         try {
             const oApplicationHandle = await this._startApplication(
-                oParsedShellHash,
                 oResolvedHashFragment,
-                sInnerAppRoute,
+                oParsedHash,
                 bNavigationFromHome
             );
             oDeferred.resolve();
@@ -1382,15 +1390,6 @@ sap.ui.define([
         StateManager.applyStalledChanges();
     };
 
-    /**
-     * @returns {boolean} Whether the floating container is docked.
-     */
-    AppLifeCycle.prototype._isFloatingContainerDocked = function () {
-        const bDocked = ShellModel.getModel().getProperty("/floatingContainer/state").includes("docked");
-        const bVisible = ShellModel.getModel().getProperty("/floatingContainer/visible");
-        return bDocked && bVisible;
-    };
-
     /**
      */
     AppLifeCycle.prototype._sendFocusBackToShell = function () {
@@ -1412,8 +1411,8 @@ sap.ui.define([
         });
     };
 
-    AppLifeCycle.prototype._initializeAppWithMetadata = function (oApplicationContainer, oResolvedHashFragment) {
-        const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oResolvedHashFragment?.sFixedShellHash);
+    AppLifeCycle.prototype._initializeAppWithMetadata = function (oApplicationContainer, oResolvedHashFragment, oParsedHash) {
+        const oMetadata = AppConfiguration.getMetadata(oResolvedHashFragment, oParsedHash);
 
         this._oCurrentApplication.meta = oMetadata;
 
@@ -1425,15 +1424,6 @@ sap.ui.define([
             if (!bFullWidth) {
                 oApplicationContainer.addStyleClass("sapUShellApplicationContainerLimitedWidth");
             }
-
-            // todo: [FLPCOREANDUX-10024] clarify whether this should be reactive instead of one time only
-            // todo: [FLPCOREANDUX-10024] move this block to ShellController
-            if (this._isFloatingContainerDocked() && window.matchMedia("(min-width: 106.4rem)").matches) {
-                oApplicationContainer.addStyleClass("sapUShellDockingContainer");
-                oApplicationContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-            } else if (this._isFloatingContainerDocked()) {
-                oApplicationContainer.removeStyleClass("sapUShellApplicationContainerLimitedWidth");
-            }
         }
 
         let sIcon = "sap-icon://folder";
@@ -1451,13 +1441,12 @@ sap.ui.define([
      *  - exit the current application if it is a stateful container.
      *
      * @param {string} sStorageAppId the storage app id.
-     * @param {string} oParsedShellHash  the parsed shell hash.
      * @param {object} oResolvedHashFragment the resolved hash fragment object.
-     * @param {string} sInnerAppRoute the innerAppRoute which is used to start the application.
+     * @param {sap.ushell.services.URLParsing.DecomposedHash} oParsedHash  the parsed shell hash.
      * @param {boolean} bNavigationFromHome whether the navigation occurred from the home page.
      * @returns {Promise} after the application was destroyed.
      */
-    AppLifeCycle.prototype._cleanupBeforeNewApp = async function (sStorageAppId, oParsedShellHash, oResolvedHashFragment, sInnerAppRoute, bNavigationFromHome) {
+    AppLifeCycle.prototype._cleanupBeforeNewApp = async function (sStorageAppId, oResolvedHashFragment, oParsedHash, bNavigationFromHome) {
         // todo: [FLPCOREANDUX-10024] add staged logging for startApplication including the cleanup similar to CSTR
         // ====== Exit current iframe app ======
         /*
@@ -1481,20 +1470,11 @@ sap.ui.define([
 
         // ====== Handle special navigation scenarios for keep alive apps ======
         if (bTargetAppWasKeptAlive) {
-            const sNewShellHash = `#${UrlParsing.constructShellHash(oParsedShellHash)}`;
-            const oComparison = UrlParsing.compareHashes(sNewShellHash, oStorageEntry.shellHash);
-            const bSameTarget = oComparison.sameIntent && oComparison.sameParameters;
-            const bNavigationWithInnerAppRoute = !!sInnerAppRoute;
-
-            // todo: FLPCOREANDUX-10024 this case should be obsolete as apps do not share the same storage id
-            // Case: different app
-            if (!bSameTarget) {
-                Log.warning(`The keepAlive app '${sStorageAppId}' has to be destroyed because of id clashes.`);
-                await this.destroyApplication(sStorageAppId, oStoredApplicationContainer);
+            const bNavigationWithInnerAppRoute = !!oParsedHash.appSpecificRoute;
 
             // 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) {
+            if (bNavigationFromHome && bNavigationWithInnerAppRoute) {
                 Log.warning(`The keepAlive app '${sStorageAppId}' has to be destroyed because of a bookmark start.`);
                 await this.destroyApplication(sStorageAppId, oStoredApplicationContainer);
             }
@@ -1504,7 +1484,7 @@ sap.ui.define([
 
         // ====== Ensure that component name and id clashes are prevented ======
         if (bIsUI5AppWithoutIframe && !bTargetAppWasKeptAlive) {
-            const sBasicHash = UrlParsing.getBasicHash(oResolvedHashFragment.sFixedShellHash);
+            const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
             const sTargetUi5ComponentId = `application-${sBasicHash}-component`;
 
             if (oCurrentApplicationContainer && oCurrentApplicationContainer.isA("sap.ushell.appIntegration.UI5ApplicationContainer")) {

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.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -71,6 +71,16 @@ sap.ui.define([
 
                 currentAppTargetResolution: { type: "object" },
 
+                /* ==========================================
+                 * =============== Rendering ================
+                 * General flow:
+                 *  1) readyForRendering=false => render placeholder
+                 *  2) readyForRendering=true => invalidation
+                 *  3) final rendering
+                 *  4) set renderComplete=true
+                 *  5) rendered() resolves
+                 */
+
                 /**
                  * Whether the container is ready for rendering.
                  * Subclasses should prevent any preparation steps and the actual rendering if this
@@ -129,23 +139,13 @@ sap.ui.define([
         renderer: ApplicationContainerRenderer
     });
 
-    // we have to cache the UI5 version first to have it available sync for the renderer
-    ApplicationContainer.ui5version = null;
-    ApplicationContainer.ui5versionPromise = ushellUtils.getUi5Version().then((sVersion) => {
-        Log.debug(`Using ui5-version: ${sVersion}`, null, "sap.ushell.appIntegration.ApplicationContainer");
-        ApplicationContainer.ui5version = sVersion;
-    });
-
-    ApplicationContainer.prototype.getUi5Version = function () {
-        return ApplicationContainer.ui5version;
-    };
-
     /**
      * Initialization of <code>ApplicationContainer</code> instance.
      */
     ApplicationContainer.prototype.init = function () {
         // set object default values again to prevent them from being "synced"
         this.setProperty("capabilities", {}, true);
+        this.oRenderedDeferred = Promise.withResolvers();
     };
 
     ApplicationContainer.prototype.invalidate = function () {
@@ -157,6 +157,37 @@ sap.ui.define([
         return Control.prototype.invalidate.apply(this, arguments);
     };
 
+    /**
+     * Sets the rendering complete state of the application container.
+     * @param {boolean} bComplete The new rendering complete state.
+     * @returns {this} <code>this</code> to allow method chaining.
+     *
+     * @since 1.141.0
+     * @private
+     */
+    ApplicationContainer.prototype.setRenderComplete = function (bComplete) {
+        this.setProperty("renderComplete", bComplete);
+
+        if (bComplete) {
+            this.oRenderedDeferred.resolve();
+        }
+
+        return this;
+    };
+
+    /**
+     * The ApplicationContainer is rendered multiple times.
+     * This helper function awaits the final rendering triggered by
+     * {@link sap.ushell.appIntegration.ApplicationContainer#setRenderComplete}.
+     * @returns {Promise} Resolves once the ApplicationContainer is rendered
+     *
+     * @since 1.141.0
+     * @private
+     */
+    ApplicationContainer.prototype.rendered = function () {
+        return this.oRenderedDeferred.promise;
+    };
+
     /**
      * Implementation of sap.ushell.renderer.INavContainerPage interface.
      * @param {boolean} bVisible The new visibility state of the control.
@@ -408,13 +439,5 @@ sap.ui.define([
         return true;
     };
 
-    // helper for tests
-    ApplicationContainer._setCachedUI5Version = function (sNewVersion) {
-        ApplicationContainer.ui5version = sNewVersion;
-        ApplicationContainer.ui5versionPromise = ApplicationContainer.ui5versionPromise.then(() => {
-            ApplicationContainer.ui5version = sNewVersion;
-        });
-    };
-
     return ApplicationContainer;
 });

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

@@ -9,17 +9,6 @@ sap.ui.define([
         apiVersion: 2
     };
 
-    ApplicationContainerRenderer.waitForUI5Version = function (oContainer) {
-        const ApplicationContainer = oContainer.getMetadata().getClass();
-        // we have to cache the UI5 version first
-        if (ApplicationContainer.ui5version === null) {
-            ApplicationContainer.ui5versionPromise.then(() => {
-                oContainer.invalidate();
-            });
-            return true;
-        }
-    };
-
     ApplicationContainerRenderer.render = function (oRenderManager, oContainer) {
         /*
          * This is only a placeholder rendering, the actual rendering is done by the sub classes.