@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/ushell/Container",
     "sap/ushell/Config",
     "sap/ui/thirdparty/hasher"
-], function (
+], (
     Localization,
     Element,
     Controller,
@@ -36,47 +36,44 @@ sap.ui.define([
     Container,
     Config,
     hasher
-) {
+) => {
     "use strict";
 
     return Controller.extend("sap.ushell.components.shell.SearchCEP.SearchCEP", {
 
         onInit: function () {
-
             this._bIsMyHome = false;
             this._bEscPressed = false;
             this.bGrowingReset = false;
             this._bClosedOnItemPress = false;
             this._SearchCEPService = Container.getServiceAsync("SearchCEP");
 
-            this._SearchCEPService.then(function (oSearchCEPService) {
+            this._SearchCEPService.then((oSearchCEPService) => {
                 this._registerDefaultProviders(oSearchCEPService);
                 this._listenToServiceEvents(oSearchCEPService);
-            }.bind(this));
+            });
 
             this._toggleSearchPopover(false);
             this._oPlaceHolderSF = Element.getElementById("PlaceHolderSearchField");
             this._registerHandleHashChange();
-            var sPlatform = Container.getFLPPlatform(true);
+            const sPlatform = Container.getFLPPlatform(true);
             if (sPlatform === "MYHOME") {
                 this._bIsMyHome = true;
             }
         },
 
         onSuggest: function (oEvent) {
-
             if (this._bEscPressed || this._bClosedOnItemPress) {
                 return;
             }
 
             this.oSF.focus();
 
-            var sValue = oEvent.getParameter("suggestValue");
+            const sValue = oEvent.getParameter("suggestValue");
             this._testProviders(sValue);
         },
 
         onfocusin: function (oEvent) {
-
             if (this.oSF.getEnableSuggestions() && Device.system.phone) {
                 // eslint-disable-next-line no-undef
                 jQuery(this.oSF.getDomRef()).find("input").attr("inputmode", "search");
@@ -86,11 +83,10 @@ sap.ui.define([
         },
 
         onSearch: function (oEvent) {
-
-            var sSearchTerm = oEvent.getParameter("query"),
-                bEscPressed = oEvent.getParameter("escPressed"),
-                bClearButtonPressed = oEvent.getParameter("clearButtonPressed"),
-                oSearchResultList = Element.getElementById("SearchResultList");
+            let sSearchTerm = oEvent.getParameter("query");
+            const bEscPressed = oEvent.getParameter("escPressed");
+            const bClearButtonPressed = oEvent.getParameter("clearButtonPressed");
+            const oSearchResultList = Element.getElementById("SearchResultList");
 
             if (bEscPressed) {
                 this._bEscPressed = bEscPressed;
@@ -104,16 +100,15 @@ sap.ui.define([
             }
 
             if (bClearButtonPressed) {
-
                 this.oSF.setValue("");
                 this._oPlaceHolderSF.setValue("");
 
                 this._testProviders();
 
-                var bClosePopover = true,
-                    aLists = this._oPopover.getContent()[1].getItems();
+                let bClosePopover = true;
+                const aLists = this._oPopover.getContent()[1].getItems();
 
-                for (var nIdx in aLists) {
+                for (const nIdx in aLists) {
                     if (aLists[nIdx].getItems().length) {
                         bClosePopover = false;
                     }
@@ -133,9 +128,8 @@ sap.ui.define([
 
                 if (this._bIsMyHome) {
                     if (oSearchResultList.getItems().length > 0) {
-
-                        var oBindingContext = oSearchResultList.getItems()[0].getBindingContext("resultModel"),
-                            oResult = oBindingContext.getObject();
+                        const oBindingContext = oSearchResultList.getItems()[0].getBindingContext("resultModel");
+                        const oResult = oBindingContext.getObject();
 
                         this._navigateToApp(oResult);
                     }
@@ -147,10 +141,9 @@ sap.ui.define([
         },
 
         onBeforeOpen: function () {
-
-            var bCollapse = false,
-                oShellHeader = Element.getElementById("shell-header"),
-                sSearchState = oShellHeader.getSearchState();
+            let bCollapse = false;
+            const oShellHeader = Element.getElementById("shell-header");
+            const sSearchState = oShellHeader.getSearchState();
 
             if (sSearchState === "COL") {
                 bCollapse = true;
@@ -168,19 +161,17 @@ sap.ui.define([
         },
 
         onAfterOpen: function () {
-
-            var nPlaceHolderSFHeight = document.getElementById("PlaceHolderSearchField").clientHeight;
-            document.getElementById("CEPSearchField").style.height = nPlaceHolderSFHeight + "px";
+            const nPlaceHolderSFHeight = document.getElementById("PlaceHolderSearchField").clientHeight;
+            document.getElementById("CEPSearchField").style.height = `${nPlaceHolderSFHeight}px`;
             // add tooltip to CEP Search icon
             document.getElementById("CEPSearchField-search").title = resources.i18n.getText("search");
         },
 
         onAfterClose: function (oEvent) {
-
-            var oSFicon = Element.getElementById("sf"),
-                oShellHeader = Element.getElementById("shell-header"),
-                sScreenSize = this._getScreenSize(),
-                aLists = this._oPopover.getContent()[1].getItems();
+            const oSFicon = Element.getElementById("sf");
+            const oShellHeader = Element.getElementById("shell-header");
+            const sScreenSize = this._getScreenSize();
+            const aLists = this._oPopover.getContent()[1].getItems();
 
             this._oPlaceHolderSF.setValue(this.oSF.getValue());
 
@@ -202,29 +193,27 @@ sap.ui.define([
                 oShellHeader.setSearchState("EXP_S", 35, false);
             }
 
-            aLists.forEach(function (oList) {
-                var oListConfig = oList._getProviderConfig(),
-                    sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
+            aLists.forEach((oList) => {
+                const oListConfig = oList._getProviderConfig();
+                const sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
                 // notify external search providers
                 if (!sGroupName) {
                     if (typeof oListConfig.popoverClosed === "function") {
-                        var fnPopoverClosedHandler = oListConfig.popoverClosed;
+                        const fnPopoverClosedHandler = oListConfig.popoverClosed;
                         fnPopoverClosedHandler(oEvent);
                     }
                 }
-            }.bind(this));
+            });
         },
 
         getHomePageApps: function () {
-
-            var sGroupName = "homePageApplications",
-                oProductsProvider = SearchProvider.getDefaultProviders()[sGroupName];
+            const sGroupName = "homePageApplications";
+            const oProductsProvider = SearchProvider.getDefaultProviders()[sGroupName];
 
             oProductsProvider.execSearch("", sGroupName);
         },
 
         _registerHandleHashChange: function () {
-
             hasher.changed.add((sNewHash) => {
                 // if navigation is not to search result page - clear search field
                 if (sNewHash !== "" && !(/WorkZoneSearchResult-display|Action-search/.test(sNewHash))) {
@@ -239,27 +228,25 @@ sap.ui.define([
         },
 
         _listenToServiceEvents: function (oSearchCEPService) {
-
             EventHub.on("updateExtProviderLists").do(this._updateExtProviderLists.bind(this, oSearchCEPService));
         },
 
         _updateExtProviderLists: function (oSearchCEPService) {
-
             if (this._oPopover) {
-                var oContent = this._oPopover.getContent()[1],
-                    aLists = oContent.getItems(),
-                    pExtProvidersPromise = oSearchCEPService.getExternalSearchProvidersPriorityArray();
+                const oContent = this._oPopover.getContent()[1];
+                const aLists = oContent.getItems();
+                const pExtProvidersPromise = oSearchCEPService.getExternalSearchProvidersPriorityArray();
 
                 // remove external provider lists
-                for (var idx in aLists) {
-                    var oList = aLists[idx],
-                        oProvider = oList._getProviderConfig(),
-                        sGroupName = this._getDefaultProviderGroupName(oProvider.id);
+                for (const idx in aLists) {
+                    const oList = aLists[idx];
+                    const oProvider = oList._getProviderConfig();
+                    const sGroupName = this._getDefaultProviderGroupName(oProvider.id);
 
                     if (!sGroupName) {
                         oContent.removeItem(oList);
                         oList.destroy();
-                        this._oResultModel.setProperty("/" + oProvider.name, []);
+                        this._oResultModel.setProperty(`/${oProvider.name}`, []);
                     }
                 }
 
@@ -270,9 +257,9 @@ sap.ui.define([
                 }
 
                 // add external provider lists
-                pExtProvidersPromise.then(function (aExtProviders) {
-                    for (var indx in aExtProviders) {
-                        var oExList = this._createList(aExtProviders[indx], undefined);
+                pExtProvidersPromise.then((aExtProviders) => {
+                    for (const indx in aExtProviders) {
+                        const oExList = this._createList(aExtProviders[indx], undefined);
                         oExList.addStyleClass(this._sContentDensityClass);
                         oContent.addItem(oExList);
                     }
@@ -283,20 +270,18 @@ sap.ui.define([
                             this._testProviders(this.oSF.getValue());
                         }
                     }
-                }.bind(this));
+                });
             }
         },
 
         _registerDefaultProviders: function (oSearchCEPService) {
-
-            for (var sKey in SearchProvider.getDefaultProviders()) {
-                oSearchCEPService._registerDefaultSearchProvider(SearchProvider.getDefaultProviders()[sKey]);
+            for (const sKey in SearchProvider.getDefaultProviders()) {
+                oSearchCEPService.registerDefaultSearchProvider(SearchProvider.getDefaultProviders()[sKey]);
             }
         },
 
         _getScreenSize: function () {
-
-            var oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
+            const oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
 
             if (oScreenSize.from >= 1440) {
                 return "XL";
@@ -310,19 +295,17 @@ sap.ui.define([
         },
 
         _focusNextList: function (oCurrentList) {
+            const aLists = this._oPopover.getContent()[1].getItems();
+            const oCurrentListIndex = aLists.map((oList) => {
+                return oList.getId();
+            }).indexOf(oCurrentList.getId());
+            const aNextLists = aLists.slice(oCurrentListIndex + 1);
 
-            var aLists = this._oPopover.getContent()[1].getItems(),
-                oCurrentListIndex = aLists.map(function (oList) {
-                    return oList.getId();
-                }).indexOf(oCurrentList.getId()),
-                aNextLists = aLists.slice(oCurrentListIndex + 1);
-
-            for (var idx = 0; idx < aNextLists.length; idx++) {
+            for (let idx = 0; idx < aNextLists.length; idx++) {
                 if (aNextLists[idx].getVisible() && aNextLists[idx].getItems().length) {
-
-                    var oControl = aNextLists[idx].getItems()[0],
-                        oParent = oControl.getParent(),
-                        oListConfig = oParent._getProviderConfig();
+                    const oControl = aNextLists[idx].getItems()[0];
+                    const oParent = oControl.getParent();
+                    const oListConfig = oParent._getProviderConfig();
 
                     oControl.focus();
                     // add list name to first list item aria text for screen reader to announce relevant list name
@@ -333,12 +316,11 @@ sap.ui.define([
         },
 
         _focusPreviousList: function (oCurrentList) {
-
-            var aLists = this._oPopover.getContent()[1].getItems(),
-                oCurrentListIndex = aLists.map(function (oList) {
-                    return oList.getId();
-                }).indexOf(oCurrentList.getId()),
-                aPreviousLists = aLists.slice(0, oCurrentListIndex);
+            const aLists = this._oPopover.getContent()[1].getItems();
+            const oCurrentListIndex = aLists.map((oList) => {
+                return oList.getId();
+            }).indexOf(oCurrentList.getId());
+            const aPreviousLists = aLists.slice(0, oCurrentListIndex);
 
             if (!aPreviousLists.length) {
                 // focus search field if no previous lists found
@@ -346,17 +328,17 @@ sap.ui.define([
                 return;
             }
 
-            for (var idx = aPreviousLists.length - 1; idx >= 0; idx--) {
+            for (let idx = aPreviousLists.length - 1; idx >= 0; idx--) {
                 if (aPreviousLists[idx].getVisible() && aPreviousLists[idx].getItems().length) {
-                    var oListItems = aPreviousLists[idx].getItems(),
-                        oAdditionalItems = document.getElementById(aPreviousLists[idx].getId() + "-triggerList"),
-                        oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
+                    const oListItems = aPreviousLists[idx].getItems();
+                    const oAdditionalItems = document.getElementById(`${aPreviousLists[idx].getId()}-triggerList`);
+                    const oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
                     // check if previous list has "more" button
                     if (oAdditionalItemsStyle.display === "none") {
                         // focus last item
                         oListItems[oListItems.length - 1].focus();
                     } else {
-                        Element.getElementById(aPreviousLists[idx].getId() + "-trigger").focus();
+                        Element.getElementById(`${aPreviousLists[idx].getId()}-trigger`).focus();
                     }
                     break;
                 }
@@ -369,16 +351,15 @@ sap.ui.define([
         },
 
         _keyDownHandler: function (oEvent) {
-
-            var oControl = oEvent.srcControl,
-                oParent = oControl.getParent(),
-                aCurrentListItems = oParent.getItems();
+            const oControl = oEvent.srcControl;
+            const oParent = oControl.getParent();
+            const aCurrentListItems = oParent.getItems();
 
             if (oEvent.code === 40 || oEvent.code === "ArrowDown") {
                 // if event was triggered on the last item in the list
                 if (aCurrentListItems[aCurrentListItems.length - 1] === oControl) {
-                    var oAdditionalItems = document.getElementById(oParent.getId() + "-triggerList"),
-                        oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
+                    const oAdditionalItems = document.getElementById(`${oParent.getId()}-triggerList`);
+                    const oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
                     // if no additional items ("More" button), move focus to the first item of the next list
                     if (oAdditionalItemsStyle.display === "none") {
                         this._focusNextList(oParent);
@@ -396,17 +377,15 @@ sap.ui.define([
         },
 
         _setListNameToAriaLabelledBy: function (oControl, sListName) {
+            const oCurrentControl = oControl.getDomRef();
+            const sHiddenSpanId = jQuery(oCurrentControl).attr("aria-labelledby");
+            const sText = Element.getElementById(sHiddenSpanId).getProperty("text");
 
-            var oCurrentControl = oControl.getDomRef(),
-                sHiddenSpanId = jQuery(oCurrentControl).attr("aria-labelledby"),
-                sText = Element.getElementById(sHiddenSpanId).getProperty("text");
-
-            jQuery(Element.getElementById(sHiddenSpanId).getDomRef()).text(sListName + ". " + sText);
+            jQuery(Element.getElementById(sHiddenSpanId).getDomRef()).text(`${sListName}. ${sText}`);
         },
 
         _getDefaultProviderGroupName: function (sProviderId) {
-
-            var oListGroupMap = {
+            const oListGroupMap = {
                 SearchResultList: "applications",
                 FrequentlyUsedAppsList: "frequentApplications",
                 SearchHistoryList: "recentSearches",
@@ -418,24 +397,22 @@ sap.ui.define([
         },
 
         _removeTopListDivider: function () {
-
             // remove divider above top list
-            setTimeout(function () {
-                var aLists = jQuery(this._oPopover.getDomRef()).find(".searchCEPList.sapUshellCEPListDivider").not(":hidden");
+            setTimeout(() => {
+                const aLists = jQuery(this._oPopover.getDomRef()).find(".searchCEPList.sapUshellCEPListDivider").not(":hidden");
                 if (aLists.length) {
-                    jQuery.each(aLists, function (index) {
+                    jQuery.each(aLists, (index) => {
                         if (jQuery(aLists[index]).hasClass("topCEPlist")) {
                             jQuery(aLists[index]).removeClass("topCEPlist");
                         }
                     });
                     jQuery(aLists[0]).addClass("topCEPlist");
                 }
-            }.bind(this), 300);
+            }, 300);
         },
 
         _createList: function (oConfiguration, oModel) {
-
-            var oList = new List({
+            const oList = new List({
                 id: oConfiguration.id,
                 showSeparators: "None",
                 headerText: oConfiguration.titleVisible ? oConfiguration.title : "",
@@ -445,7 +422,7 @@ sap.ui.define([
                 growingThreshold: oConfiguration.defaultItemCount,
                 growingScrollToLoad: false,
                 items: {
-                    path: "resultModel>/" + oConfiguration.name,
+                    path: `resultModel>/${oConfiguration.name}`,
                     factory: this._createListItem.bind(this, oConfiguration.name)
                 },
                 growingStarted: this._listUpdateStart.bind(this),
@@ -469,32 +446,31 @@ sap.ui.define([
         },
 
         _createListItem: function (sConfigurationName, sId, oContext) {
-        var oParams = {
+            const oParams = {
                 iconDensityAware: false,
                 title: oContext.getProperty("text"),
                 type: "Active"
-            },
+            };
 
-            sIconPath = oContext.getProperty("icon"),
-            sScreenSize = this._getScreenSize(),
-            sProviderLabel = oContext.getProperty("contentProviderLabel"),
-            aDisplayingLists = ["SearchResultList", "FrequentlyUsedAppsList"],
-            bEnabled = Config.last("/core/contentProviders/providerInfo/enabled"),
-            bShowContentProviderInfoOnVisualizations = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
+            const sIconPath = oContext.getProperty("icon");
+            const sScreenSize = this._getScreenSize();
+            let sProviderLabel = oContext.getProperty("contentProviderLabel");
+            const aDisplayingLists = ["SearchResultList", "FrequentlyUsedAppsList"];
+            const bEnabled = Config.last("/core/contentProviders/providerInfo/enabled");
+            const bShowContentProviderInfoOnVisualizations = Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations");
 
             if (bEnabled && bShowContentProviderInfoOnVisualizations &&
                 aDisplayingLists.includes(sConfigurationName) &&
                 sProviderLabel !== undefined && sProviderLabel !== "") {
-
                 sProviderLabel = sProviderLabel.toUpperCase();
                 if (sScreenSize === "S") {
                     oParams.description = sProviderLabel;
                 } else {
-                    oParams.title += " - " + sProviderLabel;
+                    oParams.title += ` - ${sProviderLabel}`;
                 }
             }
 
-            var oAvatar = new Avatar("", {
+            const oAvatar = new Avatar("", {
                 displaySize: "XS",
                 backgroundColor: "Transparent",
                 displayShape: "Square",
@@ -510,7 +486,7 @@ sap.ui.define([
                 oAvatar.addStyleClass("searchCEPlistItemIcon");
             }
 
-            var oListItem = new StandardListItem(oParams);
+            const oListItem = new StandardListItem(oParams);
             if (sScreenSize === "S" && oParams.description !== undefined) {
                 oListItem.addStyleClass("sapCEPSearchListItemMobileHeight");
             }
@@ -520,17 +496,16 @@ sap.ui.define([
         },
 
         _itemPress: function (oEvent) {
-
-            var fnHandleItemPress,
-                oControl = oEvent.getParameter("srcControl"),
-                oParent = oControl.getParent(),
-                oListConfig = oParent._getProviderConfig(),
-                sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
+            let fnHandleItemPress;
+            const oControl = oEvent.getParameter("srcControl");
+            const oParent = oControl.getParent();
+            const oListConfig = oParent._getProviderConfig();
+            let sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
 
             if (sGroupName) {
                 // use local handler for default provider
                 sGroupName = sGroupName.charAt(0).toUpperCase() + sGroupName.substring(1);
-                fnHandleItemPress = "_on" + sGroupName + "Press";
+                fnHandleItemPress = `_on${sGroupName}Press`;
                 this[fnHandleItemPress](oEvent);
             } else {
                 // use configuration handler for external provider
@@ -538,9 +513,9 @@ sap.ui.define([
                 fnHandleItemPress(oEvent);
 
                 // handle custom press event for specific item
-                var iControlIdx = oParent.getItems().indexOf(oControl),
-                    aModelListItems = this._oResultModel.getProperty("/" + oListConfig.name),
-                    oModelListItem = aModelListItems[iControlIdx];
+                const iControlIdx = oParent.getItems().indexOf(oControl);
+                const aModelListItems = this._oResultModel.getProperty(`/${oListConfig.name}`);
+                const oModelListItem = aModelListItems[iControlIdx];
 
                 if (oModelListItem.hasOwnProperty("press") && typeof oModelListItem.press === "function") {
                     fnHandleItemPress = oModelListItem.press;
@@ -559,12 +534,11 @@ sap.ui.define([
         },
 
         _listUpdateStart: function (oEvent) {
-
-            var oList = oEvent.getSource(),
-                oConfiguration = oList._getProviderConfig(),
-                iActualItems = oEvent.getParameter("actual"),
-                sReason = oEvent.getParameter("reason"),
-                iThreshold = this.bGrowingReset ? oConfiguration.maxItemCount : oConfiguration.defaultItemCount;
+            const oList = oEvent.getSource();
+            const oConfiguration = oList._getProviderConfig();
+            const iActualItems = oEvent.getParameter("actual");
+            const sReason = oEvent.getParameter("reason");
+            const iThreshold = this.bGrowingReset ? oConfiguration.maxItemCount : oConfiguration.defaultItemCount;
 
             /*
              * Currently UI5 List fires both deprecated and its new alternative events (growingStarted -> updateStarted).
@@ -578,14 +552,15 @@ sap.ui.define([
                         case "growing":
                             // reset property for new threshold to take effect
                             this.bGrowingReset = true;
-                            var oProperty = this._oResultModel.getProperty("/" + oConfiguration.name);
-                            this._oResultModel.setProperty("/" + oConfiguration.name, []);
-                            this._oResultModel.setProperty("/" + oConfiguration.name, oProperty);
+                            const oProperty = this._oResultModel.getProperty(`/${oConfiguration.name}`);
+                            this._oResultModel.setProperty(`/${oConfiguration.name}`, []);
+                            this._oResultModel.setProperty(`/${oConfiguration.name}`, oProperty);
                             oList.setGrowingThreshold(oConfiguration.maxItemCount);
                             break;
                         case "change":
                             oList.setGrowingThreshold(iThreshold);
                             break;
+                        default: break;
                     }
                 } else {
                     // deprecated growingStart
@@ -595,10 +570,9 @@ sap.ui.define([
         },
 
         _listUpdateFinished: function (oEvent) {
-
-            var oList = oEvent.getSource(),
-                oConfiguration = oList._getProviderConfig(),
-                oListItemsTitles;
+            const oList = oEvent.getSource();
+            const oConfiguration = oList._getProviderConfig();
+            let oListItemsTitles;
 
             if (this._getScreenSize() === "S") {
                 oListItemsTitles = oList.$().find(".sapMSLITitle, .sapMSLIDescription");
@@ -606,8 +580,8 @@ sap.ui.define([
                 oListItemsTitles = oList.$().find(".sapMSLITitleOnly");
             }
 
-            jQuery.each(oListItemsTitles, function (index) {
-                var oDiv = oListItemsTitles[index];
+            jQuery.each(oListItemsTitles, (index) => {
+                const oDiv = oListItemsTitles[index];
 
                 // add tooltips for long truncated titles
                 if (oDiv.scrollWidth > oDiv.offsetWidth) {
@@ -615,47 +589,44 @@ sap.ui.define([
                 }
                 // highlight search results
                 if (oConfiguration.id === "SearchResultList") {
-                    var sQuery = oList.getModel("resultModel").getProperty("/query");
+                    const sQuery = oList.getModel("resultModel").getProperty("/query");
 
                     if (oConfiguration.highlightResult && oConfiguration.highlightResult === true) {
-                        var sRegex = new RegExp(sQuery, "gi"),
-                            // remove <b> from previous highlighting
-                            sCleanText = oDiv.innerHTML.replace(/<[^>]*>/g, ""),
-                            sBoldTitle = sCleanText.replace(sRegex, function (sPart) {
-                                return this._getBoldTitle(oConfiguration, sPart);
-                            }.bind(this));
+                        const sRegex = new RegExp(sQuery, "gi");
+                        // remove <b> from previous highlighting
+                        const sCleanText = oDiv.innerHTML.replace(/<[^>]*>/g, "");
+                        const sBoldTitle = sCleanText.replace(sRegex, (sPart) => {
+                            return this._getBoldTitle(oConfiguration, sPart);
+                        });
                         oDiv.innerHTML = this._getHighlightedHtml(oConfiguration, sBoldTitle);
                     }
                 }
-            }.bind(this));
+            });
         },
 
         _getBoldTitle: function (oConfiguration, sPart) {
-
             if (oConfiguration.highlightSearchStringPart && oConfiguration.highlightSearchStringPart === true) {
-                return "<b>" + sPart + "</b>";
+                return `<b>${sPart}</b>`;
             }
-            return "</b>" + sPart + "<b>";
+            return `</b>${sPart}<b>`;
         },
 
         _getHighlightedHtml: function (oConfiguration, sBoldTitle) {
-
             if (!oConfiguration.highlightSearchStringPart || oConfiguration.highlightSearchStringPart !== true) {
-                return "<b>" + sBoldTitle + "</b>";
+                return `<b>${sBoldTitle}</b>`;
             }
             return sBoldTitle;
         },
 
         _testProviders: function (sQuery) {
-
             if (!this._oResultModel) {
                 this._oResultModel = new JSONModel({});
                 this._oPopover.setModel(this._oResultModel, "resultModel");
             }
 
-            var oModel = this._oResultModel,
-                iQueryLength = (sQuery || "").trim().length,
-                aLists = this._oPopover.getContent()[1].getItems();
+            const oModel = this._oResultModel;
+            const iQueryLength = (sQuery || "").trim().length;
+            const aLists = this._oPopover.getContent()[1].getItems();
 
             oModel.setProperty("/query", sQuery);
 
@@ -665,21 +636,18 @@ sap.ui.define([
                 this._sContentDensityClass = "sapUiSizeCozy";
             }
 
-            for (var idx in aLists) {
-                var oList = aLists[idx],
-                    oProvider = oList._getProviderConfig(),
-                    sGroupName = this._getDefaultProviderGroupName(oProvider.id);
+            for (const idx in aLists) {
+                const oList = aLists[idx];
+                const oProvider = oList._getProviderConfig();
+                const sGroupName = this._getDefaultProviderGroupName(oProvider.id);
 
                 oList.setVisible(false);
 
                 if (iQueryLength >= oProvider.minQueryLength && iQueryLength <= oProvider.maxQueryLength) {
-
                     oProvider.execSearch(sQuery, sGroupName).then(function (oListRef, oProviderRef, aResult) {
-
                         if (aResult && Array.isArray(aResult) && aResult.length > 0) {
-
                             // if Promise resolves with a delay and a new loop has already started - recheck priority
-                            var sCurrentQuery = this._oResultModel.getProperty("/query");
+                            const sCurrentQuery = this._oResultModel.getProperty("/query");
                             if (sCurrentQuery && (sCurrentQuery.length < oProviderRef.minQueryLength
                                 || sCurrentQuery.length > oProviderRef.maxQueryLength)) {
                                 return;
@@ -690,33 +658,35 @@ sap.ui.define([
                             }
 
                             // trigger list update after popover is reopened (native events are not firing)
-                            if (oModel.getProperty("/" + oProviderRef.name)) {
+                            if (oModel.getProperty(`/${oProviderRef.name}`)) {
                                 this.bGrowingReset = false;
-                                oModel.setProperty("/" + oProviderRef.name, []);
+                                oModel.setProperty(`/${oProviderRef.name}`, []);
                             }
 
                             oListRef.setVisible(true);
 
-                            var aResultItems = aResult.slice(0, oProviderRef.maxItemCount);
-                            oModel.setProperty("/" + oProviderRef.name, aResultItems);
+                            const aResultItems = aResult.slice(0, oProviderRef.maxItemCount);
+                            oModel.setProperty(`/${oProviderRef.name}`, aResultItems);
 
                             // custom behavior for default providers
                             switch (oListRef.getId()) {
                                 case "SearchResultList":
                                     this._applyResultsAcc(aResultItems.length);
                                     break;
+                                default: break;
                             }
                             this.oSF.focus();
                         } else {
-                            oModel.setProperty("/" + oProviderRef.name, []);
+                            oModel.setProperty(`/${oProviderRef.name}`, []);
                             // custom behavior for default providers
                             switch (oListRef.getId()) {
                                 case "SearchResultList":
                                     this._applyResultsAcc(0);
-                                    var sNoResults = resources.i18n.getText("no_apps_found", [sQuery]);
+                                    const sNoResults = resources.i18n.getText("no_apps_found", [sQuery]);
                                     oListRef.setNoDataText(sNoResults);
                                     oListRef.setVisible(true);
                                     break;
+                                default: break;
                             }
                         }
                     }.bind(this, oList, oProvider));
@@ -726,10 +696,9 @@ sap.ui.define([
         },
 
         _applyResultsAcc: function (iNumOfItems) {
-
-            var sNewAriaText = "",
-                oDescriptionSpan = this.oSF.$("SuggDescr"),
-                sOldAriaText = oDescriptionSpan.text();
+            let sNewAriaText = "";
+            const oDescriptionSpan = this.oSF.$("SuggDescr");
+            const sOldAriaText = oDescriptionSpan.text();
 
             // add items to list
             if (iNumOfItems === 1) {
@@ -747,17 +716,15 @@ sap.ui.define([
         },
 
         _toggleSearchPopover: function (bOpen) {
-
             if (!this._oPopover) {
                 Fragment.load({
-                    name: "sap.ushell.components.shell.SearchCEP.SearchFieldFragment",
+                    name: "sap.ushell.components.shell.SearchCEP.SearchField",
                     type: "XML",
                     controller: this
-                }).then(function (popover) {
-
+                }).then((popover) => {
                     this._oPopover = popover;
-                    var sScreenSize = this._getScreenSize(),
-                        nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
+                    const sScreenSize = this._getScreenSize();
+                    let nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
 
                     if (sScreenSize === "S") {
                         nPlaceHolderSFWidth = 1.1 * nPlaceHolderSFWidth;
@@ -765,26 +732,26 @@ sap.ui.define([
                         nPlaceHolderSFWidth = 1.05 * nPlaceHolderSFWidth;
                     }
 
-                    this._oPopover.setContentWidth(nPlaceHolderSFWidth + "px");
+                    this._oPopover.setContentWidth(`${nPlaceHolderSFWidth}px`);
                     if (Localization.getRTL() === true) {
-                        var nOffsetX = this._oPopover.getOffsetX();
+                        const nOffsetX = this._oPopover.getOffsetX();
                         this._oPopover.setOffsetX(-1 * nOffsetX);
                     }
 
                     this._initializeSearchField();
 
-                    var oText = new Text({
-                            id: "popoverTitle",
-                            text: "List of search results and navigation suggestions"
-                        });
+                    const oText = new Text({
+                        id: "popoverTitle",
+                        text: "List of search results and navigation suggestions"
+                    });
 
-                        oText.addStyleClass("sapUiInvisibleText");
-                        this._oPopover.addContent(oText);
+                    oText.addStyleClass("sapUiInvisibleText");
+                    this._oPopover.addContent(oText);
 
-                    this._initLists().then(function () {
+                    this._initLists().then(() => {
                         this._testProviders();
-                    }.bind(this));
-                }.bind(this));
+                    });
+                });
             } else if (bOpen) {
                 this._oPopover.openBy(this._oPlaceHolderSF);
 
@@ -795,11 +762,9 @@ sap.ui.define([
         },
 
         _initLists: function () {
-
-            return this._SearchCEPService.then(function (oSearchCEPService) {
-
-                var pProvidersPromise = oSearchCEPService.getSearchProvidersPriorityArray(),
-                    oContent = this._oPopover.getContent()[1];
+            return this._SearchCEPService.then((oSearchCEPService) => {
+                const pProvidersPromise = oSearchCEPService.getSearchProvidersPriorityArray();
+                const oContent = this._oPopover.getContent()[1];
 
                 if (!Device.support.touch) {
                     this._sContentDensityClass = "sapUiSizeCompact";
@@ -807,28 +772,26 @@ sap.ui.define([
                     this._sContentDensityClass = "sapUiSizeCozy";
                 }
 
-                return pProvidersPromise.then(function (aProviders) {
-                    for (var i = 0; i < aProviders.length; i++) {
-                        var oList = this._createList(aProviders[i], this._oResultModel);
+                return pProvidersPromise.then((aProviders) => {
+                    for (let i = 0; i < aProviders.length; i++) {
+                        const oList = this._createList(aProviders[i], this._oResultModel);
                         oList.addStyleClass(this._sContentDensityClass);
                         oContent.addItem(oList);
                     }
-                }.bind(this));
-            }.bind(this));
+                });
+            });
         },
 
         _keyDownSearchField: function (oEvent) {
-
             if (oEvent.code === 40 || oEvent.code === "ArrowDown") {
                 this.oSF.focus();
-                var aLists = this._oPopover.getContent()[1].getItems();
+                const aLists = this._oPopover.getContent()[1].getItems();
 
-                for (var sListKey in aLists) {
+                for (const sListKey in aLists) {
                     if (aLists[sListKey].getVisible() && aLists[sListKey].getItems().length > 0) {
-
-                        var oControl = aLists[sListKey].getItems()[0],
-                            oParent = oControl.getParent(),
-                            oListConfig = oParent._getProviderConfig();
+                        const oControl = aLists[sListKey].getItems()[0];
+                        const oParent = oControl.getParent();
+                        const oListConfig = oParent._getProviderConfig();
 
                         oControl.focus();
                         this._setListNameToAriaLabelledBy(oControl, oListConfig.title);
@@ -838,22 +801,22 @@ sap.ui.define([
             } else if (oEvent.code === 116 || oEvent.code === "F5") {
                 window.location.reload();
             } else if (oEvent.code === 9 || oEvent.code === "Tab") {
-                var oElement;
+                let oElement;
                 if (oEvent.shiftKey) {
                     oElement = this._oPlaceHolderSF.oParent.getDomRef().firstChild.lastChild.firstChild;
                 } else {
                     // sapUshellShellHeadEnd area
-                    var oSapUshellShellHeadEnd = this._oPlaceHolderSF.oParent.getDomRef().lastChild,
-                        aChildNodes = oSapUshellShellHeadEnd.childNodes;
+                    const oSapUshellShellHeadEnd = this._oPlaceHolderSF.oParent.getDomRef().lastChild;
+                    const aChildNodes = oSapUshellShellHeadEnd.childNodes;
                     // iterate until visible child found
-                    for (var sChildKey in aChildNodes) {
+                    for (const sChildKey in aChildNodes) {
                         if (getComputedStyle(aChildNodes[sChildKey]).display !== "none") {
                             oElement = aChildNodes[sChildKey];
                             break;
                         }
                     }
                 }
-                setTimeout(function () {
+                setTimeout(() => {
                     if (this._getScreenSize() === "S" || this._getScreenSize() === "M") {
                         Element.getElementById("shell-header").setSearchState("COL", 35, false);
                         Element.getElementById("sf").setVisible(true);
@@ -861,7 +824,7 @@ sap.ui.define([
                     if (oElement) {
                         oElement.focus();
                     }
-                }.bind(this), 0);
+                }, 0);
             } else if (oEvent.code === 27 || oEvent.code === "Escape") {
                 this.oSF.setValue("");
                 this._oPlaceHolderSF.setValue("");
@@ -870,11 +833,10 @@ sap.ui.define([
         },
 
         _initializeSearchField: function () {
-
             this.oSF = Element.getElementById("CEPSearchField");
-            var nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
+            const nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
 
-            this.oSF.setWidth(nPlaceHolderSFWidth + "px");
+            this.oSF.setWidth(`${nPlaceHolderSFWidth}px`);
             this.oSF.addEventDelegate({
                 onkeydown: this._keyDownSearchField.bind(this),
                 onfocusin: this.onfocusin.bind(this)
@@ -882,50 +844,45 @@ sap.ui.define([
         },
 
         _saveSearchTerm: function (sTerm) {
-
             if (sTerm) {
                 Container.getServiceAsync("UserRecents")
-                    .then(function (UserRecentsService) {
+                    .then((UserRecentsService) => {
                         UserRecentsService.addSearchActivity({ sTerm: sTerm });
                     });
             }
         },
 
         _onRecentSearchesPress: function (oEvent) {
-
-            var searchTerm = oEvent.getParameter("listItem").getProperty("title");
+            const searchTerm = oEvent.getParameter("listItem").getProperty("title");
 
             this.oSF.setValue(searchTerm);
-            setTimeout(function () {
+            setTimeout(() => {
                 this._testProviders(searchTerm);
-            }.bind(this));
+            });
         },
 
         _onApplicationsPress: function (oEvent) {
-
-            var sSearchTerm = this.oSF.getValue(),
-                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
-                oResult = oBindingContext.getObject();
+            const sSearchTerm = this.oSF.getValue();
+            const oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel");
+            const oResult = oBindingContext.getObject();
 
             this._saveSearchTerm(sSearchTerm);
             this._navigateToApp(oResult);
         },
 
         _onHomePageApplicationsPress: function (oEvent) {
-
-            var sSearchTerm = this.oSF.getValue(),
-                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
-                oResult = oBindingContext.getObject();
+            const sSearchTerm = this.oSF.getValue();
+            const oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel");
+            const oResult = oBindingContext.getObject();
 
             this._saveSearchTerm(sSearchTerm);
             this._navigateToApp(oResult);
         },
 
         _onExternalSearchApplicationsPress: function (oEvent) {
-
-            var sSearchTerm = this.oSF.getValue(),
-                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
-                oResult = oBindingContext.getObject();
+            const sSearchTerm = this.oSF.getValue();
+            const oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel");
+            const oResult = oBindingContext.getObject();
 
             this._saveSearchTerm(sSearchTerm);
             // Navigate to ES from search within list
@@ -937,9 +894,8 @@ sap.ui.define([
         },
 
         _onFrequentApplicationsPress: function (oEvent) {
-
-            var oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
-                oResult = oBindingContext.getObject();
+            const oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel");
+            const oResult = oBindingContext.getObject();
 
             this._navigateToApp(oResult);
             if (this._oPopover.isOpen()) {
@@ -948,8 +904,7 @@ sap.ui.define([
         },
 
         _navigateToApp: function (oResult, sSearchTerm) {
-
-            this._SearchCEPService.then(function (oSearchCEPService) {
+            this._SearchCEPService.then((oSearchCEPService) => {
                 oSearchCEPService.navigate(oResult, sSearchTerm);
             });
 
@@ -957,26 +912,25 @@ sap.ui.define([
                 this.oSF.setValue("");
             }
 
-            setTimeout(function () {
+            setTimeout(() => {
                 if (this._oPopover.isOpen()) {
                     this._oPopover.close();
                 }
-            }.bind(this), 500);
+            }, 500);
         },
 
         _navigateToResultPage: function (sTerm, bAll) {
-
             if (sTerm === "") {
                 return;
             }
-            var sHash = "#WorkZoneSearchResult-display?searchTerm=" + sTerm + "&category=app";
+            let sHash = `#WorkZoneSearchResult-display?searchTerm=${sTerm}&category=app`;
             if (bAll === true) {
-                sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"All\",\"label\":\"All\",\"labelPlural\":\"All\"},\"searchTerm\":\"" +
-                    sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
+                sHash = `#Action-search&/top=20&filter={"dataSource":{"type":"Category","id":"All","label":"All","labelPlural":"All"},"searchTerm":"${
+                    sTerm}","rootCondition":{"type":"Complex","operator":"And","conditions":[]}}`;
             }
 
-            var pNavServicePromise = Container.getServiceAsync("Navigation");
-            pNavServicePromise.then(function (oNavigationService) {
+            const pNavServicePromise = Container.getServiceAsync("Navigation");
+            pNavServicePromise.then((oNavigationService) => {
                 oNavigationService.navigate({
                     target: {
                         shellHash: sHash