@sapui5/sap.ushell 1.141.3 → 1.143.0

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

@@ -1,20 +1,18 @@
 // Copyright (c) 2009-2025 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
-    "sap/base/Log",
-    "sap/base/util/Deferred",
     "sap/ui/core/EventBus",
+    "sap/ushell/appIntegration/ApplicationContainerCache",
     "sap/ushell/Container",
     "sap/ushell/UI5ComponentType",
     "sap/ushell/utils",
     "sap/ushell/utils/UrlParsing"
 ], (
-    Log,
-    Deferred,
     EventBus,
+    ApplicationContainerCache,
     Container,
     UI5ComponentType,
     ushellUtils,
@@ -23,37 +21,28 @@ sap.ui.define([
     "use strict";
 
     class EmbeddedUI5Handler {
-        async createApp (oApplicationContainer, oResolvedHashFragment, oParsedShellHash) {
-            const sTargetUi5ComponentName = oResolvedHashFragment?.ui5ComponentName;
-            // todo: [FLPCOREANDUX-10024] check comment below
-            /**
-             * Instead the AppLifeCycle should call this module with all UI5 applications
-             * to stop the router
-             *
-             * With this we could get rid of this logic in the container
-             */
-            /*
-             * normal application:
-             * fire the _prior.newUI5ComponentInstantion event before creating the new component instance, so that
-             * the ApplicationContainer can stop the router of the current app (avoid inner-app hash change notifications)
-             * NOTE: this dependency to the ApplicationContainer is not nice, but we need a fast fix now; we should refactor
-             * the ApplicationContainer code, because most of the logic has to be done by the shell controller;
-             * maybe rather introduce a utility module
-             */
-            EventBus.getInstance().publish("ApplicationContainer", "_prior.newUI5ComponentInstantion",
-                { name: sTargetUi5ComponentName }
-            );
+        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) => {
+                if (oCachedApplicationContainer === oApplicationContainer) {
+                    return;
+                }
+
+                if (oCachedApplicationContainer.isA("sap.ushell.appIntegration.UI5ApplicationContainer")) {
+                    oCachedApplicationContainer.stopRouter();
+                }
+            });
 
             // 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);
 
             await Ui5ComponentLoader.createComponent(
                 oResolvedHashFragment,
-                oParsedShellHash, // todo: [FLPCOREANDUX-10024] remove this and similar usages
                 [],
                 UI5ComponentType.Application
             );

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.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/ApplicationType/UrlPostProcessing",
@@ -30,7 +30,7 @@ sap.ui.define([
         }
 
         async #createPostParams (oApplicationContainer, sStorageAppId, oResolvedHashFragment) {
-            const sUrl = UrlPostProcessing.processUrl(
+            const sUrl = await UrlPostProcessing.processUrl(
                 oResolvedHashFragment.url,
                 oResolvedHashFragment.applicationType,
                 false, // bForExplaceNavigation

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;
@@ -922,9 +922,10 @@ sap.ui.define([
                             };
                             oParsedHash = UrlParsing.parseShellHash(sHash);
                         }
+                        oAppProperties.ui5ComponentId = `application-${oParsedHash.semanticObject}-${oParsedHash.action}-component`;
+
                         oUi5ComponentLoader.createComponent(
                             oAppProperties,
-                            oParsedHash,
                             [],
                             UI5ComponentType.Application
                         ).then((oResolutionResultWithComponentHandle) => {

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

package/src/main/js/sap/ushell/appRuntime/ui5/renderers/fiori2/RendererExtensions.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview This module enables a RendererExtensions like API.
  * This module is NOT a wrapper for the outer shell API and has to be required explicitly.
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/util/uid",

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppConfiguration.js

@@ -4,7 +4,7 @@
  * @fileOverview This module is a iframe safe version of the AppConfiguration service.
  * The inner frame service has to be required explicitly or accessed via the global on the original path.
  * The require calls to the original file will NOT be replaced.
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycle.js

@@ -3,16 +3,18 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.AppLifeCycle}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr",
-    "sap/ushell/services/AppLifeCycle"
+    "sap/ushell/services/AppLifeCycle",
+    "sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent"
 ], (
     Log,
     AppCommunicationMgr,
-    AppLifeCycle
+    AppLifeCycle,
+    AppLifeCycleAgent
 ) => {
     "use strict";
 
@@ -46,6 +48,21 @@ sap.ui.define([
                 Log.error("reloadCurrentApp failed: ", oError);
             }
         };
+
+        /**
+         * Use legacy restore flow for current application.
+         *
+         * @param {string} sComponentId The component id of the application
+         * @param {boolean} bDisableRouterRetrigger
+         *     A flag to disable or enable the router's re-trigger
+         *     when a keep-alive application is restored
+         *
+         * @since 1.141.0
+         * @private
+         */
+        this.useLegacyRestoreFlowForCurrentApplication = async function (sComponentId, bDisableRouterRetrigger) {
+            AppLifeCycleAgent.useLegacyRestoreFlowForCurrentApplication(sComponentId, bDisableRouterRetrigger);
+        };
     }
 
     AppLifeCycleProxy.prototype = AppLifeCycle.prototype;

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent.js

@@ -102,12 +102,6 @@ sap.ui.define([
                 AppCommunicationMgr.setRequestHandler(sServiceRequest, oRequestHandlers[sServiceRequest].handler);
             });
 
-            EventHub.on("disableKeepAliveRestoreRouterRetrigger").do((oData) => {
-                if (oData.componentId && oRouterDisableRetriggerApplications[oData.componentId]) {
-                    oRouterDisableRetriggerApplications[oData.componentId] = oData.disable;
-                }
-            });
-
             this._sendAppRuntimeSetup();
             // handle dirty state confirmation dialog within the iframe and not
             // in the outer shell
@@ -566,6 +560,23 @@ sap.ui.define([
             }
             return true;
         };
+
+        /**
+         * Use legacy restore flow for current application.
+         *
+         * @param {string} sComponentId The component id of the application
+         * @param {boolean} bDisableRouterRetrigger
+         *     A flag to disable or enable the router's re-trigger
+         *     when a keep-alive application is restored
+         *
+         * @since 1.141.0
+         * @private
+         */
+        this.useLegacyRestoreFlowForCurrentApplication = function (sComponentId, bDisableRouterRetrigger) {
+            if (sComponentId && oRouterDisableRetriggerApplications[sComponentId]) {
+                oRouterDisableRetriggerApplications[sComponentId] = bDisableRouterRetrigger;
+            }
+        };
     }
 
     return new AppLifeCycleAgent();

package/src/main/js/sap/ushell/appRuntime/ui5/services/AppState.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.AppState}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/AppState",

package/src/main/js/sap/ushell/appRuntime/ui5/services/Bookmark.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Bookmark}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.BookmarkV2} instead.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/appRuntime/ui5/services/BookmarkV2.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.BookmarkV2}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/BookmarkV2",

package/src/main/js/sap/ushell/appRuntime/ui5/services/CommonDataModel.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.CommonDataModel}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/CommonDataModel",

package/src/main/js/sap/ushell/appRuntime/ui5/services/Container.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.Container}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/Container",

package/src/main/js/sap/ushell/appRuntime/ui5/services/CrossApplicationNavigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.CrossApplicationNavigation}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} instead.
  */
 sap.ui.define([
@@ -266,7 +266,7 @@ sap.ui.define([
                 Container.getServiceAsync("ShellNavigationInternal").then((oShellNavigationInternal) => {
                     oShellNavigationInternal.toExternal(oArgs, oComponent);
                 });
-            } else if (AppRuntimeContext.checkDataLossAndContinue()) {
+            } else if ((oArgs.params && oArgs.params["sap-ushell-navmode"] && oArgs.params["sap-ushell-navmode"] === "explace") || AppRuntimeContext.checkDataLossAndContinue()) {
                 AppCommunicationMgr.sendMessageToOuterShell("sap.ushell.services.CrossApplicationNavigation.toExternal", {
                     oArgs: oArgs
                 });

package/src/main/js/sap/ushell/appRuntime/ui5/services/Extension/Item.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Defines a generic interface for extension items in ShellAreas.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr"

package/src/main/js/sap/ushell/appRuntime/ui5/services/Extension.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Extension}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/appRuntime/ui5/services/FlpLaunchPage.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.FlpLaunchPage}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
 ], (

package/src/main/js/sap/ushell/appRuntime/ui5/services/FrameBoundExtension.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.FrameBoundExtension}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
 ], (

package/src/main/js/sap/ushell/appRuntime/ui5/services/LaunchPage.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.LaunchPage}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  * @deprecated since 1.120. This service has been deprecated as it only works for the classic homepage.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/appRuntime/ui5/services/MessageBroker.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.MessageBroker}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolution.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolution}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/appRuntime/ui5/services/NavTargetResolutionInternal.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.NavTargetResolutionInternal}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/NavTargetResolutionInternal",

package/src/main/js/sap/ushell/appRuntime/ui5/services/Navigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.Navigation}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",
@@ -85,7 +85,7 @@ sap.ui.define([
                 return Container.getServiceAsync("ShellNavigationInternal").then((oShellNavigationInternal) => {
                     return oShellNavigationInternal.toExternal(oTarget, oComponent);
                 });
-            } else if (AppRuntimeContext.checkDataLossAndContinue()) {
+            } else if ((oTarget.params && oTarget.params["sap-ushell-navmode"] && oTarget.params["sap-ushell-navmode"] === "explace") || AppRuntimeContext.checkDataLossAndContinue()) {
                 return AppCommunicationMgr.postMessageToFLP("sap.ushell.services.Navigation.navigate", {
                     oTarget: oTarget
                 });

package/src/main/js/sap/ushell/appRuntime/ui5/services/ReferenceResolver.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ReferenceResolver}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppCommunicationMgr"

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigation.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigation}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellNavigationInternal.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.ShellNavigationInternal}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/services/ShellNavigationInternal",

package/src/main/js/sap/ushell/appRuntime/ui5/services/ShellUIService.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.ui5service.ShellUIService}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/appRuntime/ui5/services/UserInfo.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The app runtime wrapper for {@link sap.ushell.services.UserInfo}.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

package/src/main/js/sap/ushell/appRuntime/ui5/services/adapters/Ui5ComponentLoaderAdapter.js

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

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/LoadingConfiguration.json

@@ -62,6 +62,10 @@
                     "LoadingStep": "Search",
                     "canBeLoadedAsync": false
                 },
+                {
+                    "LoadingStep": "Assistant",
+                    "canBeLoadedAsync": true
+                },
                 {
                     "LoadingStep": "ProductSwitch",
                     "canBeLoadedAsync": false

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/StepConfiguration.json

@@ -75,24 +75,19 @@
         "canBeInterrupted": false
     },
     "Notifications": {
-        "loadingMode": "byComponentCreate",
+        "loadingMode": "byRequire",
 
         "excludedShellModeAndLaunchpadStates": [{
             "shellMode": "lean"
         }],
 
-        "byComponentCreate": {
-            "enabled": true,
-            "ui5ComponentOptions": {
-                "name": "sap.ushell.components.shell.Notifications",
-                "manifest": false
-            },
-            "url": "sap/ushell/components/shell/Notifications"
+        "byRequire": {
+            "path": "sap/ushell/modules/loader/NotificationsLoader"
         },
 
         "configSwitch": [
             {
-                "path": "/core/shell/model/enableNotifications",
+                "path": "/core/notifications/enabled",
                 "assertionValue": true
             }
         ],
@@ -205,21 +200,44 @@
         "canBeInterrupted": false
     },
     "Search": {
-        "loadingMode":"byComponentCreate",
+        "loadingMode":"byRequire",
 
         "excludedShellModeAndLaunchpadStates": [{
             "shellMode": "lean"
         }],
 
-        "byComponentCreate": {
-            "enabled": true,
-            "ui5ComponentOptions": {
-                "name": "sap.ushell.components.shell.Search",
-                "manifest": false
-            },
-            "url": "sap/ushell/components/shell/Search"
+        "byRequire": {
+            "path": "sap/ushell/modules/loader/SearchLoader"
+        },
+
+        "configSwitch": [
+            {
+                "path": "/core/search/enabled",
+                "assertionValue": true
+            }
+        ],
+
+        "userCanTrigger": false,
+        "canBeInterrupted": false
+    },
+    "Assistant": {
+       "loadingMode": "byRequire",
+
+        "excludedShellModeAndLaunchpadStates": [{
+            "shellMode": "lean"
+        }],
+
+        "byRequire": {
+            "path": "sap/ushell/modules/loader/AssistantLoader"
         },
 
+        "configSwitch": [
+            {
+                "path": "/core/assistant/enabled",
+                "assertionValue": true
+            }
+        ],
+
         "userCanTrigger": false,
         "canBeInterrupted": false
     },

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/logger.js

@@ -45,7 +45,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/bootstrap/SchedulingAgent/state.js

@@ -71,7 +71,7 @@
  * }, false);
  * </pre>
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/SchedulingAgent/logger",

package/src/main/js/sap/ushell/bootstrap/cdm/cdm.constants.js

@@ -16,7 +16,6 @@ sap.ui.define([
                 customPreload: {
                     enabled: true,
                     coreResources: [
-                        "sap/ushell/preload-bundles/thirdparty.js",
                         "sap/ushell/bootstrap/core-min-0.js",
                         "sap/ushell/bootstrap/core-min-1.js",
                         "sap/ushell/bootstrap/core-min-2.js",

package/src/main/js/sap/ushell/bootstrap/common/common.configure.ui5datetimeformat.js

@@ -4,7 +4,7 @@
  * @fileOverview Configure the UI5Settings for Date and Time Format for the 'CDM'
  *               platform.
  *
- * @version 1.141.3
+ * @version 1.143.0
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",