@sapui5/sap.ushell 1.127.1 → 1.127.3

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The NavTargetResolutionInternal adapter for the demo platform.
- * @version 1.127.1
+ * @version 1.127.3
  * @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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
 ], function () {

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.127.1
+ * @version 1.127.3
  */
 /*eslint-disable quote-props*/
 sap.ui.define([], function () {

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The SupportTicket adapter for the local platform.
  *
- * @version 1.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
 ], function () {

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
 ], function () {

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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",

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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

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

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

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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  * @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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} instead.
  */
 sap.ui.define([

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/base/util/isPlainObject",

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
 ], function (

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.127.1
+ * @version 1.127.3
  * @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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

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.127.1
+ * @version 1.127.3
  * @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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ushell/services/Navigation",

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ushell/appRuntime/ui5/AppRuntimeService"

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.127.1
+ * @version 1.127.3
  * @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.127.1
+ * @version 1.127.3
  */
 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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ui/core/service/ServiceFactoryRegistry",

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ushell/services/UserInfo",

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
 ], function () {

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

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

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

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

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.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/base/i18n/Formatting",

package/src/main/js/sap/ushell/bootstrap/sandbox2.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's bootstrap code for development sandbox scenarios.
  * This is the version that creates spaces/pages runtime environment.
  *
- * @version 1.127.1
+ * @version 1.127.3
  */
 
 const OBJECT_PROTOTYPE_KEYS = Object.getOwnPropertyNames(Object.prototype);

package/src/main/js/sap/ushell/components/appfinder/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.appfinder",
         "applicationVersion": {
-            "version": "1.127.1"
+            "version": "1.127.3"
         },
         "i18n": {
             "bundleUrl": "../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/applicationIntegration/AppLifeCycle.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ui/core/Element",
@@ -213,9 +213,7 @@ sap.ui.define([
             var oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry) {
-                RelatedServices.store(oStorageEntry.service);
                 Application.store(oStorageEntry);
-                AppMeta.store(oStorageEntry.meta);
                 oStorageEntry.stateStored = true;
             }
         };
@@ -304,10 +302,10 @@ sap.ui.define([
             var oStorageEntry = Storage.get(sAppId);
 
             if (oStorageEntry && oStorageEntry.stateStored === true) {
-                Application.restore(oStorageEntry);
                 RelatedServices.restore(oStorageEntry.service);
                 this.setBackNavigationChanged(true);
                 AppMeta.restore(oStorageEntry.meta);
+                Application.restore(oStorageEntry);
             }
         };
 
@@ -526,6 +524,42 @@ sap.ui.define([
             return false;
         };
 
+        /**
+         * Stores the state of the current application
+         *  - back navigation
+         *  - title, hierarchy, relatedApps
+         *  - currentState, controlManager
+         * @returns {Promise} Resolves when the store is done.
+         *
+         * @since 1.128.0
+         * @private
+         */
+        this.storeAppExtensions = async function () {
+            const oCurrentApp = this.getCurrentApplication();
+            if (!oCurrentApp) {
+                return;
+            }
+            const sAppId = oCurrentApp.appId;
+            const oContainer = oCurrentApp.container;
+
+            const oStorageEntry = Storage.get(sAppId);
+
+            if (!oStorageEntry) {
+                return;
+            }
+
+            if (oContainer && oContainer.getApplicationType() === "UI5") {
+                await this.getComponentCreatedPromise(sAppId);
+            }
+
+            // back navigation
+            RelatedServices.store(oStorageEntry.service);
+            // title, hierarchy, relatedApps
+            AppMeta.store(oStorageEntry.meta);
+            // currentState, controlManager
+            KeepAlive.store(oStorageEntry);
+        };
+
         this.isAppOfTypeCached = function (appId, bIsAppOfTypeCachable, oKeepAliveMode) {
             var sKeepAlive;
 
@@ -978,6 +1012,10 @@ sap.ui.define([
             return oCurrentApplication;
         };
 
+        this.unsetCurrentApplication = function () {
+            oCurrentApplication = {};
+        };
+
         this.setApplicationFullWidth = function (bIsFull) {
             var oCurrent = this.getCurrentApplication();
 
@@ -1002,7 +1040,6 @@ sap.ui.define([
             var arrClosePromises = [];
             var oDeferred = new jQuery.Deferred();
 
-            StateManager.stallChanges();
             this.closeKeepAliveApps(fnCloseKeepAliveIfSameUI5App, arrClosePromises);
 
             Promise.all(arrClosePromises)
@@ -1013,7 +1050,6 @@ sap.ui.define([
                     oDeferred.resolve(oResult);
                 })
                 .catch((oError) => {
-                    StateManager.discardStalledChanges();
                     oDeferred.reject(oError);
                 });
 
@@ -1536,6 +1572,24 @@ sap.ui.define([
                                 // Activate container before showing it (start reacting to postMessage calls)
                                 that.activeContainer(oInnerControl);
                             }
+
+                            /*
+                             * Workaround:
+                             * The oCurrentApplication object does not reflect the currently opened application.
+                             * This leads to store/restore calls on the wrong application.
+                             * Create application that is not persisted and not cashed as a fallback.
+                             *
+                             * This issue occurs for iframe applications reusing the iframe.
+                             */
+                            if (oCurrentApplication.appId !== sFullAppId) {
+                                oCurrentApplication = {
+                                    appId: sFullAppId,
+                                    stt: "loading",
+                                    container: oInnerControl,
+                                    meta: AppConfiguration.getMetadata(oTarget),
+                                    app: undefined
+                                };
+                            }
                             oDeferredOpenApp.resolve();
                         });
                     });
@@ -1551,9 +1605,7 @@ sap.ui.define([
         this.switchViewState = function (sLaunchpadState, sAppId, sAppType, bIsExplaceNavigation) {
             // Store state before creating a new one
             const oFromStorageEntry = Storage.get(oCurrentApplication.appId);
-            if (oFromStorageEntry) {
-                KeepAlive.store(oFromStorageEntry);
-            } else {
+            if (!oFromStorageEntry) {
                 // We have to destroy managed queue BEFORE we're applying the pending changes
                 StateManager.destroyManagedControls();
             }

package/src/main/js/sap/ushell/components/applicationIntegration/application/Application.js

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

package/src/main/js/sap/ushell/components/applicationIntegration/application/BlueBoxHandler.js

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

package/src/main/js/sap/ushell/components/applicationIntegration/application/PostMessageAPI.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview defines the post message API for all applications running in iframe within the shell
- * @version 1.127.1
+ * @version 1.127.3
  * @private
  */
 sap.ui.define([
@@ -32,7 +32,8 @@ sap.ui.define([
     "sap/base/util/uid",
     "sap/ushell/Container",
     "sap/base/util/Deferred",
-    "sap/ushell/state/ShellModel"
+    "sap/ushell/state/ShellModel",
+    "sap/ushell/_ApplicationType/systemAlias"
 ], function (
     Formatting,
     Localization,
@@ -60,7 +61,8 @@ sap.ui.define([
     fnGetUid,
     Container,
     Deferred,
-    ShellModel
+    ShellModel,
+    SystemAlias
 ) {
     "use strict";
 
@@ -1063,31 +1065,7 @@ sap.ui.define([
                         const oAppTargetResolution = oServiceParams.oContainer.getCurrentAppTargetResolution();
                         const sFullyQualifiedSystemAlias = oAppTargetResolution.systemAlias;
                         const sContentProviderId = oAppTargetResolution.contentProviderId;
-
-                        if (sContentProviderId) {
-                            if (!sFullyQualifiedSystemAlias.includes(sContentProviderId)) {
-                                Log.error("Unexpected format for fully qualified systemAlias: missing contentProviderId.");
-                                return sFullyQualifiedSystemAlias;
-                            }
-
-                            const sSystemAliasInProvider = sFullyQualifiedSystemAlias.replace(sContentProviderId, "");
-                            // pass undefined as a default system alias within a provider
-                            if (sSystemAliasInProvider.length === 0) {
-                                return undefined;
-                            }
-
-                            if (sSystemAliasInProvider[0] !== "_") {
-                                Log.error("Unexpected format for fully qualified systemAlias: missing underscore delimiter.");
-                                return sSystemAliasInProvider;
-                            }
-                            // pass undefined as a default system alias within a provider
-                            if (sSystemAliasInProvider === "_") {
-                                return undefined;
-                            }
-
-                            return sSystemAliasInProvider.replace("_", "");
-                        }
-                        return sFullyQualifiedSystemAlias;
+                        return SystemAlias.getSystemAliasInProvider(sFullyQualifiedSystemAlias, sContentProviderId);
                     }
                 },
                 setNewAppInfo: {

package/src/main/js/sap/ushell/components/applicationIntegration/configuration/AppMeta.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview handle all the resources for the different applications.
- * @version 1.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedServices/RelatedServices.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the services for the different applications.
- * @version 1.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/container/ApplicationContainer.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The UI integration's SAPUI5 control which supports application embedding.
- * @version 1.127.1
+ * @version 1.127.3
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/contentFinder/Component.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder Component
  *
- * @version 1.127.1
+ * @version 1.127.3
  */
 
 sap.ui.define([