@sapui5/sap.ushell 1.124.1 → 1.125.0

package/src/main/js/sap/ushell/components/CatalogsManager.js

@@ -19,7 +19,8 @@ sap.ui.define([
     "sap/ui/performance/Measurement",
     "sap/base/Log",
     "sap/ushell/Config",
-    "sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils"
+    "sap/ushell/adapters/cdm/v3/_LaunchPage/readUtils",
+    "sap/ushell/Container"
 ], function (
     BaseObject,
     EventBus,
@@ -35,7 +36,8 @@ sap.ui.define([
     Measurement,
     Log,
     Config,
-    LaunchPageReadUtils
+    LaunchPageReadUtils,
+    Container
 ) {
     "use strict";
 
@@ -65,7 +67,7 @@ sap.ui.define([
         _aDoables: [],
 
         constructor: function (sId, mSettings) {
-            this.oLaunchPageServicePromise = sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            this.oLaunchPageServicePromise = Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                 this.oLaunchPageService = oLaunchPageService;
                 return oLaunchPageService;
             }.bind(this));
@@ -98,11 +100,11 @@ sap.ui.define([
             // Doable objects are kept in a global array to enable their off-ing later on.
             this._aDoables = [];
             /**
-             * @deprecated As of version 1.121
+             * @deprecated As of version 1.120
              */
             this._aDoables.push(EventHub.on("showCatalog").do(this.updateTilesAssociation.bind(this)));
             /**
-             * @deprecated As of version 1.121
+             * @deprecated As of version 1.120
              */
             this._aDoables.push(EventHub.on("updateGroups").do(this.updateTilesAssociation.bind(this)));
         },
@@ -133,7 +135,7 @@ sap.ui.define([
             // this sets a Done callback on the promise object of the groups.
             var setDoneCBForGroups = function () {
                 /**
-                 * @deprecated As of version 1.121
+                 * @deprecated As of version 1.120
                  */
                 oGroupsPromise.done(function () {
                     var aGroups = that.getModel().getProperty("/groups");
@@ -144,6 +146,9 @@ sap.ui.define([
             };
 
             if (!this.oModel.getProperty("/catalogs")) {
+                /**
+                * @deprecated As of version 1.120
+                */
                 // catalog also needs groups
                 if (!this.oModel.getProperty("/groups") || this.oModel.getProperty("/groups").length === 0) {
                     //Because of segmentation, some pins can be not selected
@@ -202,7 +207,7 @@ sap.ui.define([
         },
 
         /**
-         * @deprecated As of version 1.121
+         * @deprecated As of version 1.120
          */
         updateTilesAssociation: function () {
             this.mapCatalogTilesToGroups();
@@ -211,7 +216,7 @@ sap.ui.define([
         },
 
         /**
-         * @deprecated As of version 1.121
+         * @deprecated As of version 1.120
          */
         mapCatalogTilesToGroups: function () {
             var that = this;
@@ -242,7 +247,7 @@ sap.ui.define([
         },
 
         /**
-         * @deprecated As of version 1.121
+         * @deprecated As of version 1.120
          */
         updateCatalogTilesToGroupsMap: function () {
             var tileId;
@@ -525,15 +530,18 @@ sap.ui.define([
          * @private
          */
         _getCatalogTileId: function (oCatalogTile) {
-            var sCatalogTileId;
-            var bSpacesEnabled = Config.last("/core/spaces/enabled");
+            var sCatalogTileId = this.oLaunchPageService.getStableCatalogTileId(oCatalogTile);
 
-            if (bSpacesEnabled) {
-                sCatalogTileId = this.oLaunchPageService.getStableCatalogTileId(oCatalogTile);
+            /**
+             * @deprecated As of version 1.120
+             */
+            if (!Config.last("/core/spaces/enabled")) {
+                // set to null as getStableCatalogTileId is behaving like this
+                sCatalogTileId = null;
             }
 
             // Always fallback on the catalogTileId.
-            // Either getStableCatalogTileId is not implemented by the LaunchPageAdapter or spaces is disabled.
+            // getStableCatalogTileId is not implemented by the LaunchPageAdapter.
             if (!sCatalogTileId) {
                 sCatalogTileId = this.oLaunchPageService.getCatalogTileId(oCatalogTile);
             }
@@ -546,7 +554,7 @@ sap.ui.define([
             const associatedGrps = this.oTileCatalogToGroupsMap[catalogTileId] || [];
             const tileTags = this.oLaunchPageService.getCatalogTileTags(oCatalogTile) || [];
             const catalogTileContentProviderId = this.oLaunchPageService.getCatalogTileContentProviderId(oCatalogTile);
-            const catalogTileContentProviderLabel = await LaunchPageReadUtils.getContentProviderLabel(catalogTileContentProviderId) || catalogTileContentProviderId;
+            const catalogTileContentProviderLabel = (await LaunchPageReadUtils.getContentProviderLabel(catalogTileContentProviderId)) || catalogTileContentProviderId;
             if (tileTags.length > 0) {
                 this.tagsPool = this.tagsPool.concat(tileTags);
             }
@@ -874,7 +882,7 @@ sap.ui.define([
         resetAssociationOnFailure: function (sMsgId, aParameters) {
             this.notifyOnActionFailure(sMsgId, aParameters);
             /**
-             * @deprecated As of version 1.121
+             * @deprecated As of version 1.120
              */
             this.updateTilesAssociation();
         },

package/src/main/js/sap/ushell/components/ComponentKeysHandler.js

@@ -10,7 +10,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/renderer/AccessKeysHandler",
     "sap/ushell/bootstrap/common/common.load.model",
-    "sap/ushell/ui/launchpad/Tile"
+    "sap/ushell/ui/launchpad/Tile",
+    "sap/ushell/Container"
 ], function (
     Localization,
     Element,
@@ -21,7 +22,8 @@ sap.ui.define([
     Log,
     AccessKeysHandler,
     oModelWrapper,
-    Tile
+    Tile,
+    Container
 ) {
     "use strict";
 
@@ -49,7 +51,7 @@ sap.ui.define([
 
             // performance optimization: don't load Launchpage service on the CDM platform
             // to avoid site loading - link personalization is anyway always enabled on CDM platform
-            if (sap.ushell.Container.getLogonSystem().getPlatform() === "cdm") {
+            if (Container.getLogonSystem().getPlatform() === "cdm") {
                 return Promise.resolve();
             }
 
@@ -57,7 +59,7 @@ sap.ui.define([
              * @deprecated As of version 1.120
              */
             if (!this.oLaunchPageService) {
-                return sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+                return Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                     this.oLaunchPageService = oLaunchPageService;
                 }.bind(this));
             }
@@ -527,11 +529,11 @@ sap.ui.define([
                 return null;
             }
 
-            var oCurTile = jqTile.control(0);
+            var oCurTile = Element.closestTo(jqTile[0]);
 
             oCurTile.isLink = jqTile.hasClass("sapUshellLinkTile") || jqTile.hasClass("sapMGTLineMode");
 
-            var oGroup = jqTile.closest(".sapUshellTileContainer").control(0);
+            var oGroup = Element.closestTo(jqTile.closest(".sapUshellTileContainer")[0]);
 
             if (!oGroup) {
                 return null;
@@ -646,7 +648,7 @@ sap.ui.define([
                         if (sDirection === "up" || sDirection === "left") {
                             var sSelector = sDirection === "up" ? "first" : "last";
 
-                            if (!this._goToTileOfGroup(sSelector, jqNextTileContainer.control(0))) {
+                            if (!this._goToTileOfGroup(sSelector, Element.closestTo(jqNextTileContainer[0]))) {
                                 jqNextTileContainerHeader.focus();
                             }
                         }
@@ -985,7 +987,7 @@ sap.ui.define([
                 var jqGroup = jqFocused.closest(".sapUshellTileContainer");
 
                 if (jqGroup) {
-                    var oGroup = jqGroup.control(0);
+                    var oGroup = Element.closestTo(jqGroup[0]);
 
                     if (oGroup) {
                         this._preventDefault(oEvent);
@@ -1026,21 +1028,21 @@ sap.ui.define([
                 return;
             }
             if (jqTile.hasClass("sapFCard")) {
-                jqTile.control(0).getCardHeader().firePress();
+                Element.closestTo(jqTile[0]).getCardHeader().firePress();
                 return;
             }
 
             // ssb tiles have a genericTile that can be found with this
             var jqClosestButton = jqFocused.find("[role=button], a.sapMGT"); // Generic tiles may be rendered either as buttons or as links
             if (jqClosestButton.length && !this.oModel.getProperty("/tileActionModeActive")) {
-                var oButtonControl = jqClosestButton.control(0);
+                var oButtonControl = Element.closestTo(jqClosestButton[0]);
                 if (oButtonControl) {
                     oButtonControl.firePress();
                     return;
                 }
             }
 
-            jqTile.control(0).firePress();
+            Element.closestTo(jqTile[0]).firePress();
         },
 
         goToSelectedAnchorNavigationItem: function () {
@@ -1049,7 +1051,7 @@ sap.ui.define([
         },
 
         handleFocusOnMe: function (oEvent, bFocusPassedFirstTime) {
-            var oRenderer = sap.ushell.Container.getRendererInternal("fiori2"),
+            var oRenderer = Container.getRendererInternal("fiori2"),
                 handler = ComponentKeysHandler._instance;
 
             if (oRenderer) {

package/src/main/js/sap/ushell/components/HomepageManager.js

@@ -34,7 +34,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/base/util/extend",
     "sap/ui/performance/Measurement",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/Container"
 ], function (
     jQuery,
     Core,
@@ -64,7 +65,8 @@ sap.ui.define([
     Log,
     extend,
     Measurement,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -108,7 +110,7 @@ sap.ui.define([
                 return oHomepageManagerInstance;
             }
 
-            this.oServiceLoadingPromise = sap.ushell.Container.getServiceAsync("FlpLaunchPage")
+            this.oServiceLoadingPromise = Container.getServiceAsync("FlpLaunchPage")
                 .then(function (oLaunchPageService) {
                     this.oPageBuilderService = oLaunchPageService;
                     // add Remove action for all tiles
@@ -484,7 +486,7 @@ sap.ui.define([
             delete oData.group;
 
             function addBookmark () {
-                sap.ushell.Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                     oBookmarkService.addBookmark(oData, tileGroup)
                         .then(function () {
                             // the tile is added to our model in "_addBookmarkToModel" here we just show the success toast.

package/src/main/js/sap/ushell/components/MessagingHelper.js

@@ -1,8 +1,9 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ushell/resources"
-], function (resources) {
+    "sap/ushell/resources",
+    "sap/ushell/Container"
+], function(resources, Container) {
     "use strict";
 
     return {
@@ -35,7 +36,7 @@ sap.ui.define([
      *      The message type (optional)
      */
     function showLocalizedMessage (sMsgId, oParams, iType) {
-        sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
+        Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
             oMessageService.show(iType || oMessageService.Type.INFO, getLocalizedText(sMsgId, oParams), oParams);
         });
     }
@@ -49,7 +50,7 @@ sap.ui.define([
      *
      */
     function showLocalizedError (sMsgId, oParams) {
-        sap.ushell.Container.getServiceAsync("Message").then(function (oMessageService) {
+        Container.getServiceAsync("MessageInternal").then(function (oMessageService) {
             oMessageService.show(oMessageService.Type.ERROR, getLocalizedText(sMsgId, oParams), oParams);
         });
     }

package/src/main/js/sap/ushell/components/SharedComponentUtils.js

@@ -5,13 +5,15 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/base/Log",
-    "sap/ui/core/Component"
+    "sap/ui/core/Component",
+    "sap/ushell/Container"
 ], function (
     Device,
     Config,
     EventHub,
     Log,
-    Component
+    Component,
+    Container
 ) {
     "use strict";
 
@@ -91,7 +93,7 @@ sap.ui.define([
          * @private
          */
         _getPersonalization: function (sItem) {
-            return oSharedComponentUtils.getPersonalizer(sItem, sap.ushell.Container.getRendererInternal("fiori2"))
+            return oSharedComponentUtils.getPersonalizer(sItem, Container.getRendererInternal("fiori2"))
                 .then(function (oPersonalizer) {
                     return oPersonalizer.getPersData();
                 })
@@ -108,7 +110,7 @@ sap.ui.define([
          * @private
          */
         getPersonalizer: function (sItem, oComponent) {
-            return sap.ushell.Container.getServiceAsync("PersonalizationV2")
+            return Container.getServiceAsync("PersonalizationV2")
                 .then(function (oPersonalizationService) {
                     var oOwnerComponent = Component.getOwnerComponentFor(oComponent);
                     var oScope = {

package/src/main/js/sap/ushell/components/_HeaderManager/ControlManager.js

@@ -5,13 +5,15 @@ sap.ui.define([
     "sap/m/library",
     "sap/ui/core/Element",
     "sap/ushell/EventHub",
-    "sap/ushell/resources"
-], function(
+    "sap/ushell/resources",
+    "sap/ushell/Container"
+], function (
     Avatar,
     mobileLibrary,
     Element,
     EventHub,
-    resources
+    resources,
+    Container
 ) {
     "use strict";
 
@@ -43,7 +45,7 @@ sap.ui.define([
 
     function _createUserActionsMenuButton (oShellModel) {
         var sId = "userActionsMenuHeaderButton",
-            oUser = sap.ushell.Container.getUser(),
+            oUser = Container.getUser(),
             sTooltip = resources.i18n.getText("UserActionsMenuToggleButtonAria", [oUser.getFullName() || oUser.getId()]);
 
         var oUserActionsMenuAvatar = new Avatar({

package/src/main/js/sap/ushell/components/_HeaderManager/ShellHeader.controller.js

@@ -11,7 +11,8 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/EventHub",
     "sap/ushell/library",
-    "sap/ushell/ui/shell/OverflowListItem"
+    "sap/ushell/ui/shell/OverflowListItem",
+    "sap/ushell/Container"
 ], function (
     mobileLibrary,
     Element,
@@ -23,7 +24,8 @@ sap.ui.define([
     Config,
     EventHub,
     ushellLibrary,
-    OverflowListItem
+    OverflowListItem,
+    Container
 ) {
     "use strict";
 
@@ -137,7 +139,7 @@ sap.ui.define([
 
                         var sTarget = oShellHeadItem.getTarget();
                         if (sTarget) {
-                            sap.ushell.Container.getServiceAsync("Navigation").then(function (oNavService) {
+                            Container.getServiceAsync("Navigation").then(function (oNavService) {
                                 oNavService.navigate({ target: { shellHash: sTarget } });
                             });
                         }

package/src/main/js/sap/ushell/components/_HomepageManager/PersistentPageOperationAdapter.js

@@ -15,7 +15,8 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ui/performance/Measurement",
     "sap/m/library",
-    "sap/base/util/deepEqual"
+    "sap/base/util/deepEqual",
+    "sap/ushell/Container"
 ], function (
     BaseObject,
     Config,
@@ -26,7 +27,8 @@ sap.ui.define([
     Log,
     Measurement,
     mobileLibrary,
-    deepEqual
+    deepEqual,
+    Container
 ) {
     "use strict";
 

package/src/main/js/sap/ushell/components/appfinder/AppFinder.controller.js

@@ -5,28 +5,30 @@ sap.ui.define([
     "sap/ui/core/mvc/View",
     "sap/ui/core/mvc/Controller",
     "sap/ui/core/Component",
-    "sap/ushell/ui5service/ShellUIService",
     "sap/ushell/EventHub",
     "sap/ushell/components/appfinder/VisualizationOrganizerHelper",
     "sap/ui/core/routing/HashChanger",
     "sap/ui/thirdparty/jquery",
     "sap/ui/model/json/JSONModel",
     "sap/ui/Device",
-    "sap/ui/thirdparty/hasher"
+    "sap/ui/thirdparty/hasher",
+    "sap/ushell/components/applicationIntegration/AppLifeCycle",
+    "sap/ushell/Container"
 ], function (
     extend,
     EventBus,
     View,
     Controller,
     Component,
-    ShellUIService,
     EventHub,
     VisualizationOrganizerHelper,
     HashChanger,
     jQuery,
     JSONModel,
     Device,
-    hasher
+    hasher,
+    AppLifeCycleAI,
+    Container
 ) {
     "use strict";
 
@@ -54,8 +56,8 @@ sap.ui.define([
 
             this.bShowEasyAccessMenu = bEnableOneEasyAccessMenu && bIsDeviceEasyAccessMenuCompatible;
 
-            sap.ushell.Container.getRendererInternal("fiori2").createExtendedShellState("appFinderExtendedShellState", function () {
-                sap.ushell.Container.getRendererInternal("fiori2").showHeaderItem("backBtn", true);
+            Container.getRendererInternal("fiori2").createExtendedShellState("appFinderExtendedShellState", function () {
+                Container.getRendererInternal("fiori2").showHeaderItem("backBtn", true);
             });
 
             // model
@@ -283,9 +285,8 @@ sap.ui.define([
                     return;
                 }
 
-                if (sap.ushell.Container) {
-                    sap.ushell.Container.getRendererInternal("fiori2").applyExtendedShellState("appFinderExtendedShellState");
-                }
+                Container.getRendererInternal("fiori2").applyExtendedShellState("appFinderExtendedShellState");
+
                 this._updateShellHeader(this.oView.oPage.getTitle());
             }.bind(this), 0);
         },
@@ -311,7 +312,7 @@ sap.ui.define([
             if (this.bEnableEasyAccessOnTablet) {
                 // We need to filter out the Shell-startWDA and Shell-startGUI systems
                 // that do not support tablet
-                sap.ushell.Container.getServiceAsync("NavTargetResolutionInternal").then(function (oService) {
+                Container.getServiceAsync("NavTargetResolutionInternal").then(function (oService) {
                     // Shell-startWDA often requires the additional parameter sap-ui2-wd-app-id
                     // and Shell-startGUI requires the additional parameter sap-ui2-tcode
                     // We are providing these with a placeholder value to be able to use
@@ -617,7 +618,7 @@ sap.ui.define([
             // If sPath is defined and is different than empty string - set the group context id.
             // The recursive call is needed in order to wait until groups data is inserted to the model
             if (sPath && sPath !== "") {
-                sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+                Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                     var timeoutGetGroupDataFromModel = function () {
                         var aModelGroups = oModel.getProperty("/groups");
                         if (aModelGroups.length) {
@@ -640,7 +641,7 @@ sap.ui.define([
          */
         getSystems: function (sMenuType) {
             var oDeferred = new jQuery.Deferred();
-            sap.ushell.Container.getServiceAsync("ClientSideTargetResolution")
+            Container.getServiceAsync("ClientSideTargetResolution")
                 .then(function (oCSTRService) {
                     oCSTRService.getEasyAccessSystems(sMenuType).done(function (oSystems) {
                         var systemsModel = [];
@@ -663,19 +664,13 @@ sap.ui.define([
             return oDeferred.promise();
         },
 
-        _initializeShellUIService: function () {
-            this.oShellUIService = new ShellUIService({
-                scopeObject: this.getOwnerComponent(),
-                scopeType: "component"
-            });
-        },
-
         _updateShellHeader: function (sTitle) {
-            if (!this.oShellUIService) {
-                this._initializeShellUIService();
+            //Todo: Replace with new ShellUIService once available
+            var oShellUIService = AppLifeCycleAI.getShellUIService();
+            if (oShellUIService) {
+                oShellUIService.setTitle(sTitle);
+                oShellUIService.setHierarchy();
             }
-            this.oShellUIService.setTitle(sTitle);
-            this.oShellUIService.setHierarchy();
         },
 
         /**

package/src/main/js/sap/ushell/components/appfinder/Catalog.controller.js

@@ -20,7 +20,8 @@ sap.ui.define([
     "sap/ushell/components/appfinder/VisualizationOrganizerHelper",
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub",
-    "sap/base/Log"
+    "sap/base/Log",
+    "sap/ushell/Container"
 ], function (
     extend,
     Element,
@@ -41,7 +42,8 @@ sap.ui.define([
     VisualizationOrganizerHelper,
     WindowUtils,
     EventHub,
-    Log
+    Log,
+    Container
 ) {
     "use strict";
 
@@ -61,7 +63,7 @@ sap.ui.define([
             /**
              * @deprecated As of version 1.120
              */
-            sap.ushell.Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
                 this.oLaunchPageService = oLaunchPageService;
             }.bind(this));
 
@@ -651,7 +653,7 @@ sap.ui.define([
                             url: sUrl,
                             appId: sUrl
                         };
-                        sap.ushell.Container.getRendererInternal("fiori2").logRecentActivity(oRecentEntry);
+                        Container.getRendererInternal("fiori2").logRecentActivity(oRecentEntry);
                     }
 
                     WindowUtils.openURL(sUrl, "_blank");

package/src/main/js/sap/ushell/components/appfinder/Component.js

@@ -7,7 +7,8 @@ sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/bootstrap/common/common.load.model",
     "sap/ushell/components/SharedComponentUtils",
-    "sap/base/util/UriParameters"
+    "sap/base/util/UriParameters",
+    "sap/ushell/Container"
 ], function (
     UIComponent,
     hasher,
@@ -16,7 +17,8 @@ sap.ui.define([
     Config,
     oModelWrapper,
     oSharedComponentUtils,
-    UriParameters
+    UriParameters,
+    Container
 ) {
     "use strict";
 
@@ -64,8 +66,8 @@ sap.ui.define([
             sHash = hasher.getHash();
 
             Promise.all([
-                sap.ushell.Container.getServiceAsync("ShellNavigationInternal"),
-                sap.ushell.Container.getServiceAsync("URLParsing")
+                Container.getServiceAsync("ShellNavigationInternal"),
+                Container.getServiceAsync("URLParsing")
             ]).then(function (aServices) {
                 var oShellNavigationInternal = aServices[0];
                 var oUrlParsing = aServices[1];

package/src/main/js/sap/ushell/components/appfinder/EasyAccess.controller.js

@@ -12,7 +12,8 @@ sap.ui.define([
     "sap/ushell/resources",
     "sap/ui/model/json/JSONModel",
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
-    "sap/ushell/Config"
+    "sap/ushell/Config",
+    "sap/ushell/Container"
 ], function (
     Localization,
     Element,
@@ -25,7 +26,8 @@ sap.ui.define([
     resources,
     JSONModel,
     AccessibilityCustomData,
-    Config
+    Config,
+    Container
 ) {
     "use strict";
 
@@ -172,7 +174,7 @@ sap.ui.define([
                     // Solution for Internal incident #1770582955: After doing 'search' the results are coming from
                     // the backend and the 'bookmarkCount' property is not part of the properties there.
                     // Hence, we need to copy its previous content to the new results
-                    sap.ushell.Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
+                    Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
                         response.results.forEach(function (element) {
                             oBookmarkService.countBookmarks(element.url).then(function (count) {
                                 element.bookmarkCount = count;
@@ -480,14 +482,12 @@ sap.ui.define([
             var iSapClient;
             var oDeferred = new jQuery.Deferred();
 
-            if (sap.ushell.Container) {
-                sLanguage = sap.ushell.Container.getUser().getLanguage();
-                if (sLanguage && oRequest.requestUri.indexOf("sap-language=") < 0) {
-                    oRequest.requestUri += (oRequest.requestUri.indexOf("?") >= 0 ? "&" : "?") + "sap-language=" + sLanguage;
-                }
-                var oLogonSystem = sap.ushell.Container.getLogonSystem();
-                iSapClient = oLogonSystem && oLogonSystem.getClient();
+            sLanguage = Container.getUser().getLanguage();
+            if (sLanguage && oRequest.requestUri.indexOf("sap-language=") < 0) {
+                oRequest.requestUri += (oRequest.requestUri.indexOf("?") >= 0 ? "&" : "?") + "sap-language=" + sLanguage;
             }
+            var oLogonSystem = Container.getLogonSystem();
+            iSapClient = oLogonSystem && oLogonSystem.getClient();
 
             sap.ui.require(["sap/ui/thirdparty/datajs"], function () {
                 OData.read(