@sapui5/sap.ushell 1.124.2 → 1.125.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sapui5/sap.ushell",
-    "version": "1.124.2",
+    "version": "1.125.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.124.2</version>
+    <version>1.125.0</version>
     <copyright>Copyright (c) 2009-2023 SAP SE, All Rights Reserved</copyright>
     <documentation>SAP library: sap.ushell</documentation>
 

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

@@ -6,8 +6,9 @@ sap.ui.define([
     "sap/base/util/restricted/_curry",
     "sap/base/util/restricted/_zipObject",
     "sap/ui/VersionInfo",
-    "sap/ushell/Config"
-], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config) {
+    "sap/ushell/Config",
+    "sap/ushell/Container"
+], function (Log, oAppConfiguration, _curry, _zipObject, VersionInfo, Config, Container) {
     "use strict";
     /*global */
 
@@ -192,7 +193,7 @@ sap.ui.define([
      * @returns {Promise<string>} The promise resolves the user parameter
      */
     function getUserEnv (sUserEnv) {
-        return sap.ushell.Container.getServiceAsync("ReferenceResolver")
+        return Container.getServiceAsync("ReferenceResolver")
             .then(function (oReferenceResolverService) {
                 return new Promise(function (fnResolve, fnReject) {
                     oReferenceResolverService.resolveReferences([sUserEnv])
@@ -340,33 +341,34 @@ sap.ui.define([
      * @returns {Promise} oPromise Promise that resolves to an object
      *    keeping the application info parameters with values
      */
-        function _getInfo (aParameters, oCurrentApplication, oApplicationContainer) {
-            var aPromises = aParameters.map(function (sParameter) {
-                if (isAttributeExist(sParameter)) {
-                    return Promise.resolve(getCustomValue(sParameter));
-                }
-                // add handler function in case of custom property
-                if (_isCustom(sParameter)) {
-                    oHandlers[sParameter] = _curry(getSystemContext)(sParameter);
-                }
-                if (!oHandlers[sParameter]) {
-                    Log.error(sParameter + " is not a valid app info parameter");
-                    return undefined;
-                }
-                return oHandlers[sParameter](oCurrentApplication, oApplicationContainer);
-            });
+    function _getInfo (aParameters, oCurrentApplication, oApplicationContainer) {
+        var oHandlersIncludingCustom = {...oHandlers};
+        var aPromises = aParameters.map(function (sParameter) {
+            if (isAttributeExist(sParameter)) {
+                return Promise.resolve(getCustomValue(sParameter));
+            }
+            // add handler function in case of custom property
+            if (_isCustom(sParameter)) {
+                oHandlersIncludingCustom[sParameter] = _curry(getSystemContext)(sParameter);
+            }
+            if (!oHandlersIncludingCustom[sParameter]) {
+                Log.error(sParameter + " is not a valid app info parameter");
+                return undefined;
+            }
+            return oHandlersIncludingCustom[sParameter](oCurrentApplication, oApplicationContainer);
+        });
 
-            return Promise.allSettled(aPromises).then(function (aValues) {
-                for (var i = 0; i < aValues.length; i++) {
-                    if (aValues[i].status === "fulfilled") {
-                        aValues[i] = aValues[i].value;
-                    } else {
-                        aValues[i] = undefined;
-                    }
+        return Promise.allSettled(aPromises).then(function (aValues) {
+            for (var i = 0; i < aValues.length; i++) {
+                if (aValues[i].status === "fulfilled") {
+                    aValues[i] = aValues[i].value;
+                } else {
+                    aValues[i] = undefined;
                 }
+            }
 
-                return _zipObject(aParameters, aValues);
-            });
+            return _zipObject(aParameters, aValues);
+        });
     }
 
     //object of all app info

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

@@ -133,9 +133,6 @@ sap.ui.define([
         // Special case: Notifications and NotificationsV2 configurations are interchangeable.
         // Notifications service configuration has priority
         if (sServiceName === "Notifications" || sServiceName === "NotificationsV2") {
-            if (oServices.Notifications && oServices.NotificationsV2) {
-                Log.error("Notifications and NotificationsV2 services should not be configured at the same time. NotificationsV2 configuration is ignored.");
-            }
             return oServices.Notifications || oServices.NotificationsV2 || {};
         }
         return oServices[sServiceName] || {};
@@ -229,7 +226,6 @@ sap.ui.define([
      *   });
      * </pre>
      *
-     * @see sap.ushell.bootstrap
      * @since 1.15.0
      * @public
      */
@@ -643,7 +639,7 @@ sap.ui.define([
          *
          * @since 1.30.0
          * @public
-         * @deprecated since 1.120.0
+         * @deprecated since 1.120. Use {@link sap.ushell.services.Extension} for shell extensions instead.
          * @alias sap.ushell.Container#getRenderer
          */
         this.getRenderer = function (sRendererName) {
@@ -1298,7 +1294,7 @@ sap.ui.define([
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
                 oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
-                sap.ushell.Container.addRemoteSystem(oSystem);
+                oContainerInstance.addRemoteSystem(oSystem);
                 return oDeferred.promise();
             }
 
@@ -1415,7 +1411,7 @@ sap.ui.define([
                 // Note: this might become really asynchronous once the remote adapter is loaded
                 // from the remote system itself
                 oDeferred.resolve(createAdapter(sServiceName, oSystem, sParameter));
-                sap.ushell.Container.addRemoteSystem(oSystem);
+                oContainerInstance.addRemoteSystem(oSystem);
                 return oDeferred.promise();
             }
 
@@ -2175,7 +2171,7 @@ sap.ui.define([
 
                 function handleDarkMode (Config) {
                     if (Config.last("/core/darkMode/enabled")) {
-                        sap.ushell.Container.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
+                        oContainerInstance.getServiceAsync("DarkModeSupport").then(function (DarkModeSupportService) {
                             if (DarkModeSupportService && DarkModeSupportService.setup) { // Many qUnits mock getServiceAsync without DarkModeSupport
                                 DarkModeSupportService.setup();
                             }
@@ -2186,7 +2182,7 @@ sap.ui.define([
                 function initUITracer (Config) {
                     var bTraceEnabled = !!(new URLSearchParams(window.location.search)).get("sap-ui-xx-ushell-UITraceEnabled");
                     if (Config.last("/core/uiTracer/enabled") || bTraceEnabled) {
-                        sap.ushell.Container.getServiceAsync("UITracer");
+                        oContainerInstance.getServiceAsync("UITracer");
                     }
                 }
             }.bind(this));
@@ -2208,7 +2204,7 @@ sap.ui.define([
                         that._redirectWindow();
                     }
 
-                    if (sap.ushell.Container !== that) {
+                    if (oContainerInstance !== that) {
                         // In integration test suite, old listeners remain which do not belong to the current sap.ushell.Container instance.
                         // IE sends events also to own window. Then these old listeners react as if a remote window logged out...
                         return;

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

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

@@ -4,12 +4,11 @@
  * @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.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/isEmptyObject",
-    "sap/base/util/UriParameters",
     "sap/base/util/Version",
     "sap/ui/core/Configuration",
     "sap/ui/core/library",
@@ -19,7 +18,6 @@ sap.ui.define([
 ], function (
     Log,
     isEmptyObject,
-    UriParameters,
     Version,
     Configuration,
     coreLibrary,
@@ -77,7 +75,9 @@ sap.ui.define([
         ],
 
         getConfiguration: function (oComp) {
-            var oConfig = this._getURLParamConfiguration(); // highest priority
+            var oConfig;
+
+            oConfig = this._getURLParamConfiguration(); // highest priority
 
             if (!oConfig) {
                 oConfig = this._getMetadataConfiguration(oComp); // second source, if no URL config specified
@@ -102,11 +102,11 @@ sap.ui.define([
          * @private
          */
         _getURLParamConfiguration: function () {
-            if (typeof Configuration.getFiori2Adaptation !== "function") {
+            if (!Configuration || typeof Configuration.getFiori2Adaptation !== "function") {
                 return; // parameter is not defined in the Core
             }
 
-            var oUriParameters = UriParameters.fromQuery(window.location.search);
+            var oUriParameters = new URLSearchParams(window.location.search);
             if (!oUriParameters.get(Fiori20AdapterConfiguration.S_FIORI20ADAPTER_URL_PARAM_NAME)) {
                 return; // no param value specified in the URL
             }
@@ -200,6 +200,10 @@ sap.ui.define([
          * The allowlist is only used for applications with minUI5Version lower than 1.38 and for applications without
          * valid minUI5Version or valid app descriptor.
          * Any new/modified app with version 1.38 and higher is assumed to be built according to the Fiori 2.0 guidelines
+         *
+         * @param {sap.ui.core.UIComponent} oComp The component to check
+         * @param {string} sVersion The version to compare with
+         * @returns {boolean} Whether the component has a min version smaller than the given version
          */
         _hasMinVersionSmallerThan: function (oComp, sVersion) {
             var oInfo = oComp.getManifestEntry("sap.ui5");
@@ -253,9 +257,9 @@ sap.ui.define([
                 // check: ShellUIService is available
                 // this check is done after attaching onBeforeRendering since the service is obtained asynchronously
                 const oService = ServiceFactoryRegistry.get("sap.ushell.ui5service.ShellUIService"),
-                    oServiceInstance = oService && oService.createInstance();
+                    oServiceInstancePromise = oService && oService.createInstance();
 
-                if (!oService || !oServiceInstance) {
+                if (!oService || !oServiceInstancePromise) {
                     Log.warning(
                         "Fiori20Adapter not loaded because ShellUIService is not available",
                         "sap.ushell.ui5service.ShellUIService should be declared by configuration",
@@ -264,7 +268,7 @@ sap.ui.define([
                     return;
                 }
 
-                oServiceInstance.then(
+                oServiceInstancePromise.then(
                     (oServiceParam) => Fiori20Adapter.applyTo(oControl, oComponent, oConfig, oServiceParam),
                     (oError) => {
                         Log.warning(
@@ -274,7 +278,6 @@ sap.ui.define([
                         );
                     }
                 );
-
             }
         };
         oControl.addEventDelegate(oDelegate);

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

@@ -10,7 +10,8 @@ sap.ui.define([
     "sap/ui/core/Element",
     "sap/ui/core/EventBus",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/Container"
 ], function (
     Localization,
     Extend,
@@ -18,7 +19,8 @@ sap.ui.define([
     Element,
     EventBus,
     jQuery,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -1273,8 +1275,9 @@ sap.ui.define([
             this.oTabBarItemClickTimer = new Date();
             this.bTabBarModeActive = false;
             this.bOnTabBarElement = false;
-            if (sap.ushell.Container) {
-                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            var oLaunchpageService = Container.getServiceAsync("FlpLaunchPage");
+            if (oLaunchpageService) {
+                oLaunchpageService.then(function (oLaunchPageService) {
                     this.oLaunchPageService = oLaunchPageService;
                     timeoutLayoutInfo();
                 }.bind(this));

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

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

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

@@ -31,16 +31,18 @@
  * Therefore, applications are encouraged to use
  * the <code>AppLifeCycle</code> service in the following way:
  * <pre>
- *    sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycle) {
+ * sap.ui.require(["sap/ushell/Container"], function(Container) {
+ *      Container.getServiceAsync("AppLifeCycle").then(function (oAppLifeCycle) {
  *          oAppLifeCycle.getCurrentApplication().getTechnicalParameter("sap-fiori-id");
- *    });
+ *      });
+ * })
  * </pre>
  *
  * It is also possible to prevent applications from using the technical
  * 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.124.2
+ * @version 1.125.0
  * @private
  */
 sap.ui.define([

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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.0
  * @private
  */
 sap.ui.define([

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

@@ -34,7 +34,7 @@
  *     }
  *   }
  *   </pre>
- * @version 1.124.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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.2
+ * @version 1.125.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) {