@sapui5/sap.ushell 1.142.0 → 1.143.0

package/src/main/js/sap/ushell/adapters/local/PersonalizationAdapter.js

@@ -6,7 +6,7 @@
  *
  * The local personalization adapter can be configured to store data either in
  * the local storage (default) or in memory.
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/utils",

package/src/main/js/sap/ushell/adapters/local/PersonalizationV2Adapter.js

@@ -6,7 +6,7 @@
  *
  * The local personalization adapter can be configured to store data either in
  * the local storage (default) or in memory.
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

package/src/main/js/sap/ushell/adapters/local/SearchAdapter.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Search adapter for the demo platform.
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/adapters/local/SearchCEPAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Search adapter for CEP Search
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 /* eslint-disable quote-props */
 sap.ui.define([], () => {

package/src/main/js/sap/ushell/adapters/local/SupportTicketAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The SupportTicket adapter for the local platform.
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/adapters/local/Ui5ComponentLoaderAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the local platform
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
 ], () => {

package/src/main/js/sap/ushell/adapters/local/UserDefaultParameterPersistenceAdapter.js

@@ -6,7 +6,7 @@
  *               TODO will be replaced by true persistence within this SP!
  *               This adapter delegates to the Personalization Adapter
  *
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/adapters/local/UserInfoAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UserInfo adapter for the demo platform.
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.142.0
+ * @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) {
@@ -678,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;
@@ -690,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
@@ -744,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
@@ -766,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;
         }
@@ -781,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;
         }
 
@@ -853,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;
 
@@ -943,69 +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 {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, 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);
+                await EmbeddedUI5Handler.createApp(oApplicationContainer, oResolvedHashFragment, oParsedHash);
             }
 
             // todo: [FLPCOREANDUX-10024] rework abap direct app start
@@ -1027,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.
+         */
     };
 
     /**
@@ -1116,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) {
@@ -1135,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];
@@ -1182,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
         );
 
@@ -1204,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);
@@ -1218,7 +1230,7 @@ sap.ui.define([
                 sStorageAppId,
                 oApplicationContainer,
                 oResolvedHashFragment,
-                oParsedShellHash,
+                oParsedHash,
                 sKeepAliveMode
             );
         } else {
@@ -1252,6 +1264,7 @@ sap.ui.define([
             sStorageAppId,
             oApplicationContainer,
             oResolvedHashFragment,
+            oParsedHash,
             bWasKeptAlive
         );
         const oApplicationHandle = new ApplicationHandle(
@@ -1268,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
@@ -1289,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;
@@ -1303,9 +1315,8 @@ sap.ui.define([
 
         try {
             const oApplicationHandle = await this._startApplication(
-                oParsedShellHash,
                 oResolvedHashFragment,
-                sInnerAppRoute,
+                oParsedHash,
                 bNavigationFromHome
             );
             oDeferred.resolve();
@@ -1379,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 () {
@@ -1409,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;
 
@@ -1422,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";
@@ -1448,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 ======
         /*
@@ -1478,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);
             }
@@ -1501,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.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -129,9 +129,7 @@ sap.ui.define([
                         aNewCapabilities.push("sap.ushell.services.appLifeCycle.create");
                         aNewCapabilities.push("sap.ushell.services.appLifeCycle.destroy");
 
-                        // todo: [FLPCOREANDUX-10024] this is a workaround
-                        const bIsAppruntime = !ushellUtils.isSAPLegacyApplicationType(oApplicationContainer.getApplicationType(), oApplicationContainer.getFrameworkId());
-                        if (bIsAppruntime) {
+                        if (oSetup.isKeepAlive) { // e.g. appRuntime
                             aNewCapabilities.push("sap.ushell.services.appLifeCycle.store");
                             aNewCapabilities.push("sap.ushell.services.appLifeCycle.restore");
                         }

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

@@ -318,14 +318,14 @@ sap.ui.define([
             async handler (oMessageBody, oMessageEvent) {
                 const { appSpecificRoute, writeHistory } = oMessageBody;
 
-                const oHash = UrlParsing.parseShellHash(hasher.getHash());
+                const oParsedHash = UrlParsing.parseShellHash(hasher.getHash());
 
                 // do nothing if new is exactly like the current one
-                if (oHash.appSpecificRoute === appSpecificRoute) {
+                if (oParsedHash.appSpecificRoute === appSpecificRoute) {
                     return;
                 }
-                oHash.appSpecificRoute = appSpecificRoute;
-                const sNewHash = `#${UrlParsing.constructShellHash(oHash)}`;
+                oParsedHash.appSpecificRoute = appSpecificRoute;
+                const sNewHash = `#${UrlParsing.constructShellHash(oParsedHash)}`;
                 hasher.disableBlueBoxHashChangeTrigger = true;
                 if (writeHistory === true || writeHistory === "true") {
                     hasher.setHash(sNewHash);

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

@@ -144,10 +144,14 @@ sap.ui.define([
                 return;
             }
 
+            // Use provided methods or create fallbacks. The fallbacks are only relevant for tests
             const fnGetCurrentApplication = oOptions.getCurrentApplication || function () {};
-            this.#fnGetCurrentApplication = fnGetCurrentApplication;
+            const fnGetAllApplications = oOptions.getAllApplications || function () {
+                const oCurrentApplication = fnGetCurrentApplication();
+                return oCurrentApplication ? [oCurrentApplication] : [];
+            };
 
-            const fnGetAllApplications = oOptions.getAllApplications || function () { return []; };
+            this.#fnGetCurrentApplication = fnGetCurrentApplication;
             this.#fnGetAllApplications = fnGetAllApplications;
 
             if (oOptions.skipReplay) {

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -21,7 +21,7 @@ sap.ui.define([
     "use strict";
 
     class EmbeddedUI5Handler {
-        async createApp (oApplicationContainer, oResolvedHashFragment) {
+        async createApp (oApplicationContainer, oResolvedHashFragment, oParsedHash) {
             // We need to stop every application router to avoid inner-app hash change clashes
             // before creating a new component.
             ApplicationContainerCache.forEach((oCachedApplicationContainer) => {
@@ -37,7 +37,7 @@ sap.ui.define([
             // load ui5 component via service; core-ext-light will be loaded as part of the asyncHints
             const Ui5ComponentLoader = await Container.getServiceAsync("Ui5ComponentLoader");
 
-            const sBasicHash = UrlParsing.getBasicHash(oResolvedHashFragment.sFixedShellHash);
+            const sBasicHash = UrlParsing.constructBasicHash(oParsedHash);
             oResolvedHashFragment.ui5ComponentId = `application-${sBasicHash}-component`;
             oApplicationContainer.setUi5ComponentId(oResolvedHashFragment.ui5ComponentId);
 

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.142.0
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/ApplicationType/UrlPostProcessing",

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

@@ -480,10 +480,10 @@ sap.ui.define([
         };
 
         this._setInitialAppRoute = function () {
-            const oHash = UrlParsing.parseShellHash(hasher.getHash());
-            if (oHash && oHash.appSpecificRoute && oHash.appSpecificRoute.length > 0) {
+            const oParsedHash = UrlParsing.parseShellHash(hasher.getHash());
+            if (oParsedHash && oParsedHash.appSpecificRoute && oParsedHash.appSpecificRoute.length > 0) {
                 AppCommunicationMgr.postMessageToFLP("sap.ushell.services.CrossApplicationNavigation.setInnerAppRoute", {
-                    appSpecificRoute: oHash.appSpecificRoute
+                    appSpecificRoute: oParsedHash.appSpecificRoute
                 });
             }
         };
@@ -663,7 +663,7 @@ sap.ui.define([
         this.getPageConfig = function (oUrlData) {
             window["sap-ushell-config"] = deepExtend({}, getDefaultShellConfig(), window["sap-ushell-config"]);
 
-            // temp code for allways loading the web assistance plugin in the
+            // temp code for always loading the web assistance plugin in the
             // scube scenario. will be removed in the next release of s4 hana cloud
             if (oUrlData.hasOwnProperty("sap-remote-intent")) {
                 const oPlugins = window["sap-ushell-config"].bootstrapPlugins;

package/src/main/js/sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions.js

@@ -20,18 +20,6 @@ sap.ui.define([
     "use strict";
 
     const CheckConditions = {
-
-        // determine manifest out of found component
-        _getAppDescriptor: function (oComponent) {
-            if (oComponent && oComponent.getMetadata) {
-                const oComponentMetaData = oComponent.getMetadata();
-                if (oComponentMetaData && oComponentMetaData.getManifest) {
-                    return oComponentMetaData.getManifest();
-                }
-            }
-            return {};
-        },
-
         /**
          * Checks if RTA needs to be restarted, e.g after 'Reset to default'.
          * The sap.ui.fl library also reacts on the session storage entry and may start RTA