@sapui5/sap.ushell 1.124.2 → 1.124.4

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ushell/resources",

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

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

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

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

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

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

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

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

@@ -40,7 +40,7 @@ sap.ui.define([
     // visualizationOrganizer Component
     return UIComponent.extend("sap.ushell.components.visualizationOrganizer.Component", {
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             library: "sap.ushell",
             dependencies: { libs: ["sap.m"] },
             properties: {

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

@@ -3,7 +3,7 @@
  * @fileOverview WorkPageBuilder Component
  * This UIComponent gets initialized by the FLP renderer upon visiting a work page if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.accessibility.js

@@ -2,7 +2,7 @@
 
 /**
  * @file WorkPageBuilder accessibility features
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageBuilder/controller/WorkPageBuilder.controller.js

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

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPage.js

@@ -32,7 +32,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageButton.js

@@ -20,7 +20,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageCell.js

@@ -45,7 +45,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumn.js

@@ -32,7 +32,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageColumnResizer.js

@@ -17,7 +17,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

package/src/main/js/sap/ushell/components/workPageBuilder/controls/WorkPageRow.js

@@ -25,7 +25,7 @@ sap.ui.define([
      * @extends sap.ui.core.Control
      *
      *
-     * @version 1.124.2
+     * @version 1.124.4
      *
      * @private
      * @experimental

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

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

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

@@ -3,7 +3,7 @@
  * @fileOverview WorkPages Runtime Component
  * This UIComponent gets initialized by the FLP renderer if work pages are enabled (/core/workPages/enabled).
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/components/workPageRuntime/controller/WorkPageRuntime.controller.js

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

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

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

package/src/main/js/sap/ushell/designtime/ApplicationContainer.designtime.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Provides the Design Time Metadata for the sap.ushell.components.container.ApplicationContainer control
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/library.js

@@ -35,7 +35,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Library.init({
         name: "sap.ushell",
-        version: "1.124.2",
+        version: "1.124.4",
         dependencies: [
             "sap.ui.core",
             "sap.m"

package/src/main/js/sap/ushell/navigationMode.js

@@ -11,7 +11,7 @@
  * Method Compute is used by ClientSide TargetResolution and takes not only the
  * next application but also the current application into account.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/ShellAnalytics.js

@@ -3,7 +3,7 @@
  * @fileOverview Provides analytical data like duration for navigation steps in the shell, in FLP,
  *               in particular an array of all statistical records
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/performance/StatisticalRecord.js

@@ -3,7 +3,7 @@
  * @fileOverview Class for statistical record
  *               It should contain data like step, duration after a navigation in the shell, can have status open.
  *               The closing of a record is logged in debug mode
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/appwarmup/Component.js

@@ -87,7 +87,7 @@ sap.ui.define(
         var sComponentName = "sap.ushell.plugins.appwarmup.Component";
         return Component.extend(sComponentName, {
             metadata: {
-                version: "1.124.2",
+                version: "1.124.4",
                 library: "sap.ushell"
             },
 

package/src/main/js/sap/ushell/renderer/Renderer.js

@@ -83,9 +83,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.124.2",
+            version: "1.124.4",
             dependencies: {
-                version: "1.124.2",
+                version: "1.124.4",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -357,6 +357,8 @@ sap.ui.define([
             oDeviceModel.setDefaultBindingMode("OneWay");
             this.setModel(oDeviceModel, "device");
             this.setModel(resources.i18nModel, "i18n");
+
+            this._aCreatedControlIds = [];
         }
     });
 
@@ -587,6 +589,21 @@ sap.ui.define([
         return oSyncView;
     };
 
+    /**
+     * Stores newly created control in the shell model and in the list of created controls.
+     * @param {sap.ui.core.Control} oControl The newly created control.
+     * @param {boolean} bCurrentState Whether the control was created in the currentState context.
+     *
+     * @since 1.124
+     * @private
+     */
+    Renderer.prototype._storeControl = function (oControl, bCurrentState) {
+        this._aCreatedControlIds.push(oControl.getId());
+        if (bCurrentState) {
+            this.oShellModel.addElementToManagedQueue(oControl);
+        }
+    };
+
     /**
      * Creates an extended shell state.<br>
      * An extended shell state is an extension for the current shell that can be applied by the function applyExtendedShellState.<br>
@@ -1116,6 +1133,8 @@ sap.ui.define([
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
+                    that._storeControl(oControlInstance, false);
+
                     // In case a footer was created before, we remove it first before setting a new one
                     if (that.lastFooterId) {
                         that.removeFooter();
@@ -1494,9 +1513,10 @@ sap.ui.define([
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
+                    that._storeControl(oControlInstance, bCurrentState);
+
                     if (bIsVisible) {
                         that.showSubHeader(oControlInstance.getId(), bCurrentState, aStates);
-                        that.oShellModel.addElementToManagedQueue(oControlInstance);
                     }
                     oDeferred.resolve(oControlInstance);
                 });
@@ -1653,10 +1673,14 @@ sap.ui.define([
                     that.oShellModel.setModelToUpdate(oModelToUpdate, true);
                 }
 
-                oControlInstance = oControlInstance || new ControlClass(oControlProperties);
+                if (!oControlInstance) {
+                    oControlInstance = new ControlClass(oControlProperties);
+                    that._storeControl(oControlInstance, bCurrentState);
+                }
 
                 if (!oControlInstance.getActionType) {
                     oControlInstance = new ControlClass(oControlProperties);
+                    that._storeControl(oControlInstance, bCurrentState);
                 }
 
                 if (bIsVisible) {
@@ -1797,7 +1821,6 @@ sap.ui.define([
             if (oControlInstance) {
                 if (bIsVisible) {
                     that.showFloatingActionButton(oControlInstance.getId(), bCurrentState, aStates);
-                    that.oShellModel.addElementToManagedQueue(oControlInstance);
                 }
                 oDeferred.resolve(oControlInstance);
             }
@@ -1812,6 +1835,8 @@ sap.ui.define([
         sap.ui.require([sControlResource],
             function (ControlObject) {
                 oControlInstance = new ControlObject(oControlProperties);
+                that._storeControl(oControlInstance, bCurrentState);
+
                 if (bIsVisible) {
                     that.showFloatingActionButton(oControlInstance.getId(), bCurrentState, aStates);
                 }
@@ -1953,8 +1978,9 @@ sap.ui.define([
             sap.ui.require([sControlResource],
                 function (ControlObject) {
                     oControlInstance = new ControlObject(oControlProperties);
+                    that._storeControl(oControlInstance, bCurrentState);
+
                     if (bIsVisible) {
-                        that.oShellModel.addElementToManagedQueue(oControlInstance);
                         that.showLeftPaneContent(oControlInstance.getId(), bCurrentState, aStates);
                     }
                     oDeferred.resolve(oControlInstance);
@@ -2558,9 +2584,7 @@ sap.ui.define([
         }
         if (!oItem) {
             oItem = fnCreateItem(oControlProperties);
-            if (bCurrentState) {
-                this.oShellModel.addElementToManagedQueue(oItem);
-            }
+            this._storeControl(oItem, bCurrentState);
         }
 
         return oItem;
@@ -2787,8 +2811,18 @@ sap.ui.define([
                 return UIComponent.prototype.destroy.apply(this, arguments);
             }.bind(this))
             .then(function () {
+                if (this._aCreatedControlIds) {
+                    this._aCreatedControlIds.forEach(function (sControlId) {
+                        try {
+                            sap.ui.getCore().byId(sControlId).destroy();
+                        } catch (oError) {
+                            Log.error("Failed to destroy control with id: " + sControlId, oError);
+                        }
+                    });
+                }
+
                 ShellLayout.destroyLayout();
-            });
+            }.bind(this));
     };
 
     /**

package/src/main/js/sap/ushell/renderer/search/searchComponent/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.renderer.search.searchComponent",
         "applicationVersion": {
-            "version": "1.124.2"
+            "version": "1.124.4"
         },
         "type": "component"
     },

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/base/Object",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.124.2
+ * @version 1.124.4
  * @deprecated As of version 1.120
  */
 sap.ui.define([

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ui/core/EventBus",

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel-based site document in a platform-neutral format to it's clients
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ushell/services/_CommonDataModel/PersonalizationProcessor",

package/src/main/js/sap/ushell/services/Configuration.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's Configuration service enables Components of any kind to consume parts of Configuration
  * provided by the shell. It allows to attach on updates and receive the current values
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/ConfigurationDefaults.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Configuration Defaults service exposes default configurations set in the code base.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ContentExtensionAdapterFactory.js

@@ -4,7 +4,7 @@
  * default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ushell/Config",

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

@@ -6,7 +6,7 @@
  * It exposes interfaces to perform a hash change and/or trigger an external navigation.
  *
  * @deprecated since 1.120 Please use {@link sap.ushell.services.Navigation} instead
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",
@@ -1880,6 +1880,7 @@ sap.ui.define([
          * @returns {Promise<object>} Resolves the component data.
          * @since 1.88.0
          * @private
+         * @ui5-restricted cross.fnd.fiori.inbox (CA-INB-FIO)
          */
         this.createComponentData = function (sIntent, oConfig) {
             return new Promise(function (fnResolve, fnReject) {
@@ -1933,7 +1934,17 @@ sap.ui.define([
                             // do not change the ["require"] to .require. This is to avoid
                             //  adding dependencies for non cFLP scenario.
                             sap.ui.require(["sap/ushell/appRuntime/ui5/services/AppLifeCycleAgent"], function (AppLifeCycleAgent) {
-                                AppLifeCycleAgent.getAppInfo(oResult.appCapabilities.technicalAppComponentId).then(function (oAppInfo) {
+                                let sAppId;
+                                // We try to fetch the app id from the URL. As this also considers app variants and not just standard apps.
+                                try {
+                                    const sUrl = new URL(oResult.url);
+                                    const oURLParams = new URLSearchParams(sUrl.search);
+                                    sAppId = oURLParams.get("sap-ui-app-id");
+                                } catch (e) {
+                                    // If the URL is not a complete URL but only a URIComponent, we do a regex to find the required parameter value.
+                                    sAppId = oResult.url.match(/[?&]sap-ui-app-id=([^&]+)/)[1];
+                                }
+                                AppLifeCycleAgent.getAppInfo(sAppId).then(function (oAppInfo) {
                                     if (oAppInfo.hasOwnProperty("oResolvedHashFragment")) {
                                         oAppInfo = oAppInfo.oResolvedHashFragment;
                                     }
@@ -1943,7 +1954,7 @@ sap.ui.define([
                                     }
                                     // Create the component data and resolve the promise
                                     createComponentData({
-                                        ui5ComponentName: oResult.appCapabilities.technicalAppComponentId,
+                                        ui5ComponentName: sAppId,
                                         applicationDependencies: oAppInfo,
                                         url: oAppInfo.url
                                     });

package/src/main/js/sap/ushell/services/DarkModeSupport.js

@@ -5,7 +5,7 @@
  *
  * The service provide dark mode support functionality
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -3,13 +3,15 @@
 /**
  * @fileOverview Defines a generic interface for extension items in ShellAreas.
  *
- * @version 1.124.2
+ * @version 1.124.4
  */
 sap.ui.define([
     "sap/base/Log",
+    "sap/ushell/components/applicationIntegration/AppLifeCycle",
     "sap/ushell/Config"
 ], function (
     Log,
+    AppLifeCycleAI,
     Config
 ) {
     "use strict";
@@ -19,6 +21,10 @@ sap.ui.define([
      * @class
      * @classdesc Item wrapping an item positioned in an extension point.
      * To be instantiated by {@link sap.ushell.services.Extension}.
+     * <br>
+     * The item will be automatically destroyed when the user navigates away from the current application.
+     * After calling {@link sap.ushell.services.Extension.Item#showOnHome} or {@link sap.ushell.services.Extension.Item#showForAllApps}
+     * the item is not destroyed automatically and has to be destroyed manually via {@link sap.ushell.services.Extension.Item#destroy}.
      *
      * @hideconstructor
      *
@@ -43,9 +49,32 @@ sap.ui.define([
             throw new Error("Shall be implemented by item");
         };
 
-        constructor (oControl, visibilityHandler) {
+        constructor (oControl, visibilityHandler, controlWasPreCreated) {
             this.#control = oControl;
             this.#visibilityHandler = visibilityHandler;
+
+            /*
+             * if the control was pre-created the application should take care of the control life cycle.
+             * Add the control to the managed queue by default and remove it once it is related to a base state.
+             */
+            if (!controlWasPreCreated) {
+                const ShellModel = AppLifeCycleAI.getElementsModel();
+                ShellModel.addElementToManagedQueue(this.#control);
+            } else {
+                Log.warning("The control was pre-created and the application is responsible for the control life cycle");
+            }
+        }
+
+        /**
+         * Removes the item from the managed queue.
+         * With this the item will not be destroyed when the user navigates away from the application.
+         *
+         * @since 1.128.0
+         * @private
+         */
+        #removeFromManagedQueue () {
+            const ShellModel = AppLifeCycleAI.getElementsModel();
+            ShellModel.removeElementFromManagedQueue(this.#control);
         }
 
         /**
@@ -83,6 +112,11 @@ sap.ui.define([
          * @private
          */
         setVisibilityForLaunchpadState (launchpadState, visible) {
+            if (visible) {
+                // if the item was once related to the base state it should not be added to the managed queue.
+                this.#removeFromManagedQueue();
+            }
+
             this.#visibilityMap[launchpadState] = visible;
             this.#visibilityHandler(visible, false, launchpadState);
         }
@@ -120,6 +154,7 @@ sap.ui.define([
         /**
          * Shows the item for all applications.
          * Does not change the visibility of the item for the launchpad "home".
+         * Disables the automatic destruction of the item when the user navigates away from the current application.
          * @returns {this} Reference to <code>this</code> for method chaining.
          *
          * @since 1.120.0
@@ -146,6 +181,7 @@ sap.ui.define([
         /**
          * Shows the item for launchpad "home".
          * Does not change the visibility of the item within applications.
+         * Disables the automatic destruction of the item when the user navigates away from the current application.
          * @returns {this} Reference to <code>this</code> for method chaining.
          *
          * @since 1.120.0