@sapui5/sap.ushell 1.138.0 → 1.139.0

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing catalog data for the 'CDM' platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readHome.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Helper for accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readPages.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing pages data for the 'CDM' platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper for accessing the read utils for the 'CDM' platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/_LaunchPage/readVisualizations.js

@@ -4,7 +4,7 @@
  *
  * TODO: Simplify function names
  *
- * @version 1.138.0
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cep/MenuAdapter.js

@@ -103,23 +103,18 @@ sap.ui.define([
      * @private
     */
     MenuAdapter.prototype._loadVisualizations = async function () {
-        // Workaround until the new menu query is available.
-        if (Config.last("/core/menuQueryAvailable")) {
-            const aVisualizationIds = await this._getVisualizationIds();
-
-            if (aVisualizationIds.length > 0) {
-                const oFilterParams = {
-                    filter: [{
-                        id: {
-                            in: aVisualizationIds
-                        }
-                    }]
-                };
-                return this.oWorkPageService.loadVisualizations(oFilterParams, true);
-            }
-        }
+        const aVisualizationIds = await this._getVisualizationIds();
 
-        return [];
+        if (aVisualizationIds.length > 0) {
+            const oFilterParams = {
+                filter: [{
+                    id: {
+                        in: aVisualizationIds
+                    }
+                }]
+            };
+            return this.oWorkPageService.loadVisualizations(oFilterParams, true);
+        }
     };
 
     /**
@@ -420,32 +415,11 @@ sap.ui.define([
      * @private
      */
     MenuAdapter.prototype._doRequest = function (sServiceUrl, sSiteId) {
-        // This query is still subject to change, as the GraphQL service is not yet finalized.
-        let sQuery = "";
         // Workaround until the new menu query is available.
         // Until then we support both queries.
-        if (Config.last("/core/menuQueryAvailable")) {
-            sQuery = `{
+        let sQuery = `{
             menu(siteId: "${sSiteId}")
         }`;
-        } else {
-            sQuery = `{
-                spaces(siteId: "${sSiteId}") {
-                    nodes {
-                        id,
-                        descriptor {
-                            value(select: ["/title"])
-                        },
-                        workPages {
-                            nodes {
-                                id,
-                                contents(queryInput: {selectProperties: ["/descriptor"], selectDescriptorValueProperties: ["/title", "/pageType"]})
-                            }
-                        }
-                    }
-                }
-            }`;
-        }
 
         // Replace line breaks and spaces
         sQuery = sQuery
@@ -471,26 +445,6 @@ sap.ui.define([
             }
             return JSON.parse(oResponse.responseText || "{}");
         }).then((oData) => {
-            // Structure the data to match the expected format of the new menu query.
-            // Workaround until the spaces query is deprecated and the new menu query is used.
-            if (!Config.last("/core/menuQueryAvailable")) {
-                oData.data.menu = oData.data.spaces.nodes.map((oSpace) => {
-                    return {
-                        id: oSpace.id,
-                        type: "space",
-                        title: oSpace?.descriptor?.value?.title,
-                        subMenu: oSpace?.workPages?.nodes?.map((oPage) => {
-                            return {
-                                id: oPage.id,
-                                type: "workpage",
-                                title: oPage?.contents?.descriptor?.value?.title,
-                                pageType: oPage.contents.descriptor?.value?.pageType ? "page" : "workpage"
-                            };
-                        })
-                    };
-                });
-            }
-
             // Temporary workaround for QESAPSHELL-108
             try {
                 oData.data.menu = oData.data.menu.filter((node) => {

package/src/main/js/sap/ushell/adapters/cep/NavTargetResolutionAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileoverview The NavTargetResolution adapter for SAP MyHome used in FioriLaunchpad.CEP.MyHome
- * @version 1.138.0
+ * @version 1.139.0
  * @deprecated since 1.120
  * @private
  */

package/src/main/js/sap/ushell/adapters/cep/NavTargetResolutionInternalAdapter.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileoverview The NavTargetResolutionInternal adapter for SAP MyHome
- * @version 1.138.0
+ * @version 1.139.0
  * @since 1.120
  */
 

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's Search adapter for CEP applications (client-side search).
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/core/Lib",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's UserDefaultParameterPersistence adapter for the CFLP
  *               platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/utils/HttpClient",

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

@@ -5,7 +5,7 @@
  *
  * The local personalization adapter can be configured to store data either in
  * the local storage (default) or in memory.
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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

@@ -5,7 +5,7 @@
  *   TODO will be replaced by true persistence within this SP!
  *   This adapter delegates to the Personalization Adapter
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/services/appstate/AppStatePersistencyMethod",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's ClientSideTargetResolutionAdapter for the local
  *               platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell's container adapter for standalone demos.
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page builder adapter for the 'demo' platform.
  *
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's page builder adapter for the 'demo' platform.
  *
  * @deprecated since 1.100
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/adapters/local/FlpLaunchPageAdapter"

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The NavTargetResolution adapter for the demo platform used in scube ui5appruntime.scube.
- * @version 1.138.0
+ * @version 1.139.0
  * @deprecated since 1.120
  * @private
  */

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The NavTargetResolutionInternal adapter for the demo platform.
- * @version 1.138.0
+ * @version 1.139.0
  * @since 1.120
  * @private
  */

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's page builder adapter for the 'demo' platform.
  * It creates chip instances from chip raw data. Compared to the other platforms this adapter has restricted functionality.
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ui/core/ComponentContainer",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview PagePersistenceAdapter for the local platform.
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/utils",

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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.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.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/util/deepEqual",
@@ -282,7 +282,7 @@ sap.ui.define([
                             }
 
                             if (oInterface.isActiveOnly) {
-                                oTarget.activeOnly = true;
+                                oTarget.onlyCurrentApplication = true;
                             }
 
                             PostMessageManager.setDistributionPolicy(sServiceRequest, oTarget);
@@ -1029,7 +1029,6 @@ sap.ui.define([
         if (bWasKeptAlive && bWasFetchedFromCache && StatefulContainerV2Handler.isStatefulContainerSupportingKeepAlive(oApplicationContainer)) {
             return StatefulContainerV2Handler.restoreAppWithinSameFrame(
                 oApplicationContainer,
-                oResolvedHashFragment.url,
                 sStorageAppId,
                 oResolvedHashFragment
             );
@@ -1042,7 +1041,6 @@ sap.ui.define([
             }
             const oResult = await StatefulContainerV2Handler.createApp(
                 oApplicationContainer,
-                oResolvedHashFragment.url,
                 sStorageAppId,
                 oResolvedHashFragment
             );
@@ -1636,7 +1634,7 @@ sap.ui.define([
             if (oPotentialApplicationContainer.getIsInvalidIframe()) {
                 bIframeInvalid = true;
                 sReason = "iframe is in invalid state";
-            } else if (StatefulContainerV2Handler.isIframeIsValidSupported(oPotentialApplicationContainer)) {
+            } else if (oPotentialApplicationContainer.supportsIframeInvalidation()) {
                 const iLastValidTimeDelta = new Date().getTime() - oPotentialApplicationContainer.getIsIframeValidTime().time;
                 bIframeInvalid = iLastValidTimeDelta >= iValidIframeTimeout;
                 sReason = `iframe did not ping in the last '${iLastValidTimeDelta}' ms`;

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.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -429,6 +429,19 @@ sap.ui.define([
         });
     };
 
+    /**
+     * Shortcut to check if the application container supports the iframe invalidation.
+     * @returns {boolean} Whether the application container supports the iframe invalidation.
+     *
+     * @since 1.139.0
+     * @private
+     */
+    ApplicationContainer.prototype.supportsIframeInvalidation = function () {
+        return this.supportsCapabilities([
+            "sap.ushell.services.appRuntime.iframeIsValid"
+        ]);
+    };
+
     // helper for tests
     ApplicationContainer._setCachedUI5Version = function (sNewVersion) {
         ApplicationContainer.ui5version = sNewVersion;

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

@@ -1,8 +1,10 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 sap.ui.define([
-    "sap/ushell/state/StateManager"
+    "sap/ushell/state/StateManager",
+    "sap/ushell/utils"
 ], (
-    StateManager
+    StateManager,
+    ushellUtils
 ) => {
     "use strict";
 
@@ -30,7 +32,7 @@ sap.ui.define([
             this.#oNavContainer = oNavContainer;
         }
 
-        navTo (bIsNavToHome) {
+        async navTo (bIsNavToHome) {
             const sAppContainerId = this.#oApplicationContainer.getId();
             ApplicationHandle.#oNavContainer.navTo(sAppContainerId);
 
@@ -40,6 +42,9 @@ sap.ui.define([
                 this.#oResolvedHashFragment.applicationType,
                 this.#oResolvedHashFragment.explicitNavMode
             );
+
+            // await a tick to ensure the navigation is processed
+            await ushellUtils.awaitTimeout(0);
         }
 
         getNavigationRedirectHash () {

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

@@ -92,7 +92,7 @@ sap.ui.define([
         this._attachLogoutEvent(); // todo: [FLPCOREANDUX-10024] might be always added
         this._initNWBCStorage();
         this._addRemoteSystemForUrl();
-        this._calculateIframeUrl();
+        this._calculateIframeUrl(); // todo: [FLPCOREANDUX-10024] check whether this can be async
         this._calculateIframeWithPost();
 
         // the post mechanism requires the iframeUrl without system alias
@@ -238,7 +238,7 @@ sap.ui.define([
         sIframeUrl = UrlPostProcessing.processUrl(
             sIframeUrl,
             sApplicationType,
-            false, // bForFramelessWindow
+            false, // bForExplaceNavigation
             this
         );
 
@@ -384,10 +384,12 @@ sap.ui.define([
             return false;
         }
 
+        // this checks whether the message is sent from the iframe itself
         if (oMessage.source && oMessage.source === this.getPostMessageTarget()) {
             return true;
         }
 
+        // this checks whether the message is sent from the iframe's origin: e.g. a nested iframe
         if (oMessage.origin && oMessage.origin === this.getPostMessageTargetOrigin()) {
             return true;
         }
@@ -407,11 +409,10 @@ sap.ui.define([
      */
     IframeApplicationContainer.prototype.sendRequest = async function (sServiceRequest, oMessageBody, bWaitForResponse = false) {
         if (!bWaitForResponse) {
-            return PostMessageManager.sendRequest(
+            return PostMessageManager.sendRequestToApplication(
                 sServiceRequest,
                 oMessageBody,
-                this.getPostMessageTarget(),
-                this.getPostMessageTargetOrigin(),
+                this,
                 false
             );
         }
@@ -428,11 +429,10 @@ sap.ui.define([
             this.removeStyleClass("sapUShellApplicationContainerIframeHidden");
         }
 
-        const oPromise = PostMessageManager.sendRequest(
+        const oPromise = PostMessageManager.sendRequestToApplication(
             sServiceRequest,
             oMessageBody,
-            this.getPostMessageTarget(),
-            this.getPostMessageTargetOrigin(),
+            this,
             true
         );
 

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

@@ -16,27 +16,32 @@ sap.ui.define([
     "use strict";
 
     const oDistributionPolicies = {
-        "sap.ushell.appRuntime.innerAppRouteChange": {
-            activeOnly: true,
-            ignoreCapabilities: true
-        },
         "sap.ushell.appRuntime.keepAliveAppHide": {
-            activeOnly: true,
+            preventBroadcast: true,
             ignoreCapabilities: true
         },
         "sap.ushell.appRuntime.keepAliveAppShow": {
-            activeOnly: true,
+            preventBroadcast: true,
             ignoreCapabilities: true
         },
-        "sap.ushell.appRuntime.hashChange": {
-            activeOnly: true
+        "sap.ushell.sessionHandler.beforeApplicationHide": {
+            preventBroadcast: true,
+            ignoreCapabilities: true
         },
-        "sap.ushell.appRuntime.setDirtyFlag": {
-            activeOnly: true
+        "sap.ushell.sessionHandler.afterApplicationShow": {
+            preventBroadcast: true,
+            ignoreCapabilities: true
         },
-        "sap.ushell.appRuntime.getDirtyFlag": {
-            activeOnly: true
+
+        "sap.ushell.appRuntime.innerAppRouteChange": {
+            onlyCurrentApplication: true,
+            ignoreCapabilities: true
+        },
+        "sap.ushell.appRuntime.hashChange": {
+            onlyCurrentApplication: true,
+            ignoreCapabilities: true
         },
+
         "sap.ushell.appRuntime.themeChange": {
             ignoreCapabilities: true
         },

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

@@ -99,37 +99,20 @@ sap.ui.define([
         }
 
         /**
-         * Applies the visibility of an item according to the fiori2 renderer logic.
+         * Applies the visibility of an item.
+         * Helper to apply the visibility of an item which is not based on the Extension service (e.g. Renderer).
          * @param {sap.ushell.services.Extension.Item|sap.ushell.services.FrameBoundExtension.Item} oItem The extension item.
          * @param {boolean} bVisible The visibility for the item.
-         * @param {boolean} bCurrentState Wether the visibility applies to the current state.
-         * @param {sap.ushell.renderer.Renderer.LaunchpadState[]} aStates The desired launchpad states.
          *
          * @since 1.125.0
          * @private
          */
-        applyItemVisibility (oItem, bVisible, bCurrentState, aStates) {
-            /* eslint-disable no-unused-expressions */
-            if (bCurrentState) {
-                bVisible ? oItem.showForCurrentApp() : oItem.hideForCurrentApp();
+        applyItemVisibility (oItem, bVisible) {
+            if (bVisible) {
+                oItem.showForCurrentApp();
             } else {
-                bVisible ? oItem.hideForCurrentApp() : oItem.showForCurrentApp();
-
-                // aStates is only evaluated if bCurrentState is false
-                if (Array.isArray(aStates)) {
-                    if (aStates.includes("app")) {
-                        bVisible ? oItem.showForAllApps() : oItem.hideForAllApps();
-                    } else {
-                        bVisible ? oItem.hideForAllApps() : oItem.showForAllApps();
-                    }
-                    if (aStates.includes("home")) {
-                        bVisible ? oItem.showOnHome() : oItem.hideOnHome();
-                    } else {
-                        bVisible ? oItem.hideOnHome() : oItem.showOnHome();
-                    }
-                }
+                oItem.hideForCurrentApp();
             }
-            /* eslint-enable no-unused-expressions */
         }
     }