@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/components/shell/MenuBar/controller/MenuBar.controller.js

@@ -10,10 +10,9 @@ sap.ui.define([
     "sap/ushell/utils/WindowUtils",
     "sap/m/IconTabFilter",
     "sap/m/IconTabSeparator",
-    "sap/ushell/utils",
     "sap/ushell/Config",
     "sap/ushell/Container"
-], function (
+], (
     CustomData,
     Controller,
     JSONModel,
@@ -24,10 +23,9 @@ sap.ui.define([
     WindowUtils,
     IconTabFilter,
     IconTabSeparator,
-    ShellUtils,
     Config,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -61,12 +59,12 @@ sap.ui.define([
             this.oContainerRouter.getRoute("openFLPPage").attachMatched(this._selectIndexAfterRouteChange, this);
             this.oContainerRouter.getRoute("openWorkPage").attachMatched(this._selectIndexAfterRouteChange, this);
 
-            this.oEventHubListener = EventHub.on("enableMenuBarNavigation").do(function (bEnableMenuBarNavigation) {
+            this.oEventHubListener = EventHub.on("enableMenuBarNavigation").do((bEnableMenuBarNavigation) => {
                 this.getView().getModel("viewConfiguration").setProperty("/enableMenuBarNavigation", bEnableMenuBarNavigation);
-            }.bind(this));
+            });
 
-            var oViewConfiguration = new JSONModel({
-                //We need to initialize with a non-empty key to avoid flickering of the selection.
+            const oViewConfiguration = new JSONModel({
+                // We need to initialize with a non-empty key to avoid flickering of the selection.
                 selectedKey: "None Existing Key",
                 enableMenuBarNavigation: true,
                 ariaTexts: {
@@ -77,15 +75,14 @@ sap.ui.define([
             this.getView().setModel(oViewConfiguration, "viewConfiguration");
 
             this.oURLParsingService = Container.getServiceAsync("URLParsing");
-            this.oGetDefaultSpacePromise = Container.getServiceAsync("Menu")
-                .then(function (oMenuService) {
-                    return oMenuService.getDefaultSpace();
-                });
+            this.oGetDefaultSpacePromise = Container.getServiceAsync("Menu").then((oMenuService) => {
+                return oMenuService.getDefaultSpace();
+            });
             this._selectIndexAfterRouteChange();
 
             // According to the developer colleagues of the tnt.ToolHeader this class has to be
             // removed so that the ToolHeader looks correctly with the ushell styling in the Belize theme.
-            var oToolHeader = this.byId("navigationBar");
+            const oToolHeader = this.byId("navigationBar");
             if (oToolHeader) {
                 oToolHeader.removeStyleClass("sapContrast");
             }
@@ -101,11 +98,11 @@ sap.ui.define([
          * @since 1.72.0
          */
         onMenuItemSelection: function (event) {
-            var sSelectedMenuEntryKey = event.getParameter("key");
-            var oMenuModel = this.getView().getModel("menu");
+            const sSelectedMenuEntryKey = event.getParameter("key");
+            const oMenuModel = this.getView().getModel("menu");
 
-            var aMenuEntries = oMenuModel.getProperty("/");
-            var oDestinationIntent = this._getNestedMenuEntryByUid(aMenuEntries, sSelectedMenuEntryKey);
+            const aMenuEntries = oMenuModel.getProperty("/");
+            const oDestinationIntent = this._getNestedMenuEntryByUid(aMenuEntries, sSelectedMenuEntryKey);
 
             if (oDestinationIntent.type === "IBN") {
                 this._performNavigation(oDestinationIntent.target);
@@ -124,7 +121,7 @@ sap.ui.define([
          * @returns {object} Returns the menu entry or undefined if not present
          */
         _getNestedMenuEntry: function (aMenuEntries, fnCheck) {
-            return aMenuEntries.reduce(function (oSelectedMenuEntry, oMenuEntry) {
+            return aMenuEntries.reduce((oSelectedMenuEntry, oMenuEntry) => {
                 if (oSelectedMenuEntry) {
                     return oSelectedMenuEntry;
                 }
@@ -134,10 +131,9 @@ sap.ui.define([
                 }
 
                 if (oMenuEntry.menuEntries) {
-
                     return this._getNestedMenuEntry(oMenuEntry.menuEntries, fnCheck);
                 }
-            }.bind(this), undefined);
+            }, undefined);
         },
 
         /**
@@ -168,22 +164,21 @@ sap.ui.define([
          * @private
          * @since 1.74.0
          */
-         _performNavigation: function (destinationTarget) {
-            return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
-                var oParams = {};
-                destinationTarget.parameters.forEach(function (oParameter) {
-                    if (oParameter.name && oParameter.value) {
-                        oParams[oParameter.name] = [oParameter.value];
-                    }
-                });
-
-                oNavigationService.navigate({
-                    target: {
-                        semanticObject: destinationTarget.semanticObject,
-                        action: destinationTarget.action
-                    },
-                    params: oParams
-                });
+        _performNavigation: async function (destinationTarget) {
+            const oNavigationService = await Container.getServiceAsync("Navigation");
+            const oParams = {};
+            destinationTarget.parameters.forEach((oParameter) => {
+                if (oParameter.name && oParameter.value) {
+                    oParams[oParameter.name] = [oParameter.value];
+                }
+            });
+
+            oNavigationService.navigate({
+                target: {
+                    semanticObject: destinationTarget.semanticObject,
+                    action: destinationTarget.action
+                },
+                params: oParams
             });
         },
 
@@ -212,52 +207,47 @@ sap.ui.define([
          * @private
          * @since 1.72.0
          */
-        _selectIndexAfterRouteChange: function () {
-            var oViewConfigModel = this.getView().getModel("viewConfiguration");
-
-            return Promise.all([
-                this.oURLParsingService,
-                this.oGetDefaultSpacePromise,
-                this.getOwnerComponent().oMenuModelPromise
-            ]).then(function (aResults) {
-                var oUrlParsingService = aResults[0];
-                var oDefaultSpace = aResults[1];
-
-                var sSelectedMenuKey;
-                var sHash = hasher.getHash();
-                var oHashParts = oUrlParsingService.parseShellHash(sHash);
-                var aMenuEntries = this.getView().getModel("menu").getProperty("/");
-
-                if (oHashParts.semanticObject === "Shell" && oHashParts.action === "home") {
-                    if (Config.last("/core/homeApp/enabled")) {
-                        sSelectedMenuKey = this._getHomeAppUID(aMenuEntries) || "";
-                    } else {
-                        // Determine the user's default page and initiate loading
-                        var oDefaultSpacePage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
-                        sSelectedMenuKey = (oDefaultSpacePage) ? this._getMenuUID(aMenuEntries, oDefaultSpace.id, oDefaultSpacePage.id) || "" : "";
-                    }
+        _selectIndexAfterRouteChange: async function () {
+            const oViewConfigModel = this.getView().getModel("viewConfiguration");
+
+            const oUrlParsingService = await this.oURLParsingService;
+            const oDefaultSpace = await this.oGetDefaultSpacePromise;
+            await this.getOwnerComponent().oMenuModelPromise;
+
+            let sSelectedMenuKey;
+            const sHash = hasher.getHash();
+            const oHashParts = oUrlParsingService.parseShellHash(sHash);
+            const aMenuEntries = this.getView().getModel("menu").getProperty("/");
 
+            if (oHashParts.semanticObject === "Shell" && oHashParts.action === "home") {
+                if (Config.last("/core/homeApp/enabled")) {
+                    sSelectedMenuKey = this._getHomeAppUID(aMenuEntries) || "";
+                } else {
+                    // Determine the user's default page and initiate loading
+                    const oDefaultSpacePage = oDefaultSpace && oDefaultSpace.children && oDefaultSpace.children[0];
+                    sSelectedMenuKey = (oDefaultSpacePage) ? this._getMenuUID(aMenuEntries, oDefaultSpace.id, oDefaultSpacePage.id) || "" : "";
+                }
+
+                oViewConfigModel.setProperty("/selectedKey", sSelectedMenuKey);
+            } else {
+                const sSpaceId = ObjectPath.get("params.spaceId.0", oHashParts);
+                const sPageId = ObjectPath.get("params.pageId.0", oHashParts);
+
+                // First evaluate the last clicked key and search for the top level entry if it matches the parameters
+                const sSelectedKey = oViewConfigModel.getProperty("/selectedKey");
+                const oMenuEntry = this._getNestedMenuEntryByUid(aMenuEntries, sSelectedKey);
+                if (this._hasSpaceIdAndPageId(oMenuEntry, sSpaceId, sPageId)) {
+                    sSelectedMenuKey = oMenuEntry.uid;
+                } else {
+                    sSelectedMenuKey = this._getMenuUID(aMenuEntries, sSpaceId, sPageId);
+                }
+
+                if (sSelectedMenuKey) {
                     oViewConfigModel.setProperty("/selectedKey", sSelectedMenuKey);
                 } else {
-                    var sSpaceId = ObjectPath.get("params.spaceId.0", oHashParts);
-                    var sPageId = ObjectPath.get("params.pageId.0", oHashParts);
-
-                    // First evaluate the last clicked key and search for the top level entry if it matches the parameters
-                    var sSelectedKey = oViewConfigModel.getProperty("/selectedKey");
-                    var oMenuEntry = this._getNestedMenuEntryByUid(aMenuEntries, sSelectedKey);
-                    if (this._hasSpaceIdAndPageId(oMenuEntry, sSpaceId, sPageId)) {
-                        sSelectedMenuKey = oMenuEntry.uid;
-                    } else {
-                        sSelectedMenuKey = this._getMenuUID(aMenuEntries, sSpaceId, sPageId);
-                    }
-
-                    if (sSelectedMenuKey) {
-                        oViewConfigModel.setProperty("/selectedKey", sSelectedMenuKey);
-                    } else {
-                        oViewConfigModel.setProperty("/selectedKey", "None Existing Key");
-                    }
+                    oViewConfigModel.setProperty("/selectedKey", "None Existing Key");
                 }
-            }.bind(this));
+            }
         },
 
         /**
@@ -277,7 +267,7 @@ sap.ui.define([
             function fnCheck (oMenuEntry) {
                 return this._hasSpaceIdAndPageId(oMenuEntry, spaceId, pageId);
             }
-            var oMatchedMenuEntry = this._getNestedMenuEntry(aMenuEntries, fnCheck.bind(this));
+            const oMatchedMenuEntry = this._getNestedMenuEntry(aMenuEntries, fnCheck.bind(this));
             return oMatchedMenuEntry && oMatchedMenuEntry.uid;
         },
 
@@ -295,7 +285,7 @@ sap.ui.define([
             function fnCheck (oMenuEntry) {
                 return oMenuEntry.target.semanticObject === "Shell" && oMenuEntry.target.action === "home";
             }
-            var oMatchedMenuEntry = this._getNestedMenuEntry(aMenuEntries, fnCheck.bind(this));
+            const oMatchedMenuEntry = this._getNestedMenuEntry(aMenuEntries, fnCheck.bind(this));
             return oMatchedMenuEntry && oMatchedMenuEntry.uid;
         },
 
@@ -310,11 +300,11 @@ sap.ui.define([
          * @since 1.77.0
          */
         _hasSpaceIdAndPageId: function (oMenuEntry, sSpaceId, sPageId) {
-            var aParameters = ObjectPath.get("target.parameters", oMenuEntry) || [];
-            var oSpaceIdParam = aParameters.find(function (oParameter) {
+            const aParameters = ObjectPath.get("target.parameters", oMenuEntry) || [];
+            const oSpaceIdParam = aParameters.find((oParameter) => {
                 return oParameter.name === "spaceId" && oParameter.value === sSpaceId;
             });
-            var oPageIdParam = aParameters.find(function (oParameter) {
+            const oPageIdParam = aParameters.find((oParameter) => {
                 return oParameter.name === "pageId" && oParameter.value === sPageId;
             });
             return oSpaceIdParam !== undefined && oPageIdParam !== undefined;

package/src/main/js/sap/ushell/components/shell/MenuBar/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.MenuBar",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/Component.js

@@ -4,7 +4,7 @@ sap.ui.define([
     "sap/ui/core/mvc/XMLView",
     "sap/ushell/library",
     "sap/ushell/resources"
-], function (UIComponent, XMLView, ushellLibrary, resources) {
+], (UIComponent, XMLView, ushellLibrary, resources) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.shell.NavigationBarMenu.Component", {

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenu.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.138.1
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([
@@ -21,7 +21,7 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ui/model/json/JSONModel"
-], function (
+], (
     InvisibleMessage,
     coreLibrary,
     Controller,
@@ -35,14 +35,14 @@ sap.ui.define([
     Container,
     EventHub,
     JSONModel
-) {
+) => {
     "use strict";
 
     // shortcut for sap.ui.core.dnd.RelativeDropPosition
-    var RelativeDropPosition = coreLibrary.dnd.RelativeDropPosition;
+    const RelativeDropPosition = coreLibrary.dnd.RelativeDropPosition;
 
     // shortcut for sap.ui.core.InvisibleMessageMode
-    var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
+    const InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
 
     /**
      * @alias sap.ushell.components.shell.NavigationBarMenu.controller.NavigationBarMenu
@@ -109,7 +109,7 @@ sap.ui.define([
          * @private
          */
         _onPinnedSpacesUpdateFinished: function (oEvent) {
-            var sPinnedSpacesTreeTitleText = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Title", [oEvent.getParameter("total") || 0]);
+            const sPinnedSpacesTreeTitleText = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Title", [oEvent.getParameter("total") || 0]);
             this.byId("PinnedSpacesTreeTitle").setText(sPinnedSpacesTreeTitleText);
         },
 
@@ -186,7 +186,7 @@ sap.ui.define([
             const oPinButton = oEvent.getSource();
             const sSpacePath = oPinButton.getBindingContext("spaces").getPath();
             const oModel = this._getModel();
-            const bIsPinned = oModel.getProperty(sSpacePath + "/pinned");
+            const bIsPinned = oModel.getProperty(`${sSpacePath}/pinned`);
             if (!bIsPinned) {
                 this._pinSpace(sSpacePath);
             } else {
@@ -245,18 +245,17 @@ sap.ui.define([
          */
         rearrangePinnedSpaces: function (oEvent) {
             const oModel = this.oModel || this.getOwnerComponent().getModel("spaces");
-            var oDraggedSpaceContext = oEvent.getParameter("draggedControl").getBindingContext("spaces");
-            var iSourcePinnedSortOrder = oModel.getProperty(oDraggedSpaceContext.getPath()).pinnedSortOrder;
-            var oDroppedSpace = oEvent.getParameter("droppedControl");
-            var oDroppedSpaceContext = oDroppedSpace.getBindingContext("spaces");
-            var iDroppedPinnedSortOrder = oModel.getProperty(oDroppedSpaceContext.getPath()).pinnedSortOrder;
-            var sDropPosition = oEvent.getParameter("dropPosition");
-            var iTargetPinnedSortOrder = iDroppedPinnedSortOrder + (sDropPosition === RelativeDropPosition.After ? 1 : 0);
+            const oDraggedSpaceContext = oEvent.getParameter("draggedControl").getBindingContext("spaces");
+            const iSourcePinnedSortOrder = oModel.getProperty(oDraggedSpaceContext.getPath()).pinnedSortOrder;
+            const oDroppedSpace = oEvent.getParameter("droppedControl");
+            const oDroppedSpaceContext = oDroppedSpace.getBindingContext("spaces");
+            const iDroppedPinnedSortOrder = oModel.getProperty(oDroppedSpaceContext.getPath()).pinnedSortOrder;
+            const sDropPosition = oEvent.getParameter("dropPosition");
+            const iTargetPinnedSortOrder = iDroppedPinnedSortOrder + (sDropPosition === RelativeDropPosition.After ? 1 : 0);
 
             this._rearrangePinnedSpaces(iSourcePinnedSortOrder, iTargetPinnedSortOrder, oDroppedSpace, sDropPosition);
         },
 
-
         /**
          * Rearranges the pinned spaces by using the Menu service.
          *
@@ -269,22 +268,22 @@ sap.ui.define([
          * @private
          */
         _rearrangePinnedSpaces: function (sourceIndex, targetIndex, droppedItem, dropPosition) {
-            this.pMenuServicePromise.then(function (oMenu) {
+            this.pMenuServicePromise.then((oMenu) => {
                 oMenu.moveMenuEntry(sourceIndex, targetIndex);
 
                 // manage focus after move happened
-                var oPinnedSpacesTree = this.byId("PinnedSpaces");
-                var oDelegate = {
+                const oPinnedSpacesTree = this.byId("PinnedSpaces");
+                const oDelegate = {
                     onAfterRendering: function () {
-                        var aPinnedSpaces = oPinnedSpacesTree.getItems();
-                        var iDroppedItemPosition = oPinnedSpacesTree.indexOfItem(droppedItem);
-                        var focusIndex;
+                        const aPinnedSpaces = oPinnedSpacesTree.getItems();
+                        const iDroppedItemPosition = oPinnedSpacesTree.indexOfItem(droppedItem);
+                        let focusIndex;
                         if (sourceIndex < targetIndex) {
                             focusIndex = iDroppedItemPosition - (dropPosition === RelativeDropPosition.Before ? 1 : 0);
                         } else {
                             focusIndex = iDroppedItemPosition + (dropPosition === RelativeDropPosition.After ? 1 : 0);
                         }
-                        var oPinnedSpaceToFocus = aPinnedSpaces[focusIndex];
+                        const oPinnedSpaceToFocus = aPinnedSpaces[focusIndex];
                         if (oPinnedSpaceToFocus) {
                             oPinnedSpaceToFocus.focus();
                         }
@@ -294,11 +293,11 @@ sap.ui.define([
                 droppedItem.addEventDelegate(oDelegate);
 
                 // announces the move
-                var sPinnedSpaceMovedMessage = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Moved");
+                const sPinnedSpaceMovedMessage = resources.i18n.getText("NavigationBarMenu.PinnedSpaces.Moved");
                 this._oInvisibleMessageInstance.announce(sPinnedSpaceMovedMessage, InvisibleMessageMode.Polite);
 
                 this._savePinnedSpaces();
-            }.bind(this));
+            });
         },
 
         /**
@@ -311,7 +310,7 @@ sap.ui.define([
          * @private
          */
         _bindPinnedSpaces: function () {
-            var oPinnedSpaces = this.byId("PinnedSpaces");
+            const oPinnedSpaces = this.byId("PinnedSpaces");
 
             if (!this._pCustomTreeItemPromise) {
                 this._pCustomTreeItemPromise = Fragment.load({
@@ -320,7 +319,7 @@ sap.ui.define([
                     async: true,
                     controller: this,
                     name: "sap.ushell.components.shell.NavigationBarMenu.view.CustomTreeItem"
-                }).then(function (oCustomTreeItem) {
+                }).then((oCustomTreeItem) => {
                     oCustomTreeItem.addEventDelegate({
                         onsapdownmodifiers: this._moveSpaceDown.bind(this),
                         onsapupmodifiers: this._moveSpaceUp.bind(this)
@@ -330,7 +329,8 @@ sap.ui.define([
                         filters: [
                             new Filter({ path: "pinned", operator: FilterOperator.EQ, value1: true }),
                             new Filter({ path: "type", operator: FilterOperator.NE, value1: "separator" }),
-                            new Filter({ path: "isHomeEntry", operator: FilterOperator.EQ, value1: false })],
+                            new Filter({ path: "isHomeEntry", operator: FilterOperator.EQ, value1: false })
+                        ],
                         sorter: [new Sorter({ path: "pinnedSortOrder", descending: false })],
                         parameters: {
                             arrayNames: ["menuEntries"]
@@ -338,7 +338,7 @@ sap.ui.define([
                         template: oCustomTreeItem,
                         templateShareable: false
                     });
-                }.bind(this));
+                });
             }
 
             return this._pCustomTreeItemPromise;
@@ -397,10 +397,10 @@ sap.ui.define([
          * @private
          */
         allSpacesFactory: function (sId, oContext) {
-            var oMenuEntry = oContext.getModel().getProperty(oContext.getPath());
-            var aSubMenuEntries = oMenuEntry.menuEntries || [];
+            const oMenuEntry = oContext.getModel().getProperty(oContext.getPath());
+            const aSubMenuEntries = oMenuEntry.menuEntries || [];
 
-            var oSpaceItem = this.byId("AllSpaces").getDependents()[0].clone(sId);
+            const oSpaceItem = this.byId("AllSpaces").getDependents()[0].clone(sId);
             oSpaceItem.setType("Active");
             oSpaceItem.attachPress(this.onMenuItemSelection, this);
             // If the space has only one page, this means no sub menu:
@@ -426,8 +426,8 @@ sap.ui.define([
          */
         _unpinSpace: function (sSpacePath, bSaveUnpinning) {
             const oModel = this._getModel();
-            oModel.setProperty(sSpacePath + "/pinned", false);
-            oModel.setProperty(sSpacePath + "/pinnedSortOrder", "-1");
+            oModel.setProperty(`${sSpacePath}/pinned`, false);
+            oModel.setProperty(`${sSpacePath}/pinnedSortOrder`, "-1");
             if (bSaveUnpinning) {
                 this._savePinnedSpaces();
             }
@@ -441,17 +441,17 @@ sap.ui.define([
          * @private
          */
         _pinSpace: function (sSpacePath) {
-            var iNumberOfPinnedSpaces = this.byId("PinnedSpaces").getItems().length;
+            const iNumberOfPinnedSpaces = this.byId("PinnedSpaces").getItems().length;
             const oModel = this._getModel();
             // Since the MyHome and separator are part of the model (pinnedSortOrder 0 and 1), the 1st new pinned space starts with 2.
-            var iNewPinnedSortOrder = 2;
+            let iNewPinnedSortOrder = 2;
             if (iNumberOfPinnedSpaces > 0) {
-                var oLastPinnedSpace = this.byId("PinnedSpaces").getItems()[iNumberOfPinnedSpaces - 1];
-                var sLastPinnedSpacePath = oLastPinnedSpace.getBindingContextPath("spaces");
-                iNewPinnedSortOrder = oModel.getProperty(sLastPinnedSpacePath + "/pinnedSortOrder") + 1;
+                const oLastPinnedSpace = this.byId("PinnedSpaces").getItems()[iNumberOfPinnedSpaces - 1];
+                const sLastPinnedSpacePath = oLastPinnedSpace.getBindingContextPath("spaces");
+                iNewPinnedSortOrder = oModel.getProperty(`${sLastPinnedSpacePath}/pinnedSortOrder`) + 1;
             }
-            oModel.setProperty(sSpacePath + "/pinnedSortOrder", iNewPinnedSortOrder);
-            oModel.setProperty(sSpacePath + "/pinned", true);
+            oModel.setProperty(`${sSpacePath}/pinnedSortOrder`, iNewPinnedSortOrder);
+            oModel.setProperty(`${sSpacePath}/pinned`, true);
             this._savePinnedSpaces();
         },
 
@@ -469,9 +469,9 @@ sap.ui.define([
          */
         _performNavigation: function (oDestinationTarget) {
             return Container.getServiceAsync("Navigation")
-                .then(function (oNavigationService) {
-                    var oParams = {};
-                    oDestinationTarget.parameters.forEach(function (oParameter) {
+                .then((oNavigationService) => {
+                    const oParams = {};
+                    oDestinationTarget.parameters.forEach((oParameter) => {
                         if (oParameter.name && oParameter.value) {
                             oParams[oParameter.name] = [oParameter.value];
                         }
@@ -511,13 +511,12 @@ sap.ui.define([
          * @since 1.114.0
          */
         onMenuItemSelection: async function (oEvent) {
-
             // Access menu entry
-            var oListItem = oEvent.getSource();
-            var oItemContextPath = oListItem.getBindingContextPath("spaces");
+            const oListItem = oEvent.getSource();
+            const oItemContextPath = oListItem.getBindingContextPath("spaces");
             const oModel = this._getModel();
-            var oListItemModelEntry = oModel.getProperty(oItemContextPath);
-            var bAmIAllSpacesItem = oEvent.getParameter("id").includes("AllSpaces");
+            const oListItemModelEntry = oModel.getProperty(oItemContextPath);
+            const bAmIAllSpacesItem = oEvent.getParameter("id").includes("AllSpaces");
             if (!bAmIAllSpacesItem) {
                 return;
             }
@@ -543,10 +542,10 @@ sap.ui.define([
          */
         _savePinnedSpaces: function () {
             const oModel = this._getModel();
-            this.pMenuServicePromise.then(function (oMenu) {
+            this.pMenuServicePromise.then((oMenu) => {
                 oModel.refresh(true);
                 return oMenu.savePersonalization();
-            }.bind(this));
+            });
         },
 
         _getModel: function () {

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/controller/NavigationBarMenuButton.controller.js

@@ -4,7 +4,7 @@
  * @fileOverview Controller for the NavigationBarMenu Popover. It is responsible for Popover handling, model binding, persistence
  * logic to pin, unpin and rearrange pinned spaces as well as executing navigation.
  *
- * @version 1.138.1
+ * @version 1.139.0
  * @private
  */
 sap.ui.define([
@@ -14,14 +14,14 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/EventHub",
     "sap/ui/model/json/JSONModel"
-], function (
+], (
     InvisibleMessage,
     NavigationBarMenuController,
     Fragment,
     Container,
     EventHub,
     JSONModel
-) {
+) => {
     "use strict";
 
     /**
@@ -61,12 +61,12 @@ sap.ui.define([
             this._oEventHubListener = EventHub.on("enableMenuBarNavigation").do((bEnableMenuBarNavigation) => {
                 this.oViewConfigurationModel.setProperty("/enableMenuBarNavigation", bEnableMenuBarNavigation);
             });
-
         },
 
         /**
          * Opens the Navigation Bar Menu Popover. Sets the menu model from the menu bar to the popover.
          * @param {sap.ui.base.Event} oEvent Press Event of the Button to open the Popover.
+         * @returns {Promise<undefined>} Promise that resolves, after the pinned spaces are bound.
          *
          * @since 1.114.0
          * @private
@@ -105,7 +105,7 @@ sap.ui.define([
                 return;
             }
 
-            return this._pPopoverPromise.then(function (oPopover) {
+            return this._pPopoverPromise.then((oPopover) => {
                 oPopover.close();
             });
         },

package/src/main/js/sap/ushell/components/shell/NavigationBarMenu/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.components.shell.NavigationBarMenu",
         "applicationVersion": {
-            "version": "1.138.1"
+            "version": "1.139.0"
         },
         "i18n": {
             "bundleUrl": "../../../renderer/resources/resources.properties",