@sapui5/sap.ushell 1.124.3 → 1.126.0

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

@@ -26,7 +26,7 @@
  * 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.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview Ui5 Native Service Factory
  *
- * @version 1.124.3
+ * @version 1.126.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.124.3
+ * @version 1.126.0
  */
 
 sap.ui.define([
@@ -117,7 +117,7 @@ sap.ui.define([
 
             // clone args to allow Chrome to optimize addCallAllowedCheck
             aArgs = new Array(arguments.length);
-            for (i=0; i < aArgs.length; ++i) {
+            for (i = 0; i < aArgs.length; ++i) {
               aArgs[i] = arguments[i];
             }
 
@@ -295,7 +295,13 @@ sap.ui.define([
      * @private
      */
     function getServiceAsync (sUshellServiceName) {
-        return sap.ushell.Container.getServiceAsync(sUshellServiceName);
+        return new Promise(function (resolve, reject) {
+            // avoid cyclic dependencies to sap/ushell/Container. Hence the Container is required here
+            sap.ui.require(["sap/ushell/Container"], function (Container) {
+                Container.getServiceAsync(sUshellServiceName).then(
+                    (serviceInstance) => { resolve(serviceInstance); });
+            });
+        });
     }
 
     /**

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

@@ -32,7 +32,8 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/ui/launchpad/Tile",
     "sap/ushell/utils",
-    "sap/ushell/utils/UrlParsing"
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/Container"
 ], function (
     Log,
     extend,
@@ -42,7 +43,8 @@ sap.ui.define([
     EventHub,
     Tile,
     utils,
-    urlParsing
+    urlParsing,
+    Container
 ) {
     "use strict";
 
@@ -415,7 +417,7 @@ sap.ui.define([
          * @private
          */
         _getUserDetails: function (/*sUserText*/) {
-            var oUser = sap.ushell.Container.getUser();
+            var oUser = Container.getUser();
             return {
                 fullName: oUser.getFullName() || "",
                 userId: oUser.getId() || "",

package/src/main/js/sap/ushell/_URLTemplateProcessor/DefinitionParameterSetBuilder.js

@@ -4,7 +4,7 @@
  * @fileOverview Methods to build the set of parameters used by the URL template.
  *
  *
- * @version 1.124.3
+ * @version 1.126.0
  *
  * @private
  *

package/src/main/js/sap/ushell/_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.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/Functions.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Methods to parse and execute functions defined for the URL Template parameter language.
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/Resolvers.js

@@ -5,7 +5,7 @@
  * 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.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/TemplateParameterParser.js

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/_URLTemplateProcessor/utils.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Utility functions for modules of <code>URLTemplateProcessor</code>.
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 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.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/util/Version",
@@ -97,7 +97,7 @@ sap.ui.define([
             if (!this._getInboundsDeferred) {
                 this._getInboundsDeferred = new jQuery.Deferred();
 
-                sap.ushell.Container.getServiceAsync("CommonDataModel")
+                Container.getServiceAsync("CommonDataModel")
                     .then(function (oService) {
                         return oService.getSiteWithoutPersonalization();
                     })
@@ -137,7 +137,7 @@ sap.ui.define([
             if (!this.oSystemAliasesDeferred) {
                 this.oSystemAliasesDeferred = new jQuery.Deferred();
 
-                sap.ushell.Container.getServiceAsync("CommonDataModel")
+                Container.getServiceAsync("CommonDataModel")
                     .then(function (oService) {
                         return oService.getSiteWithoutPersonalization();
                     })
@@ -255,7 +255,7 @@ sap.ui.define([
             if (!this.oContentProviderDataOriginsDeferred) {
                 this.oContentProviderDataOriginsDeferred = new jQuery.Deferred();
 
-                sap.ushell.Container.getServiceAsync("CommonDataModel")
+                Container.getServiceAsync("CommonDataModel")
                     .then(function (oService) {
                         return oService.getSiteWithoutPersonalization();
                     })

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

@@ -4,12 +4,11 @@
  * @fileOverview The Unified Shell's sap.ushell.adapters.cdm.CommonDataModelAdapter for the 'CDM'
  *               platform.
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/extend",
-    "sap/base/util/UriParameters",
     "sap/base/util/Version",
     "sap/ui/thirdparty/URI",
     "sap/ui/thirdparty/jquery",
@@ -17,7 +16,6 @@ sap.ui.define([
 ], function (
     Log,
     extend,
-    UriParameters,
     Version,
     URI,
     jQuery,
@@ -327,7 +325,7 @@ sap.ui.define([
      * @private
      */
     CommonDataModelAdapter.prototype._identifySiteUrlFromConfig = function (oAdapterConfiguration) {
-        var oParams = UriParameters.fromQuery(window.location.search);
+        var oParams = new URLSearchParams(window.location.search);
         var sSiteURL = oParams.get("sap-ushell-cdm-site-url");
         var oConfig = oAdapterConfiguration && oAdapterConfiguration.config;
         // take the site URL from the url parameter "sap-ushell-cdm-site-url" preferred if provided

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

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

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

@@ -2,7 +2,7 @@
 /**
  * @fileOverview The Unified Shell"s container adapter for the Common Data Model (CDM) platform.
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's LaunchPageAdapter for the
  *               'CDM' platform - Version 2 (V2)
  * @deprecated since 1.100
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_LaunchPage/readHome",
@@ -32,7 +32,8 @@ sap.ui.define([
     "sap/base/util/ObjectPath",
     "sap/base/Log",
     "sap/ushell/UI5ComponentType",
-    "sap/ushell/EventHub"
+    "sap/ushell/EventHub",
+    "sap/ushell/Container"
 ], function (
     oReadHomePageUtils,
     oModifyHomePageUtils, // TODO should be loaded lazy only when really needed
@@ -59,7 +60,8 @@ sap.ui.define([
     ObjectPath,
     Log,
     UI5ComponentType,
-    EventHub
+    EventHub,
+    Container
 ) {
     "use strict";
 
@@ -98,8 +100,8 @@ sap.ui.define([
         this._mFailedResolvedTiles = {};
 
         Promise.all([
-            sap.ushell.Container.getServiceAsync("URLParsing"),
-            sap.ushell.Container.getServiceAsync("CommonDataModel")
+            Container.getServiceAsync("URLParsing"),
+            Container.getServiceAsync("CommonDataModel")
         ]).then(function (aServices) {
             this.oURLParsingService = aServices[0]; // It is not used internally. Keep it for back compatibility.
             this.oCDMService = aServices[1];
@@ -235,7 +237,7 @@ sap.ui.define([
         this._getTileFromHash = function (sIntent) {
             var oDeferred = new jQuery.Deferred();
 
-            sap.ushell.Container.getServiceAsync("ClientSideTargetResolution").then(function (oCstrService) {
+            Container.getServiceAsync("ClientSideTargetResolution").then(function (oCstrService) {
                 var fnResolveTile = oCstrService.resolveTileIntent.bind(oCstrService);
                 this._getTileFromHashInContextOfSite(fnResolveTile, this._mCatalogTilePromises, sIntent)
                     .done(oDeferred.resolve)
@@ -671,7 +673,7 @@ sap.ui.define([
             oDeferred = new jQuery.Deferred();
             this._assureLoadedDeferred = oDeferred;
 
-            sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
+            Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
                 oCDMSiteService.getSite()
                     .done(function (oSite) {
                         // Ensure site has expected CDM format
@@ -1906,7 +1908,7 @@ sap.ui.define([
             if (bIsCustomTile) {
                 oEventHub.once("CoreResourcesComplementLoaded")
                     .do(function () {
-                        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader").then(function (oComponentLoader) {
+                        Container.getServiceAsync("Ui5ComponentLoader").then(function (oComponentLoader) {
                             _customTileCreateCompContainer(oComponentLoader)
                                 .then(function (oCompContainer) {
                                     oDeferred.resolve(oCompContainer);
@@ -2478,7 +2480,7 @@ sap.ui.define([
 
             // setTimeout is required here. Otherwise the the oDeferred.notify() would
             // be a synchronous call, which would cause wrong behavior in some scenarios
-            sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
+            Container.getServiceAsync("CommonDataModel").then(function (oCDMSiteService) {
                 oCDMSiteService.getSite().done(function (oSite) {
                     // catalogs from site should be loaded first as they require
                     // loading of less resources
@@ -3518,7 +3520,7 @@ sap.ui.define([
             }
 
             // Persist personalization changes
-            sap.ushell.Container.getServiceAsync("CommonDataModel")
+            Container.getServiceAsync("CommonDataModel")
                 .then(function (oCdmService) {
                     oCdmService.save()
                         .fail(function (sErrorMsg0) {

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

@@ -5,10 +5,12 @@
  */
 sap.ui.define([
     "sap/ushell/library",
-    "sap/ushell/Config"
-], function (
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], function(
     ushellLibrary,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -42,7 +44,7 @@ sap.ui.define([
             return Promise.resolve(false);
         }
 
-        return sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (oCdmService) {
+        return Container.getServiceAsync("CommonDataModel").then(function (oCdmService) {
             return oCdmService.getMenuEntries("main").then(function (aMenuEntries) {
                 return aMenuEntries.length > 0;
             });
@@ -57,7 +59,7 @@ sap.ui.define([
      * @private
      */
     MenuAdapter.prototype.getMenuEntries = function () {
-        return sap.ushell.Container.getServiceAsync("CommonDataModel").then(function (oCdmService) {
+        return Container.getServiceAsync("CommonDataModel").then(function (oCdmService) {
             return oCdmService.getMenuEntries("main");
         });
     };
@@ -107,7 +109,7 @@ sap.ui.define([
     MenuAdapter.prototype._normalizeMenuEntries = function (aMenuEntries) {
         var aGetPageTitlePromises = []; // promises array resolving missing page titles
 
-        return sap.ushell.Container.getServiceAsync("CommonDataModel")
+        return Container.getServiceAsync("CommonDataModel")
             .then(function (oCdmService) {
                 aMenuEntries.forEach(function (oMenuEntry) {
                     // Add menuEntries attribute if missing

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

@@ -5,7 +5,7 @@
  * It combines the page data, tile data, navigation data and personalization into a CDM 3.1 site.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -14,8 +14,9 @@ sap.ui.define([
     "sap/base/util/extend",
     "sap/base/util/Version",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/Config"
-], function (Log, deepExtend, cdmSiteUtils, extend, Version, jQuery, Config) {
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], function (Log, deepExtend, cdmSiteUtils, extend, Version, jQuery, Config, Container) {
     "use strict";
 
     /**
@@ -50,7 +51,7 @@ sap.ui.define([
     PagesCommonDataModelAdapter.prototype.getSite = function () {
         var oDeferred = new jQuery.Deferred();
 
-        sap.ushell.Container.getServiceAsync("NavigationDataProvider")
+        Container.getServiceAsync("NavigationDataProvider")
             .then(function (oNavigationDataProvider) {
                 return oNavigationDataProvider.getNavigationData();
             })
@@ -110,8 +111,8 @@ sap.ui.define([
             }
 
             return Promise.all([
-                sap.ushell.Container.getServiceAsync("PagePersistence"),
-                sap.ushell.Container.getServiceAsync("NavigationDataProvider")
+                Container.getServiceAsync("PagePersistence"),
+                Container.getServiceAsync("NavigationDataProvider")
             ])
                 .then(function (aService) {
                     var oPagePersistenceService = aService[0];
@@ -320,8 +321,8 @@ sap.ui.define([
                 }
 
                 return Promise.all([
-                    sap.ushell.Container.getServiceAsync("PagePersistence"),
-                    sap.ushell.Container.getServiceAsync("NavigationDataProvider")
+                    Container.getServiceAsync("PagePersistence"),
+                    Container.getServiceAsync("NavigationDataProvider")
                 ])
                     .then(function (aServices) {
                         var oPagePersistenceService = aServices[0];
@@ -381,7 +382,7 @@ sap.ui.define([
     PagesCommonDataModelAdapter.prototype.getPersonalization = function (CDMVersion) {
         var oDeferred = new jQuery.Deferred();
 
-        sap.ushell.Container.getServiceAsync("PersonalizationV2")
+        Container.getServiceAsync("PersonalizationV2")
             .then(async function (oPersonalizationService) {
                 var oPersId;
 
@@ -436,7 +437,7 @@ sap.ui.define([
     PagesCommonDataModelAdapter.prototype.setPersonalization = function (personalizationData) {
         var oDeferred = new jQuery.Deferred();
 
-        sap.ushell.Container.getServiceAsync("PersonalizationV2")
+        Container.getServiceAsync("PersonalizationV2")
             .then(async function (oPersonalizationService) {
                 var oPersId;
                 var oCDMSiteVersion = new Version(personalizationData.version);
@@ -487,7 +488,7 @@ sap.ui.define([
      * @private
      */
     PagesCommonDataModelAdapter.prototype.getVisualizations = function () {
-        return sap.ushell.Container.getServiceAsync("VisualizationDataProvider").then(function (oVisualizationDataProvider) {
+        return Container.getServiceAsync("VisualizationDataProvider").then(function (oVisualizationDataProvider) {
             return Promise.all([
                 oVisualizationDataProvider.getVisualizationData(),
                 this.oSitePromise
@@ -511,7 +512,7 @@ sap.ui.define([
      * @private
      */
     PagesCommonDataModelAdapter.prototype.getVizTypes = function () {
-        return sap.ushell.Container.getServiceAsync("VisualizationDataProvider").then(function (oVisualizationDataProvider) {
+        return Container.getServiceAsync("VisualizationDataProvider").then(function (oVisualizationDataProvider) {
             return Promise.all([
                 oVisualizationDataProvider.getVisualizationData(),
                 this.oSitePromise
@@ -545,7 +546,7 @@ sap.ui.define([
                 return;
             }
 
-            return sap.ushell.Container.getServiceAsync("VisualizationDataProvider")
+            return Container.getServiceAsync("VisualizationDataProvider")
                 .then(function (oVisualizationDataProvider) {
                     return oVisualizationDataProvider.loadVizType(sVizType);
                 })

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

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/_Personalization/internals",

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

@@ -5,7 +5,7 @@
  *
  *
  * The CDM personalization adapter can be used to store data in the RA@ABAP platform.
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "./PersonalizationAdapter"

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Ui5ComponentLoaderAdapter for the CDM platform
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
 ], function () {

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/modifyHome.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of modifying the home page data for the 'CDM' platform.
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readCatalogs.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview Helper of accessing catalog data for the 'CDM' platform.
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/readHome.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview Helper of accessing Home Page data for the 'CDM' platform.
  *
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/_LaunchPage/uri.transform.js

@@ -4,7 +4,7 @@
  * @fileOverview Transforms relative URIs as used e.g. for data sources in the
  * manifest.json
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/URI"

package/src/main/js/sap/ushell/adapters/cdm/util/AppForInbound.js

@@ -5,7 +5,7 @@
  * Creates CDM site entries for apps with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/util/cdmSiteUtils.js

@@ -5,7 +5,7 @@
  * Creates CDM site entities with the provided data.
  * Only used on the ABAP platform and on local for testing.
  *
- * @version 1.124.3
+ * @version 1.126.0
  * @private
  */
 sap.ui.define([

package/src/main/js/sap/ushell/adapters/cdm/v3/AdapterBase.js

@@ -4,7 +4,7 @@
  * @fileOverview The Base of Unified Shell's LaunchPageAdapter for the 'CDM' platform - Version 3 (V3)
  *   and StaticGroupsContainer for Featured Group
  *
- * @version 1.124.3
+ * @version 1.126.0
  */
 sap.ui.define([
     "sap/ushell/adapters/cdm/v3/_LaunchPage/readHome",
@@ -27,7 +27,8 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/base/util/deepClone",
     "sap/base/Log",
-    "sap/ushell/UI5ComponentType"
+    "sap/ushell/UI5ComponentType",
+    "sap/ushell/Container"
 ], function (
     oReadHomePageUtils,
     oReadVisualization,
@@ -49,7 +50,8 @@ sap.ui.define([
     deepExtend,
     deepClone,
     Log,
-    UI5ComponentType
+    UI5ComponentType,
+    Container
 ) {
     "use strict";
 
@@ -1105,7 +1107,7 @@ sap.ui.define([
         var bIsCustomTile;
         var oDeferred = new jQuery.Deferred();
 
-        sap.ushell.Container.getServiceAsync("Ui5ComponentLoader")
+        Container.getServiceAsync("Ui5ComponentLoader")
             .then(function (oComponentLoaderService) {
                 oComponentLoader = oComponentLoaderService;
                 var oTileComponentData = this._createTileComponentData(oTile, bIsCatalogTile, oResolvedTile);
@@ -1373,7 +1375,7 @@ sap.ui.define([
         var sContentProviderId = this.getTileContentProviderId(oTile);
 
         if (sContentProviderId) {
-            oPrefixDataSourcePromise = sap.ushell.Container.getServiceAsync("ClientSideTargetResolution")
+            oPrefixDataSourcePromise = Container.getServiceAsync("ClientSideTargetResolution")
                 .then(function (oCSTRService) {
                     return oCSTRService.getSystemContext(sContentProviderId);
                 })