@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -14,7 +14,7 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/library",
     "sap/ushell/resources"
-], function (
+], (
     Log,
     mobileLibrary,
     MessageBox,
@@ -28,19 +28,19 @@ sap.ui.define([
     Container,
     ushellLibrary,
     resources
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.ButtonType
-    var ButtonType = mobileLibrary.ButtonType;
+    const ButtonType = mobileLibrary.ButtonType;
 
     // shortcut for sap.ushell.ContentNodeType
-    var ContentNodeType = ushellLibrary.ContentNodeType;
+    const ContentNodeType = ushellLibrary.ContentNodeType;
 
     // visualizationOrganizer Component
     return UIComponent.extend("sap.ushell.components.visualizationOrganizer.Component", {
         metadata: {
-            version: "1.138.1",
+            version: "1.139.0",
             library: "sap.ushell",
             dependencies: { libs: ["sap.m"] },
             properties: {
@@ -67,19 +67,19 @@ sap.ui.define([
          * @see _fillVizIdMaps
          */
         requestData: function () {
-            var bOnlyHomePage = !Config.last("/core/shell/enablePersonalization") && Config.last("/core/spaces/myHome/enabled");
-            var sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
+            const bOnlyHomePage = !Config.last("/core/shell/enablePersonalization") && Config.last("/core/spaces/myHome/enabled");
+            const sMyHomePageId = Config.last("/core/spaces/myHome/myHomePageId");
             return Container.getServiceAsync("CommonDataModel")
-                .then(function (oCommonDataModelService) {
+                .then((oCommonDataModelService) => {
                     return oCommonDataModelService.getAllPages();
                 })
-                .then(function (aPages) {
+                .then((aPages) => {
                     if (bOnlyHomePage) {
-                        aPages = aPages.filter(function (oPage) {
+                        aPages = aPages.filter((oPage) => {
                             return oPage.identification.id === sMyHomePageId;
                         });
                     }
-                    this.aPersonalizablePages = aPages.map(function (oPage) {
+                    this.aPersonalizablePages = aPages.map((oPage) => {
                         return {
                             id: oPage.identification.id,
                             title: oPage.identification.title
@@ -87,7 +87,7 @@ sap.ui.define([
                     });
                     this._fillVizIdMaps(aPages);
                     return this.aPersonalizablePages;
-                }.bind(this));
+                });
         },
 
         /**
@@ -99,18 +99,18 @@ sap.ui.define([
          */
         _fillVizIdMaps: function (aPages) {
             this.mVizIdInPages = new Map();
-            aPages.forEach(function (oPage) {
-                Object.keys(oPage.payload.sections).forEach(function (sId) {
-                    Object.keys(oPage.payload.sections[sId].viz).forEach(function (vId) {
-                        var vizId = oPage.payload.sections[sId].viz[vId].vizId;
+            aPages.forEach((oPage) => {
+                Object.keys(oPage.payload.sections).forEach((sId) => {
+                    Object.keys(oPage.payload.sections[sId].viz).forEach((vId) => {
+                        const vizId = oPage.payload.sections[sId].viz[vId].vizId;
                         if (this.mVizIdInPages.has(vizId)) {
                             this.mVizIdInPages.get(vizId).add(oPage.identification.id);
                         } else {
                             this.mVizIdInPages.set(vizId, new Set([oPage.identification.id]));
                         }
-                    }.bind(this));
-                }.bind(this));
-            }.bind(this));
+                    });
+                });
+            });
         },
 
         /**
@@ -124,7 +124,7 @@ sap.ui.define([
             if (bSectionContext) {
                 return this.stVizIdInSection.has(vizId);
             }
-            var stPages = this.mVizIdInPages.get(vizId);
+            const stPages = this.mVizIdInPages.get(vizId);
             return !!(stPages && stPages.size);
         },
 
@@ -155,9 +155,9 @@ sap.ui.define([
          * @see isVizIdPresent
          */
         formatPinButtonTooltip: function (vizId, sectionContext) {
-            var bIsVizIdPresent = this.isVizIdPresent(decodeURIComponent(vizId), !!sectionContext);
+            const bIsVizIdPresent = this.isVizIdPresent(decodeURIComponent(vizId), !!sectionContext);
 
-            //No SectionContext
+            // No SectionContext
             if (!sectionContext && bIsVizIdPresent) {
                 return resources.i18n.getText("EasyAccessMenu_PinButton_Toggled_Tooltip");
             }
@@ -166,7 +166,7 @@ sap.ui.define([
                 return resources.i18n.getText("EasyAccessMenu_PinButton_UnToggled_Tooltip");
             }
 
-            //SectionContext with sectionID
+            // SectionContext with sectionID
             if (sectionContext.sectionID && bIsVizIdPresent) {
                 return resources.i18n.getText("VisualizationOrganizer.Button.Tooltip.RemoveFromSection");
             }
@@ -175,7 +175,7 @@ sap.ui.define([
                 return resources.i18n.getText("VisualizationOrganizer.Button.Tooltip.AddToSection");
             }
 
-            //SectionContext without sectionID
+            // SectionContext without sectionID
             if (!sectionContext.sectionID && bIsVizIdPresent) {
                 return resources.i18n.getText("VisualizationOrganizer.Button.Tooltip.RemoveFromPage", [sectionContext.pageTitle]);
             }
@@ -200,8 +200,8 @@ sap.ui.define([
          * @see toggle
          */
         onTilePinButtonClick: function (oEvent, oSectionContext) {
-            var oSource = oEvent.getSource();
-            var oTileData = oSource.getBindingContext().getProperty();
+            const oSource = oEvent.getSource();
+            const oTileData = oSource.getBindingContext().getProperty();
 
             if (oSource.getBusy()) {
                 return Promise.resolve();
@@ -210,7 +210,7 @@ sap.ui.define([
             if (oSectionContext) {
                 oSource.setBusy(true);
                 return this._applyOrganizationChangeToSection(oSource, oTileData, oSectionContext)
-                    .then(function () {
+                    .then(() => {
                         oSource.setBusy(false);
                     });
             }
@@ -218,7 +218,7 @@ sap.ui.define([
             if (this.aPersonalizablePages.length === 1) {
                 oSource.setBusy(true);
                 return this._applyChangeToPage(oSource, oTileData, this.aPersonalizablePages[0])
-                    .then(function () {
+                    .then(() => {
                         oSource.setBusy(false);
                     });
             }
@@ -236,26 +236,26 @@ sap.ui.define([
          * @protected
          */
         open: function (oOpenBy, oVizInfo) {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
-            var oLoadPopover = Promise.resolve();
+            let oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            let oLoadPopover = Promise.resolve();
 
             if (!oPopover) {
-                oLoadPopover = new Promise(function (resolve, reject) {
-                    sap.ui.require(["sap/ui/core/Fragment"], function (Fragment) {
+                oLoadPopover = new Promise((resolve, reject) => {
+                    sap.ui.require(["sap/ui/core/Fragment"], (Fragment) => {
                         Fragment.load({
                             name: "sap.ushell.components.visualizationOrganizer.VisualizationOrganizerPopover",
                             type: "XML",
                             controller: this
                         }).then(resolve).catch(reject);
-                    }.bind(this));
-                }.bind(this)).then(function (popover) {
+                    });
+                }).then((popover) => {
                     oPopover = popover;
                     oPopover.setModel(new JSONModel({ pages: [], searchTerm: "" }));
                     oPopover.setModel(resources.i18nModel, "i18n");
                 });
             }
 
-            return oLoadPopover.then(function () {
+            return oLoadPopover.then(() => {
                 this.oOpenBy = oOpenBy;
                 this.sVisualizationId = decodeURIComponent(oVizInfo.id);
                 this.sVisualizationTitle = oVizInfo.title;
@@ -266,14 +266,14 @@ sap.ui.define([
                 return Promise.all([
                     Container.getServiceAsync("Menu"),
                     Container.getServiceAsync("Pages")
-                ]).then(function (aResults) {
-                    var oPageAssociation;
-                    var oMenuService = aResults[0];
-                    var oPagesService = aResults[1];
+                ]).then((aResults) => {
+                    let oPageAssociation;
+                    const oMenuService = aResults[0];
+                    const oPagesService = aResults[1];
                     if (oVizInfo.isBookmark) {
                         oPageAssociation = oPagesService._findBookmarks({ url: oVizInfo.url })
-                            .then(function (aAssociation) {
-                                var aPageIds = aAssociation.map(function (oFoundViz) {
+                            .then((aAssociation) => {
+                                const aPageIds = aAssociation.map((oFoundViz) => {
                                     return oFoundViz.pageId;
                                 });
                                 return Promise.resolve(new Set(aPageIds));
@@ -286,22 +286,22 @@ sap.ui.define([
                         oMenuService.getContentNodes([ContentNodeType.Space, ContentNodeType.Page]),
                         oPageAssociation
                     ]);
-                }.bind(this)).then(function (aResults) {
-                    var aContentNodes = aResults[0];
-                    var oPageIds = aResults[1];
+                }).then((aResults) => {
+                    let aContentNodes = aResults[0];
+                    const oPageIds = aResults[1];
 
-                    var bOnlyHomePage = !Config.last("/core/shell/enablePersonalization") && Config.last("/core/spaces/myHome/enabled");
-                    var sMyHomeSpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
-                    var aPages = [];
+                    const bOnlyHomePage = !Config.last("/core/shell/enablePersonalization") && Config.last("/core/spaces/myHome/enabled");
+                    const sMyHomeSpaceId = Config.last("/core/spaces/myHome/myHomeSpaceId");
+                    const aPages = [];
 
                     aContentNodes = this._filterPersonalizableContentNodes(aContentNodes);
 
-                    aContentNodes.forEach(function (oContentNode) {
+                    aContentNodes.forEach((oContentNode) => {
                         if (bOnlyHomePage && oContentNode.id !== sMyHomeSpaceId) {
-                            //In case of disabled personalization and enabled home page we need to show only home page
+                            // In case of disabled personalization and enabled home page we need to show only home page
                             return;
                         }
-                        oContentNode.children.forEach(function (oChildNode) {
+                        oContentNode.children.forEach((oChildNode) => {
                             if (!this._isPersonalizablePage(oChildNode.id)) {
                                 // We cannot organize visualizations of unknown pages.
                                 // So the page is disregarded.
@@ -314,18 +314,18 @@ sap.ui.define([
                                 spaceId: oContentNode.id,
                                 selected: oPageIds && oPageIds.has(oChildNode.id)
                             });
-                        }.bind(this));
-                    }.bind(this));
+                        });
+                    });
 
-                    var oPopoverModel = oPopover.getModel();
+                    const oPopoverModel = oPopover.getModel();
                     oPopoverModel.setProperty("/pages", aPages);
                     oPopoverModel.setProperty("/pinnedPages", oPageIds);
 
                     this._updatePagesList();
 
                     oPopover.openBy(oOpenBy);
-                }.bind(this));
-            }.bind(this));
+                });
+            });
         },
 
         /**
@@ -343,13 +343,13 @@ sap.ui.define([
             if (!Array.isArray(aContentNodes)) {
                 return [];
             }
-            return aContentNodes.reduce(function (aNodes, oContentNode) {
+            return aContentNodes.reduce((aNodes, oContentNode) => {
                 oContentNode.children = this._filterPersonalizableContentNodes(oContentNode.children);
                 if (oContentNode.type === ContentNodeType.HomepageGroup || oContentNode.type === ContentNodeType.Space || (oContentNode.type === ContentNodeType.Page && oContentNode.isContainer)) {
                     aNodes.push(oContentNode);
                 }
                 return aNodes;
-            }.bind(this), []);
+            }, []);
         },
 
         /**
@@ -359,8 +359,8 @@ sap.ui.define([
          * @protected
          */
         cancel: function () {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
-            var oChangedItems = this._retrieveChangedPageIds();
+            const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            const oChangedItems = this._retrieveChangedPageIds();
 
             if (oPopover && oChangedItems.deleteFromPageIds.length === 0 && oChangedItems.addToPageIds.length === 0) {
                 oPopover.close();
@@ -392,7 +392,7 @@ sap.ui.define([
          * @protected
          */
         toggle: function (oOpenBy, oVizInfo) {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             // To really make the visualizationOrganizer toggleable, we need to know the last openBy control.
             if (oPopover && oPopover.isOpen() && oPopover._oOpenBy && oPopover._oOpenBy.getId() === oOpenBy.getId()) {
                 this.cancel();
@@ -412,39 +412,39 @@ sap.ui.define([
          * @private
          */
         _applyOrganizationChangeToSection: function (oOpenBy, oVizInfo, oSectionContext) {
-            return Container.getServiceAsync("Pages").then(function (oPageService) {
-                var oVizChangeChain;
-                var sVizId = decodeURIComponent(oVizInfo.id);
-                var sVisualizationTitle = oVizInfo.title;
-                var sPageId = oSectionContext.pageID;
-                var sSectionId = oSectionContext.sectionID;
-                var sMessageToUser = this._getTextMsgSectionContext(oSectionContext, sVizId, sVisualizationTitle);
+            return Container.getServiceAsync("Pages").then((oPageService) => {
+                let oVizChangeChain;
+                const sVizId = decodeURIComponent(oVizInfo.id);
+                const sVisualizationTitle = oVizInfo.title;
+                const sPageId = oSectionContext.pageID;
+                const sSectionId = oSectionContext.sectionID;
+                const sMessageToUser = this._getTextMsgSectionContext(oSectionContext, sVizId, sVisualizationTitle);
 
                 if (this.stVizIdInSection.has(sVizId)) {
-                    oVizChangeChain = oPageService.findVisualization(sPageId, sSectionId, sVizId).then(function (aVisualizationLocations) {
+                    oVizChangeChain = oPageService.findVisualization(sPageId, sSectionId, sVizId).then((aVisualizationLocations) => {
                         if (aVisualizationLocations.length === 0) {
                             return Promise.resolve();
                         }
-                        var oVizDeleteChain;
-                        var iPageIndex = oPageService.getPageIndex(sPageId);
+                        let oVizDeleteChain;
+                        const iPageIndex = oPageService.getPageIndex(sPageId);
 
-                        var aSortedVisualizationsPerSectionIndexes = aVisualizationLocations.sort(function (a, b) {
+                        const aSortedVisualizationsPerSectionIndexes = aVisualizationLocations.sort((a, b) => {
                             return b.sectionIndex - a.sectionIndex;
                         });
 
-                        aSortedVisualizationsPerSectionIndexes.forEach(function (oVisualizationLocation) {
-                            oVisualizationLocation.vizIndexes.sort(function (a, b) {
+                        aSortedVisualizationsPerSectionIndexes.forEach((oVisualizationLocation) => {
+                            oVisualizationLocation.vizIndexes.sort((a, b) => {
                                 return b - a;
                             });
                         });
 
-                        aSortedVisualizationsPerSectionIndexes.forEach(function (oVisualizationLocation) {
-                            var iSectionIndex = oVisualizationLocation.sectionIndex;
-                            oVisualizationLocation.vizIndexes.forEach(function (iVizIndex) {
+                        aSortedVisualizationsPerSectionIndexes.forEach((oVisualizationLocation) => {
+                            const iSectionIndex = oVisualizationLocation.sectionIndex;
+                            oVisualizationLocation.vizIndexes.forEach((iVizIndex) => {
                                 if (!oVizDeleteChain) {
                                     oVizDeleteChain = oPageService.deleteVisualization(iPageIndex, iSectionIndex, iVizIndex);
                                 } else {
-                                    oVizDeleteChain = oVizDeleteChain.then(function () {
+                                    oVizDeleteChain = oVizDeleteChain.then(() => {
                                         return oPageService.deleteVisualization(iPageIndex, iSectionIndex, iVizIndex);
                                     });
                                 }
@@ -452,24 +452,24 @@ sap.ui.define([
                         });
                         return oVizDeleteChain;
                     })
-                        .then(function () {
+                        .then(() => {
                             this.stVizIdInSection.delete(sVizId);
-                        }.bind(this));
+                        });
                 } else {
-                    oVizChangeChain = oPageService.addVisualization(sPageId, sSectionId, sVizId).then(function () {
+                    oVizChangeChain = oPageService.addVisualization(sPageId, sSectionId, sVizId).then(() => {
                         this.stVizIdInSection.add(sVizId);
-                    }.bind(this));
+                    });
                 }
-                return oVizChangeChain.then(function () {
+                return oVizChangeChain.then(() => {
                     oOpenBy.getBinding("icon")?.refresh(true);
                     oOpenBy.getBinding("type")?.refresh(true);
                     oOpenBy.getBinding("tooltip")?.refresh(true);
 
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+                    sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
                         MessageToast.show(sMessageToUser, { offset: "0 -50" });
                     });
                 });
-            }.bind(this));
+            });
         },
 
         /**
@@ -483,11 +483,11 @@ sap.ui.define([
          * @private
          */
         _getTextMsgSectionContext: function (oSectionContext, sVizId, sVisualizationTitle) {
-            var sSectionId = oSectionContext.sectionID;
-            var sSectionTitle = oSectionContext.sectionTitle;
-            var sPageTitle = oSectionContext.pageTitle;
+            const sSectionId = oSectionContext.sectionID;
+            const sSectionTitle = oSectionContext.sectionTitle;
+            const sPageTitle = oSectionContext.pageTitle;
 
-            //sectionID
+            // sectionID
             if (sSectionId && this.stVizIdInSection.has(sVizId)) {
                 return resources.i18n.getText("VisualizationOrganizer.MessageToastSectionContextRemove", [sVisualizationTitle || sVizId, sSectionTitle, sPageTitle]);
             }
@@ -496,7 +496,7 @@ sap.ui.define([
                 return resources.i18n.getText("VisualizationOrganizer.MessageToastSectionContextAdd", [sVisualizationTitle || sVizId, sSectionTitle, sPageTitle]);
             }
 
-            //No sectionID
+            // No sectionID
             if (!sSectionId && this.stVizIdInSection.has(sVizId)) {
                 return resources.i18n.getText("VisualizationOrganizer.MessageToastPageRemove", [sVisualizationTitle || sVizId, sPageTitle]);
             }
@@ -516,7 +516,7 @@ sap.ui.define([
          * @private
          */
         _organizeVisualizations: function () {
-            var oChangedItems = this._retrieveChangedPageIds();
+            const oChangedItems = this._retrieveChangedPageIds();
             if (this.oVizInfo.isBookmark) {
                 return this._applyBookmarkOrganizationChange(oChangedItems, true);
             }
@@ -540,30 +540,30 @@ sap.ui.define([
          * @see _organizeVisualizations
          */
         _applyOrganizationChange: function (oVisualizationChanges, bShowMessage) {
-            var iChangedVisualizations = (oVisualizationChanges.addToPageIds.length + oVisualizationChanges.deleteFromPageIds.length);
+            const iChangedVisualizations = (oVisualizationChanges.addToPageIds.length + oVisualizationChanges.deleteFromPageIds.length);
             if (!iChangedVisualizations) {
                 return Promise.resolve();
             }
-            var sVizId = this.sVisualizationId;
-            var oOpenBy = this.oOpenBy;
-            var stAlreadyRemovedFromPageId = new Set();
-            var oPagesService;
-            var oVizChangeChain = Container.getServiceAsync("Pages").then(function (PagesService) {
+            const sVizId = this.sVisualizationId;
+            const oOpenBy = this.oOpenBy;
+            const stAlreadyRemovedFromPageId = new Set();
+            let oPagesService;
+            let oVizChangeChain = Container.getServiceAsync("Pages").then((PagesService) => {
                 oPagesService = PagesService;
             });
 
-            oVisualizationChanges.deleteFromPageIds.forEach(function (sPageId) {
+            oVisualizationChanges.deleteFromPageIds.forEach((sPageId) => {
                 if (!stAlreadyRemovedFromPageId.has(sPageId)) {
                     stAlreadyRemovedFromPageId.add(sPageId);
-                    oVizChangeChain = oVizChangeChain.then(function () {
-                        return oPagesService.findVisualization(sPageId, null, sVizId).then(function (aVizLocations) {
-                            var aPromises = [];
-
-                            for (var iNrOfSections = aVizLocations.length - 1; iNrOfSections >= 0; iNrOfSections--) {
-                                var oVizLocation = aVizLocations[iNrOfSections];
-                                var iPageIndex = oPagesService.getPageIndex(oVizLocation.pageId);
-                                for (var iNrOfViz = oVizLocation.vizIndexes.length - 1; iNrOfViz >= 0; iNrOfViz--) {
-                                    var iVizIndex = oVizLocation.vizIndexes[iNrOfViz];
+                    oVizChangeChain = oVizChangeChain.then(() => {
+                        return oPagesService.findVisualization(sPageId, null, sVizId).then((aVizLocations) => {
+                            const aPromises = [];
+
+                            for (let iNrOfSections = aVizLocations.length - 1; iNrOfSections >= 0; iNrOfSections--) {
+                                const oVizLocation = aVizLocations[iNrOfSections];
+                                const iPageIndex = oPagesService.getPageIndex(oVizLocation.pageId);
+                                for (let iNrOfViz = oVizLocation.vizIndexes.length - 1; iNrOfViz >= 0; iNrOfViz--) {
+                                    const iVizIndex = oVizLocation.vizIndexes[iNrOfViz];
                                     aPromises.push(oPagesService.deleteVisualization(iPageIndex, oVizLocation.sectionIndex, iVizIndex));
                                 }
                             }
@@ -573,10 +573,10 @@ sap.ui.define([
                     });
                 }
                 this.mVizIdInPages.get(sVizId).delete(sPageId);
-            }.bind(this));
+            });
 
-            oVisualizationChanges.addToPageIds.forEach(function (sPageId) {
-                oVizChangeChain = oVizChangeChain.then(function () {
+            oVisualizationChanges.addToPageIds.forEach((sPageId) => {
+                oVizChangeChain = oVizChangeChain.then(() => {
                     return oPagesService.addVisualization(sPageId, null, sVizId);
                 });
                 if (this.mVizIdInPages.has(sVizId)) {
@@ -584,16 +584,16 @@ sap.ui.define([
                 } else {
                     this.mVizIdInPages.set(sVizId, new Set([sPageId]));
                 }
-            }.bind(this));
+            });
 
-            return oVizChangeChain.then(function () {
+            return oVizChangeChain.then(() => {
                 if (oOpenBy) {
                     oOpenBy.getBinding("icon")?.refresh(true);
                     oOpenBy.getBinding("type")?.refresh(true);
                     oOpenBy.getBinding("tooltip")?.refresh(true);
                 }
                 if (bShowMessage) {
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+                    sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
                         MessageToast.show(resources.i18n.getText("VisualizationOrganizer.MessageToast"));
                     });
                 }
@@ -608,10 +608,10 @@ sap.ui.define([
          * @private
          */
         _resetPopup: function (oEvent) {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
-            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
-            var oToggleButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
+            const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            const oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            const oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
+            const oToggleButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
 
             oPopover.detachAfterClose(this.fnResetPopup);
 
@@ -635,8 +635,8 @@ sap.ui.define([
          * @private
          */
         onSelectionChange: function (event) {
-            var oSLI = event.getParameter("listItem");
-            var bSelected = event.getParameter("selected");
+            const oSLI = event.getParameter("listItem");
+            const bSelected = event.getParameter("selected");
             this._changeSelectionForAllPagesWithTheSamePageId(oSLI, bSelected);
         },
 
@@ -650,14 +650,14 @@ sap.ui.define([
          * @private
          */
         _changeSelectionForAllPagesWithTheSamePageId: function (item, selected) {
-            var oModel = item.getModel();
-            var oContext = item.getBindingContext();
-            var sId = oContext.getProperty("id");
-            var bSelect = (selected !== undefined) ? selected : !oContext.getProperty("selected");
-
-            var aPages = oModel.getProperty("/pages");
-            for (var index = 0; index < aPages.length; index++) {
-                var oPage = aPages[index];
+            const oModel = item.getModel();
+            const oContext = item.getBindingContext();
+            const sId = oContext.getProperty("id");
+            const bSelect = (selected !== undefined) ? selected : !oContext.getProperty("selected");
+
+            const aPages = oModel.getProperty("/pages");
+            for (let index = 0; index < aPages.length; index++) {
+                const oPage = aPages[index];
                 if (oPage.id === sId) {
                     oPage.selected = bSelect;
                 }
@@ -673,8 +673,8 @@ sap.ui.define([
          * @private
          */
         _onSearch: function (oEvent) {
-            var oSelectedPagesButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
-            var bPressed = this.getPressed();
+            const oSelectedPagesButton = Element.getElementById("sapUshellVisualizationOrganizerSelectedPages");
+            let bPressed = this.getPressed();
 
             if (oEvent.sId === "press") {
                 bPressed = !bPressed;
@@ -685,11 +685,11 @@ sap.ui.define([
         },
 
         _updatePagesList: function () {
-            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
-            var oBinding = oPagesList.getBinding("items");
-            var sSearchValue = oSearchField.getValue();
-            var bToggleActive = this.getPressed();
+            const oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            const oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
+            const oBinding = oPagesList.getBinding("items");
+            const sSearchValue = oSearchField.getValue();
+            const bToggleActive = this.getPressed();
 
             if (bToggleActive) {
                 oBinding.filter(new Filter({
@@ -773,22 +773,22 @@ sap.ui.define([
                 return Promise.resolve(null);
             }
 
-            return Container.getServiceAsync("Pages").then(function (oPageService) {
-                var sPageId = decodeURIComponent(oContext.pageID);
-                var sSelectedSectionId = oContext.sectionID ? decodeURIComponent(oContext.sectionID) : "";
+            return Container.getServiceAsync("Pages").then((oPageService) => {
+                const sPageId = decodeURIComponent(oContext.pageID);
+                const sSelectedSectionId = oContext.sectionID ? decodeURIComponent(oContext.sectionID) : "";
 
                 return oPageService.loadPage(sPageId)
-                    .then(function (sPagePath) {
-                        var oPage = oPageService.getModel().getProperty(sPagePath);
-                        var oSectionContext = this._createSectionContext(oPage, sSelectedSectionId);
+                    .then((sPagePath) => {
+                        const oPage = oPageService.getModel().getProperty(sPagePath);
+                        const oSectionContext = this._createSectionContext(oPage, sSelectedSectionId);
 
                         return oSectionContext;
-                    }.bind(this))
-                    .catch(function () {
-                        Log.warning(sPageId + " cannot be loaded. Please, check the id of the page.");
+                    })
+                    .catch(() => {
+                        Log.warning(`${sPageId} cannot be loaded. Please, check the id of the page.`);
                         return Promise.resolve(null);
                     });
-            }.bind(this));
+            });
         },
 
         /**
@@ -801,12 +801,12 @@ sap.ui.define([
          * @private
          */
         _createSectionContext: function (oPage, sSelectedSectionId) {
-            var aPageSections = oPage.sections;
-            var oSelectedSection;
+            const aPageSections = oPage.sections;
+            let oSelectedSection;
 
             if (sSelectedSectionId) {
-                //sectionID parameter is set in the URL
-                oSelectedSection = aPageSections.find(function (oSection) {
+                // sectionID parameter is set in the URL
+                oSelectedSection = aPageSections.find((oSection) => {
                     return oSection.id === sSelectedSectionId;
                 });
 
@@ -820,10 +820,10 @@ sap.ui.define([
                 };
             }
 
-            //sectionID parameter is not set in the URL
-            aPageSections.forEach(function (oSection) {
+            // sectionID parameter is not set in the URL
+            aPageSections.forEach((oSection) => {
                 this._initVizIdsInSection(oSection);
-            }.bind(this));
+            });
 
             return {
                 pageID: oPage.id,
@@ -841,9 +841,9 @@ sap.ui.define([
          */
 
         _initVizIdsInSection: function (oSection) {
-            oSection.visualizations.forEach(function (oVisualization) {
+            oSection.visualizations.forEach((oVisualization) => {
                 this.stVizIdInSection.add(oVisualization.vizId);
-            }.bind(this));
+            });
         },
 
         /**
@@ -864,23 +864,23 @@ sap.ui.define([
          * @private
          */
         _isPersonalizablePage: function (sPageId) {
-            var iIndex = this.aPersonalizablePages.findIndex(function (oPage) {
+            const iIndex = this.aPersonalizablePages.findIndex((oPage) => {
                 return oPage.id === sPageId;
             });
             return iIndex > -1;
         },
 
         _retrieveChangedPageIds: function () {
-            var oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
-            var oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
-            var oPopoverModel = oPagesList.getModel();
-            var stInitialPages = oPopoverModel.getProperty("/pinnedPages") || new Set();
+            const oPagesList = Element.getElementById("sapUshellVisualizationOrganizerSpacesList");
+            const oSearchField = Element.getElementById("sapUshellVisualizationOrganizerSearch");
+            const oPopoverModel = oPagesList.getModel();
+            const stInitialPages = oPopoverModel.getProperty("/pinnedPages") || new Set();
 
             // reset the filter, as some selected items might be hidden
             oPagesList.getBinding("items").filter(null);
 
             // filter groupHeaderItems (spaces) out of the result.
-            var aItems = oPagesList.getItems().filter(function (oItem) {
+            const aItems = oPagesList.getItems().filter((oItem) => {
                 return oItem.isA("sap.m.StandardListItem");
             });
 
@@ -888,12 +888,12 @@ sap.ui.define([
             oSearchField.fireSearch();
 
             // Map to prevent duplicates.
-            var mAlreadyOrganizedPageIds = {};
-            var aAddToPageIds = [];
-            var aDeleteFromPageIds = [];
+            const mAlreadyOrganizedPageIds = {};
+            const aAddToPageIds = [];
+            const aDeleteFromPageIds = [];
 
-            aItems.forEach(function (oItem) {
-                var sItemId = oItem.getBindingContext().getProperty("id");
+            aItems.forEach((oItem) => {
+                const sItemId = oItem.getBindingContext().getProperty("id");
 
                 if (!mAlreadyOrganizedPageIds[sItemId]) {
                     mAlreadyOrganizedPageIds[sItemId] = true;
@@ -912,7 +912,7 @@ sap.ui.define([
         },
 
         okay: function () {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             // Prevent multiple add clicks
             if (oPopover.getBusy()) {
                 return;
@@ -921,11 +921,11 @@ sap.ui.define([
             oPopover.setBusy(true);
 
             this._organizeVisualizations()
-                .then(function () {
+                .then(() => {
                     oPopover.setBusy(false);
                     oPopover.close();
                 })
-                .catch(function (oError) {
+                .catch((oError) => {
                     Log.error("Could not save the selected pages on the VisualizationOrganizerPopover", oError);
                 });
         },
@@ -941,8 +941,8 @@ sap.ui.define([
          * @see toggle
          */
         onHierarchyAppsPinButtonClick: function (oEvent, oSectionContext) {
-            var oSource = oEvent.getSource();
-            var oAppInfo = oSource.getParent().getBinding("title").getContext().getObject();
+            const oSource = oEvent.getSource();
+            const oAppInfo = oSource.getParent().getBinding("title").getContext().getObject();
 
             if (oSource.getBusy()) {
                 return Promise.resolve(false);
@@ -954,7 +954,7 @@ sap.ui.define([
             if (oSectionContext) {
                 oSource.setBusy(true);
                 return this._applyBookmarkTileChangeToSection(oAppInfo, oSectionContext)
-                    .then(function () {
+                    .then(() => {
                         oSource.setBusy(false);
                         return Promise.resolve(true);
                     });
@@ -963,27 +963,27 @@ sap.ui.define([
             if (this.aPersonalizablePages.length === 1) {
                 oSource.setBusy(true);
                 return this._applyChangeToPage(oSource, oAppInfo, this.aPersonalizablePages[0])
-                    .then(function () {
+                    .then(() => {
                         oSource.setBusy(false);
                         return Promise.resolve(true);
                     });
             }
 
-            return new Promise(function (fnResolve) {
+            return new Promise((fnResolve) => {
                 this.toggle(oSource, oAppInfo)
-                    .then(function () {
-                        var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+                    .then(() => {
+                        const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
                         if (oPopover && oPopover.isOpen()) {
-                            oPopover.attachEventOnce("afterClose", function () {
-                                //update pin button
+                            oPopover.attachEventOnce("afterClose", () => {
+                                // update pin button
                                 fnResolve(true);
                             });
                         } else {
-                            //close the dialog by click
+                            // close the dialog by click
                             fnResolve(false);
                         }
                     });
-            }.bind(this));
+            });
         },
 
         /**
@@ -997,18 +997,18 @@ sap.ui.define([
          * @see _organizeVisualizations
          */
         _applyBookmarkOrganizationChange: function (oVisualizationChanges, bShowMessage) {
-            var iChangedVisualizations = (oVisualizationChanges.addToPageIds.length + oVisualizationChanges.deleteFromPageIds.length);
+            const iChangedVisualizations = (oVisualizationChanges.addToPageIds.length + oVisualizationChanges.deleteFromPageIds.length);
             if (!iChangedVisualizations) {
                 return Promise.resolve();
             }
-            var oVizInfo = this.oVizInfo;
-            var stAlreadyRemovedFromPageId = new Set();
-            var oBookmarkService;
-            var oPagesService;
-            var oVizChangeChain = Promise.all([
+            const oVizInfo = this.oVizInfo;
+            const stAlreadyRemovedFromPageId = new Set();
+            let oBookmarkService;
+            let oPagesService;
+            let oVizChangeChain = Promise.all([
                 Container.getServiceAsync("BookmarkV2"),
                 Container.getServiceAsync("Pages")
-            ]).then(function (aServices) {
+            ]).then((aServices) => {
                 oBookmarkService = aServices[0];
                 oPagesService = aServices[1];
                 return Promise.resolve();
@@ -1017,24 +1017,24 @@ sap.ui.define([
             // Bookmark service support only deletion of the bookmark tiles for all pages
             // and it is not possible to delete on the specific page.
             // For this reason we need to use Pages service directly.
-            oVisualizationChanges.deleteFromPageIds.forEach(function (sPageId) {
+            oVisualizationChanges.deleteFromPageIds.forEach((sPageId) => {
                 if (!stAlreadyRemovedFromPageId.has(sPageId)) {
                     stAlreadyRemovedFromPageId.add(sPageId);
-                    oVizChangeChain = oVizChangeChain.then(function () {
+                    oVizChangeChain = oVizChangeChain.then(() => {
                         return oPagesService.deleteBookmarks({ url: oVizInfo.url }, sPageId);
                     });
                 }
             });
 
-            oVisualizationChanges.addToPageIds.forEach(function (sPageId) {
-                oVizChangeChain = oVizChangeChain.then(function () {
-                    var oVisualization = {
+            oVisualizationChanges.addToPageIds.forEach((sPageId) => {
+                oVizChangeChain = oVizChangeChain.then(() => {
+                    const oVisualization = {
                         url: oVizInfo.url,
                         title: oVizInfo.text,
                         subtitle: oVizInfo.subtitle,
                         icon: oVizInfo.icon
                     };
-                    var oContainer = {
+                    const oContainer = {
                         type: ushellLibrary.ContentNodeType.Page,
                         id: sPageId,
                         isContainer: true
@@ -1043,9 +1043,9 @@ sap.ui.define([
                 });
             });
 
-            return oVizChangeChain.then(function () {
+            return oVizChangeChain.then(() => {
                 if (bShowMessage) {
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+                    sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
                         MessageToast.show(resources.i18n.getText("VisualizationOrganizer.MessageToast"));
                     });
                 }
@@ -1062,13 +1062,13 @@ sap.ui.define([
          * @private
          */
         _applyBookmarkTileChangeToSection: function (oVizInfo, oSectionContext) {
-            return Container.getServiceAsync("Pages").then(function (oPageService) {
-                var oVizChangeChain;
-                var sMessageToUser;
-                var sUrl = oVizInfo.url;
-                var sVisualizationTitle = oVizInfo.title;
-                var sPageId = oSectionContext.pageID;
-                var sSectionId = oSectionContext.sectionID;
+            return Container.getServiceAsync("Pages").then((oPageService) => {
+                let oVizChangeChain;
+                let sMessageToUser;
+                const sUrl = oVizInfo.url;
+                const sVisualizationTitle = oVizInfo.title;
+                const sPageId = oSectionContext.pageID;
+                const sSectionId = oSectionContext.sectionID;
 
                 if (oVizInfo.bookmarkCount > 0) {
                     sMessageToUser = resources.i18n.getText(
@@ -1077,7 +1077,7 @@ sap.ui.define([
                     );
                     oVizChangeChain = oPageService.deleteBookmarks({ url: sUrl }, sPageId, sSectionId);
                 } else {
-                    var oVisualization = {
+                    const oVisualization = {
                         url: sUrl,
                         title: oVizInfo.text,
                         subtitle: oVizInfo.subtitle,
@@ -1089,8 +1089,8 @@ sap.ui.define([
                     );
                     oVizChangeChain = oPageService.addBookmarkToPage(sPageId, oVisualization, sSectionId);
                 }
-                return oVizChangeChain.then(function () {
-                    sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+                return oVizChangeChain.then(() => {
+                    sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
                         MessageToast.show(sMessageToUser, { offset: "0 -50" });
                     });
                 });
@@ -1108,12 +1108,12 @@ sap.ui.define([
          */
         updateBookmarkCount: function (aAppsData, oSectionContext) {
             return Container.getServiceAsync("Pages")
-                .then(function (PagesService) {
-                    var aCountPromises = aAppsData.map(function (oAppData) {
+                .then((PagesService) => {
+                    const aCountPromises = aAppsData.map((oAppData) => {
                         return PagesService._findBookmarks({ url: oAppData.url })
-                            .then(function (aFoundBookmarks) {
+                            .then((aFoundBookmarks) => {
                                 if (oSectionContext) {
-                                    aFoundBookmarks = aFoundBookmarks.filter(function (oBookmark) {
+                                    aFoundBookmarks = aFoundBookmarks.filter((oBookmark) => {
                                         return oSectionContext.pageID === oBookmark.pageId && oSectionContext.sectionID === oBookmark.sectionId;
                                     });
                                 }
@@ -1132,7 +1132,7 @@ sap.ui.define([
          * @see isVizIdPresent
          */
         formatBookmarkPinButtonTooltip: function (bookmarkCount, sectionContext) {
-            var sText;
+            let sText;
 
             if (sectionContext) {
                 if (bookmarkCount > 0) {
@@ -1166,34 +1166,34 @@ sap.ui.define([
          * @private
          */
         _applyChangeToPage: function (oOpenBy, oVizInfo, oPage) {
-            var sVisualizationId = decodeURIComponent(oVizInfo.id);
-            var sVisualizationTitle = oVizInfo.title;
-            var sPageId = oPage.id;
-            var bIsVizIdPresented = oVizInfo.isBookmark ? oVizInfo.bookmarkCount > 0 : this.isVizIdPresent(sVisualizationId);
-            var oVisualizationChanges = {
+            const sVisualizationId = decodeURIComponent(oVizInfo.id);
+            const sVisualizationTitle = oVizInfo.title;
+            const sPageId = oPage.id;
+            const bIsVizIdPresented = oVizInfo.isBookmark ? oVizInfo.bookmarkCount > 0 : this.isVizIdPresent(sVisualizationId);
+            const oVisualizationChanges = {
                 addToPageIds: bIsVizIdPresented ? [] : [sPageId],
                 deleteFromPageIds: bIsVizIdPresented ? [sPageId] : []
             };
-            var sMessageToUser = resources.i18n.getText(
+            const sMessageToUser = resources.i18n.getText(
                 bIsVizIdPresented ? "VisualizationOrganizer.MessageToastPageRemove" : "VisualizationOrganizer.MessageToastPageAdd",
                 [sVisualizationTitle || sVisualizationId, oPage.title]
             );
 
             this.oVizInfo = oVizInfo;
             this.sVisualizationId = sVisualizationId;
-            var oChangePromise;
+            let oChangePromise;
             if (oVizInfo.isBookmark) {
                 oChangePromise = this._applyBookmarkOrganizationChange(oVisualizationChanges, false);
             } else {
                 oChangePromise = this._applyOrganizationChange(oVisualizationChanges, false);
             }
 
-            return oChangePromise.then(function () {
+            return oChangePromise.then(() => {
                 oOpenBy.getBinding("icon")?.refresh(true);
                 oOpenBy.getBinding("type")?.refresh(true);
                 oOpenBy.getBinding("tooltip")?.refresh(true);
 
-                sap.ui.require(["sap/m/MessageToast"], function (MessageToast) {
+                sap.ui.require(["sap/m/MessageToast"], (MessageToast) => {
                     MessageToast.show(sMessageToUser, { offset: "0 -50" });
                 });
             });
@@ -1226,7 +1226,7 @@ sap.ui.define([
         },
 
         exit: function () {
-            var oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
+            const oPopover = Element.getElementById("sapUshellVisualizationOrganizerPopover");
             if (oPopover) {
                 oPopover.destroy();
             }