@sapui5/sap.ushell 1.138.0 → 1.139.0

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

@@ -13,7 +13,7 @@ sap.ui.define([
     "sap/ui/Device",
     "sap/ui/thirdparty/hasher",
     "sap/ushell/Container"
-], function (
+], (
     extend,
     EventBus,
     View,
@@ -27,19 +27,19 @@ sap.ui.define([
     Device,
     hasher,
     Container
-) {
+) => {
     "use strict";
 
     // Only used when CLASSIC HOMEPAGE is enabled
-    var oCatalogsManager;
+    let oCatalogsManager;
 
     return Controller.extend("sap.ushell.components.appfinder.AppFinder", {
         onInit: function () {
-            var oComponent = Component.getOwnerComponentFor(this.getView());
+            const oComponent = Component.getOwnerComponentFor(this.getView());
             this.oRouter = oComponent.getRouter();
 
-            var oView = this.getView();
-            var oModel = oComponent.getModel();
+            const oView = this.getView();
+            const oModel = oComponent.getModel();
 
             oView.setModel(oModel);
 
@@ -49,8 +49,8 @@ sap.ui.define([
             this.bEnableEasyAccessUserMenu = oModel.getProperty("/enableEasyAccessUserMenu");
             this.bEnableEasyAccessOnTablet = oModel.getProperty("/enableEasyAccessOnTablet");
 
-            var bEnableOneEasyAccessMenu = this.bEnableEasyAccessSAPMenu || this.bEnableEasyAccessUserMenu;
-            var bIsDeviceEasyAccessMenuCompatible = !Device.system.phone && !Device.system.tablet || Device.system.tablet && this.bEnableEasyAccessOnTablet || Device.system.combi;
+            const bEnableOneEasyAccessMenu = this.bEnableEasyAccessSAPMenu || this.bEnableEasyAccessUserMenu;
+            const bIsDeviceEasyAccessMenuCompatible = !Device.system.phone && !Device.system.tablet || Device.system.tablet && this.bEnableEasyAccessOnTablet || Device.system.combi;
 
             this.bShowEasyAccessMenu = bEnableOneEasyAccessMenu && bIsDeviceEasyAccessMenuCompatible;
 
@@ -70,15 +70,14 @@ sap.ui.define([
 
             this.oVisualizationOrganizerHelper = VisualizationOrganizerHelper.getInstance();
 
-            this.oInitPromise = this.pCatalogView.then(function (CatalogView) {
+            this.oInitPromise = this.pCatalogView.then((CatalogView) => {
                 CatalogView.addStyleClass("sapUiGlobalBackgroundColor sapUiGlobalBackgroundColorForce");
                 // Fetch the VisualizationOrganizer data AFTER the view is created since it requires it
                 return this.oVisualizationOrganizerHelper.loadAndUpdate();
-            }.bind(this));
+            });
             // routing for both 'catalog' and 'appFinder' is supported and added below
             this.oRouter.attachRouteMatched(this._handleAppFinderNavigation.bind(this));
 
-
             oView.createSubHeader();
 
             // attaching a resize handler to determine is hamburger button should be visible or not in the App Finder sub header.
@@ -92,16 +91,16 @@ sap.ui.define([
 
         onExit: function () {
             // Explicitly destroy the view to avoid memory leaks if it is not part of the UI5 hierarchy.
-            this.pCatalogView.then(function (CatalogView) {
+            this.pCatalogView.then((CatalogView) => {
                 CatalogView.destroy();
             });
         },
 
         _resizeHandler: function () {
             // update the visibility of the hamburger button upon resizing
-            var bShowOpenCloseSplitAppButton = this._showOpenCloseSplitAppButton();
+            const bShowOpenCloseSplitAppButton = this._showOpenCloseSplitAppButton();
 
-            var bCurrentShowOpenCloseSplitAppButton = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
+            const bCurrentShowOpenCloseSplitAppButton = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
             if (bShowOpenCloseSplitAppButton !== bCurrentShowOpenCloseSplitAppButton) {
                 this.oSubHeaderModel.setProperty("/openCloseSplitAppButtonVisible", bShowOpenCloseSplitAppButton);
 
@@ -125,26 +124,26 @@ sap.ui.define([
                 oRenderer.getRootControl().getShellHeader()._oLastFocusedHeaderElement = null;
             } catch { /* fail silently */ }
 
-            var EventData = extend({}, oEvent);
+            const EventData = extend({}, oEvent);
             if (this.firstView !== false) {
                 // setting first focus
                 if (!this.bShowEasyAccessMenu) {
-                    this.pCatalogView.then(function (CatalogView) {
+                    this.pCatalogView.then((CatalogView) => {
                         this.getView().oPage.addContent(CatalogView);
-                        setTimeout(function () {
+                        setTimeout(() => {
                             jQuery("#catalogSelect").focus();
                         }, 0);
-                    }.bind(this));
+                    });
                 }
                 this.firstView = false;
             }
 
             // Forward event to pCatalogView
-            this.pCatalogView.then(function (CatalogView) {
+            this.pCatalogView.then((CatalogView) => {
                 CatalogView.getController().customRouteMatched(EventData);
             });
 
-            var oView = this.getView();
+            const oView = this.getView();
             this._preloadAppHandler();
             this._getPathAndHandleGroupContext(oEvent);
 
@@ -204,36 +203,36 @@ sap.ui.define([
         },
 
         onTagsFilter: function (oEvent) {
-            var oTagsFilter = oEvent.getSource(),
-                oSubHeaderModel = oTagsFilter.getModel("subHeaderModel"),
-                aSelectedTags = oEvent.getSource().getSelectedItems(),
-                bTagsMode = aSelectedTags.length > 0,
-                oTagsData = {
-                    tagMode: bTagsMode,
-                    selectedTags: []
-                };
-
-            aSelectedTags.forEach(function (oTag) {
+            const oTagsFilter = oEvent.getSource();
+            const oSubHeaderModel = oTagsFilter.getModel("subHeaderModel");
+            const aSelectedTags = oEvent.getSource().getSelectedItems();
+            const bTagsMode = aSelectedTags.length > 0;
+            const oTagsData = {
+                tagMode: bTagsMode,
+                selectedTags: []
+            };
+
+            aSelectedTags.forEach((oTag) => {
                 oTagsData.selectedTags.push(oTag.getText());
             });
             oSubHeaderModel.setProperty("/activeMenu", this.getCurrentMenuName());
             oSubHeaderModel.setProperty("/tag", oTagsData);
 
-            this.pCatalogView.then(function (CatalogView) {
+            this.pCatalogView.then((CatalogView) => {
                 CatalogView.getController().onTag(oTagsData);
             });
         },
 
         searchHandler: function (oEvent) {
-            var sSearchTerm = oEvent.getSource().getValue(),
-                searchChanged = false;
+            let sSearchTerm = oEvent.getSource().getValue();
+            let searchChanged = false;
             if (sSearchTerm === null) {
                 return;
             }
 
             // take the data from the model
-            var oSearchData = this.oSubHeaderModel.getProperty("/search");
-            var sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
+            const oSearchData = this.oSubHeaderModel.getProperty("/search");
+            let sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
 
             // update active menu to current
             if (this.getCurrentMenuName() !== sActiveMenu) {
@@ -268,7 +267,7 @@ sap.ui.define([
             this.oSubHeaderModel.refresh(true);
 
             if (searchChanged) {
-                this.pCatalogView.then(function (CatalogView) {
+                this.pCatalogView.then((CatalogView) => {
                     CatalogView.getController().onSearch(oSearchData);
                 });
             }
@@ -281,16 +280,16 @@ sap.ui.define([
          *   - setting the shell-header-title accordingly
          */
         _preloadAppHandler: function () {
-            setTimeout(function () {
+            setTimeout(() => {
                 // Since this callback is executed via setTimeout the navigation
                 // might already has proceed to another hash
-                var sCurrentHash = hasher.getHash() || "";
+                const sCurrentHash = hasher.getHash() || "";
                 if (!sCurrentHash.startsWith("Shell-appfinder")) {
                     return;
                 }
 
                 this._updateShellHeader(this.oView.oPage.getTitle());
-            }.bind(this), 0);
+            }, 0);
         },
 
         getCurrentMenuName: function () {
@@ -298,7 +297,7 @@ sap.ui.define([
         },
 
         _navigateTo: function (sName) {
-            var sContextNavigation = this.oVisualizationOrganizerHelper.getNavigationContextAsText.apply(this);
+            const sContextNavigation = this.oVisualizationOrganizerHelper.getNavigationContextAsText.apply(this);
             if (sContextNavigation) {
                 this.oRouter.navTo(sName, {
                     filters: sContextNavigation
@@ -309,19 +308,18 @@ sap.ui.define([
         },
 
         _filterSystemModelsOnTablet: function (aReturnSystems) {
-            var oDeferredReturnSystems = new jQuery.Deferred();
+            const oDeferredReturnSystems = new jQuery.Deferred();
 
             if (this.bEnableEasyAccessOnTablet) {
                 // We need to filter out the Shell-startWDA and Shell-startGUI systems
                 // that do not support tablet
-                Container.getServiceAsync("NavTargetResolutionInternal").then(function (oService) {
+                Container.getServiceAsync("NavTargetResolutionInternal").then((oService) => {
                     // Shell-startWDA often requires the additional parameter sap-ui2-wd-app-id
                     // and Shell-startGUI requires the additional parameter sap-ui2-tcode
                     // We are providing these with a placeholder value to be able to use
                     // the resolution service.
-                    var aFilteredReturnSystemsPromises = aReturnSystems.reduce(function (aResult, oSystem) {
-                        var oNavigationPromise;
-                        oNavigationPromise = oService.isNavigationSupported(
+                    const aFilteredReturnSystemsPromises = aReturnSystems.reduce((aResult, oSystem) => {
+                        const oNavigationPromise = oService.isNavigationSupported(
                             [{
                                 target: {
                                     semanticObject: "Shell",
@@ -337,16 +335,16 @@ sap.ui.define([
                                 params: { "sap-system": oSystem.systemId, "sap-ui2-tcode": "." }
                             }]);
 
-                        aResult.push(new Promise(function (resolve, reject) {
+                        aResult.push(new Promise((resolve, reject) => {
                             oNavigationPromise
-                                .then(function (aIsNavigationSupported) {
-                                    var oResult = { system: oSystem, isSupported: false };
+                                .then((aIsNavigationSupported) => {
+                                    const oResult = { system: oSystem, isSupported: false };
                                     if (aIsNavigationSupported[0].supported || aIsNavigationSupported[1].supported) {
                                         oResult.isSupported = true;
                                     }
                                     resolve(oResult);
                                 })
-                                .fail(function () {
+                                .fail(() => {
                                     resolve({ system: oSystem, isSupported: false });
                                 });
                         }));
@@ -354,9 +352,8 @@ sap.ui.define([
                         return aResult;
                     }, []);
 
-                    Promise.all(aFilteredReturnSystemsPromises).then(function (aResults) {
-                        var aFilteredReturnSystems;
-                        aFilteredReturnSystems = aResults.reduce(function (aFiltered, oSystem) {
+                    Promise.all(aFilteredReturnSystemsPromises).then((aResults) => {
+                        const aFilteredReturnSystems = aResults.reduce((aFiltered, oSystem) => {
                             if (oSystem.isSupported) {
                                 aFiltered.push(oSystem.system);
                             }
@@ -380,8 +377,8 @@ sap.ui.define([
          * @protected
          */
         getGroupNavigationContext: function () {
-            var oGroupContext = this.oView.getModel().getProperty("/groupContext");
-            var sGroupContextPath = oGroupContext ? oGroupContext.path : null;
+            const oGroupContext = this.oView.getModel().getProperty("/groupContext");
+            const sGroupContextPath = oGroupContext ? oGroupContext.path : null;
 
             if (sGroupContextPath) {
                 return JSON.stringify({ targetGroup: encodeURIComponent(sGroupContextPath) });
@@ -391,28 +388,28 @@ sap.ui.define([
         },
 
         getSystemsModels: function () {
-            var that = this;
+            const that = this;
             if (this.getSystemsPromise) {
                 return this.getSystemsPromise;
             }
 
-            var getSystemsDeferred = new jQuery.Deferred();
+            const getSystemsDeferred = new jQuery.Deferred();
             this.getSystemsPromise = getSystemsDeferred.promise();
 
-            var aModelPromises = ["userMenu", "sapMenu"].map(function (menuType) {
-                var systemsModel = new JSONModel();
+            const aModelPromises = ["userMenu", "sapMenu"].map((menuType) => {
+                const systemsModel = new JSONModel();
                 systemsModel.setProperty("/systemSelected", null);
                 systemsModel.setProperty("/systemsList", []);
 
                 return that.getSystems(menuType)
                     .then(that._filterSystemModelsOnTablet.bind(that))
-                    .then(function (aReturnSystems) {
+                    .then((aReturnSystems) => {
                         // add filter here?
                         systemsModel.setProperty("/systemsList", aReturnSystems);
                         return systemsModel;
                     });
             });
-            jQuery.when.apply(jQuery, aModelPromises).then(function (userMenuModel, sapMenuModel) {
+            jQuery.when.apply(jQuery, aModelPromises).then((userMenuModel, sapMenuModel) => {
                 getSystemsDeferred.resolve(userMenuModel, sapMenuModel);
             });
 
@@ -423,33 +420,33 @@ sap.ui.define([
             this.oSubHeaderModel.setProperty("/search/searchMode", false);
             this.oSubHeaderModel.setProperty("/search/searchTerm", "");
 
-            var sName = oEvent.getParameter("id");
+            const sName = oEvent.getParameter("id");
 
             this._navigateTo(sName);
         },
 
         onShow: function (oEvent) {
-            var sParameter = oEvent.getParameter("name");
+            const sParameter = oEvent.getParameter("name");
             if (sParameter === this.getCurrentMenuName()) {
                 return;
             }
 
             // update place holder string on the search input according to the showed menu
-            var oView = this.getView();
+            const oView = this.getView();
             oView._updateSearchWithPlaceHolder(sParameter);
 
             this._updateCurrentMenuName(sParameter);
             this.getSystemsModels()
-                .then(function (userMenuSystemsModel, sapMenuSystemsModel) {
-                    var sapMenuSystemsList = sapMenuSystemsModel.getProperty("/systemsList");
-                    var userMenuSystemsList = userMenuSystemsModel.getProperty("/systemsList");
+                .then((userMenuSystemsModel, sapMenuSystemsModel) => {
+                    const sapMenuSystemsList = sapMenuSystemsModel.getProperty("/systemsList");
+                    const userMenuSystemsList = userMenuSystemsModel.getProperty("/systemsList");
 
                     // call view to remove content from page
                     oView.oPage.removeAllContent();
 
                     // in case we have systems we do want the sub header to be rendered accordingly
                     // (no systems ==> no easy access menu buttons in sub header)
-                    var systemsList = (this.currentMenu === "sapMenu" ? sapMenuSystemsList : userMenuSystemsList);
+                    const systemsList = (this.currentMenu === "sapMenu" ? sapMenuSystemsList : userMenuSystemsList);
                     if (systemsList && systemsList.length) {
                         // call view to render the sub header with easy access menus
                         oView.updateSubHeader(this.currentMenu, true);
@@ -460,7 +457,7 @@ sap.ui.define([
 
                     if (this.currentMenu === "catalog") {
                         // add catalog view
-                        this.pCatalogView.then(function (CatalogView) {
+                        this.pCatalogView.then((CatalogView) => {
                             oView.oPage.addContent(CatalogView);
                         });
                     } else if (this.currentMenu === "userMenu") {
@@ -480,7 +477,7 @@ sap.ui.define([
                                 }
                             });
                         }
-                        this.pUserMenuView.then(function (UserMenuView) {
+                        this.pUserMenuView.then((UserMenuView) => {
                             oView.oPage.addContent(UserMenuView);
                         });
                     } else if (this.currentMenu === "sapMenu") {
@@ -500,7 +497,7 @@ sap.ui.define([
                                 }
                             });
                         }
-                        this.pSapMenuView.then(function (SapMenuView) {
+                        this.pSapMenuView.then((SapMenuView) => {
                             oView.oPage.addContent(SapMenuView);
                         });
                     }
@@ -517,7 +514,7 @@ sap.ui.define([
                     }
 
                     this.oSubHeaderModel.refresh(true);
-                }.bind(this));
+                });
         },
 
         _updateCurrentMenuName: function (sMenu) {
@@ -538,9 +535,11 @@ sap.ui.define([
          * This method sets a class on the AppFinder page to state if tags are shown or not currently in the subheader.
          * The reason for it is that if tags do appear than we have a whole set of different styling to the header and its behavior,
          * so we use different css selectors
+         *
+         * @param {string} sMenu menu string.
          */
         _toggleViewWithSearchAndTagsClasses: function (sMenu) {
-            var oView = this.getView();
+            const oView = this.getView();
 
             if (oView._showSearch(sMenu)) {
                 oView.oPage.addStyleClass("sapUshellAppFinderSearch");
@@ -556,7 +555,7 @@ sap.ui.define([
         },
 
         _toggleViewWithToggleButtonClass: function (bButtonVisible) {
-            var oView = this.getView();
+            const oView = this.getView();
             if (bButtonVisible) {
                 oView.oPage.addStyleClass("sapUshellAppFinderToggleButton");
             } else {
@@ -565,16 +564,15 @@ sap.ui.define([
         },
 
         _setFocusToSegmentedButton: function (systemsList) {
-            var oView = this.getView();
+            const oView = this.getView();
 
             if (systemsList && systemsList.length) {
-                var sButtonId = oView.segmentedButton.getSelectedButton();
-                setTimeout(function () {
-                    jQuery("#" + sButtonId).focus();
+                const sButtonId = oView.segmentedButton.getSelectedButton();
+                setTimeout(() => {
+                    jQuery(`#${sButtonId}`).focus();
                 }, 0);
-
             } else {
-                setTimeout(function () {
+                setTimeout(() => {
                     jQuery("#catalogSelect").focus();
                 }, 0);
             }
@@ -586,9 +584,9 @@ sap.ui.define([
          * @private
          */
         _getPathAndHandleGroupContext: function (oEvent) {
-            var oParameters = oEvent.getParameter("arguments");
-            var sDataParam = oParameters.filters;
-            var oDataParam;
+            const oParameters = oEvent.getParameter("arguments");
+            const sDataParam = oParameters.filters;
+            let oDataParam;
             try {
                 oDataParam = JSON.parse(sDataParam);
             } catch (e) {
@@ -605,14 +603,13 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         _updateModelWithGroupContext: function (oDataParam) {
-            var oModel = this.oView.getModel(),
-                sPath = (oDataParam && decodeURIComponent(oDataParam.targetGroup)) || "";
+            const oModel = this.oView.getModel();
+            let sPath = (oDataParam && decodeURIComponent(oDataParam.targetGroup)) || "";
 
-            var oGroupModel = oModel.getProperty(sPath),
-                oGroupContext;
+            let oGroupModel = oModel.getProperty(sPath);
 
             sPath = sPath === "undefined" ? undefined : sPath;
-            oGroupContext = {
+            const oGroupContext = {
                 path: sPath,
                 id: "",
                 title: oGroupModel && oGroupModel.title
@@ -620,9 +617,9 @@ sap.ui.define([
             // If sPath is defined and is different than empty string - set the group context id.
             // The recursive call is needed in order to wait until groups data is inserted to the model
             if (sPath && sPath !== "") {
-                Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
-                    var timeoutGetGroupDataFromModel = function () {
-                        var aModelGroups = oModel.getProperty("/groups");
+                Container.getServiceAsync("FlpLaunchPage").then((oLaunchPageService) => {
+                    function timeoutGetGroupDataFromModel () {
+                        const aModelGroups = oModel.getProperty("/groups");
                         if (aModelGroups.length && oGroupModel?.object) {
                             oGroupModel = oModel.getProperty(sPath);
                             oGroupContext.id = oLaunchPageService.getGroupId(oGroupModel.object);
@@ -630,7 +627,7 @@ sap.ui.define([
                             return;
                         }
                         setTimeout(timeoutGetGroupDataFromModel, 100);
-                    };
+                    }
                     timeoutGetGroupDataFromModel();
                 });
             }
@@ -642,16 +639,16 @@ sap.ui.define([
          * @returns {*} - a list of systems to show in the system selector dialog
          */
         getSystems: function (sMenuType) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
             Container.getServiceAsync("ClientSideTargetResolution")
-                .then(function (oCSTRService) {
+                .then((oCSTRService) => {
                     return oCSTRService.getEasyAccessSystems(sMenuType);
                 })
                 .then((oSystems) => {
-                    var systemsModel = [];
-                    var aSystemsID = Object.keys(oSystems);
-                    for (var i = 0; i < aSystemsID.length; i++) {
-                        var sCurrentSystemID = aSystemsID[i];
+                    const systemsModel = [];
+                    const aSystemsID = Object.keys(oSystems);
+                    for (let i = 0; i < aSystemsID.length; i++) {
+                        const sCurrentSystemID = aSystemsID[i];
                         systemsModel[i] = {
                             systemName: oSystems[sCurrentSystemID].text,
                             systemId: sCurrentSystemID
@@ -659,8 +656,8 @@ sap.ui.define([
                     }
                     oDeferred.resolve(systemsModel);
                 })
-                .catch(function (sErrorMsg) {
-                    oDeferred.reject("An error occurred while retrieving the systems: " + sErrorMsg);
+                .catch((sErrorMsg) => {
+                    oDeferred.reject(`An error occurred while retrieving the systems: ${sErrorMsg}`);
                 });
             return oDeferred.promise();
         },

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

@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/m/Page",
     "sap/ushell/resources",
     "sap/ui/Device"
-], function (
+], (
     Element,
     View,
     InvisibleText,
@@ -36,12 +36,12 @@ sap.ui.define([
     Page,
     ushellResources,
     Device
-) {
+) => {
     "use strict";
 
     return View.extend("sap.ushell.components.appfinder.AppFinderView", {
         createContent: function () {
-            var oResourceBundle = ushellResources.i18n;
+            const oResourceBundle = ushellResources.i18n;
 
             this.oPage = new Page("appFinderPage", {
                 showHeader: false,
@@ -64,22 +64,28 @@ sap.ui.define([
          * This method checks according to the menu id if search is enabled according to the configuration.
          * Empty menu id is treated as 'catalog' as when loading the appFinder if no menu
          * identified as a routing parameter then we load catalog by default
+         *
+         * @param {string} sMenu menu string.
+         * @returns {boolean} whether the menu search is enabled.
          */
         _showSearch: function (sMenu) {
-            var sModelProperty = "enableCatalogSearch";
+            let sModelProperty = "enableCatalogSearch";
             if (sMenu === "userMenu") {
                 sModelProperty = "enableEasyAccessUserMenuSearch";
             } else if (sMenu === "sapMenu") {
                 sModelProperty = "enableEasyAccessSAPMenuSearch";
             }
 
-            return this.getModel().getProperty("/" + sModelProperty);
+            return this.getModel().getProperty(`/${sModelProperty}`);
         },
 
         /**
          * This method checks according to the menu id if tags is enabled according to the configuration.
          * Empty menu id is treated as 'catalog' as when loading the appFinder if no menu
          * identified as a routing parameter then we load catalog by default
+         *
+         * @param {string} sMenu menu string.
+         * @returns {boolean} whether the menu tag filter is enabled.
          */
         _showSearchTag: function (sMenu) {
             if (sMenu === "userMenu" || sMenu === "sapMenu") {
@@ -95,7 +101,7 @@ sap.ui.define([
             if (Device.system.desktop) {
                 this.oToolbar.addEventDelegate({
                     onAfterRendering: function () {
-                        var oCatalogButton = document.getElementById("catalog-button");
+                        const oCatalogButton = document.getElementById("catalog-button");
                         if (oCatalogButton) {
                             oCatalogButton.setAttribute("accesskey", "a");
                         }
@@ -128,8 +134,8 @@ sap.ui.define([
         },
 
         updateSubHeader: function (sMenu, bEasyAccess) {
-            var oSegmentedButton,
-                oSearchInput;
+            let oSegmentedButton;
+            let oSearchInput;
 
             // clear content from toolbar
             this.oToolbar.removeAllContent();
@@ -157,10 +163,10 @@ sap.ui.define([
                 return this.segmentedButton;
             }
 
-            var oController = this.getController();
-            var oResourceBundle = ushellResources.i18n;
+            const oController = this.getController();
+            const oResourceBundle = ushellResources.i18n;
 
-            var oCatalogSBIInvisibleText = new InvisibleText({
+            const oCatalogSBIInvisibleText = new InvisibleText({
                 text: oResourceBundle.getText("AppFinder.SegmentedButton.Catalog.Describedby")
             }).toStatic();
             this.addDependent(oCatalogSBIInvisibleText);
@@ -189,7 +195,7 @@ sap.ui.define([
             });
 
             if (oController.bEnableEasyAccessUserMenu) {
-                var oUserMenuSBIInvisibleText = new InvisibleText({
+                const oUserMenuSBIInvisibleText = new InvisibleText({
                     text: oResourceBundle.getText("AppFinder.SegmentedButton.UserMenu.Describedby")
                 }).toStatic();
                 this.addDependent(oUserMenuSBIInvisibleText);
@@ -214,7 +220,7 @@ sap.ui.define([
                 }));
             }
             if (oController.bEnableEasyAccessSAPMenu) {
-                var oSAPMenuSBIInvisibleText = new InvisibleText({
+                const oSAPMenuSBIInvisibleText = new InvisibleText({
                     text: oResourceBundle.getText("AppFinder.SegmentedButton.SAPMenu.Describedby")
                 }).toStatic();
                 this.addDependent(oSAPMenuSBIInvisibleText);
@@ -248,7 +254,7 @@ sap.ui.define([
             // invoke the search handler on the controller
             this.getController().searchHandler.apply(this.getController(), arguments);
             // select text right after search executed
-            var oAppFinderSearch = Element.getElementById("appFinderSearch");
+            const oAppFinderSearch = Element.getElementById("appFinderSearch");
             if (oAppFinderSearch) {
                 oAppFinderSearch.focus();
             }
@@ -284,11 +290,11 @@ sap.ui.define([
                     sap.ui.require([
                         "sap/ushell/components/ComponentKeysHandler",
                         "sap/ushell/renderer/AccessKeysHandler"
-                    ], function (ComponentKeysHandler, AccessKeysHandler) {
-                        ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
+                    ], (ComponentKeysHandler, AccessKeysHandler) => {
+                        ComponentKeysHandler.getInstance().then((ComponentKeysHandlerInstance) => {
                             this.oAppFinderSearchControl.addEventDelegate({
                                 onsaptabnext: function (oEvent) {
-                                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
+                                    const openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                                     if (openCloseSplitAppButton.getVisible() && !openCloseSplitAppButton.getPressed()) {
                                         oEvent.preventDefault();
                                         AccessKeysHandler.setIsFocusHandledByAnotherHandler(true);
@@ -296,8 +302,8 @@ sap.ui.define([
                                     }
                                 }
                             });
-                        }.bind(this));
-                    }.bind(this));
+                        });
+                    });
                 }
             }
             this.oAppFinderSearchContainer.addItem(this.oAppFinderSearchControl);
@@ -307,7 +313,7 @@ sap.ui.define([
         },
 
         _updateSearchWithPlaceHolder: function (sMenu) {
-            var sSearchPlaceHolderKey = "";
+            let sSearchPlaceHolderKey = "";
             if (sMenu === "catalog") {
                 sSearchPlaceHolderKey = "EasyAccessMenu_SearchPlaceHolder_Catalog";
             } else if (sMenu === "userMenu") {
@@ -327,7 +333,7 @@ sap.ui.define([
                 return this.oAppFinderTagFilter;
             }
 
-            var oController = this.getController();
+            const oController = this.getController();
 
             this.oAppFinderTagFilter = new MultiComboBox("appFinderTagFilter", {
                 selectedKeys: {