@sapui5/sap.ushell 1.124.2 → 1.124.4

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.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/Element",
@@ -95,6 +95,7 @@ sap.ui.define([
             },
             oGlobalShellCommunicationHandlers = [],
             oGlobalIframeCommunicationHandlers = {},
+            oComponentCreatedPromises = {},
             isBackNavigationChanged = false,
             oKeepAliveModes = {
                 FULL: "true",
@@ -122,6 +123,64 @@ sap.ui.define([
             return (oCurrentApplication.appId === appId);
         };
 
+        /**
+         * Sets the componentCreated promise for a given appId if it does not exist yet.
+         * Returns the promise along with the resolve and reject functions.
+         * @private
+         * @since 1.125.0
+         * @param {string} sAppId The id of the created application.
+         * @returns {{
+         *     promise: Promise,
+         *     resolve: function,
+         *     reject: function
+         * }} An object containing the promise and the resolve and reject functions.
+         */
+        this.setComponentCreatedPromise = function (sAppId) {
+            if (!oComponentCreatedPromises[sAppId]) {
+                oComponentCreatedPromises[sAppId] = {};
+                oComponentCreatedPromises[sAppId].promise = new Promise((resolve, reject) => {
+                    oComponentCreatedPromises[sAppId].resolve = resolve;
+                    oComponentCreatedPromises[sAppId].reject = reject;
+                });
+            }
+
+            return oComponentCreatedPromises[sAppId];
+        };
+
+        /**
+         * Resolves the componentCreated promise for the given appId. If the promise does not yet exist, it is created.
+         * @param {string} sAppId The id of the created application.
+         * @private
+         * @since 1.125.0
+         */
+        this.resolveComponentCreatedPromise = function (sAppId) {
+            if (!sAppId) { return; }
+            this.setComponentCreatedPromise(sAppId).resolve();
+        };
+
+        /**
+         * Rejects the componentCreated promise for the given appId. If the promise does not yet exist, it is created.
+         * @param {string} sAppId The id of the created application.
+         * @private
+         * @since 1.125.0
+         */
+        this.rejectComponentCreatedPromise = function (sAppId) {
+            if (!sAppId) { return; }
+            this.setComponentCreatedPromise(sAppId).reject("Component was not created for app " + sAppId);
+        };
+
+        /**
+         * Returns the componentCreated promise for the given appId. If the promise does not yet exist, it is created.
+         * @param {string} sAppId The id of the created application.
+         * @returns {Promise | undefined} The componentCreated promise for the given appId or undefined if no appId is given.
+         * @private
+         * @since 1.125.0
+         */
+        this.getComponentCreatedPromise = function (sAppId) {
+            if (!sAppId) { return; }
+            return this.setComponentCreatedPromise(sAppId).promise;
+        };
+
         this.isAppWithSimilarShellHashInCache = function (appId, sFixedShellHash) {
             var oAppEntry = Storage.get(appId);
 
@@ -162,6 +221,8 @@ sap.ui.define([
                     oApp.active();
                 }
             }
+
+            this.resolveComponentCreatedPromise(sAppId);
         };
 
         this.onGetMe = function (oEvent, sChannel, oData) {
@@ -319,9 +380,13 @@ sap.ui.define([
             }
 
             if (sFromId && oFrom) {
+                // STATEFUL
                 if (BlueBoxHandler.isStatefulContainer(oFrom)) {
                     oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
+
+                //STATELESS
                 } else if (Storage.get(sFromId)) {
+                    // Back Navigation Case
                     if (RelatedServices.isBackNavigation() === true && !isHomePage) {
                         //check if the Iframe needs to be cached instead of destroy
                         if (!BlueBoxHandler.returnUnusedKeepAliveContainer(oFrom)) {
@@ -331,14 +396,24 @@ sap.ui.define([
                         } else {
                             oPromiseAppClose = this.handleExitStateful(sFromId, oFrom, isHomePage);
                         }
+
+                    // Forward Navigation Cases
+                    } else if (oFrom.getApplicationType() === "UI5") {
+                        // Wait until navigation's source app has been started completey, so that a later back navigation finds a proper app that
+                        // can be re-enabled (keep-alive scenario)
+                        oPromiseAppClose = this.getComponentCreatedPromise(sFromId).then(() => { this.store(sFromId); });
                     } else {
                         this.store(sFromId);
                     }
                     EventBus.getInstance().publish("sap.ushell", "appClosed", oFrom);
+
+                // LEGACY STATEFUL (WebGUI)
                 } else if (oFrom.getStatefulType && oFrom.getStatefulType() === BlueBoxHandler.STATEFUL_TYPES.GUI_V1) {
                     if (isHomePage) {
                         oPromiseAppClose = PostMessageUtils.postMessageToIframeApp(oFrom, "sap.gui", "triggerCloseSessionImmediately");
                     }
+
+                // THE REST...
                 } else {
                     bIsAppOfTypeCachable = aCachedAppTypes.indexOf(oFrom.getApplicationType) >= 0;
 
@@ -1448,7 +1523,13 @@ sap.ui.define([
                         // Assuming a previously existing TR container existed and is now
                         // going to be reused, we prompt the container to load the new application context.
                         var oPromiseAsyncAppCreate = new jQuery.Deferred().resolve().promise();
-
+                        //  SAP GUI is sending post messages for back navigation as soon the create application event is sent to the iframe,
+                        // so this makes sure the container is active before sending the event.
+                        // For WD applications, the application is active only after the application is created.
+                        // So it is not navigated twice.
+                        if (oInnerControl.getApplicationType() === ApplicationType.TR.type) {
+                            that.activeContainer(oInnerControl);
+                        }
                         //here, we create the application in case this is a stateful container (meaning, using the existing iframe)
                         if (bReuseStatefulContainer) {
                             //for scube - make sure the container is active before we open the app
@@ -1468,8 +1549,10 @@ sap.ui.define([
                         //for case of stateful container or gui v1 stateful, show the application view (make it visible)
                         oPromiseAsyncAppCreate.then(function () {
                             utils.setPerformanceMark("FLP -- centerViewPort");
-                            // Activate container before showing it (start reacting to postMessage calls)
-                            that.activeContainer(oInnerControl);
+                            if (oInnerControl.getApplicationType() !== ApplicationType.TR.type) {
+                                // Activate container before showing it (start reacting to postMessage calls)
+                                that.activeContainer(oInnerControl);
+                            }
                             oDeferredOpenApp.resolve();
                         });
                     });

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.124.2
+ * @version 1.124.4
  */
 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.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -145,7 +145,7 @@ sap.ui.define([
                         });
                     });
             }
-
+            oInnerControl.setProperty("reservedParameters", oTarget.reservedParameters, true);
             oInnerControl.setProperty("currentAppUrl", sUrl, true);
             oInnerControl.setProperty("currentAppId", sStorageKey, true);
             oInnerControl.setProperty("currentAppTargetResolution", oTarget, true);

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.124.2
+ * @version 1.124.4
  * @private
  */
 sap.ui.define([
@@ -1016,6 +1016,16 @@ sap.ui.define([
         },
         "sap.ushell.services.AppLifeCycle": {
             oServiceCalls: {
+                reloadCurrentApp: {
+                    executeServiceCallFn: async (oServiceParams) => {
+                        // should only be called for appruntime
+                        EventHub.emit("reloadCurrentApp", {
+                            // Omit sAppContainerId, otherwise the entire iframe will be reloaded
+                            sCurrentHash: hasher.getHash(),
+                            date: Date.now()
+                        });
+                    }
+                },
                 getFullyQualifiedXhrUrl: {
                     executeServiceCallFn: async (oServiceParams) => {
                         const { path } = oServiceParams.oMessageData.body;

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.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/util/extend",

package/src/main/js/sap/ushell/components/applicationIntegration/elements/model.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The models assosicated with the applciation.
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/EventBus",
@@ -862,7 +862,7 @@ sap.ui.define([
         };
 
         this.addElementToManagedQueue = function (oItem) {
-            //update extenstionShell
+            //update extensionShell
             //get the current model ref
             var sStateName = Config.last("/core/shell/model/currentState/stateName"),
                 oBaseExtensionShellStates,
@@ -900,6 +900,29 @@ sap.ui.define([
             }
         };
 
+        /**
+         * Removes an item from the managed queue.
+         * @param {sap.ui.core.Control} oItem The item to remove from the managed queue.
+         *
+         * @since 1.128.0
+         * @private
+         */
+        this.removeElementFromManagedQueue = function (oItem) {
+            var sStateName = Config.last("/core/shell/model/currentState/stateName");
+            var sItemId = oItem.getId();
+
+            // remove from currentState
+            var aCurrentStateManagedObjects = oApplicationShellStates.extendedShellStates[sStateName].managedObjects;
+            var iIndexInCurrentState = aCurrentStateManagedObjects.indexOf(sItemId);
+            if (iIndexInCurrentState > -1) {
+                aCurrentStateManagedObjects.splice(iIndexInCurrentState, 1);
+            }
+
+            // remove from managed elements
+            delete oManagedElements[sItemId];
+        };
+
+
         this.updateNeededTriggersMap = function (oStorage, aTriggers) {
             var index;
 

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.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/components/applicationIntegration/relatedShellElements/RelatedShellElements.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview handle all the related shell elements of the different applications.
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

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.124.2
+ * @version 1.124.4
  */
 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.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinder/controller/AppSearch.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file AppSearch controller for AppSearch view
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "./ContentFinderDialog.controller",

package/src/main/js/sap/ushell/components/contentFinder/controller/ContentFinderDialog.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog root view
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "../model/formatter",

package/src/main/js/sap/ushell/components/contentFinder/controller/WidgetGallery.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for WidgetGallery view
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "./ContentFinderDialog.controller"

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinder",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "i18n": "./resources/resources.properties",
         "ach": "CA-FLP-FE-UI",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ContentFinder standalone Component
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/contentFinderStandalone/controller/ContentFinderStandalone.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Controller for ContentFinderDialog standalone root view
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.contentFinderStandalone",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "ach": "CA-FLP-FE-UI",
         "type": "component",

package/src/main/js/sap/ushell/components/contentFinderStandalone/manifestAppSearch.json

@@ -3,7 +3,7 @@
   "sap.app": {
     "id": "sap.ushell.components.contentFinder",
     "applicationVersion": {
-      "version": "1.124.2"
+      "version": "1.124.4"
     },
     "i18n": "../contentFinder/resources/resources.properties",
     "ach": "CA-FLP-FE-UI",

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

@@ -17,7 +17,7 @@ sap.ui.define([
 
         // use inline declaration instead of component.json to save 1 round trip
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             library: "sap.ushell",
             dependencies: {
                 libs: ["sap.m", "sap.ui.vbm", "sap.suite.ui.commons", "sap.ui.layout", "sap.viz"],

package/src/main/js/sap/ushell/components/homepage/ActionMode.js

@@ -20,7 +20,7 @@
  *  - Deactivation handler
  *  - Rendering tile action menu
  *
- * @version 1.124.2
+ * @version 1.124.4
  *
  * @deprecated since 1.112
  */

package/src/main/js/sap/ushell/components/homepage/DashboardContent.view.js

@@ -5,7 +5,7 @@
  * with a header of type <code>sap.ushell.ui.launchpad.AnchorNavigationBar</code>
  * and content of type <code>sap.ushell.ui.launchpad.DashboardGroupsContainer</code>.
  *
- * @version 1.124.2
+ * @version 1.124.4
  *
  * @deprecated since 1.112
  * @private

package/src/main/js/sap/ushell/components/homepage/DashboardGroupsBox.js

@@ -6,7 +6,7 @@
  * Exposes the public function <code>createGroupsBox</code>
  * @see sap.ushell.components.homepage.DashboardContent.view
  *
- * @version 1.124.2
+ * @version 1.124.4
  * @since 1.35.0
  *
  * @deprecated since 1.112

package/src/main/js/sap/ushell/components/homepage/DashboardUIActions.js

@@ -5,7 +5,7 @@
  * Extends <code>sap.ui.base.Object</code><br>
  * Exposes the public function <code>initializeUIActions</code>
  *
- * @version 1.124.2
+ * @version 1.124.4
  * @since 1.35.0
  *
  * @deprecated since 1.112

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

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

package/src/main/js/sap/ushell/components/pages/ActionMode.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview ActionMode for the PageRuntime view
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

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

@@ -5,7 +5,7 @@
  * #Shell-home or #Launchpad-openFLPPage if spaces are enabled (/core/spaces/enabled).
  * In the future it should completely replace the classical homepage.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/MyHomeImport.js

@@ -2,7 +2,7 @@
 /**
  * @fileOverview MyHome migrate functionality for the PageRuntime view
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/pages/controller/PageRuntime.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file PageRuntime controller for PageRuntime view
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/Element",
@@ -298,6 +298,7 @@ sap.ui.define([
             if (!bNavigationToHomeApp) {
                 this._openFLPPage();
             } else {
+                this._cancelActionMode();
                 // Navigate to empty page to avoid flickering of old page
                 // BCP: 2270064359
                 this.oPagesRuntimeNavContainer.to(this.oEmptyPage);

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

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

package/src/main/js/sap/ushell/components/runtimeSwitcher/controller/RuntimeSwitcher.controller.js

@@ -2,7 +2,7 @@
 
 /**
  * @file RuntimeSwitcher's controller for RuntimeSwitcher's view
- * @version 1.124.2
+ * @version 1.124.4
  */
  sap.ui.define([
     "sap/ui/core/mvc/Controller",

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

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.runtimeSwitcher",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "ach": "CA-FLP-FE-COR",
         "type": "component",

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.124.2
+ * @version 1.124.4
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/Notifications/Component.js

@@ -48,7 +48,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.Notifications.Component", {
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             library: "sap.ushell.components.shell.Notifications",
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/Notifications/Notifications.controller.js

@@ -378,7 +378,6 @@ sap.ui.define([
                 ]);
                 MessageToast.show(sMessage, { duration: 4000 });
                 await this.refreshModel();
-                this._retainFocus();
             } catch (oResult) {
                 const iNrOfSucceededNotifications = oResult.succededNotifications && oResult.succededNotifications.length;
                 if (iNrOfSucceededNotifications) {
@@ -392,12 +391,12 @@ sap.ui.define([
                     ]);
                     MessageToast.show(sMessage, { duration: 4000 });
                     await this.refreshModel();
-                    this._retainFocus();
                 } else {
                     _errorMessage(resources.i18n.getText("notificationsFailedExecuteBulkAction"));
                 }
             } finally {
                 oModel.setProperty(`${sPathToNotification}/Busy`, false);
+                this._retainFocus();
             }
         },
 

package/src/main/js/sap/ushell/components/shell/ProductSwitch/Component.js

@@ -33,7 +33,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.ProductSwitch.Component", {
 
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             library: "sap.ushell.components.shell.ProductSwitch",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Search/manifest.json

@@ -4,7 +4,7 @@
         "id": "sap.ushell.components.shell.Search",
 
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/SearchCEP/Component.js

@@ -31,7 +31,7 @@ sap.ui.define([
 
     return UIComponent.extend("sap.ushell.components.shell.SearchCEP.Component", {
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             library: ["sap.ushell", "sap.ushell.components.shell"],
             dependencies: {
                 libs: ["sap.m"]

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",