@sapui5/sap.ushell 1.127.2 → 1.128.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.127.2",
+    "version": "1.128.0",
     "description": "SAPUI5 Library sap.ushell",
     "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
     "keywords": [

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

@@ -2,7 +2,7 @@
 <library xmlns="http://www.sap.com/sap.ui.library.xsd">
     <name>sap.ushell</name>
     <vendor>SAP SE</vendor>
-    <version>1.127.2</version>
+    <version>1.128.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 
@@ -102,10 +102,10 @@
             <component>
                 <name>CA-FLP-FE-AI</name>
                 <modules>
-                    <module>sap/ushell/_ApplicationType/*</module>
+                    <module>sap/ushell/ApplicationType/*</module>
                     <module>sap/ushell/ApplicationType</module>
 
-                    <module>sap/ushell/_URLTemplateProcessor/*</module>
+                    <module>sap/ushell/URLTemplateProcessor/*</module>
                     <module>sap/ushell/URLTemplateProcessor</module>
 
                     <module>sap/ushell/components/applicationIntegration/*</module>

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/guiResolution.js

@@ -3,10 +3,10 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/_ApplicationType/systemAlias",
-    "sap/ushell/_ApplicationType/utils",
-    "sap/ushell/services/_ClientSideTargetResolution/ParameterMapping",
-    "sap/ushell/services/_ClientSideTargetResolution/Utils"
+    "sap/ushell/ApplicationType/systemAlias",
+    "sap/ushell/ApplicationType/utils",
+    "sap/ushell/services/ClientSideTargetResolution/ParameterMapping",
+    "sap/ushell/services/ClientSideTargetResolution/Utils"
 ], function (
     Log,
     deepExtend,

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/ui5Resolution.js

@@ -2,7 +2,7 @@
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
-    "sap/ushell/_ApplicationType/utils"
+    "sap/ushell/ApplicationType/utils"
 ], function (
     Log,
     deepExtend,

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/urlResolution.js

@@ -2,8 +2,8 @@
 sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/_ApplicationType/systemAlias",
-    "sap/ushell/_ApplicationType/utils",
+    "sap/ushell/ApplicationType/systemAlias",
+    "sap/ushell/ApplicationType/utils",
     "sap/ushell/Config"
 ], function (
     deepExtend,

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/urlTemplateResolution.js

@@ -9,11 +9,11 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ui/thirdparty/URI",
     "sap/ui/core/routing/History",
-    "sap/ushell/_ApplicationType/utils",
+    "sap/ushell/ApplicationType/utils",
     "sap/base/util/deepClone",
     "sap/base/util/isPlainObject",
     "sap/ushell/Container",
-    "sap/ushell/_ApplicationType/guiResolution",
+    "sap/ushell/ApplicationType/guiResolution",
     "sap/ushell/utils/UrlParsing"
 ], function (
     Log,
@@ -92,6 +92,7 @@ sap.ui.define([
                     }
                 };
 
+                // eslint-disable-next-line complexity
                 createEnv().then(function (oEnv) {
                     // the runtime environment, containing data from the current state of the FLP
                     oRuntime.env = oEnv;
@@ -599,6 +600,8 @@ sap.ui.define([
                     debugMode = window["sap-ui-debug"];
                 }
 
+                const bEnablePersonalization = Config.last("/core/shell/enablePersonalization");
+
                 fnResolve({
                     language: sLanguage,
                     logonLanguage: sLogonLanguage,
@@ -610,7 +613,8 @@ sap.ui.define([
                     sapPlugins: oPluginsService._getNamesOfPluginsWithAgents(),
                     innerAppState: getInnerAppState(),
                     sessionTimeout: sessionTimeout,
-                    historyDirection: History.getInstance().getDirection() || ""
+                    historyDirection: History.getInstance().getDirection() || "",
+                    enableShellPersonalization: bEnablePersonalization
                 });
             });
         });
@@ -698,8 +702,8 @@ sap.ui.define([
         handleURLTransformation: handleURLTransformation,
 
         // for testing
-        getBrowserHash: getBrowserHash
-
+        getBrowserHash: getBrowserHash,
+        _createEnv: createEnv
     };
 
     return oExportedAPIs;

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/utils.js

@@ -2,7 +2,7 @@
 
 sap.ui.define([
     "sap/ushell/utils/UrlParsing",
-    "sap/ushell/_ApplicationType/systemAlias",
+    "sap/ushell/ApplicationType/systemAlias",
     "sap/ushell/utils",
     "sap/ui/thirdparty/URI",
     "sap/base/util/ObjectPath"

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/wcfResolution.js

@@ -3,8 +3,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/_ApplicationType/systemAlias",
-    "sap/ushell/_ApplicationType/utils"
+    "sap/ushell/ApplicationType/systemAlias",
+    "sap/ushell/ApplicationType/utils"
 ], function (
     Log,
     deepExtend,

package/src/main/js/sap/ushell/{_ApplicationType → ApplicationType}/wdaResolution.js

@@ -3,8 +3,8 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/base/util/ObjectPath",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/_ApplicationType/systemAlias",
-    "sap/ushell/_ApplicationType/utils",
+    "sap/ushell/ApplicationType/systemAlias",
+    "sap/ushell/ApplicationType/utils",
     "sap/ushell/Container"
 ], function (
     deepExtend,

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

@@ -10,7 +10,7 @@ sap.ui.define([
     function generateWDAResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/wdaResolution"], function (oWdaResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/wdaResolution"], function (oWdaResolution) {
                 oWdaResolution.generateWDAResolutionResult.apply(oWdaResolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -19,7 +19,7 @@ sap.ui.define([
     function resolveEasyAccessMenuIntentWDA () {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/wdaResolution"], function (oWdaResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/wdaResolution"], function (oWdaResolution) {
                 oWdaResolution.resolveEasyAccessMenuIntentWDA.apply(oWdaResolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -27,7 +27,7 @@ sap.ui.define([
 
     function generateTRResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/guiResolution"], function (oGuiResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/guiResolution"], function (oGuiResolution) {
                 oGuiResolution.generateTRResolutionResult(oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver).then(fnResolve, fnReject);
             });
         });
@@ -36,7 +36,7 @@ sap.ui.define([
     function resolveEasyAccessMenuIntentWebgui () {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/guiResolution"], function (oGuiResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/guiResolution"], function (oGuiResolution) {
                 oGuiResolution.resolveEasyAccessMenuIntentWebgui.apply(oGuiResolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -45,7 +45,7 @@ sap.ui.define([
     function generateWCFResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/wcfResolution"], function (oWcfResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/wcfResolution"], function (oWcfResolution) {
                 oWcfResolution.generateWCFResolutionResult.apply(oWcfResolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -54,7 +54,7 @@ sap.ui.define([
     function generateUI5ResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/ui5Resolution"], function (oUi5Resolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/ui5Resolution"], function (oUi5Resolution) {
                 oUi5Resolution.generateUI5ResolutionResult.apply(oUi5Resolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -63,7 +63,7 @@ sap.ui.define([
     function generateURLTemplateResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/urlTemplateResolution"], function (oUrlTemplateResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/urlTemplateResolution"], function (oUrlTemplateResolution) {
                 oUrlTemplateResolution.generateURLTemplateResolutionResult.apply(oUrlTemplateResolution, _arguments).then(fnResolve, fnReject);
             });
         });
@@ -72,7 +72,7 @@ sap.ui.define([
     function generateURLResolutionResult (oMatchingTarget, sBaseUrl, fnExternalSystemAliasResolver) {
         var _arguments = arguments;
         return new Promise(function (fnResolve, fnReject) {
-            sap.ui.require(["sap/ushell/_ApplicationType/urlResolution"], function (oUrlResolution) {
+            sap.ui.require(["sap/ushell/ApplicationType/urlResolution"], function (oUrlResolution) {
                 oUrlResolution.generateURLResolutionResult.apply(oUrlResolution, _arguments).then(fnResolve, fnReject);
             });
         });

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

@@ -2,7 +2,7 @@
 sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/bootstrap/common/common.create.configcontract.core",
-    "sap/ushell/_Config/utils"
+    "sap/ushell/Config/utils"
 ], function (EventHub, CommonCreateConfigContract, oConfigUtils) {
     "use strict";
 

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

@@ -259,7 +259,13 @@ sap.ui.define([
          * @alias sap.ushell.Container#init
          */
         this.init = function (sPlatform, mAdapterPackagesByPlatform) {
+
+            /**
+             * No globals anymore in 2.0...
+             * @deprecated As of version 1.120
+             */
             ObjectPath.set("sap.ushell.Container", oContainerInstance);
+
             return this._init(sPlatform, mAdapterPackagesByPlatform)
                 .then(function (oCreatedAdapter) {
                     oAdapter = oCreatedAdapter;
@@ -1748,7 +1754,7 @@ sap.ui.define([
 
             this.callRegisteredLogoutHandlers().then(() => {
                 function resolve () {
-                    oAdapter.logout(true).always(function () {
+                    ushellUtils.promisify(oAdapter.logout(true)).finally(function () {
                         oLocalStorage.removeItem(sSessionTerminationKey);
                         oDeferred.resolve();
                     });
@@ -1797,7 +1803,9 @@ sap.ui.define([
                     Object.keys(mSystems).forEach(function (sAlias) {
                         try {
                             aRemoteLogoutPromises.push(
-                                createAdapter("Container", mSystems[sAlias]).logout(false)
+                                // Promisify is used to ensure that the promise is handled for all platform adapters which
+                                // may return a native promise or jQuery deferred.
+                                ushellUtils.promisify(createAdapter("Container", mSystems[sAlias]).logout(false))
                             );
                         } catch (e) {
                             Log.warning("Could not create adapter for " + sAlias,
@@ -1805,12 +1813,12 @@ sap.ui.define([
                         }
                         oLocalStorage.removeItem(sRemoteSystemPrefix + sAlias);
                     });
-                    // wait for all remote system logouts to be finished
-                    // Note: We use done() and not always(), and we require all adapters to resolve their logout(false) in any case.
-                    // If we use always() and any adapter's promise is rejected, the deferred object from when() is *immediately* rejected, too.
+                    // Wait for all remote system logouts to be finished
+                    // Note: We use "Promise.allSettled" because we require all adapters to resolve their logout(false) in any case.
+                    // If we use "Promise.all" and any adapter's promise is rejected, all other promises are *immediately* rejected, too.
                     // Then the redirect happens before all remote logouts are finished.
                     // TODO force logoutLogonSystem after timeout?
-                    jQuery.when.apply(jQuery, aRemoteLogoutPromises).done(logoutLogonSystem);
+                    Promise.allSettled(aRemoteLogoutPromises).then(logoutLogonSystem);
                 }
 
                 if (typeof oAdapter.addFurtherRemoteSystems === "function") {

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

@@ -5,7 +5,7 @@
  *
  * The Fiori20 adapter automatically re-styles old (Fiori 1) applications to match Fiori2 design requirements.
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/ui/base/Object",

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

@@ -4,7 +4,7 @@
  * @fileOverview The purpose Fiori20AdapterTest in this file is to decide whether to load the Fiori20Adapter at all.
  * This file is kept small in size on purpose as it is always required in productive code even when Fiori 2 adaptation is not required.
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview NWBCInterface for NWBC client
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

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

@@ -42,7 +42,7 @@
  * parameters. If the application tries to access an internal parameter (e.g.,
  * sap-ui-app-id-hint) via the API, the application receives an error message.
  *
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/DefinitionParameterSetBuilder.js

@@ -4,15 +4,15 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.127.2
+ * @version 1.128.0
  *
  * @private
  *
  */
 sap.ui.define([
-    "sap/ushell/_URLTemplateProcessor/TemplateParameterParser",
-    "sap/ushell/_URLTemplateProcessor/Resolvers",
-    "sap/ushell/_URLTemplateProcessor/utils",
+    "sap/ushell/URLTemplateProcessor/TemplateParameterParser",
+    "sap/ushell/URLTemplateProcessor/Resolvers",
+    "sap/ushell/URLTemplateProcessor/utils",
     "sap/ushell/utils/type"
 ], function (oTemplateParameterParser, oResolvers, oUtils, oType) {
     "use strict";

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/DependencyGraph.js

@@ -8,7 +8,7 @@
  * The proper order of evaluation can be determined by creating and visiting a graph that represents parameters and depending parameters
  * as nodes. This graph can be also used to detect cyclic references in the parameter set definition.
  *
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/Functions.js

@@ -2,13 +2,13 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ui/thirdparty/URI",
-    "sap/ushell/_URLTemplateProcessor/utils",
+    "sap/ushell/URLTemplateProcessor/utils",
     "sap/ushell/utils/type"
 ], function (
     deepExtend,

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/Resolvers.js

@@ -5,13 +5,13 @@
  * For a given context (e.g. the reference to a site, the application section from the site, parameters added during runtime, etc),
  * this module can be used to find the values associated to given URL Template parameter names.
  *
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([
     "sap/base/util/deepExtend",
-    "sap/ushell/_URLTemplateProcessor/Functions",
-    "sap/ushell/_URLTemplateProcessor/utils"
+    "sap/ushell/URLTemplateProcessor/Functions",
+    "sap/ushell/URLTemplateProcessor/utils"
 ], function (
     deepExtend,
     _Functions,

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/TemplateParameterParser.js

@@ -34,11 +34,11 @@
  *     }
  *   }
  *   </pre>
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([
-    "sap/ushell/_URLTemplateProcessor/Functions"
+    "sap/ushell/URLTemplateProcessor/Functions"
 ], function (
     _Functions
 ) {

package/src/main/js/sap/ushell/{_URLTemplateProcessor → URLTemplateProcessor}/utils.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([

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

@@ -26,18 +26,18 @@
  * The language to define parameters in the URL Template parameter set contains a minimal set of conditionals,
  * logical operators, and functions that allow to define the parameter set with a certain degree of control.
  *
- * @version 1.127.2
+ * @version 1.128.0
  * @private
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ui/thirdparty/URI",
     "sap/ui/thirdparty/URITemplate", // needed for "URI#expand"
-    "sap/ushell/_URLTemplateProcessor/DefinitionParameterSetBuilder",
-    "sap/ushell/_URLTemplateProcessor/DependencyGraph",
-    "sap/ushell/_URLTemplateProcessor/Resolvers",
-    "sap/ushell/_URLTemplateProcessor/TemplateParameterParser",
-    "sap/ushell/_URLTemplateProcessor/utils"
+    "sap/ushell/URLTemplateProcessor/DefinitionParameterSetBuilder",
+    "sap/ushell/URLTemplateProcessor/DependencyGraph",
+    "sap/ushell/URLTemplateProcessor/Resolvers",
+    "sap/ushell/URLTemplateProcessor/TemplateParameterParser",
+    "sap/ushell/URLTemplateProcessor/utils"
 ], function (
     Log,
     URI,

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 
 sap.ui.define([

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

@@ -6,7 +6,7 @@
  * Exposes methods to create a UI5 Service Factory for a specific Unified Shell
  * Service.
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/ClientSideTargetResolutionAdapter.js

@@ -9,7 +9,7 @@
  * <li>provide the resolveHashFragment function, a fallback method called by ClientSideTargetResolution service.</li>
  * </ul>
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/util/Version",

package/src/main/js/sap/ushell/adapters/cdm/CommonDataModelAdapter.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/adapters/cdm/ConfigurationDefaultsAdapter.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The ConfigurationDefaults adapter for the CDM platform.
  *
- * @version 1.127.2
+ * @version 1.128.0
  */
 sap.ui.define([
     "sap/ushell/bootstrap/cdm/cdm.constants",