@sapui5/sap.ushell 1.124.2 → 1.125.0

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's PluginManager service. Allows handling the loading of Fiori Launchpad plugins.
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -10,14 +10,16 @@ sap.ui.define([
     "sap/ushell/components/applicationIntegration/application/PostMessageAPIInterface",
     "sap/ushell/services/_PluginManager/Extensions",
     "sap/ushell/UI5ComponentType",
-    "sap/ushell/utils"
+    "sap/ushell/utils",
+    "sap/ushell/Container"
 ], function (
     Log,
     jQuery,
     PostMessageAPIInterface,
     fnGetExtensions,
     UI5ComponentType,
-    ushellUtils
+    ushellUtils,
+    Container
 ) {
     "use strict";
 
@@ -176,7 +178,7 @@ sap.ui.define([
                             S_COMPONENT_NAME
                         );
                     } else {
-                        sap.ushell.Container.setXhrLogonTimeout(sComponentUrl, iXhrLogonTimeout);
+                        Container.setXhrLogonTimeout(sComponentUrl, iXhrLogonTimeout);
                     }
                 }
                 return jQuery.ajax(sComponentUrl + "/" + this._getFileNameForXhrAuth(), { dataType: "text" });
@@ -245,7 +247,7 @@ sap.ui.define([
                 oApplicationProperties.oPostMessageInterface = oPostMessageInterface;
             }
 
-            sap.ushell.Container.getServiceAsync("Ui5ComponentLoader")
+            Container.getServiceAsync("Ui5ComponentLoader")
                 .then(function (UI5ComponentLoaderService) {
                     this._handleXhrAuthentication(oApplicationProperties.applicationConfiguration, oComponentOptions.url)
                         .done(function () {

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview resolves references
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -16,7 +16,8 @@ sap.ui.define([
     "sap/ui/model/odata/ODataUtils",
     "sap/ui/model/odata/v4/ODataUtils",
     "sap/ui/thirdparty/jquery",
-    "sap/ushell/User"
+    "sap/ushell/User",
+    "sap/ushell/Container"
 ], function (
     Log,
     Formatting,
@@ -29,7 +30,8 @@ sap.ui.define([
     ODataUtilsV2,
     ODataUtilsV4,
     jQuery,
-    User
+    User,
+    Container
 ) {
     "use strict";
 
@@ -79,25 +81,25 @@ sap.ui.define([
                 sValue = Formatting.getABAPTimeFormat();
             }
             if (sReference === "User.env.sap-language") {
-                sValue = sap.ushell.Container.getUser().getLanguage();
+                sValue = Container.getUser().getLanguage();
             }
             if (sReference === "User.env.sap-languagebcp47") {
-                sValue = sap.ushell.Container.getUser().getLanguageBcp47();
+                sValue = Container.getUser().getLanguageBcp47();
             }
             if (sReference === "User.env.sap-accessibility") {
-                sValue = (sap.ushell.Container.getUser().getAccessibilityMode()) ? "X" : undefined;
+                sValue = (Container.getUser().getAccessibilityMode()) ? "X" : undefined;
             }
             if (sReference === "User.env.sap-statistics") {
                 sValue = (Supportability.isStatisticsEnabled()) ? "true" : undefined;
             }
             if (sReference === "User.env.sap-theme") {
-                sValue = sap.ushell.Container.getUser().getTheme(User.prototype.constants.themeFormat.THEME_NAME_PLUS_URL);
+                sValue = Container.getUser().getTheme(User.prototype.constants.themeFormat.THEME_NAME_PLUS_URL);
             }
             if (sReference === "User.env.sap-theme-name") {
-                sValue = sap.ushell.Container.getUser().getTheme();
+                sValue = Container.getUser().getTheme();
             }
             if (sReference === "User.env.sap-theme-NWBC") {
-                sValue = sap.ushell.Container.getUser().getTheme(User.prototype.constants.themeFormat.NWBC);
+                sValue = Container.getUser().getTheme(User.prototype.constants.themeFormat.NWBC);
             }
             oDeferred.resolve({ value: sValue });
 
@@ -170,12 +172,12 @@ sap.ui.define([
             var bAllRefsResolvable = true;
             var oDistinctRefs = {};
             var oDistinctEnvRefs = {};
-            var oUserDefaultParametersSrvcPromise = sap.ushell.Container.getServiceAsync("UserDefaultParameters");
+            var oUserDefaultParametersSrvcPromise = Container.getServiceAsync("UserDefaultParameters");
             var oResolver;
             var oSystemContextPromise;
 
             if (!oSystemContext) {
-                oSystemContextPromise = sap.ushell.Container.getServiceAsync("ClientSideTargetResolution")
+                oSystemContextPromise = Container.getServiceAsync("ClientSideTargetResolution")
                     .then(function (oCstr) {
                         return oCstr.getSystemContext();
                     });

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The Unified Shell's search service which provides Enterprise Search via SINA.
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define(["sap/ui/core/Lib"], function (Library) {
     "use strict";

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

@@ -3,15 +3,16 @@
 /**
  * @fileOverview The Unified Shell's Search for myHome.
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub",
     "sap/base/util/deepExtend",
-    "sap/ushell/utils/UrlParsing"
-], function (Log, WindowUtils, EventHub, deepExtend, UrlParsing) {
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/Container"
+], function (Log, WindowUtils, EventHub, deepExtend, UrlParsing, Container) {
     "use strict";
 
     var EMPTY_SEARCH_RESULTS = {
@@ -131,7 +132,7 @@ sap.ui.define([
                 }
             }
 
-            return sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavigationService) {
+            return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
                 return oNavigationService.navigate({
                     target: {
                         shellHash: sUrl

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module exposes the searchable content.
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ushell/Config",

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

@@ -2,8 +2,8 @@
 
 /**
  * @fileOverview Shell Navigation Service.
- * @version 1.124.2
- * @deprecated since 1.120
+ * @version 1.125.0
+ * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
  */
 sap.ui.define([
     "sap/base/Log",
@@ -68,7 +68,7 @@ sap.ui.define([
      *
      * @since 1.15.0
      * @public
-     * @deprecated since 1.120
+     * @deprecated since 1.120. Use {@link sap.ushell.services.Navigation} for Navigation instead.
      */
     function ShellNavigation (oContainerInterface, sParameters, oServiceConfiguration) {
         Log.error("Deprecated service call. Please migrate any dependencies to this service.", null, "sap.ushell.services.ShellNavigation");

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

@@ -17,7 +17,8 @@ sap.ui.define([
     "sap/base/util/isEmptyObject",
     "sap/ui/thirdparty/jquery",
     "sap/base/Log",
-    "sap/base/util/deepEqual"
+    "sap/base/util/deepEqual",
+    "sap/ushell/Container"
 ], function (
     EventBus,
     ushellLibrary,
@@ -31,7 +32,8 @@ sap.ui.define([
     isEmptyObject,
     jQuery,
     Log,
-    deepEqual
+    deepEqual,
+    Container
 ) {
     "use strict";
 
@@ -328,7 +330,7 @@ sap.ui.define([
             return oDeferred.resolve(oParams).promise();
         }
 
-        sap.ushell.Container.getServiceAsync("AppState")
+        Container.getServiceAsync("AppState")
             .then(function (AppStateService) {
                 var oSaveContext = new StoreContext(AppStateService, oComponent, bTransient);
                 var oResult = UrlShortening.compactHash(sHash, aRetainParameterList, oSaveContext);
@@ -381,8 +383,6 @@ sap.ui.define([
      *    whether the response should be returned in verbose format. If
      *    this flag is set to true, this function returns an object
      *    instead of a string.
-     * @param {object} [oComponent]
-     *    an optional instance of sap.ui.core.UIComponent
      * @returns {Promise<object>}
      *    <p>a string that can be put into an href attribute of an
      *    HTML anchor.  The returned string will always start with a
@@ -409,7 +409,7 @@ sap.ui.define([
      * @since 1.15.0
      * @private
      */
-    ShellNavigationHashChanger.prototype.hrefForExternal = function (oArgs, bVerbose, oComponent) {
+    ShellNavigationHashChanger.prototype.hrefForExternal = function (oArgs, bVerbose) {
         // must encode the result
         function encodeResult (vResult, bIsVerbose) {
             if (bIsVerbose === true) {
@@ -420,7 +420,7 @@ sap.ui.define([
             return vResult;
         }
 
-        return this.hrefForExternalNoEncAsync(oArgs, bVerbose, oComponent).then(function (vResult) {
+        return this.hrefForExternalNoEncAsync(oArgs, bVerbose).then(function (vResult) {
             return encodeResult(vResult, bVerbose);
         });
     };
@@ -534,29 +534,23 @@ sap.ui.define([
         if (bAsync) {
             var oDeferred = new jQuery.Deferred();
 
-            this.hrefForExternalNoEncAsync(oArgs, bVerbose, oComponent)
+            this.hrefForExternalNoEncAsync(oArgs, bVerbose)
                 .then(oDeferred.resolve)
                 .catch(oDeferred.reject);
 
             return oDeferred.promise();
         }
 
-        var oResult;
-        var AppStateService = sap.ushell.Container.getService("AppState"); // LEGACY API (deprecated)
-        var oSaveContext = new StoreContext(AppStateService, oComponent);
-
-        var oTmp = this.privhrefForExternalNoEnc(oArgs, oSaveContext);
+        var oTmp = this.privhrefForExternalNoEnc(oArgs);
         if (bVerbose === true) {
-            oResult = {
+            return {
                 hash: oTmp.hash,
                 params: oTmp.params,
                 skippedParams: oTmp.skippedParams
             };
-        } else {
-            oResult = oTmp.hash;
         }
 
-        return oResult;
+        return oTmp.hash;
     };
 
     /**
@@ -567,8 +561,6 @@ sap.ui.define([
      *     object encoding a semantic object and action
      * @param {boolean} [bVerbose]
      *    whether the response should be returned in verbose format.
-     * @param {object} [oComponent]
-     *    an optional instance of sap.ui.core.UIComponent
      *
      * @returns {Promise<object>}
      *    <p>Promise resolving a string that can be put into an href
@@ -578,47 +570,40 @@ sap.ui.define([
      * @since 1.95.0
      * @private
      */
-    ShellNavigationHashChanger.prototype.hrefForExternalNoEncAsync = function (oArgs, bVerbose, oComponent) {
-        return sap.ushell.Container.getServiceAsync("AppState")
-            .then(function (AppStateService) {
-                var oResult;
-                var oSaveContext = new StoreContext(AppStateService, oComponent);
-
-                var oTmp = this.privhrefForExternalNoEnc(oArgs, oSaveContext);
-                if (bVerbose === true) {
-                    oResult = {
-                        hash: oTmp.hash,
-                        params: oTmp.params,
-                        skippedParams: oTmp.skippedParams
-                    };
-                } else {
-                    oResult = oTmp.hash;
-                }
+    ShellNavigationHashChanger.prototype.hrefForExternalNoEncAsync = function (oArgs, bVerbose) {
+        var vResult;
 
-                return new Promise(function (resolve, reject) {
-                    oSaveContext.getPromise()
-                        .done(function () {
-                            resolve(oResult);
-                        })
-                        .fail(reject);
-                });
-            }.bind(this));
+        var oTmp = this.privhrefForExternalNoEnc(oArgs);
+        if (bVerbose === true) {
+            vResult = {
+                hash: oTmp.hash,
+                params: oTmp.params,
+                skippedParams: oTmp.skippedParams
+            };
+        } else {
+            vResult = oTmp.hash;
+        }
+
+        return new Promise(function (resolve) {
+            resolve(vResult);
+
+        });
     };
 
     /**
      * Shortened(!)
      * @param {object} oArgs arguments
-     * @param {object} oSaveContext Save context
-     * @returns {string} Shell hash
+     * @returns {object} Object with at least member "hash", containing THE hash
      */
-    ShellNavigationHashChanger.prototype.privhrefForExternalNoEnc = function (oArgs, oSaveContext) {
+    ShellNavigationHashChanger.prototype.privhrefForExternalNoEnc = function (oArgs) {
         if (oArgs === undefined) {
             return this.privgetCurrentShellHash();
         }
         // construct url
         if (oArgs && oArgs.target && (typeof oArgs.target.semanticObject === "string" || typeof oArgs.target.shellHash === "string")) {
-            const sHash = "#" + this.privconstructShellHash(oArgs);
-            return UrlShortening.compactHash(sHash, undefined, oSaveContext);
+            return {
+                hash: "#" + this.privconstructShellHash(oArgs)
+            };
         }
         return this.privgetCurrentShellHash();
     };
@@ -664,7 +649,7 @@ sap.ui.define([
      *
      * constructs sth. like    http://....ushell#AnObject-Action?A=B ....
      * and navigates to it.
-     * @param {object} oComponent runtime
+     * @param {object} oComponent runtime - not in use anymore!
      * @param {boolean} bWriteHistory
      *     set to false to invoke replaceHash
      *
@@ -673,13 +658,10 @@ sap.ui.define([
      * @private
      */
     ShellNavigationHashChanger.prototype.toExternal = function (oArgs, oComponent, bWriteHistory) {
-        return sap.ushell.Container.getServiceAsync("AppState")
-            .then(function (AppStateService) {
-                var oSaveContext = new StoreContext(AppStateService, oComponent);
-                var sHash = this.privhrefForExternalNoEnc(oArgs, oSaveContext).hash; // shortened!
-                var sAppHash = this.privgetAppHash(oArgs);
-                this.privsetHash(sHash, sAppHash, bWriteHistory);
-            }.bind(this));
+        var sHash = this.privhrefForExternalNoEnc(oArgs).hash;
+        var sAppHash = this.privgetAppHash(oArgs);
+        this.privsetHash(sHash, sAppHash, bWriteHistory);
+        return Promise.resolve();
     };
 
     /**

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

@@ -7,7 +7,7 @@ sap.ui.define([
     "sap/ui/core/EventBus",
     "sap/ushell/services/ShellNavigationHashChanger",
     "sap/ui/core/routing/HashChanger"
-], function(EventBus, ShellNavigationHashChanger, HashChanger) {
+], function (EventBus, ShellNavigationHashChanger, HashChanger) {
     "use strict";
 
     /* global hasher */

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

@@ -12,20 +12,22 @@
  * it is pertinent that the API user employs this service's version of <code>toExternal()</code> for cross application
  * navigation (instead) of using the one provided by CrossApplicationNavigation service.</p>
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
     "sap/ushell/utils",
     "sap/ushell/services/AppConfiguration",
     "sap/base/Log",
-    "sap/ushell/utils/UrlParsing"
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/Container"
 ], function (
     jQuery,
     utils,
     AppConfiguration,
     Log,
-    UrlParsing
+    UrlParsing,
+    Container
 ) {
     "use strict";
 
@@ -63,8 +65,8 @@ sap.ui.define([
     function SmartNavigation (oContainerInterface, sParameters, oServiceConfig) {
         this._oServiceConfig = oServiceConfig;
 
-        this._oCrossAppNavigationServicePromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
-        this._oPersonalizationServicePromise = sap.ushell.Container.getServiceAsync("Personalization");
+        this._oCrossAppNavigationServicePromise = Container.getServiceAsync("CrossApplicationNavigation");
+        this._oPersonalizationServicePromise = Container.getServiceAsync("Personalization");
 
         this._oHashCodeCache = { "": 0 };
     }
@@ -226,7 +228,7 @@ sap.ui.define([
         );
 
         // Container.getService is OK because alternatives are provided for external use. The function is not called by ushell itself.
-        var CrossApplicationNavigationService = sap.ushell.Container.getService("CrossApplicationNavigation"); // LEGACY API (deprecated)
+        var CrossApplicationNavigationService = Container.getService("CrossApplicationNavigation"); // LEGACY API (deprecated)
 
         return CrossApplicationNavigationService.hrefForExternal.apply(CrossApplicationNavigationService, arguments);
     };

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview APIs for the S/4 MyHome
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ushell/Config",
@@ -11,7 +11,8 @@ sap.ui.define([
     "sap/ui/thirdparty/hasher",
     "sap/ushell/utils/WindowUtils",
     "sap/base/Log",
-    "sap/ushell/EventHub"
+    "sap/ushell/EventHub",
+    "sap/ushell/Container"
 ], function (
     Config,
     deepClone,
@@ -19,7 +20,8 @@ sap.ui.define([
     hasher,
     WindowUtils,
     Log,
-    EventHub
+    EventHub,
+    Container
 ) {
     "use strict";
 
@@ -73,7 +75,7 @@ sap.ui.define([
      */
     SpaceContent.prototype.getPage = function (pageId) {
         var oPagesService;
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oService) {
                 oPagesService = oService;
                 return oPagesService.loadPage(pageId);
@@ -96,7 +98,7 @@ sap.ui.define([
      */
     SpaceContent.prototype.getPages = function (pageIds) {
         var oPagesService;
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oService) {
                 oPagesService = oService;
                 return oPagesService.loadPages(pageIds);
@@ -126,7 +128,7 @@ sap.ui.define([
      * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
      */
     SpaceContent.prototype.addSection = function (pageId, sectionIndex, sectionProperties) {
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oPagesService) {
                 var iPageIndex = oPagesService.getPageIndex(pageId);
                 return oPagesService.addSection(iPageIndex, sectionIndex, sectionProperties);
@@ -150,7 +152,7 @@ sap.ui.define([
      * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
      */
     SpaceContent.prototype.addVisualization = function (pageId, sectionId, vizId) {
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oPagesService) {
                 return oPagesService.addVisualization(pageId, sectionId, vizId);
             });
@@ -172,7 +174,7 @@ sap.ui.define([
      * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
      */
     SpaceContent.prototype.moveVisualization = function (pageId, sourceSectionIndex, sourceVisualizationIndex, targetSectionIndex, targetVisualizationIndex) {
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oPagesService) {
                 var iPageIndex = oPagesService.getPageIndex(pageId);
                 return oPagesService.moveVisualization(iPageIndex, sourceSectionIndex, sourceVisualizationIndex, targetSectionIndex, targetVisualizationIndex);
@@ -208,7 +210,7 @@ sap.ui.define([
             info: visualizationData.info
         };
 
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oPagesService) {
                 var iPageIndex = oPagesService.getPageIndex(pageId);
                 return oPagesService.updateVisualization(iPageIndex, sectionIndex, visualizationIndex, oVisualizationDataToUpdate);
@@ -229,7 +231,7 @@ sap.ui.define([
      * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
      */
     SpaceContent.prototype.deleteVisualization = function (pageId, sectionIndex, visualizationIndex) {
-        return sap.ushell.Container.getServiceAsync("Pages")
+        return Container.getServiceAsync("Pages")
             .then(function (oPagesService) {
                 var iPageIndex = oPagesService.getPageIndex(pageId);
                 return oPagesService.deleteVisualization(iPageIndex, sectionIndex, visualizationIndex);
@@ -249,7 +251,7 @@ sap.ui.define([
      * @ui5-restricted Used by S/4 MyHome (ux.eng.s4producthomes1)
      */
     SpaceContent.prototype.instantiateVisualization = function (vizData) {
-        return sap.ushell.Container.getServiceAsync("VisualizationInstantiation")
+        return Container.getServiceAsync("VisualizationInstantiation")
             .then(function (oVisualizationInstantiationService) {
                 return oVisualizationInstantiationService.instantiateVisualization(vizData);
             });
@@ -298,7 +300,7 @@ sap.ui.define([
                         url: url,
                         appId: url
                     };
-                    sap.ushell.Container.getRendererInternal("fiori2").logRecentActivity(oRecentEntry);
+                    Container.getRendererInternal("fiori2").logRecentActivity(oRecentEntry);
                 }
             }
 
@@ -367,8 +369,8 @@ sap.ui.define([
         var oCSTRService;
 
         return Promise.all([
-            sap.ushell.Container.getServiceAsync("ClientSideTargetResolution"),
-            sap.ushell.Container.getServiceAsync("UserDefaultParameters")
+            Container.getServiceAsync("ClientSideTargetResolution"),
+            Container.getServiceAsync("UserDefaultParameters")
         ])
             .then(function (oResult) {
                 oCSTRService = oResult[0];

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's UI tracing service.
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ushell/EventHub",

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

@@ -16,12 +16,14 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/base/Object",
     "sap/ushell/utils",
-    "sap/ushell/utils/UrlParsing"
+    "sap/ushell/utils/UrlParsing",
+    "sap/ushell/Container"
 ], function (
     Log,
     BaseObject,
     utils,
-    UrlParsingUtil
+    UrlParsingUtil,
+    Container
 ) {
     "use strict";
 
@@ -393,7 +395,7 @@ sap.ui.define([
             }
 
             // Container.getService is OK here. The NavTargetResolutionInternal service should be present already and the function is deprecated.
-            var oResolution = sap.ushell.Container.getService("NavTargetResolutionInternal").getCurrentResolution(); // LEGACY API (deprecated)
+            var oResolution = Container.getService("NavTargetResolutionInternal").getCurrentResolution(); // LEGACY API (deprecated)
             // note: if component is specified but lacks sap-system, we do not do a fallback!
             if (!sSystem && !vComponentOrSystem && oResolution && oResolution.url) {
                 sSystem = new URL(oResolution.url, window.location.href).searchParams.get("sap-system");
@@ -408,7 +410,7 @@ sap.ui.define([
                 sServiceUrl = sServiceUrl.replace(/(\/[^?]*?)(\/$|$|(\/?\?.*))/, "$1;o=" + sSystem + "$2");
             }
 
-            sap.ushell.Container.addRemoteSystemForServiceUrl(sServiceUrl);
+            Container.addRemoteSystemForServiceUrl(sServiceUrl);
             return sServiceUrl;
         };
     }

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

@@ -6,7 +6,7 @@
  * Service wrapper for the sap/ushell/utils/UrlShortening module.
  * @deprecated since 1.118. Please use the UrlShortening module directly.
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
  sap.ui.define(["sap/ushell/utils/UrlShortening"], function (UrlShortening) {
     "use strict";

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

@@ -1,7 +1,7 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 /**
  * @fileOverview The URLTemplate service provides utilities when working with URL templates
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/ushell/utils",

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's UI5 component loader service.
  * This is a shell-internal service and no public or application facing API!
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",

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

@@ -14,18 +14,20 @@
  *
  * This is *not* an application facing service, but for Shell Internal usage.
  *
- * @version 1.124.2
+ * @version 1.125.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/base/util/deepExtend",
     "sap/base/util/ObjectPath",
-    "sap/ui/thirdparty/jquery"
+    "sap/ui/thirdparty/jquery",
+    "sap/ushell/Container"
 ], function (
     Log,
     deepExtend,
     ObjectPath,
-    jQuery
+    jQuery,
+    Container
 ) {
     "use strict";
 
@@ -89,7 +91,7 @@ sap.ui.define([
     UserDefaultParameterPersistence.prototype._getSystemContextPromise = function (oSystemContext) {
         if (!oSystemContext) {
             Log.warning("UserDefaultParameterPersistence: The systemContext was not provided, using defaultSystemContext as fallback");
-            return sap.ushell.Container.getServiceAsync("ClientSideTargetResolution")
+            return Container.getServiceAsync("ClientSideTargetResolution")
                 .then(function (oCSTR) {
                     return oCSTR.getSystemContext();
                 });