@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -14,7 +14,7 @@ sap.ui.define([
     "sap/ushell/ui/launchpad/AccessibilityCustomData",
     "sap/ushell/Config",
     "sap/ushell/Container"
-], function (
+], (
     Localization,
     Element,
     Controller,
@@ -28,7 +28,7 @@ sap.ui.define([
     AccessibilityCustomData,
     Config,
     Container
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.appfinder.EasyAccess", {
@@ -37,11 +37,11 @@ sap.ui.define([
         SEARCH_RESULTS_PER_REQUEST: 100,
 
         onInit: function () {
-            var that = this;
+            const that = this;
             this.translationBundle = resources.i18n;
             this.oView = this.getView();
-            var oEasyAccessSystemsModel = this.oView.getModel("easyAccessSystemsModel");
-            var systemSelectedBinding = oEasyAccessSystemsModel.bindProperty("/systemSelected");
+            const oEasyAccessSystemsModel = this.oView.getModel("easyAccessSystemsModel");
+            const systemSelectedBinding = oEasyAccessSystemsModel.bindProperty("/systemSelected");
             systemSelectedBinding.attachChange(that.adjustUiOnSystemChange.bind(this));
 
             this.menuName = this.oView.getViewData().menuName;
@@ -54,18 +54,18 @@ sap.ui.define([
             Promise.all([
                 this.oView.pHierarchyFolders,
                 this.oView.pHierarchyApps
-            ]).then(function (aResults) {
+            ]).then((aResults) => {
                 aResults[0].setModel(this.easyAccessModel, "easyAccess");
                 aResults[1].setModel(this.easyAccessModel, "easyAccess");
-            }.bind(this));
+            });
 
             if (!Config.last("/core/spaces/enabled")) {
-                sap.ui.require(["sap/ushell/components/HomepageManager"], function (HomepageManager) {
-                    var oModel = this.getView().getModel();
+                sap.ui.require(["sap/ushell/components/HomepageManager"], (HomepageManager) => {
+                    const oModel = this.getView().getModel();
                     if (!oModel.getProperty("/catalogs")) {
                         // catalog also needs groups
                         if (!oModel.getProperty("/groups") || oModel.getProperty("/groups").length === 0) {
-                            var oHomepageManager = HomepageManager.prototype.getInstance();
+                            const oHomepageManager = HomepageManager.prototype.getInstance();
                             if (oHomepageManager) {
                                 this.oHomepageManager = oHomepageManager;
                                 this.oHomepageManager.loadPersonalizedGroups();
@@ -74,19 +74,19 @@ sap.ui.define([
                             }
                         }
                     }
-                }.bind(this));
+                });
             }
 
             // take the sub-header model
-            var oSubHeaderModel = this.oView.getModel("subHeaderModel");
+            const oSubHeaderModel = this.oView.getModel("subHeaderModel");
 
             // init listener for the toggle button binding context
-            var oToggleButtonModelBinding = oSubHeaderModel.bindProperty("/openCloseSplitAppButtonToggled");
+            const oToggleButtonModelBinding = oSubHeaderModel.bindProperty("/openCloseSplitAppButtonToggled");
             oToggleButtonModelBinding.attachChange(that.handleToggleButtonModelChanged.bind(this));
 
             // only in case search is enabled for this View, we init the listener on the search binding context
             if (this.oView.getViewData().enableSearch) {
-                var oSearchModelBinding = oSubHeaderModel.bindProperty("/search");
+                const oSearchModelBinding = oSubHeaderModel.bindProperty("/search");
                 oSearchModelBinding.attachChange(that.handleSearchModelChanged.bind(this));
             }
 
@@ -94,7 +94,7 @@ sap.ui.define([
         },
 
         checkIfSystemSelectedAndLoadData: function () {
-            var oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
+            const oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
             if (oSystemSelected) {
                 this.systemId = oSystemSelected.systemId;
                 this.loadMenuItemsFirstTime(this.oView.getViewData().menuName, oSystemSelected);
@@ -105,11 +105,11 @@ sap.ui.define([
             Promise.all([
                 this.oView.pHierarchyFolders,
                 this.oView.pHierarchyApps
-            ]).then(function (aResults) {
-                var oHierarchyFolders = aResults[0];
-                var oHierarchyApps = aResults[1];
+            ]).then((aResults) => {
+                const oHierarchyFolders = aResults[0];
+                const oHierarchyApps = aResults[1];
                 oHierarchyFolders.setBusy(false);
-                var entity = this.easyAccessModel.getProperty(path || "/");
+                const entity = this.easyAccessModel.getProperty(path || "/");
                 if (typeof entity.folders !== "undefined") {
                     oHierarchyFolders.updatePageBindings(path, forward);
                     oHierarchyApps.getController().updatePageBindings(path);
@@ -117,24 +117,24 @@ sap.ui.define([
                 }
                 oHierarchyFolders.setBusy(true);
                 this.getMenuItems(this.menuName, this.systemId, entity.id, entity.level).then(function (path, response) {
-                    this.easyAccessModel.setProperty(path + "/folders", response.folders);
-                    this.easyAccessModel.setProperty(path + "/apps", response.apps);
+                    this.easyAccessModel.setProperty(`${path}/folders`, response.folders);
+                    this.easyAccessModel.setProperty(`${path}/apps`, response.apps);
                     oHierarchyFolders.updatePageBindings(path, forward);
                     oHierarchyApps.getController().updatePageBindings(path);
                     oHierarchyFolders.setBusy(false);
-                }.bind(this, path), function (error) {
+                }.bind(this, path), (error) => {
                     this.handleGetMenuItemsError(error);
-                }.bind(this));
-            }.bind(this));
+                });
+            });
         },
 
         handleSearch: function (searchTerm) {
-            var isFirstTime = !this.pHierarchyAppsSearchResults;
+            const isFirstTime = !this.pHierarchyAppsSearchResults;
 
             if (isFirstTime) {
                 // create the Hierarchy-Apps view for search-result
                 this.pHierarchyAppsSearchResults = View.create({
-                    id: this.getView().getId() + "hierarchyAppsSearchResults",
+                    id: `${this.getView().getId()}hierarchyAppsSearchResults`,
                     viewName: "module:sap/ushell/components/appfinder/HierarchyAppsView",
                     height: "100%",
                     viewData: {
@@ -142,7 +142,7 @@ sap.ui.define([
                         getMoreSearchResults: this.getMoreSearchResults.bind(this),
                         CatalogsManager: this.getView().getViewData().CatalogsManager
                     }
-                }).then(function (HierarchyAppsView) {
+                }).then((HierarchyAppsView) => {
                     // set the model
                     this.easyAccessSearchResultsModel = new JSONModel();
                     // change the default value of the maximum number of entries which are used for list bindings
@@ -161,22 +161,22 @@ sap.ui.define([
                         writeToDom: true
                     }));
                     return HierarchyAppsView;
-                }.bind(this));
+                });
             }
 
-            this.pHierarchyAppsSearchResults.then(function (HierarchyAppsView) {
+            this.pHierarchyAppsSearchResults.then((HierarchyAppsView) => {
                 // reset for the paging mechanism
                 this.searchResultFrom = 0;
                 this.oView.splitApp.getCurrentDetailPage().setBusy(true);
                 this.easyAccessSearchResultsModel.setProperty("/apps", []);
                 this.easyAccessSearchResultsModel.setProperty("/total", 0);
-                this._getSearchResults(searchTerm, this.searchResultFrom).then(function (response) {
+                this._getSearchResults(searchTerm, this.searchResultFrom).then((response) => {
                     // Solution for Internal incident #1770582955: After doing 'search' the results are coming from
                     // the backend and the 'bookmarkCount' property is not part of the properties there.
                     // Hence, we need to copy its previous content to the new results
-                    Container.getServiceAsync("BookmarkV2").then(function (oBookmarkService) {
-                        response.results.forEach(function (element) {
-                            oBookmarkService.countBookmarks(element.url).then(function (count) {
+                    Container.getServiceAsync("BookmarkV2").then((oBookmarkService) => {
+                        response.results.forEach((element) => {
+                            oBookmarkService.countBookmarks(element.url).then((count) => {
                                 element.bookmarkCount = count;
                             });
                         });
@@ -184,7 +184,7 @@ sap.ui.define([
                         this.easyAccessSearchResultsModel.setProperty("/apps", response.results);
                         this.easyAccessSearchResultsModel.setProperty("/total", response.count);
 
-                        this.searchResultFrom = response.results.length; //for the paging mechanism -> update the next search results
+                        this.searchResultFrom = response.results.length; // for the paging mechanism -> update the next search results
                         if (isFirstTime) {
                             this.oView.splitApp.addDetailPage(HierarchyAppsView);
                         }
@@ -194,55 +194,55 @@ sap.ui.define([
 
                         this.oView.splitApp.getCurrentDetailPage().setBusy(false);
                         if (this.oView.splitApp.getCurrentDetailPage() !== HierarchyAppsView) {
-                            this.oView.splitApp.toDetail(this.getView().getId() + "hierarchyAppsSearchResults");
+                            this.oView.splitApp.toDetail(`${this.getView().getId()}hierarchyAppsSearchResults`);
                         }
-                    }.bind(this));
-                }.bind(this), function (error) {
+                    });
+                }, (error) => {
                     this.handleGetMenuItemsError(error);
                     this.oView.splitApp.getCurrentDetailPage().setBusy(false);
-                }.bind(this));
+                });
 
                 return HierarchyAppsView;
-            }.bind(this));
+            });
         },
 
         getMoreSearchResults: function () {
             if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
                 this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(true);
             }
-            var oSubHeaderModel = this.oView.getModel("subHeaderModel");
-            var sSearchTerm = oSubHeaderModel.getProperty("/search/searchTerm");
-            this._getSearchResults(sSearchTerm, this.searchResultFrom).then(function (response) {
-                var aCurrentResults = this.easyAccessSearchResultsModel.getProperty("/apps");
+            const oSubHeaderModel = this.oView.getModel("subHeaderModel");
+            const sSearchTerm = oSubHeaderModel.getProperty("/search/searchTerm");
+            this._getSearchResults(sSearchTerm, this.searchResultFrom).then((response) => {
+                const aCurrentResults = this.easyAccessSearchResultsModel.getProperty("/apps");
                 // Due to a bug -> need to copy the array by reference in order for the binding to the model will behave as expected
-                var aNewResults = aCurrentResults.slice();
+                const aNewResults = aCurrentResults.slice();
                 Array.prototype.push.apply(aNewResults, response.results);
                 this.easyAccessSearchResultsModel.setProperty("/apps", aNewResults);
                 if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
                     this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(false);
                 }
-                this.searchResultFrom = aNewResults.length; //for the paging mechanism -> update the next search results
-            }.bind(this), function (error) {
+                this.searchResultFrom = aNewResults.length; // for the paging mechanism -> update the next search results
+            }, (error) => {
                 this.handleGetMenuItemsError(error);
                 if (this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy) {
                     this.oView.splitApp.getCurrentDetailPage().setShowMoreResultsBusy(true);
                 }
-            }.bind(this));
+            });
         },
 
         _getSearchResults: function (searchTerm, from) {
-            var oDeferred = new jQuery.Deferred();
-            var sServiceUrl = this._getODataRequestForSearchUrl(this.menuName, this.systemId, searchTerm, from);
+            const oDeferred = new jQuery.Deferred();
+            const sServiceUrl = this._getODataRequestForSearchUrl(this.menuName, this.systemId, searchTerm, from);
 
-            var oRequest = {
+            const oRequest = {
                 requestUri: sServiceUrl
             };
 
-            var oCallOdataServicePromise = this._callODataService(oRequest, this.handleSuccessOnReadFilterResults);
-            oCallOdataServicePromise.done(function (data) {
+            const oCallOdataServicePromise = this._callODataService(oRequest, this.handleSuccessOnReadFilterResults);
+            oCallOdataServicePromise.done((data) => {
                 oDeferred.resolve(data);
             });
-            oCallOdataServicePromise.fail(function (error) {
+            oCallOdataServicePromise.fail((error) => {
                 oDeferred.reject(error);
             });
 
@@ -250,7 +250,7 @@ sap.ui.define([
         },
 
         getSystemNameOrId: function () {
-            var oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
+            const oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
             if (oSystemSelected) {
                 return oSystemSelected.name || oSystemSelected.id;
             }
@@ -258,17 +258,17 @@ sap.ui.define([
         },
 
         adjustUiOnSystemChange: function () {
-            var oCurrentData = this.easyAccessModel.getData();
+            const oCurrentData = this.easyAccessModel.getData();
             // we do not put in cache empty objects
             // if there is no data for system then we do not cache this, this causes inconsistencies when looking at the data
             if (this.systemId && oCurrentData && oCurrentData.id) {
                 this.easyAccessCache[this.systemId] = oCurrentData;
             }
 
-            var oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
+            const oSystemSelected = this.oView.getModel("easyAccessSystemsModel").getProperty("/systemSelected");
             if (oSystemSelected) {
                 this.systemId = oSystemSelected.systemId;
-                var newData = this.easyAccessCache[this.systemId];
+                const newData = this.easyAccessCache[this.systemId];
 
                 if (newData) {
                     this.easyAccessModel.setData(newData);
@@ -277,7 +277,7 @@ sap.ui.define([
                     Promise.all([
                         this.oView.pHierarchyFolders,
                         this.oView.pHierarchyApps
-                    ]).then(function (aResults) {
+                    ]).then((aResults) => {
                         aResults[0].setBusy(true);
                         aResults[1].setBusy(true);
                     });
@@ -287,11 +287,11 @@ sap.ui.define([
         },
 
         handleToggleButtonModelChanged: function () {
-            var oSubHeaderModel = this.oView.getModel("subHeaderModel");
-            var bButtonVisible = oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
-            var bButtonToggled = oSubHeaderModel.getProperty("/openCloseSplitAppButtonToggled");
+            const oSubHeaderModel = this.oView.getModel("subHeaderModel");
+            const bButtonVisible = oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
+            const bButtonToggled = oSubHeaderModel.getProperty("/openCloseSplitAppButtonToggled");
 
-            var oSplitApp = this.getView().splitApp;
+            const oSplitApp = this.getView().splitApp;
 
             if (bButtonVisible) {
                 if (bButtonToggled && !oSplitApp.isMasterShown()) {
@@ -303,22 +303,22 @@ sap.ui.define([
         },
 
         handleSearchModelChanged: function () {
-            var oSubHeaderModel = this.oView.getModel("subHeaderModel");
-            var sActiveMenu = oSubHeaderModel.getProperty("/activeMenu");
+            const oSubHeaderModel = this.oView.getModel("subHeaderModel");
+            const sActiveMenu = oSubHeaderModel.getProperty("/activeMenu");
 
             // if view ID does not contain the active menu then return
             if (this.getView().getId().indexOf(sActiveMenu) === -1) {
                 return;
             }
 
-            var sSearchTerm = oSubHeaderModel.getProperty("/search/searchTerm");
-            var bSearchMode = oSubHeaderModel.getProperty("/search/searchMode");
+            const sSearchTerm = oSubHeaderModel.getProperty("/search/searchTerm");
+            const bSearchMode = oSubHeaderModel.getProperty("/search/searchMode");
 
             // make sure search mode is true && the search term is not null or undefined
             if (bSearchMode) {
                 // update 'aria-controls' property of the App Finder's Search Field
                 // (This property is the first custom data of the search-field control)
-                Element.getElementById("appFinderSearch").getCustomData()[0].setValue(this.getView().getId() + "hierarchyAppsSearchResults");
+                Element.getElementById("appFinderSearch").getCustomData()[0].setValue(`${this.getView().getId()}hierarchyAppsSearchResults`);
 
                 // of search term is a real value (not empty) then we perform search
                 if (sSearchTerm) {
@@ -331,37 +331,37 @@ sap.ui.define([
                 Element.getElementById("appFinderSearch").getCustomData()[0].setValue("");
 
                 // else - search mode is false, so we go back to the hierarchy apps regular view
-                this.oView.splitApp.toDetail(this.getView().getId() + "hierarchyApps");
+                this.oView.splitApp.toDetail(`${this.getView().getId()}hierarchyApps`);
             }
         },
 
         loadMenuItemsFirstTime: function (menuName, oSystem) {
-            return this.getMenuItems(menuName, oSystem.systemId, "", 0).then(function (response) {
+            return this.getMenuItems(menuName, oSystem.systemId, "", 0).then((response) => {
                 response.text = oSystem.systemName || oSystem.systemId;
                 this.easyAccessModel.setData(response);
                 Promise.all([
                     this.oView.pHierarchyFolders,
                     this.oView.pHierarchyApps
-                ]).then(function (aResults) {
+                ]).then((aResults) => {
                     aResults[0].setBusy(false);
                     aResults[1].setBusy(false);
                 });
                 this.navigateHierarchy("", false);
-            }.bind(this), function (error) {
+            }, (error) => {
                 this.handleGetMenuItemsError(error);
                 Promise.all([
                     this.oView.pHierarchyFolders,
                     this.oView.pHierarchyApps
-                ]).then(function (aResults) {
+                ]).then((aResults) => {
                     aResults[0].updatePageBindings("/", false);
                     aResults[1].getController().updatePageBindings("/");
                 });
-            }.bind(this));
+            });
         },
 
         handleGetMenuItemsError: function (error) {
-            var sErrorMessage = this.getErrorMessage(error);
-            sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
+            const sErrorMessage = this.getErrorMessage(error);
+            sap.ui.require(["sap/m/MessageBox"], (MessageBox) => {
                 MessageBox.error(sErrorMessage);
             });
             this.easyAccessModel.setData("");
@@ -379,7 +379,7 @@ sap.ui.define([
          */
         _getErrorDetails: function (oError) {
             try {
-                var oBody = JSON.parse(oError.response.body);
+                const oBody = JSON.parse(oError.response.body);
                 return oBody.error.message.value;
             } catch (oTryError) {
                 return null;
@@ -387,7 +387,7 @@ sap.ui.define([
         },
 
         getErrorMessage: function (oError) {
-            var sMenuNameString = "";
+            let sMenuNameString = "";
             if (this.menuName === "SAP_MENU") {
                 sMenuNameString = this.translationBundle.getText("easyAccessSapMenuNameParameter");
             } else if (this.menuName === "USER_MENU") {
@@ -396,7 +396,7 @@ sap.ui.define([
 
             if (oError) {
                 if (oError.message) {
-                    var sErrorDetails = this._getErrorDetails(oError);
+                    const sErrorDetails = this._getErrorDetails(oError);
                     if (sErrorDetails) {
                         return this.translationBundle.getText("easyAccessErrorGetDataErrorMsgWithDetails", [sMenuNameString, oError.message, sErrorDetails]);
                     }
@@ -416,7 +416,7 @@ sap.ui.define([
          * @returns {*} - an object to add to the system easy access model
          */
         getMenuItems: function (menuType, systemId, entityId, entityLevel, numberOfNextLevels) {
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
             if (menuType !== "SAP_MENU" && menuType !== "USER_MENU") {
                 oDeferred.reject("Invalid menuType parameter");
@@ -446,9 +446,9 @@ sap.ui.define([
             if (entityId === "") {
                 entityLevel = 0;
             }
-            var iNumberOfNextLevelsValue;
-            var oModel = this.getView().getModel();
-            var iConfiguredNumbersOfLevels = oModel.getProperty("/easyAccessNumbersOfLevels");
+            let iNumberOfNextLevelsValue;
+            const oModel = this.getView().getModel();
+            const iConfiguredNumbersOfLevels = oModel.getProperty("/easyAccessNumbersOfLevels");
             if (iConfiguredNumbersOfLevels) {
                 iNumberOfNextLevelsValue = iConfiguredNumbersOfLevels;
             } else if (numberOfNextLevels) {
@@ -456,21 +456,21 @@ sap.ui.define([
             } else {
                 iNumberOfNextLevelsValue = this.DEFAULT_NUMBER_OF_LEVELS;
             }
-            var iLevelFilter = entityLevel + iNumberOfNextLevelsValue + 1;
+            const iLevelFilter = entityLevel + iNumberOfNextLevelsValue + 1;
 
-            var sServiceUrl = this._getODataRequestUrl(menuType, systemId, entityId, iLevelFilter);
+            const sServiceUrl = this._getODataRequestUrl(menuType, systemId, entityId, iLevelFilter);
 
-            var oRequest = { requestUri: sServiceUrl };
+            const oRequest = { requestUri: sServiceUrl };
 
-            var oCallOdataServicePromise = this._callODataService(oRequest, this.handleSuccessOnReadMenuItems, {
+            const oCallOdataServicePromise = this._callODataService(oRequest, this.handleSuccessOnReadMenuItems, {
                 systemId: systemId,
                 entityId: entityId,
                 iLevelFilter: iLevelFilter
             });
-            oCallOdataServicePromise.done(function (data) {
+            oCallOdataServicePromise.done((data) => {
                 oDeferred.resolve(data);
             });
-            oCallOdataServicePromise.fail(function (error) {
+            oCallOdataServicePromise.fail((error) => {
                 oDeferred.reject(error);
             });
 
@@ -478,18 +478,16 @@ sap.ui.define([
         },
 
         _callODataService: function (oRequest, fSuccessHandler, oSuccessHandlerParameters) {
-            var sLanguage;
-            var iSapClient;
-            var oDeferred = new jQuery.Deferred();
+            const oDeferred = new jQuery.Deferred();
 
-            sLanguage = Container.getUser().getLanguage();
+            const sLanguage = Container.getUser().getLanguage();
             if (sLanguage && oRequest.requestUri.indexOf("sap-language=") < 0) {
-                oRequest.requestUri += (oRequest.requestUri.indexOf("?") >= 0 ? "&" : "?") + "sap-language=" + sLanguage;
+                oRequest.requestUri += `${oRequest.requestUri.indexOf("?") >= 0 ? "&" : "?"}sap-language=${sLanguage}`;
             }
-            var oLogonSystem = Container.getLogonSystem();
-            iSapClient = oLogonSystem && oLogonSystem.getClient();
+            const oLogonSystem = Container.getLogonSystem();
+            const iSapClient = oLogonSystem && oLogonSystem.getClient();
 
-            sap.ui.require(["sap/ui/thirdparty/datajs"], function () {
+            sap.ui.require(["sap/ui/thirdparty/datajs"], () => {
                 OData.read(
                     {
                         requestUri: oRequest.requestUri,
@@ -503,34 +501,34 @@ sap.ui.define([
                         }
                     },
                     // Success handler
-                    function (oResult, oResponseData) {
+                    (oResult, oResponseData) => {
                         if (oResult && oResult.results && oResponseData && oResponseData.statusCode === 200) {
-                            var oReturnedModel = fSuccessHandler.bind(this, oResult, oSuccessHandlerParameters || {})();
+                            const oReturnedModel = fSuccessHandler.bind(this, oResult, oSuccessHandlerParameters || {})();
                             oDeferred.resolve(oReturnedModel);
                         }
-                    }.bind(this),
+                    },
                     // Fail handler
-                    function (oMessage) {
+                    (oMessage) => {
                         oDeferred.reject(oMessage);
                     }
                 );
-            }.bind(this));
+            });
 
             return oDeferred.promise();
         },
 
         handleSuccessOnReadMenuItems: function (oResult, oParameters) {
-            var oReturnedModel = this._oDataResultFormatter(oResult.results, oParameters.systemId, oParameters.entityId, oParameters.iLevelFilter);
+            const oReturnedModel = this._oDataResultFormatter(oResult.results, oParameters.systemId, oParameters.entityId, oParameters.iLevelFilter);
             return oReturnedModel;
         },
 
         handleSuccessOnReadFilterResults: function (oResult) {
-            var sUpdatedUrl;
+            let sUpdatedUrl;
 
-            oResult.results.forEach(function (oResultItem, iIndex) {
+            oResult.results.forEach((oResultItem, iIndex) => {
                 sUpdatedUrl = this._appendSystemToUrl(oResultItem, this.systemId);
                 oResultItem.url = sUpdatedUrl;
-            }.bind(this));
+            });
 
             return {
                 results: oResult.results,
@@ -540,13 +538,13 @@ sap.ui.define([
 
         _appendSystemToUrl: function (oData, sSystemId) {
             if (oData.url) {
-                return oData.url + (oData.url.indexOf("?") > 0 ? "&" : "?") + "sap-system=" + sSystemId;
+                return `${oData.url + (oData.url.indexOf("?") > 0 ? "&" : "?")}sap-system=${sSystemId}`;
             }
         },
 
         _oDataResultFormatter: function (aResults, systemId, entityId, iLevelFilter) {
-            var oFoldersMap = {};
-            var oReturnedData = {};
+            const oFoldersMap = {};
+            let oReturnedData = {};
 
             if (entityId === "") {
                 oReturnedData = {
@@ -566,18 +564,18 @@ sap.ui.define([
                 oFoldersMap[entityId] = oReturnedData;
             }
 
-            var odataResult;
-            for (var i = 0; i < aResults.length; i++) {
+            let odataResult;
+            for (let i = 0; i < aResults.length; i++) {
                 odataResult = aResults[i];
 
-                var oParent;
+                let oParent;
                 if (odataResult.level === "01") {
                     oParent = oFoldersMap.root;
                 } else {
                     oParent = oFoldersMap[odataResult.parentId];
                 }
 
-                var oMenuItem = {
+                const oMenuItem = {
                     id: odataResult.Id,
                     text: odataResult.text,
                     subtitle: odataResult.subtitle,
@@ -606,16 +604,16 @@ sap.ui.define([
         },
 
         _getODataRequestUrl: function (menuType, systemId, entityId, iLevelFilter) {
-            var sServiceUrl = this._getServiceUrl(menuType);
+            let sServiceUrl = this._getServiceUrl(menuType);
 
-            var sLevelFilter;
+            let sLevelFilter;
             if (iLevelFilter < 10) {
-                sLevelFilter = "0" + iLevelFilter;
+                sLevelFilter = `0${iLevelFilter}`;
             } else {
                 sLevelFilter = iLevelFilter.toString();
             }
 
-            var entityIdFilter = "";
+            let entityIdFilter = "";
             if (entityId) {
                 // we check if the entityId is already encoded
                 // in case not (e.g. decoding it equals to the value itself) - we encode it
@@ -623,50 +621,48 @@ sap.ui.define([
                     entityId = encodeURIComponent(entityId);
                 }
 
-                entityIdFilter = "('" + entityId + "')/AllChildren";
+                entityIdFilter = `('${entityId}')/AllChildren`;
             }
 
-            sServiceUrl = sServiceUrl + ";o=" + systemId + "/MenuItems" + entityIdFilter + "?$filter=level lt '" + sLevelFilter + "'&$orderby=level,text";
+            sServiceUrl = `${sServiceUrl};o=${systemId}/MenuItems${entityIdFilter}?$filter=level lt '${sLevelFilter}'&$orderby=level,text`;
             return sServiceUrl;
         },
 
         _getODataRequestForSearchUrl: function (menuType, systemId, sTerm, iFrom) {
-            var sServiceUrl = this._getServiceUrl(menuType);
-            var iNumOfRecords = this.SEARCH_RESULTS_PER_REQUEST;
+            let sServiceUrl = this._getServiceUrl(menuType);
+            const iNumOfRecords = this.SEARCH_RESULTS_PER_REQUEST;
             sTerm = this._removeWildCards(sTerm);
             sTerm = encodeURIComponent(sTerm);
             iFrom = !iFrom ? 0 : iFrom;
 
             // format the given term using the ODataUtils
             sTerm = ODataUtils.formatValue(sTerm, "Edm.String");
-            sServiceUrl = sServiceUrl
-                + ";o=" + systemId
-                + "/MenuItems?$filter=type ne 'FL' and ("
-                + "substringof(" + sTerm + ", text) or "
-                + "substringof(" + sTerm + ", subtitle) or "
-                + "substringof(" + sTerm + ", url)"
+            sServiceUrl = `${sServiceUrl};o=${systemId}/MenuItems?$filter=type ne 'FL' and (`
+                + `substringof(${sTerm}, text) or `
+                + `substringof(${sTerm}, subtitle) or `
+                + `substringof(${sTerm}, url)`
                 + ")"
-                + "&$orderby=text,subtitle,url&$inlinecount=allpages&$skip=" + iFrom + "&$top=" + iNumOfRecords;
+                + `&$orderby=text,subtitle,url&$inlinecount=allpages&$skip=${iFrom}&$top=${iNumOfRecords}`;
 
             return sServiceUrl;
         },
 
         _getServiceUrl: function (menuType) {
-            var sServiceUrl;
-            var oModel = this.getView().getModel();
+            let sServiceUrl;
+            const oModel = this.getView().getModel();
             if (menuType === "SAP_MENU") {
-                var oSapMenuServiceUrlConfig = oModel.getProperty("/sapMenuServiceUrl");
+                const oSapMenuServiceUrlConfig = oModel.getProperty("/sapMenuServiceUrl");
                 if (oSapMenuServiceUrlConfig) {
                     sServiceUrl = oSapMenuServiceUrlConfig;
                 } else {
-                    sServiceUrl = this.DEFAULT_URL + "/EASY_ACCESS_MENU";
+                    sServiceUrl = `${this.DEFAULT_URL}/EASY_ACCESS_MENU`;
                 }
             } else if (menuType === "USER_MENU") {
-                var oUserMenuServiceUrlConfig = oModel.getProperty("/userMenuServiceUrl");
+                const oUserMenuServiceUrlConfig = oModel.getProperty("/userMenuServiceUrl");
                 if (oUserMenuServiceUrlConfig) {
                     sServiceUrl = oUserMenuServiceUrlConfig;
                 } else {
-                    sServiceUrl = this.DEFAULT_URL + "/USER_MENU";
+                    sServiceUrl = `${this.DEFAULT_URL}/USER_MENU`;
                 }
             }
             return sServiceUrl;