@sapui5/sap.ushell 1.127.1 → 1.128.0

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

@@ -35,7 +35,7 @@ sap.ui.define([
      */
     var oUshellLibrary = Library.init({
         name: "sap.ushell",
-        version: "1.127.1",
+        version: "1.128.0",
         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.127.1
+ * @version 1.128.0
  */
 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.127.1
+ * @version 1.128.0
  */
 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.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/plugins/BaseRTAPlugin.js

@@ -5,7 +5,7 @@ sap.ui.define([
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/AppLifeCycleUtils",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
 	"sap/ushell/appRuntime/ui5/plugins/baseRta/Trigger"
-], function(
+], function (
 	Component,
 	Element,
 	AppLifeCycleUtils,
@@ -27,26 +27,17 @@ sap.ui.define([
 
 			this.oTrigger = new Trigger(this.mConfig);
 
-			this._oPluginPromise = this.oTrigger.getInitPromise()
-				.then(CheckConditions.checkUI5App.bind(CheckConditions))
-				.then(function (bIsUI5App) {
-					if (
-						this.mConfig.checkRestartRTA
-						&& bIsUI5App
-						&& CheckConditions.checkRestartRTA(this.mConfig.layer)
-					) {
-						return this.oTrigger.triggerStartRta(this);
-					}
-					return undefined;
-				}.bind(this))
-
-				.then(function () {
-					return AppLifeCycleUtils.getAppLifeCycleService();
-				})
-
-				.then(function (oAppLifeCycleService) {
-					oAppLifeCycleService.attachAppLoaded(this._onAppLoaded, this);
-				}.bind(this));
+			this._oPluginPromise = (async () => {
+				await this.oTrigger.getInitPromise();
+				if (
+					this.mConfig.checkRestartRTA
+					&& CheckConditions.checkRestartRTA(this.mConfig.layer)
+				) {
+					await this.oTrigger.triggerStartRta(this);
+				}
+				const oAppLifeCycleService = await AppLifeCycleUtils.getAppLifeCycleService();
+				await oAppLifeCycleService.attachAppLoaded(this._onAppLoaded, this);
+			})();
 		},
 
 		getPluginPromise: function () {
@@ -65,18 +56,15 @@ sap.ui.define([
 				}.bind(this));
 		},
 
-		_onAppLoaded: function () {
-			return CheckConditions.checkUI5App()
-				.then(function (bIsUI5App) {
-					if (bIsUI5App) {
-						if (CheckConditions.checkRestartRTA(this.mConfig.layer)) {
-							this.oTrigger.triggerStartRta(this);
-						}
-						this._adaptButtonVisibility(this.mConfig.id, true);
-					} else {
-						this._adaptButtonVisibility(this.mConfig.id, false);
-					}
-				}.bind(this));
+		_onAppLoaded: async function () {
+			if (await CheckConditions.checkRtaPrerequisites()) {
+				if (CheckConditions.checkRestartRTA(this.mConfig.layer)) {
+					this.oTrigger.triggerStartRta(this);
+				}
+				this._setButtonVisibility(true);
+			} else {
+				this._setButtonVisibility(false);
+			}
 		},
 
 		/**
@@ -89,14 +77,15 @@ sap.ui.define([
 			return this.oTrigger.triggerStartRta(this);
 		},
 
-		_adaptButtonVisibility: function (vControl, bVisible) {
-			if (typeof vControl === "string") {
-				vControl = Element.getElementById(vControl);
-			}
-			if (!vControl) {
+		_setButtonVisibility: function (bVisible) {
+			if (!this.oActionButton) {
 				return;
 			}
-			vControl.setVisible(bVisible);
+			if (bVisible) {
+				this.oActionButton.showForAllApps();
+			} else {
+				this.oActionButton.hideForAllApps();
+			}
 		},
 
 		/**

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.127.1",
+                version: "1.128.0",
                 library: "sap.ushell"
             },
 

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

@@ -1,60 +1,45 @@
-// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
-
-sap.ui.define([
-    "sap/ushell/plugins/BaseRTAPlugin",
-    "sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
-    "sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer"
-], function (
-    BaseRTAPlugin,
-    CheckConditions,
-    Renderer
-) {
-    "use strict";
-
-    function checkKeyUser () {
-        return new Promise(function (resolve) {
-            sap.ui.require([
-                "sap/ui/fl/write/api/FeaturesAPI"
-            ], function (
-                FeaturesAPI
-            ) {
-                resolve(FeaturesAPI.isKeyUser());
-            });
-        });
-    }
-
-    var RTAPlugin = BaseRTAPlugin.extend("sap.ushell.plugins.rta.Component", {
-        sType: "rta",
-        metadata: {
-            manifest: "json",
-            library: "sap.ushell"
-        },
-
-        init: function () {
-            var oConfig = {
-                sComponentName: "sap.ushell.plugins.rta",
-                layer: "CUSTOMER",
-                developerMode: false,
-                id: "RTA_Plugin_ActionButton",
-                text: "RTA_BUTTON_TEXT",
-                icon: "sap-icon://wrench",
-                visible: true,
-                checkRestartRTA: true
-            };
-            BaseRTAPlugin.prototype.init.call(this, oConfig);
-            this._oPluginPromise = this._oPluginPromise.then(function () {
-                return Promise.all([
-                    CheckConditions.checkUI5App(),
-                    checkKeyUser(),
-                    CheckConditions.checkDesktopDevice()
-                ]);
-            })
-            .then(function (aResults) {
-                var bButtonIsVisible = this.mConfig.visible && aResults[0] && aResults[1] && aResults[2];
-                return Renderer.createActionButton(this, this._onAdapt.bind(this), bButtonIsVisible);
-            }.bind(this));
-        }
-    });
-
-    return RTAPlugin;
-}, true /* bExport */);
+// Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+sap.ui.define([
+	"sap/ushell/plugins/BaseRTAPlugin",
+	"sap/ushell/appRuntime/ui5/plugins/baseRta/CheckConditions",
+	"sap/ushell/appRuntime/ui5/plugins/baseRta/Renderer"
+], function (
+	BaseRTAPlugin,
+	CheckConditions,
+	Renderer
+) {
+	"use strict";
+
+	var RTAPlugin = BaseRTAPlugin.extend("sap.ushell.plugins.rta.Component", {
+		sType: "rta",
+		metadata: {
+			manifest: "json",
+			library: "sap.ushell"
+		},
+
+		init: function () {
+			var oConfig = {
+				sComponentName: "sap.ushell.plugins.rta",
+				layer: "CUSTOMER",
+				developerMode: false,
+				id: "RTA_Plugin_ActionButton",
+				text: "RTA_BUTTON_TEXT",
+				icon: "sap-icon://wrench",
+				visible: true,
+				checkRestartRTA: true
+			};
+			BaseRTAPlugin.prototype.init.call(this, oConfig);
+			this._oPluginPromise = this._oPluginPromise
+			.then(CheckConditions.checkRtaPrerequisites.bind(CheckConditions))
+			.then(function (bRtaAvailable) {
+				return Renderer.createActionButton(this, this._onAdapt.bind(this), bRtaAvailable);
+			}.bind(this))
+			.then(function (oActionButton) {
+				this.oActionButton = oActionButton;
+			}.bind(this));
+		}
+	});
+
+	return RTAPlugin;
+}, true /* bExport */);

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

@@ -1,9 +1,8 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
-sap.ui.define(function () {
+sap.ui.define([], function () {
     "use strict";
 
-
     var History = function () {
         this._history = [];
         this._backwards = false;
@@ -69,15 +68,6 @@ sap.ui.define(function () {
         this.getHistoryLength = function () {
             return this._history.length;
         };
-
-        /**
-         * restore deprecated globals
-         * @deprecated since 1.120.0
-         */
-        setTimeout(() => { // defer by a tick to avoid circular dependencies
-            sap.ui.require(["sap/ushell/renderers/fiori2/History"], function () {
-            });
-        }, 100);
     };
     return new History();
 });

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

@@ -85,14 +85,6 @@ sap.ui.define([
         destroy: destroyIFrameDialog
     };
 
-    /**
-     * restore deprecated globals
-     * @deprecated since 1.120.0
-     */
-    setTimeout(() => { // defer by a tick to avoid circular dependencies
-        sap.ui.require(["sap/ushell/renderers/fiori2/LogonFrameProvider"], function () {});
-    }, 0);
-
     return LogonFrameProvider;
 
 });

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

@@ -34,7 +34,7 @@ sap.ui.define([
     "sap/ushell/renderer/utils",
     "sap/ushell/ui/launchpad/ActionItem",
     "sap/ushell/state/StateManager",
-    "sap/ushell/state/ShellModel"
+    "sap/ushell/renderers/fiori2/RendererExtensions" // restore deprecated globals
 ], function (
     Component,
     Element,
@@ -65,7 +65,7 @@ sap.ui.define([
     RendererUtils,
     ActionItem,
     StateManager,
-    ShellModel
+    RendererExtensions // restore deprecated globals
 ) {
     "use strict";
 
@@ -100,9 +100,9 @@ sap.ui.define([
      */
     var Renderer = UIComponent.extend("sap.ushell.renderer.Renderer", /** @lends sap.ushell.renderer.Renderer.prototype */ {
         metadata: {
-            version: "1.127.1",
+            version: "1.128.0",
             dependencies: {
-                version: "1.127.1",
+                version: "1.128.0",
                 libs: ["sap.ui.core", "sap.m"],
                 components: []
             },
@@ -686,6 +686,8 @@ sap.ui.define([
         const aStates = this._sanitizeStates(vStates);
 
         aIds.forEach((sId) => {
+            StateManager.updateManagedControl(sId, !bCurrentState);
+
             if (bCurrentState) {
                 StateManager.updateCurrentState("header.headItems", Operation.Add, sId);
                 return;
@@ -899,6 +901,8 @@ sap.ui.define([
         const aStates = this._sanitizeStates(vStates);
 
         aIds.forEach((sId) => {
+            StateManager.updateManagedControl(sId, !bCurrentState);
+
             if (bCurrentState) {
                 StateManager.updateCurrentState(sPath, sOperation, sId);
                 return;
@@ -2813,8 +2817,7 @@ sap.ui.define([
      */
     setTimeout(() => { // defer by a tick to avoid circular dependencies
         sap.ui.require([
-            "sap/ushell/renderers/fiori2/Renderer",
-            "sap/ushell/renderers/fiori2/RendererExtensions"
+            "sap/ushell/renderers/fiori2/Renderer"
         ], function () {});
     }, 0);
 

package/src/main/js/sap/ushell/renderer/Shell.controller.js

@@ -40,7 +40,9 @@ sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/ushell/Container",
     "sap/ushell/state/ShellModel",
-    "sap/ushell/state/StateManager"
+    "sap/ushell/state/StateManager",
+    "sap/ushell/renderers/fiori2/LogonFrameProvider", // restore deprecated globals
+    "sap/ushell/renderers/fiori2/History" // restore deprecated globals
 ], function (
     History,
     Log,
@@ -78,7 +80,9 @@ sap.ui.define([
     ObjectPath,
     Container,
     ShellModel,
-    StateManager
+    StateManager,
+    DeprecatedLogonFrameProvider, // restore deprecated globals
+    DeprecatedHistory // restore deprecated globals
 ) {
     "use strict";
 
@@ -1150,6 +1154,14 @@ sap.ui.define([
                     // we will determine the next navigation mode.
                     oResolvedHashFragment = oShellController._calculateNavigationMode(oResolvedHashFragment);
 
+                    // do not stall for initial navigation
+                    if (oShellController.currentAppBeforeNav) {
+                        // store the state of the current app before opening the new app
+                        AppLifeCycleAI.storeAppExtensions();
+                        // stall all state management changes, those __most probably__ come from the target application
+                        StateManager.stallChanges();
+                    }
+
                     oShellController._handleEarlyNavigation(sFixedShellHash, sAppPart, oResolvedHashFragment).then(function (bProcessed) {
                         if (bProcessed !== true) {
                             // add application config to the application properties
@@ -1227,6 +1239,9 @@ sap.ui.define([
                                         false);
                                 });
                             });
+                        } else {
+                            // navigation was NWBC or explace, any changes were done by the source application
+                            StateManager.applyStalledChanges();
                         }
                         oDeferred.resolve();
                     });
@@ -2015,6 +2030,8 @@ sap.ui.define([
                 oDashboard.setBusy(false);
             }
 
+            StateManager.discardStalledChanges();
+
             if (ushellUtils.isPlainObject(vMessage)) {
                 this.reportError(vMessage.technicalMessage, vDetails.technicalMessage, sComponent);
                 Container.getServiceAsync("MessageInternal").then(function (oMessage) {

package/src/main/js/sap/ushell/renderer/allMyApps/AllMyApps.controller.js

@@ -18,7 +18,8 @@ sap.ui.define([
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub",
     "sap/ushell/state/ShellModel",
-    "sap/ushell/Container"
+    "sap/ushell/Container",
+    "sap/ushell/renderers/fiori2/allMyApps/AllMyAppsManager" // restore deprecated globals
 ], function (
     mobileLibrary,
     StandardListItem,
@@ -34,7 +35,8 @@ sap.ui.define([
     WindowUtils,
     EventHub,
     ShellModel,
-    Container
+    Container,
+    DeprecatedAllMyAppsManager // restore deprecated globals
 ) {
     "use strict";
 

package/src/main/js/sap/ushell/renderer/allMyApps/AllMyAppsManager.js

@@ -466,13 +466,5 @@ sap.ui.define([
             });
     };
 
-    /**
-     * restore deprecated globals
-     * @deprecated since 1.120.0
-     */
-    setTimeout(() => { // defer by a tick to avoid circular dependencies
-        sap.ui.require(["sap/ushell/renderers/fiori2/allMyApps/AllMyAppsManager"], function () {});
-    }, 0);
-
     return new AllMyAppsManager();
 });

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.127.1"
+            "version": "1.128.0"
         },
         "type": "component"
     },

package/src/main/js/sap/ushell/renderers/fiori2/Renderer.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
  /**
-  * File was moved to sap/ushell/renderer/Renderer
+  * @fileoverview File was moved to sap/ushell/renderer/Renderer
   * @deprecated since 1.120.0
   */
  sap.ui.define([

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

@@ -1,5 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
+/**
+ * @deprecated since 1.119.0
+ * @fileoverview
+ */
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/core/Element",

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

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

@@ -1,4 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
+
+/**
+ * @fileoverview AppType object.
+ * @deprecated since 1.94. Please use {@link sap.ushell.library.AppType} instead.
+ */
 sap.ui.define([
     "sap/ushell/library",
     "sap/ushell/utils/AppType"

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

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/Formatter.js

@@ -13,7 +13,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/InboundIndex.js

@@ -27,7 +27,7 @@
  *
  * @private
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/InboundProvider.js

@@ -34,11 +34,11 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
-    "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
-    "sap/ushell/services/_ClientSideTargetResolution/InboundIndex",
+    "sap/ushell/services/ClientSideTargetResolution/VirtualInbounds",
+    "sap/ushell/services/ClientSideTargetResolution/InboundIndex",
     "sap/ushell/utils"
 ], function (
     VirtualInbounds,

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/PrelaunchOperations.js

@@ -4,7 +4,7 @@
  * @file PrelaunchOperations are executed just before launching the application (post parameter mapping and app state merging) if the
  * <code>sap-prelaunch-operations</code> parameter is specified as a technical parameter.
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/Search.js

@@ -8,13 +8,13 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/ushell/utils",
-    "sap/ushell/services/_ClientSideTargetResolution/Utils",
-    "sap/ushell/services/_ClientSideTargetResolution/VirtualInbounds",
-    "sap/ushell/services/_ClientSideTargetResolution/Formatter",
+    "sap/ushell/services/ClientSideTargetResolution/Utils",
+    "sap/ushell/services/ClientSideTargetResolution/VirtualInbounds",
+    "sap/ushell/services/ClientSideTargetResolution/Formatter",
     "sap/ushell/TechnicalParameters",
     "sap/base/Log"
 ], function (

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/StagedLogger.js

@@ -39,7 +39,7 @@
  *
  * This is a dependency of ClientSideTargetResolution. Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/Log"

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/SystemContext.js

@@ -8,7 +8,7 @@
  * <p>This is a dependency of ClientSideTargetResolution. Interfaces exposed
  * by this module may change at any time without notice.</p>
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/util/ObjectPath",

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/Utils.js

@@ -6,7 +6,7 @@
  * This is a dependency of ClientSideTargetResolution.
  * Interfaces exposed by this module may change at any time without notice.
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/util/deepExtend"

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/VirtualInbounds.js

@@ -12,7 +12,7 @@
  * <p>This is a dependency of ClientSideTargetResolution.  Interfaces
  * exposed by this module may change at any time without notice.</p>
  *
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([], function () {
     "use strict";

package/src/main/js/sap/ushell/services/{_ClientSideTargetResolution → ClientSideTargetResolution}/XAppStateProcessing.js

@@ -6,10 +6,10 @@
  * Operations in this module are assumed to be executed after the target mapping has been identified (post search).
  *
  * @private
- * @version 1.127.1
+ * @version 1.128.0
  */
 sap.ui.define([
-    "sap/ushell/services/_ClientSideTargetResolution/Utils",
+    "sap/ushell/services/ClientSideTargetResolution/Utils",
     "sap/base/util/ObjectPath",
     "sap/base/util/isEmptyObject",
     "sap/base/util/isPlainObject",