@sapui5/sap.ushell 1.136.3 → 1.138.1

package/src/main/js/sap/ushell/renderers/fiori2/Shell.view.js

@@ -22,7 +22,7 @@ sap.ui.define([
     "sap/ushell/state/ShellModel",
     "sap/ushell/state/StateManager",
     "sap/ushell/state/BindingHelper"
-], function (
+], (
     Log,
     Avatar,
     mobileLibrary,
@@ -39,7 +39,7 @@ sap.ui.define([
     ShellModel,
     StateManager,
     BindingHelper
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.AvatarSize
@@ -48,9 +48,6 @@ sap.ui.define([
     // shortcut for sap.ushell.state.StateManager.Operation
     const Operation = StateManager.Operation;
 
-    // shortcut for sap.ushell.state.StateManager.ShellMode
-    const ShellMode = StateManager.ShellMode;
-
     // shortcut for sap.ushell.renderer.ShellLayout.ShellArea
     const ShellArea = ShellLayout.ShellArea;
 
@@ -67,16 +64,16 @@ sap.ui.define([
 
         waitForShellLayout: function () {
             if (!this._oShellLayoutPromise) {
-                this._oShellLayoutPromise = new Promise(function (resolve) {
+                this._oShellLayoutPromise = new Promise((resolve) => {
                     this.getController().addDoable(EventHub.once("ShellLayoutApplied").do(resolve));
-                }.bind(this));
+                });
             }
             return this._oShellLayoutPromise;
         },
 
         getViewDataConfig: function () {
-            var oViewData = this.getViewData() || {};
-            var oConfig = oViewData.config || {};
+            const oViewData = this.getViewData() || {};
+            const oConfig = oViewData.config || {};
             return oConfig;
         },
 
@@ -105,9 +102,7 @@ sap.ui.define([
             this.setNavigationBarMinHeight();
 
             // RendererRootView / NavContainer / viewPortContainer
-            var oRendererRootView = this.createRendererRootViewSync();
-
-            this.initCanvasShapesManager();
+            const oRendererRootView = this.createRendererRootViewSync();
 
             this.setDisplayBlock(true);
 
@@ -117,9 +112,9 @@ sap.ui.define([
         },
 
         initBackgroundImage: function () {
-            this.waitForShellLayout().then(function () {
-                var oDomRef = document.getElementById(ShellArea.BackgroundImage);
-                var sBackgroundHtml = [
+            this.waitForShellLayout().then(() => {
+                const oDomRef = document.getElementById(ShellArea.BackgroundImage);
+                const sBackgroundHtml = [
                     // "Shell Canvas" category in ThemeDesigner
                     "<div class='sapUiShellBackgroundImage sapUiGlobalBackgroundImageForce sapContrastPlus'></div>",
                     // "Application Background" category in ThemeDesigner
@@ -130,18 +125,18 @@ sap.ui.define([
         },
 
         createRendererRootViewSync: function () {
-            var oController = this.getController();
+            const oController = this.getController();
             // eslint-disable-next-line ushell/no-deprecated
-            var oRendererRootView = sap.ui.xmlfragment("sap.ushell.renderer.RendererRootView", oController); // LEGACY API (deprecated)
+            const oRendererRootView = sap.ui.xmlfragment("sap.ushell.renderer.RendererRootView", oController); // LEGACY API (deprecated)
             BindingHelper.overrideUpdateAggregation(oRendererRootView);
 
             return oRendererRootView;
         },
 
         createRendererRootViewSyncFallback: function () {
-            var oController = this.getController();
+            const oController = this.getController();
             // eslint-disable-next-line ushell/no-deprecated
-            var oRendererRootView = sap.ui.xmlfragment("sap.ushell.renderer.RendererRootViewFallback", oController); // LEGACY API (deprecated)
+            const oRendererRootView = sap.ui.xmlfragment("sap.ushell.renderer.RendererRootViewFallback", oController); // LEGACY API (deprecated)
             BindingHelper.overrideUpdateAggregation(oRendererRootView);
 
             return oRendererRootView;
@@ -149,16 +144,12 @@ sap.ui.define([
 
         createShellHeaderSync: function () {
             // Create own model for the header
-            var oHeaderController = new ShellHeaderController();
+            const oHeaderController = new ShellHeaderController();
 
             // eslint-disable-next-line ushell/no-deprecated
-            var oShellHeader = sap.ui.xmlfragment("sap.ushell.renderer.shellHeader.ShellHeader", oHeaderController); // LEGACY API (deprecated)
+            const oShellHeader = sap.ui.xmlfragment("sap.ushell.renderer.shellHeader.ShellHeader", oHeaderController); // LEGACY API (deprecated)
             BindingHelper.overrideUpdateAggregation(oShellHeader);
 
-            if (StateManager.getShellMode() === ShellMode.Embedded) {
-                oShellHeader.setNoLogo();
-            }
-
             // Assign models to the Shell Header
             oShellHeader.setModel(ShellModel.getModel(), "shellModel");
             oShellHeader.setModel(ushellResources.i18nModel, "i18n");
@@ -166,7 +157,7 @@ sap.ui.define([
             // save for later use
             this._oShellHeader = oShellHeader;
 
-            this.waitForShellLayout().then(function () {
+            this.waitForShellLayout().then(() => {
                 oShellHeader.placeAt(ShellArea.ShellHeader, "only");
                 oHeaderController.onInit();
             });
@@ -175,26 +166,26 @@ sap.ui.define([
 
         setNavigationBarMinHeight: function () {
             return sap.ushell.Container.getServiceAsync("Menu")
-                .then(function (oMenuService) {
+                .then((oMenuService) => {
                     return oMenuService.isMenuEnabled();
-                }).then(function (bMenuEnabled) {
+                }).then((bMenuEnabled) => {
                     if (!bMenuEnabled) {
                         return;
                     }
 
-                    this.waitForShellLayout().then(function () {
-                        var navigationBar = document.getElementById(ShellArea.NavigationBar);
+                    this.waitForShellLayout().then(() => {
+                        const navigationBar = document.getElementById(ShellArea.NavigationBar);
                         navigationBar.classList.add("sapUshellMenuBarHeight");
                     });
-                }.bind(this))
-                .catch(function (vError) {
+                })
+                .catch((vError) => {
                     Log.info("Could not apply min-height of the navigationBar", vError);
                 });
         },
 
         createRightFloatingContainer: function () {
-            sap.ui.require(["sap/ushell/ui/shell/RightFloatingContainer"], function (RightFloatingContainer) {
-                var oRightFloatingContainer = new RightFloatingContainer({
+            sap.ui.require(["sap/ushell/ui/shell/RightFloatingContainer"], (RightFloatingContainer) => {
+                const oRightFloatingContainer = new RightFloatingContainer({
                     id: "right-floating-container",
                     top: "2",
                     right: "2",
@@ -212,38 +203,15 @@ sap.ui.define([
                 // save for later use
                 this._oRightFloatingContainer = oRightFloatingContainer;
 
-                this.waitForShellLayout().then(function () {
+                this.waitForShellLayout().then(() => {
                     oRightFloatingContainer.placeAt(ShellArea.RightFloatingContainer, "only");
                 });
-            }.bind(this));
-        },
-
-        initCanvasShapesManager: function () {
-            this.bindFactory({
-                model: ShellModel.getConfigModel(),
-                factory: this.createCanvasShapesManager.bind(this),
-                bindingPath: "/enableBackGroundShapes",
-                bindingType: BINDING_TYPE.Property,
-                valueCheck: function (bValue) {
-                    return !!bValue;
-                }
             });
         },
 
-        createCanvasShapesManager: function () {
-            var iInterval = setInterval(function () {
-                if (Core.isThemeApplied()) {
-                    clearInterval(iInterval);
-                    sap.ui.require(["sap/ushell/CanvasShapesManager"], function (CanvasShapesManager) {
-                        CanvasShapesManager.drawShapes();
-                    });
-                }
-            }, 200);
-        },
-
         createSubHeader: function () {
-            sap.ui.require(["sap/ushell/ui/shell/SubHeader"], function (SubHeader) {
-                var oSubHeader = new SubHeader({
+            sap.ui.require(["sap/ushell/ui/shell/SubHeader"], (SubHeader) => {
+                const oSubHeader = new SubHeader({
                     id: "subhdr",
                     content: {
                         path: "shellModel>/subHeader/items",
@@ -255,10 +223,10 @@ sap.ui.define([
                 oSubHeader.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSubHeader);
 
-                this.waitForShellLayout().then(function () {
+                this.waitForShellLayout().then(() => {
                     oSubHeader.placeAt(ShellArea.SubHeader, "only");
                 });
-            }.bind(this));
+            });
         },
 
         createFloatingContainer: function () {
@@ -268,8 +236,8 @@ sap.ui.define([
         },
 
         createSidePane: function () {
-            sap.ui.require(["sap/ushell/ui/shell/SidePane"], function (SidePane) {
-                var oSidePane = new SidePane({
+            sap.ui.require(["sap/ushell/ui/shell/SidePane"], (SidePane) => {
+                const oSidePane = new SidePane({
                     id: "shell-sidePane",
                     visible: "{shellModel>/sidePane/visible}",
                     content: {
@@ -282,15 +250,15 @@ sap.ui.define([
                 oSidePane.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oSidePane);
 
-                this.waitForShellLayout().then(function () {
+                this.waitForShellLayout().then(() => {
                     oSidePane.placeAt(ShellArea.SidePane, "only");
                 });
-            }.bind(this));
+            });
         },
 
         createToolArea: function () {
-            sap.ui.require(["sap/ushell/ui/shell/ToolArea"], function (ToolArea) {
-                var oShellToolArea = new ToolArea({
+            sap.ui.require(["sap/ushell/ui/shell/ToolArea"], (ToolArea) => {
+                const oShellToolArea = new ToolArea({
                     id: "shell-toolArea",
                     visible: "{shellModel>/toolArea/visible}",
                     toolAreaItems: {
@@ -303,15 +271,15 @@ sap.ui.define([
                 oShellToolArea.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellToolArea);
 
-                this.waitForShellLayout().then(function () {
+                this.waitForShellLayout().then(() => {
                     oShellToolArea.placeAt(ShellArea.ToolArea, "only");
                 });
-            }.bind(this));
+            });
         },
 
         createFloatingActions: function () {
-            sap.ui.require(["sap/ushell/ui/shell/ShellFloatingActions"], function (ShellFloatingActions) {
-                var oShellFloatingActions = new ShellFloatingActions({
+            sap.ui.require(["sap/ushell/ui/shell/ShellFloatingActions"], (ShellFloatingActions) => {
+                const oShellFloatingActions = new ShellFloatingActions({
                     id: "shell-floatingActions",
                     floatingActions: {
                         path: "shellModel>/floatingActions/items",
@@ -323,25 +291,25 @@ sap.ui.define([
                 oShellFloatingActions.setModel(ShellModel.getModel(), "shellModel");
                 this.addDanglingControl(oShellFloatingActions);
 
-                this.waitForShellLayout().then(function () {
+                this.waitForShellLayout().then(() => {
                     oShellFloatingActions.placeAt(ShellArea.FloatingActions, "only");
                 });
-            }.bind(this));
+            });
         },
 
         initAllMyAppsView: function () {
-            return sap.ushell.Container.getServiceAsync("AllMyApps").then(function (oAllMyApps) {
+            return sap.ushell.Container.getServiceAsync("AllMyApps").then((oAllMyApps) => {
                 if (oAllMyApps.isEnabled()) {
                     return this.createAllMyAppsView();
                 }
-            }.bind(this));
+            });
         },
 
         createAllMyAppsView: function () {
             return XMLView.create({
                 id: "allMyAppsView",
                 viewName: "sap.ushell.renderer.allMyApps.AllMyApps"
-            }).then(function (allMyAppsView) {
+            }).then((allMyAppsView) => {
                 allMyAppsView.setModel(ShellModel.getConfigModel(), "configModel");
                 allMyAppsView.setModel(ushellResources.i18nModel, "i18n");
                 allMyAppsView.addCustomData(new AccessibilityCustomData({
@@ -351,17 +319,17 @@ sap.ui.define([
                 }));
                 this.addDanglingControl(allMyAppsView);
                 this.getShellHeader().getAppTitle().setAllMyApps(allMyAppsView);
-            }.bind(this));
+            });
         },
 
         /**
          * Begin factory functions for lazy instantiation of Shell Layout controls
          */
         createPostCoreExtControls: function () {
-            var oShellModel = ShellModel.getModel();
+            const oShellModel = ShellModel.getModel();
 
             // apply the highest z-index used by the shell
-            sap.ui.require(["sap/ui/core/Popup"], function (Popup) {
+            sap.ui.require(["sap/ui/core/Popup"], (Popup) => {
                 Popup.setInitialZIndex(11);
             });
 
@@ -511,17 +479,17 @@ sap.ui.define([
          * @since 1.115.0
          */
         bindFactory: function (oSettings) {
-            var oModel = oSettings.model;
-            var fnFactory = oSettings.factory;
-            var sPath = oSettings.bindingPath;
-            var sBindingType = oSettings.bindingType;
-            var fnValueCheck = oSettings.valueCheck;
+            const oModel = oSettings.model;
+            const fnFactory = oSettings.factory;
+            const sPath = oSettings.bindingPath;
+            const sBindingType = oSettings.bindingType;
+            const fnValueCheck = oSettings.valueCheck;
 
-            var vValue = oModel.getProperty(sPath);
+            let vValue = oModel.getProperty(sPath);
             if (fnValueCheck(vValue)) {
                 fnFactory();
             } else {
-                var oBinding;
+                let oBinding;
                 switch (sBindingType) {
                     case BINDING_TYPE.List:
                         oBinding = oModel.bindList(sPath);

package/src/main/js/sap/ushell/renderers/fiori2/allMyApps/AllMyAppsManager.js

@@ -7,7 +7,7 @@
  */
 sap.ui.define([
     "sap/ushell/renderer/allMyApps/AllMyAppsManager"
-], function (AllMyAppsManager) {
+], (AllMyAppsManager) => {
     "use strict";
 
     return AllMyAppsManager;

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

@@ -6,24 +6,28 @@
 sap.ui.define([
     "sap/base/i18n/Localization",
     "sap/ui/model/resource/ResourceModel"
-], function (
+], (
     Localization,
     ResourceModel
-) {
+) => {
     "use strict";
 
-    // ensure that sap.ushell exists
-    var oResources = {};
+    const oResources = {};
 
-    oResources.getTranslationModel = function (sLocale) {
-        if (!this._oResourceModel) {
-            // create translation resource model
-            this._oResourceModel = new ResourceModel({
-                bundleUrl: sap.ui.require.toUrl("sap/ushell/renderer/resources/resources.properties"),
-                bundleLocale: sLocale
-            });
-        }
-        return this._oResourceModel;
+    oResources.i18n = null;
+    oResources.i18nModel = new ResourceModel({
+        bundleUrl: sap.ui.require.toUrl("sap/ushell/renderer/resources/resources.properties"),
+        bundleLocale: Localization.getLanguage(),
+        async: true
+    });
+
+    oResources._pResourceBundle = oResources.i18nModel.getResourceBundle().then((oResourceBundle) => {
+        oResources.i18n = oResourceBundle;
+    });
+
+    // only after the awaitResourceBundle is done i18n property is set and getText is available
+    oResources.awaitResourceBundle = async function () {
+        await oResources._pResourceBundle;
     };
 
     /**
@@ -62,7 +66,7 @@ sap.ui.define([
                     return text;
                 }
             }
-            // If the current user launguage is not in JSON, take the text under the "default" key
+            // If the current user language is not in JSON, take the text under the "default" key
             return oTranslationTexts.default || "";
         } catch (err) {
             // A customer may provide one text for all languages instead of JSON
@@ -70,13 +74,5 @@ sap.ui.define([
         }
     };
 
-    // Proxy to avoid adding dependency to Localization in modules where a check for RTL is needed
-    oResources.getRTL = function () {
-        return Localization.getRTL();
-    };
-
-    oResources.i18nModel = oResources.getTranslationModel(Localization.getLanguage());
-    oResources.i18n = oResources.i18nModel.getResourceBundle();
-
     return oResources;
 }, /* bExport= */ true);

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

@@ -403,7 +403,7 @@ sap.ui.define([
         this.setWindowTitle = function (sTitle) {
             const sWindowTitleExtension = ushellResources.getTranslationFromJSON(Config.last("/core/shell/windowTitleExtension"));
             if (sWindowTitleExtension) {
-                if (ushellResources.getRTL()) {
+                if (Localization.getRTL()) {
                     sTitle = `${sWindowTitleExtension} - ${sTitle}`;
                 } else {
                     sTitle = `${sTitle} - ${sWindowTitleExtension}`;

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

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ui/base/EventProvider",

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

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ui/base/Object",

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.136.3
+ * @version 1.138.1
  * @deprecated since 1.120
  */
 sap.ui.define([

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

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's bookmark service. Allows creating shortcuts on the user's home page.
  *
- * @version 1.136.3
+ * @version 1.138.1
  */
 sap.ui.define([
     "sap/ui/core/EventBus",