@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview The menu service provides the entries for the menu bar
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/Config",
@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/base/Log",
     "sap/ushell/resources",
     "sap/ushell/Container"
-], function (
+], (
     Config,
     ushellLibrary,
     ushellUtils,
@@ -22,11 +22,11 @@ sap.ui.define([
     Log,
     resources,
     Container
-) {
+) => {
     "use strict";
 
     // shortcut for sap.ushell.ContentNodeType
-    var ContentNodeType = ushellLibrary.ContentNodeType;
+    const ContentNodeType = ushellLibrary.ContentNodeType;
 
     /**
      * @alias sap.ushell.services.Menu
@@ -118,44 +118,38 @@ sap.ui.define([
      * @since 1.71.0
      * @private
      */
-    Menu.prototype.getMenuEntries = function () {
-        return this.oAdapter.getMenuEntries()
-            .then(function (aMenuEntries) {
-                if (Config.last("/core/homeApp/enabled")) {
-                    var oHomeAppEntry = {
-                        id: Config.last("/core/spaces/myHome/myHomeSpaceId"),
-                        title: resources.i18n.getText("HomeApp.Menu.Title"),
-                        "help-id": "homeApp-menuEntry",
-                        description: "",
-                        icon: undefined,
-                        type: "IBN",
-                        target: {
-                            semanticObject: "Shell",
-                            action: "home",
-                            parameters: [],
-                            innerAppRoute: undefined
-                        },
-                        isHomeEntry: true,
-                        menuEntries: []
-                    };
-                    aMenuEntries.splice(0, 0, oHomeAppEntry);
-                }
-                return aMenuEntries;
-            })
-            .then(function (aMenuEntries) {
-                return aMenuEntries
-                    .map(function (oMenuEntry) {
-                        // Attach unique ID to all 1st and 2nd level entries
-                        oMenuEntry.uid = ushellUtils.generateUniqueId([]);
-                        if (oMenuEntry.menuEntries) {
-                            oMenuEntry.menuEntries.forEach(function (oSubMenuEntry) {
-                                oSubMenuEntry.uid = ushellUtils.generateUniqueId([]);
-                            });
-                        }
-
-                        return oMenuEntry;
-                    });
-            });
+    Menu.prototype.getMenuEntries = async function () {
+        const aMenuEntries = await this.oAdapter.getMenuEntries();
+        if (Config.last("/core/homeApp/enabled")) {
+            const oHomeAppEntry = {
+                id: Config.last("/core/spaces/myHome/myHomeSpaceId"),
+                title: resources.i18n.getText("HomeApp.Menu.Title"),
+                "help-id": "homeApp-menuEntry",
+                description: "",
+                icon: undefined,
+                type: "IBN",
+                target: {
+                    semanticObject: "Shell",
+                    action: "home",
+                    parameters: [],
+                    innerAppRoute: undefined
+                },
+                isHomeEntry: true,
+                menuEntries: []
+            };
+            aMenuEntries.splice(0, 0, oHomeAppEntry);
+        }
+        return aMenuEntries.map((oMenuEntry) => {
+            // Attach unique ID to all 1st and 2nd level entries
+            oMenuEntry.uid = ushellUtils.generateUniqueId([]);
+            if (oMenuEntry.menuEntries) {
+                oMenuEntry.menuEntries.forEach((oSubMenuEntry) => {
+                    oSubMenuEntry.uid = ushellUtils.generateUniqueId([]);
+                });
+            }
+
+            return oMenuEntry;
+        });
     };
 
     /**
@@ -187,8 +181,8 @@ sap.ui.define([
      * @private
      * @deprecated since 1.104. Please use {@link #getContentNodes} instead.
      */
-    Menu.prototype.getSpacesPagesHierarchy = function () {
-        var oMenuEntriesPromise;
+    Menu.prototype.getSpacesPagesHierarchy = async function () {
+        let oMenuEntriesPromise;
         if (this.oAdapter.getContentNodeEntries) {
             oMenuEntriesPromise = this.oAdapter.getContentNodeEntries();
         } else {
@@ -196,43 +190,40 @@ sap.ui.define([
         }
 
         // Calculate hierarchy from the menu
-        return oMenuEntriesPromise
-            .then(function (aMenuEntries) {
-                return {
-                    spaces:
-                        // Calculate an array of spaces, which contain a list of their pages each
-                        aMenuEntries.reduce(function (aSpaces, oMenuEntry) {
-                            // Get pages that can be accessed by the current menu entry
-                            var aPages;
-                            if (oMenuEntry.menuEntries && oMenuEntry.menuEntries.length) {
-                                aPages = this._getAccessiblePages(oMenuEntry.menuEntries);
-                            } else {
-                                aPages = this._getAccessiblePages([oMenuEntry]);
-                            }
-
-                            // Calculate space and add it to spaces array
-                            // ... but only if it has at least one page
-                            if (aPages.length) {
-                                aSpaces.push({
-                                    title: oMenuEntry.title,
-                                    id: aPages[0].spaceId,
-                                    pages: aPages
-                                        .map(function (oPage) {
-                                            return {
-                                                title: oPage.title,
-                                                id: oPage.id
-                                            };
-                                        })
-                                });
-                            }
-
-                            return aSpaces;
-                        }.bind(this), [])
-                };
-            }.bind(this))
-            .catch(function () {
-                return { spaces: [] };
-            });
+        try {
+            const aMenuEntries = await oMenuEntriesPromise;
+            return {
+                // Calculate an array of spaces, which contain a list of their pages each
+                spaces: aMenuEntries.reduce((aSpaces, oMenuEntry) => {
+                    // Get pages that can be accessed by the current menu entry
+                    let aPages;
+                    if (oMenuEntry.menuEntries && oMenuEntry.menuEntries.length) {
+                        aPages = this._getAccessiblePages(oMenuEntry.menuEntries);
+                    } else {
+                        aPages = this._getAccessiblePages([oMenuEntry]);
+                    }
+
+                    // Calculate space and add it to spaces array
+                    // ... but only if it has at least one page
+                    if (aPages.length) {
+                        aSpaces.push({
+                            title: oMenuEntry.title,
+                            id: aPages[0].spaceId,
+                            pages: aPages.map((oPage) => {
+                                return {
+                                    title: oPage.title,
+                                    id: oPage.id
+                                };
+                            })
+                        });
+                    }
+
+                    return aSpaces;
+                }, [])
+            };
+        } catch (oError) {
+            return { spaces: [] };
+        }
     };
 
     /**
@@ -261,19 +252,17 @@ sap.ui.define([
      * @private
      * @since 1.104.0
      */
-    Menu.prototype.getContentNodes = function (aContentNodeTypes, bKeepUnrequestedParents) {
+    Menu.prototype.getContentNodes = async function (aContentNodeTypes, bKeepUnrequestedParents) {
         // no filter provided defaults to all ContentNodeTypes defined
         if (!aContentNodeTypes) {
             aContentNodeTypes = Object.values(ContentNodeType);
         }
         bKeepUnrequestedParents = !!bKeepUnrequestedParents;
 
-        return this.oAdapter.getContentNodes()
-            .then(function (aContentNodes) {
-                aContentNodes = deepClone(aContentNodes);
-                var aFilteredContentNodes = this._filterContentNodes(aContentNodes, aContentNodeTypes, bKeepUnrequestedParents);
-                return aFilteredContentNodes;
-            }.bind(this));
+        let aContentNodes = await this.oAdapter.getContentNodes();
+        aContentNodes = deepClone(aContentNodes);
+        const aFilteredContentNodes = this._filterContentNodes(aContentNodes, aContentNodeTypes, bKeepUnrequestedParents);
+        return aFilteredContentNodes;
     };
 
     /**
@@ -293,16 +282,16 @@ sap.ui.define([
             return [];
         }
 
-        return aContentNodes.reduce(function (aNodes, oContentNode) {
+        return aContentNodes.reduce((aNodes, oContentNode) => {
             oContentNode.children = this._filterContentNodes(oContentNode.children, aTypes, bKeepUnrequestedParents);
 
-            var bIsSupportedType = aTypes.includes(oContentNode.type);
+            const bIsSupportedType = aTypes.includes(oContentNode.type);
             if (bIsSupportedType || (bKeepUnrequestedParents && oContentNode.children.length)) {
                 aNodes.push(oContentNode);
             }
 
             return aNodes;
-        }.bind(this), []);
+        }, []);
     };
 
     /**
@@ -328,19 +317,19 @@ sap.ui.define([
 
             // the "pinnedSortOrder" property is always defined and is used to find the default space
             const oFirstPersonalizedSpace = oMenuModel.getData()
-                .filter(function filterOutTheSeparatorAndTheUnpinnedMenuEntries (oMenuEntry) {
+                .filter((oMenuEntry) => {
                     return oMenuEntry.type !== "separator" && oMenuEntry.pinned;
                 })
-                .filter(function filterOutEmptySpaces (oMenuEntry) {
-                    return aContentNodes.some(function testForSpaceWithAtLeastOnePage (oContentNode) {
+                .filter((oMenuEntry) => {
+                    return aContentNodes.some((oContentNode) => {
                         return oMenuEntry.id === oContentNode.id && oContentNode.children.length;
                     });
                 })
-                .reduce(function chooseSpaceWithLowerSortOrder (oCurrentMinimalMenuEntry, oCurrentMenuEntry) {
+                .reduce((oCurrentMinimalMenuEntry, oCurrentMenuEntry) => {
                     return oCurrentMinimalMenuEntry.pinnedSortOrder < oCurrentMenuEntry.pinnedSortOrder ? oCurrentMinimalMenuEntry : oCurrentMenuEntry;
                 }, {});
 
-            const oNonEmptyPersonalizedSpace = aContentNodes.find(function findContentNodeForMenuEntry (oContentNode) {
+            const oNonEmptyPersonalizedSpace = aContentNodes.find((oContentNode) => {
                 return oFirstPersonalizedSpace.id === oContentNode.id;
             });
             if (oNonEmptyPersonalizedSpace) {
@@ -349,7 +338,7 @@ sap.ui.define([
             // if no space is pinned fallback to content nodes
         }
 
-        const oNonEmptySpace = aContentNodes.find(function (oContentNode) {
+        const oNonEmptySpace = aContentNodes.find((oContentNode) => {
             return oContentNode.children.length;
         });
         return oNonEmptySpace;
@@ -363,16 +352,15 @@ sap.ui.define([
      * @since 1.90.0
      * @private
      */
-    Menu.prototype.getMyHomeSpace = function () {
+    Menu.prototype.getMyHomeSpace = async function () {
         if (!Config.last("/core/spaces/myHome/enabled")) {
-            return Promise.resolve(null);
+            return null;
         }
-        var sMySpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
-        return this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]).then(function (aContentNodes) {
-            return aContentNodes.find(function (oContentNode) {
-                return oContentNode.type === ContentNodeType.Space && oContentNode.id === sMySpaceId;
-            }) || null;
-        });
+        const sMySpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
+        const aContentNodes = await this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
+        return aContentNodes.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Space && oContentNode.id === sMySpaceId;
+        }) || null;
     };
 
     /**
@@ -389,18 +377,18 @@ sap.ui.define([
      */
     Menu.prototype._getAccessiblePages = function (aMenuEntries) {
         return aMenuEntries
-            .filter(function (oMenuEntry) {
+            .filter((oMenuEntry) => {
                 return oMenuEntry
                     && oMenuEntry.type === "IBN"
                     && oMenuEntry.target
                     && oMenuEntry.target.semanticObject === "Launchpad"
                     && oMenuEntry.target.action === "openFLPPage";
             })
-            .map(function (oMenuEntry) {
-                var oSpaceParam = oMenuEntry.target.parameters.find(function (oParam) {
+            .map((oMenuEntry) => {
+                const oSpaceParam = oMenuEntry.target.parameters.find((oParam) => {
                     return oParam.name === "spaceId";
                 });
-                var oPageParam = oMenuEntry.target.parameters.find(function (oParam) {
+                const oPageParam = oMenuEntry.target.parameters.find((oParam) => {
                     return oParam.name === "pageId";
                 });
                 return {
@@ -422,14 +410,12 @@ sap.ui.define([
      * @since 1.78.0
      * @private
      */
-    Menu.prototype.hasMultiplePages = function (spaceId) {
-        return this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page])
-            .then(function (aContentNodes) {
-                var oSpace = aContentNodes.find(function (oContentNode) {
-                    return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
-                });
-                return oSpace && oSpace.children.length > 1;
-            });
+    Menu.prototype.hasMultiplePages = async function (spaceId) {
+        const aContentNodes = await this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
+        const oSpace = aContentNodes.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
+        });
+        return oSpace && oSpace.children.length > 1;
     };
 
     /**
@@ -441,23 +427,21 @@ sap.ui.define([
      * @since 1.93.0
      * @private
      */
-    Menu.prototype.isSpacePageAssigned = function (spaceId, pageId) {
-        return this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page])
-            .then(function (aContentNodes) {
-                var oSpace = aContentNodes.find(function (oContentNode) {
-                    return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
-                });
+    Menu.prototype.isSpacePageAssigned = async function (spaceId, pageId) {
+        const aContentNodes = await this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
+        const oSpace = aContentNodes.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
+        });
 
-                if (!oSpace) {
-                    return false;
-                }
+        if (!oSpace) {
+            return false;
+        }
 
-                var oPage = oSpace.children.find(function (oContentNode) {
-                    return oContentNode.type === ContentNodeType.Page && oContentNode.id === pageId;
-                });
+        const oPage = oSpace.children.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Page && oContentNode.id === pageId;
+        });
 
-                return !!oPage;
-            });
+        return !!oPage;
     };
 
     /**
@@ -471,22 +455,23 @@ sap.ui.define([
      * @since 1.92.0
      * @private
      */
-    Menu.prototype.getSpaceAndPageTitles = function (spaceId, pageId) {
-        return this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]).then(function (aContentNodes) {
-            var oPage;
-            var oSpace = aContentNodes.find(function (oContentNode) {
-                return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
-            });
-            if (oSpace) {
-                oPage = oSpace.children.find(function (oContentNode) {
-                    return oContentNode.type === ContentNodeType.Page && oContentNode.id === pageId;
-                });
-            }
-            if (oPage) {
-                return { spaceTitle: oSpace.label, pageTitle: oPage.label };
-            }
+    Menu.prototype.getSpaceAndPageTitles = async function (spaceId, pageId) {
+        const aContentNodes = await this.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]);
+        const oSpace = aContentNodes.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Space && oContentNode.id === spaceId;
+        });
+
+        if (!oSpace) {
             return null;
+        }
+
+        const oPage = oSpace.children.find((oContentNode) => {
+            return oContentNode.type === ContentNodeType.Page && oContentNode.id === pageId;
         });
+        if (!oPage) {
+            return null;
+        }
+        return { spaceTitle: oSpace.label, pageTitle: oPage.label };
     };
 
     /**
@@ -496,96 +481,86 @@ sap.ui.define([
      *
      * @returns {Promise<sap.ui.model.json.JSONModel>} Resolves to the JSONModel attached to the UI.
      */
-    Menu.prototype.getMenuModel = function () {
-        if (this.bIsMenuModelFilled) {
-            return Promise.resolve(this.oModel);
-        }
+    Menu.prototype.getMenuModel = async function () {
+        if (!this.bIsMenuModelFilled) {
+            let oMenuEntriesPromise;
+            if (Config.last("/core/menu/personalization/enabled")) {
+                oMenuEntriesPromise = this._getMenuEntriesWithPersonalizationData();
+            } else {
+                oMenuEntriesPromise = this.getMenuEntries();
+            }
 
-        var oMenuEntriesPromise;
-        if (Config.last("/core/menu/personalization/enabled")) {
-            oMenuEntriesPromise = this._getMenuEntriesWithPersonalizationData();
-        } else {
-            oMenuEntriesPromise = this.getMenuEntries();
+            const aMenuEntries = await oMenuEntriesPromise;
+            this.oModel.setData(aMenuEntries);
+            this.bIsMenuModelFilled = true;
         }
 
-        return oMenuEntriesPromise
-            .then(function (entries) {
-                var aMenuEntries = entries;
-                this.oModel.setData(aMenuEntries);
-                this.bIsMenuModelFilled = true;
-                return this.oModel;
-            }.bind(this));
+        return this.oModel;
     };
 
     /** Returns menu entries including personalization Data
      *  separator and home entry if configured.
      *  Personalization Data is pinned sort order, and the pinned property
      *  The order of array that is returned represents the order of all menu entries
-     * @returns {object[]} nodes The array of nodes and their children.
+     * @returns {Promise<object[]>} nodes The array of nodes and their children.
      * @since 1.114.0
      */
-    Menu.prototype._getMenuEntriesWithPersonalizationData = function () {
-        return Promise.all([
-            this.getMenuEntries(),
-            this.oAdapter.getMenuPersonalization()
-        ])
-            .then(function (oResult) {
-                var aMenuEntries = oResult[0];
-                var oMenuPersonalization = oResult[1];
-                var aPersonalizedMenuEntries;
-
-                // The navigation bar items are created via data binding therefore the separator,
-                // has to be in the model as well.
-                var oSeparator = {
-                    type: "separator",
-                    pinned: true
-                };
-                let bShowSeparator = true;
-                if (aMenuEntries[0] && aMenuEntries[0].isHomeEntry) {
-                    aMenuEntries.splice(1, 0, oSeparator);
-                } else if (Config.last("/core/menu/personalization/showNavigationBarMenuButton")) {
-                    aMenuEntries.splice(0, 0, oSeparator);
-                } else {
-                    bShowSeparator = false;
-                }
+    Menu.prototype._getMenuEntriesWithPersonalizationData = async function () {
+        const aMenuEntries = await this.getMenuEntries();
+        const oMenuPersonalization = await this.oAdapter.getMenuPersonalization();
+        let aPersonalizedMenuEntries;
 
-                if (!oMenuPersonalization) {
-                    // If there is no personalization yet, initially all the spaces are displayed as pinned.
-                    aPersonalizedMenuEntries = aMenuEntries.map(function addPinnedPropertyAndSortOrder (oMenuEntry, iIndex) {
-                        oMenuEntry.pinned = true;
-                        oMenuEntry.pinnedSortOrder = iIndex;
-                        return oMenuEntry;
-                    });
-                } else {
-                    // The personalization does not contain the MyHome entry and the separator
-                    // therefore the index of the pinned spaces has to be adapted accordingly.
-                    var iIndexOffset = 1;
-                    if (aMenuEntries[0].isHomeEntry) {
-                        iIndexOffset = 2;
-                    }
-                    // Adds the pinned property and the pinned property sort order.
-                    // unpinned entries get sort order -1
-                    aPersonalizedMenuEntries = aMenuEntries.map(function addPinnedPropertyAndSortOrder (oMenuEntry) {
-                        oMenuEntry.pinned = oMenuPersonalization.pinnedSpaces.includes(oMenuEntry.id);
-                        oMenuEntry.pinnedSortOrder = oMenuPersonalization.pinnedSpaces.indexOf(oMenuEntry.id);
-                        if (oMenuEntry.pinnedSortOrder > -1) {
-                            oMenuEntry.pinnedSortOrder = oMenuEntry.pinnedSortOrder + iIndexOffset;
-                        }
-                        return oMenuEntry;
-                    });
+        // The navigation bar items are created via data binding therefore the separator,
+        // has to be in the model as well.
+        const oSeparator = {
+            type: "separator",
+            pinned: true
+        };
+        let bShowSeparator = true;
+        if (aMenuEntries[0] && aMenuEntries[0].isHomeEntry) {
+            aMenuEntries.splice(1, 0, oSeparator);
+        } else if (Config.last("/core/menu/personalization/showNavigationBarMenuButton")) {
+            aMenuEntries.splice(0, 0, oSeparator);
+        } else {
+            bShowSeparator = false;
+        }
 
-                    if (bShowSeparator) {
-                        // Set the MyHome entry and the separator to be pinned.
-                        aMenuEntries[0].pinned = true;
-                        aMenuEntries[0].pinnedSortOrder = 0;
-                        if (aMenuEntries[0].isHomeEntry) {
-                            aMenuEntries[1].pinned = true;
-                            aMenuEntries[1].pinnedSortOrder = 1;
-                        }
-                    }
+        if (!oMenuPersonalization) {
+            // If there is no personalization yet, initially all the spaces are displayed as pinned.
+            aPersonalizedMenuEntries = aMenuEntries.map((oMenuEntry, iIndex) => {
+                oMenuEntry.pinned = true;
+                oMenuEntry.pinnedSortOrder = iIndex;
+                return oMenuEntry;
+            });
+        } else {
+            // The personalization does not contain the MyHome entry and the separator
+            // therefore the index of the pinned spaces has to be adapted accordingly.
+            let iIndexOffset = 1;
+            if (aMenuEntries[0].isHomeEntry) {
+                iIndexOffset = 2;
+            }
+            // Adds the pinned property and the pinned property sort order.
+            // unpinned entries get sort order -1
+            aPersonalizedMenuEntries = aMenuEntries.map((oMenuEntry) => {
+                oMenuEntry.pinned = oMenuPersonalization.pinnedSpaces.includes(oMenuEntry.id);
+                oMenuEntry.pinnedSortOrder = oMenuPersonalization.pinnedSpaces.indexOf(oMenuEntry.id);
+                if (oMenuEntry.pinnedSortOrder > -1) {
+                    oMenuEntry.pinnedSortOrder = oMenuEntry.pinnedSortOrder + iIndexOffset;
                 }
-                return aPersonalizedMenuEntries;
+                return oMenuEntry;
             });
+
+            if (bShowSeparator) {
+                // Set the MyHome entry and the separator to be pinned.
+                aMenuEntries[0].pinned = true;
+                aMenuEntries[0].pinnedSortOrder = 0;
+                if (aMenuEntries[0].isHomeEntry) {
+                    aMenuEntries[1].pinned = true;
+                    aMenuEntries[1].pinnedSortOrder = 1;
+                }
+            }
+        }
+        return aPersonalizedMenuEntries;
     };
 
     /**
@@ -594,19 +569,21 @@ sap.ui.define([
      * @since 1.114.0
      */
     Menu.prototype._extractPersonalization = function () {
-        var oMenuPersonalization = {
+        const oMenuPersonalization = {
             version: "1.0.0",
             pinnedSpaces: []
         };
 
-        var aMenuEntriesWithPersonalizationData = this.oModel.getData();
+        const aMenuEntriesWithPersonalizationData = this.oModel.getData();
 
         oMenuPersonalization.pinnedSpaces = aMenuEntriesWithPersonalizationData
-            .filter(function filterOutHomeEntryAndSeparatorAndUnpinned (oMenuEntry) {
+            .filter((oMenuEntry) => {
                 return !oMenuEntry.isHomeEntry && oMenuEntry.type !== "separator" && oMenuEntry.pinned;
-            }).sort(function (oMenuEntryA, oMenuEntryB) {
+            })
+            .sort((oMenuEntryA, oMenuEntryB) => {
                 return oMenuEntryA.pinnedSortOrder - oMenuEntryB.pinnedSortOrder;
-            }).map(function (oMenuEntry) {
+            })
+            .map((oMenuEntry) => {
                 return oMenuEntry.id;
             });
 
@@ -618,29 +595,25 @@ sap.ui.define([
      * @returns {Promise} Resolved when saved successfully, rejected if saving fails
      * @since 1.114.0
      */
-    Menu.prototype.savePersonalization = function () {
-        var oMenuPersonalizationData = this._extractPersonalization();
+    Menu.prototype.savePersonalization = async function () {
+        const oMenuPersonalizationData = this._extractPersonalization();
 
-        return Container.getServiceAsync("PersonalizationV2")
-            .then(async function (oPersonalizationService) {
-                var oPersId;
-
-                oPersId = {
-                    container: "sap.ushell.menuPersonalization",
-                    item: "data"
-                };
+        const oPersonalizationService = await Container.getServiceAsync("PersonalizationV2");
+        const oPersId = {
+            container: "sap.ushell.menuPersonalization",
+            item: "data"
+        };
 
-                // The data is read from the metatags which dos not use any cachebuster tokens.
-                var oScope = {
-                    validity: "Infinity",
-                    keyCategory: oPersonalizationService.KeyCategory.FIXED_KEY,
-                    writeFrequency: oPersonalizationService.WriteFrequency.HIGH,
-                    clientStorageAllowed: false
-                };
-                const oPersonalizer = await oPersonalizationService.getPersonalizer(oPersId, oScope);
+        // The data is read from the metatags which dos not use any cachebuster tokens.
+        const oScope = {
+            validity: "Infinity",
+            keyCategory: oPersonalizationService.KeyCategory.FIXED_KEY,
+            writeFrequency: oPersonalizationService.WriteFrequency.HIGH,
+            clientStorageAllowed: false
+        };
+        const oPersonalizer = await oPersonalizationService.getPersonalizer(oPersId, oScope);
 
-                return oPersonalizer.setPersData(oMenuPersonalizationData);
-            });
+        return oPersonalizer.setPersData(oMenuPersonalizationData);
     };
 
     /**
@@ -653,22 +626,27 @@ sap.ui.define([
      * @private
      */
     Menu.prototype.moveMenuEntry = function (iSourceIndex, iTargetIndex) {
-        var aMenuEntries = this.oModel.getData();
-        var oMenuEntryToMove = aMenuEntries.find(function (oMenuEntry) {
+        const aMenuEntries = this.oModel.getData();
+        const oMenuEntryToMove = aMenuEntries.find((oMenuEntry) => {
             return oMenuEntry.pinnedSortOrder === iSourceIndex;
         });
         oMenuEntryToMove.pinnedSortOrder = iTargetIndex - 0.5;
-        aMenuEntries.map(function (oMenuEntry) {
-            // create a shallow copy of the array so that the following array functions
-            // don't change the original one
-            return oMenuEntry;
-        }).filter(function (oMenuEntry) {
-            return oMenuEntry.pinned;
-        }).sort(function (oMenuEntryA, oMenuEntryB) {
-            return oMenuEntryA.pinnedSortOrder - oMenuEntryB.pinnedSortOrder;
-        }).forEach(function (oMenuEntry, iIndex) {
-            oMenuEntry.pinnedSortOrder = iIndex;
-        });
+        aMenuEntries
+            .map((oMenuEntry) => {
+                // create a shallow copy of the array so that the following array functions
+                // don't change the original one
+                return oMenuEntry;
+            })
+            .filter((oMenuEntry) => {
+                return oMenuEntry.pinned;
+            })
+            .sort((oMenuEntryA, oMenuEntryB) => {
+                return oMenuEntryA.pinnedSortOrder - oMenuEntryB.pinnedSortOrder;
+            })
+            .forEach((oMenuEntry, iIndex) => {
+                oMenuEntry.pinnedSortOrder = iIndex;
+            });
+
         this.oModel.refresh(true);
     };
 
@@ -684,17 +662,15 @@ sap.ui.define([
      * @since 1.115.0
      * @private
      */
-    Menu.prototype.isPinned = function (sSpaceId) {
+    Menu.prototype.isPinned = async function (sSpaceId) {
         if (Config.last("/core/menu/personalization/enabled") === false) {
-            return Promise.resolve(true);
+            return true;
         }
 
-        return this.getMenuModel()
-            .then(function (oModel) {
-                return oModel.getData().some(function (oMenuEntry) {
-                    return oMenuEntry.id === sSpaceId && oMenuEntry.pinned;
-                });
-            });
+        const oModel = await this.getMenuModel();
+        return oModel.getData().some((oMenuEntry) => {
+            return oMenuEntry.id === sSpaceId && oMenuEntry.pinned;
+        });
     };
 
     /**
@@ -710,11 +686,11 @@ sap.ui.define([
      * @private
      * @since 1.107.0
      */
-    Menu.prototype.isWorkPage = function (sPageId) {
+    Menu.prototype.isWorkPage = async function (sPageId) {
         if (this.oAdapter.isWorkPage) {
             return this.oAdapter.isWorkPage(sPageId);
         }
-        return Promise.resolve(false);
+        return false;
     };
 
     /**
@@ -728,8 +704,8 @@ sap.ui.define([
      * @private
      */
     Menu.prototype._getNodeInfo = function (nodeId, nodes, isChild, managerId) {
-        var oNodeInfo;
-        for (var i = 0; i < nodes.length; i++) {
+        let oNodeInfo;
+        for (let i = 0; i < nodes.length; i++) {
             if (!isChild) { managerId = this._getManagerIdInNodeTree(nodeId, nodes[i]); }
             if (nodes[i].id === nodeId) {
                 return {
@@ -761,14 +737,14 @@ sap.ui.define([
      * @private
      */
     Menu.prototype._nodeManagementPermitted = function (nodeId, rootNodes, managerId) {
-        var oNodeInfo = this._getNodeInfo(nodeId, rootNodes);
+        const oNodeInfo = this._getNodeInfo(nodeId, rootNodes);
         if (!oNodeInfo.node) {
-            Log.error("Node with id " + nodeId + " cannot be found and will be skipped.");
+            Log.error(`Node with id ${nodeId} cannot be found and will be skipped.`);
             return false;
         }
         if (oNodeInfo.managerId && oNodeInfo.managerId !== managerId) {
-            Log.error("Node with id " + nodeId + " cannot be managed by '" + managerId + "'" +
-                " because it is already managed by '" + oNodeInfo.managerId + "'.");
+            Log.error(`Node with id ${nodeId} cannot be managed by '${managerId}'` +
+                ` because it is already managed by '${oNodeInfo.managerId}'.`);
             return false;
         }
         return true;
@@ -787,7 +763,7 @@ sap.ui.define([
         if (node.id === nodeId) { return managerId || node.managerId; }
         if (node.managerId) { managerId = node.managerId; }
         if (node.menuEntries && node.menuEntries.length > 0) {
-            for (var i = 0; i < node.menuEntries.length; ++i) {
+            for (let i = 0; i < node.menuEntries.length; ++i) {
                 managerId = this._getManagerIdInNodeTree(nodeId, node.menuEntries[i], managerId);
             }
             return managerId;
@@ -805,7 +781,7 @@ sap.ui.define([
      * @private
      */
     Menu.prototype._updateNode = function (nodeId, nodes, managedTree) {
-        var oTree = deepClone(managedTree || {});
+        const oTree = deepClone(managedTree || {});
         // Make sure that all menu entries have uid:
         function addUid (treeObj) {
             if (treeObj) {
@@ -816,7 +792,7 @@ sap.ui.define([
         addUid(oTree);
 
         // traverse the tree to find the menu entry with the required ID and replace it
-        return nodes.map(function (node) {
+        return nodes.map((node) => {
             if (node.id === nodeId) {
                 return oTree;
             }
@@ -824,7 +800,7 @@ sap.ui.define([
                 node.menuEntries = this._updateNode(nodeId, node.menuEntries, oTree);
             }
             return node;
-        }.bind(this));
+        });
     };
 
     /**
@@ -837,11 +813,11 @@ sap.ui.define([
      * @private
      */
     Menu.prototype._createEntryProviders = function (managerId, nodeIds, model) {
-        var aNodes = model.getData();
-        var oMenuEntryProvider = {};
-        var sNodeId;
+        const aNodes = model.getData();
+        const oMenuEntryProvider = {};
+        let sNodeId;
 
-        for (var i = 0; i < nodeIds.length; ++i) {
+        for (let i = 0; i < nodeIds.length; ++i) {
             sNodeId = nodeIds[i];
 
             if (!this._nodeManagementPermitted(sNodeId, aNodes, managerId)) {
@@ -850,7 +826,7 @@ sap.ui.define([
 
             oMenuEntryProvider[sNodeId] = {
                 setData: function (nodeId, managedTree) {
-                    var aUpdatedNodes = this._updateNode(nodeId, aNodes, managedTree);
+                    const aUpdatedNodes = this._updateNode(nodeId, aNodes, managedTree);
 
                     model.setData(aUpdatedNodes);
                 }.bind(this, sNodeId)
@@ -887,15 +863,14 @@ sap.ui.define([
      * @param {string[]} nodeIds An array of nodeId strings.
      * @returns {Promise<object>} The entry provider functions mapped to the nodeIds.
      */
-    Menu.prototype.getEntryProvider = function (pluginName, nodeIds) {
+    Menu.prototype.getEntryProvider = async function (pluginName, nodeIds) {
         if (this._isManagerBlocked(pluginName)) {
-            Log.error("ManagerId '" + pluginName + "' is already listed as an entry manager.");
-            return Promise.reject("ManagerId " + pluginName + " is already listed as an entry manager.");
+            Log.error(`ManagerId '${pluginName}' is already listed as an entry manager.`);
+            return Promise.reject(`ManagerId ${pluginName} is already listed as an entry manager.`);
         }
         this._setManagerBlocked(pluginName);
-        return this.getMenuModel().then(function (model) {
-            return this._createEntryProviders(pluginName, nodeIds, model);
-        }.bind(this));
+        const oModel = await this.getMenuModel();
+        return this._createEntryProviders(pluginName, nodeIds, oModel);
     };
 
     // Return menu service from this module