@sapui5/sap.ushell 1.138.1 → 1.140.0

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

@@ -21,8 +21,10 @@ sap.ui.define([
     "sap/ushell/utils/WindowUtils",
     "sap/ushell/EventHub",
     "sap/base/Log",
-    "sap/ushell/Container"
-], function (
+    "sap/ushell/Container",
+    "sap/ushell/api/performance/Extension",
+    "sap/ushell/api/performance/NavigationSource"
+], (
     extend,
     Element,
     EventBus,
@@ -43,35 +45,36 @@ sap.ui.define([
     WindowUtils,
     EventHub,
     Log,
-    Container
-) {
+    Container,
+    Extension,
+    NavigationSource
+) => {
     "use strict";
 
     // shortcut for sap.m.SplitAppMode
-    var SplitAppMode = mobileLibrary.SplitAppMode;
+    const SplitAppMode = mobileLibrary.SplitAppMode;
 
     // shortcut for sap.ushell.AppType
-    var AppType = ushellLibrary.AppType;
+    const AppType = ushellLibrary.AppType;
 
-    var oCatalogsManager;
+    let oCatalogsManager;
 
     /* global hasher */
     return Controller.extend("sap.ushell.components.appfinder.Catalog", {
         oPopover: null,
         onInit: function () {
-
             /**
              * @deprecated since 1.120
              */
-            Container.getServiceAsync("FlpLaunchPage").then(function (oLaunchPageService) {
+            Container.getServiceAsync("FlpLaunchPage").then((oLaunchPageService) => {
                 this.oLaunchPageService = oLaunchPageService;
-            }.bind(this));
+            });
 
             // take the sub-header model
             this.categoryFilter = "";
             this.preCategoryFilter = "";
 
-            var oView = this.getView();
+            const oView = this.getView();
             this.oMainModel = oView.getModel();
             this.oSubHeaderModel = oView.getModel("subHeaderModel");
             this.resetPage = false;
@@ -86,7 +89,7 @@ sap.ui.define([
             document.mainModel = this.oMainModel;
 
             // init listener for the toggle button binding context
-            var oToggleButtonModelBinding = this.oSubHeaderModel.bindProperty("/openCloseSplitAppButtonToggled");
+            const oToggleButtonModelBinding = this.oSubHeaderModel.bindProperty("/openCloseSplitAppButtonToggled");
             oToggleButtonModelBinding.attachChange(this.handleToggleButtonModelChanged, this);
 
             oView.oCatalogsContainer.setHandleSearchCallback(this.handleSearchModelChanged.bind(this));
@@ -117,12 +120,12 @@ sap.ui.define([
                 this.allocateNextPage();
             }
 
-            jQuery(window).resize(function () {
-                var windowWidth = jQuery(window).width();
-                var windowHeight = jQuery(window).height();
+            jQuery(window).resize(() => {
+                const windowWidth = jQuery(window).width();
+                const windowHeight = jQuery(window).height();
 
                 this.PagingManager.setContainerSize(windowWidth, windowHeight);
-            }.bind(this));
+            });
             this._handleAppFinderWithDocking();
             EventBus.getInstance().subscribe("launchpad", "appFinderWithDocking", this._handleAppFinderWithDocking, this);
             EventBus.getInstance().subscribe("sap.ushell", "appFinderAfterNavigate", this._handleAppFinderAfterNavigate, this);
@@ -143,13 +146,13 @@ sap.ui.define([
         },
 
         _decodeUrlFilteringParameters: function (sUrlParameters) {
-            var oUrlParameters;
+            let oUrlParameters;
             try {
                 oUrlParameters = JSON.parse(sUrlParameters);
             } catch (e) {
                 oUrlParameters = sUrlParameters;
             }
-            var hashTag = (oUrlParameters && oUrlParameters.tagFilter && oUrlParameters.tagFilter) || [];
+            const hashTag = (oUrlParameters && oUrlParameters.tagFilter && oUrlParameters.tagFilter) || [];
 
             if (hashTag) {
                 try {
@@ -172,7 +175,7 @@ sap.ui.define([
         },
 
         _applyFilters: function (wasRendered) {
-            var shouldFocusOnCategory = false;
+            let shouldFocusOnCategory = false;
 
             if (this.categoryFilter) {
                 // If all is selected pass an empty string.
@@ -224,12 +227,12 @@ sap.ui.define([
         },
 
         clearFilters: function () {
-            var shouldFocusOnCategory = false;
+            let shouldFocusOnCategory = false;
             if (this.categoryFilter !== this.preCategoryFilter) {
                 shouldFocusOnCategory = true;
             }
-            var bSearchMode = this.oSubHeaderModel.getProperty("/search/searchMode");
-            var bTagMode = this.oSubHeaderModel.getProperty("/tag/tagMode");
+            const bSearchMode = this.oSubHeaderModel.getProperty("/search/searchMode");
+            const bTagMode = this.oSubHeaderModel.getProperty("/tag/tagMode");
 
             // if a search was made before
             if (bSearchMode) {
@@ -259,7 +262,7 @@ sap.ui.define([
 
         onShow: function (oEvent) {
             // if the user goes to the catalog directly (not via the homepage) we must close the loading dialog
-            var sUrlParameters = oEvent.getParameter("arguments").filters;
+            const sUrlParameters = oEvent.getParameter("arguments").filters;
 
             extend(this.getView().getViewData(), oEvent);
             this._decodeUrlFilteringParameters(sUrlParameters);
@@ -283,7 +286,7 @@ sap.ui.define([
         },
 
         setTagsFilter: function (aFilter) {
-            var oParameterObject = {
+            const oParameterObject = {
                 catalogSelector: this.categoryFilter ? this.categoryFilter : resources.i18n.getText("all"),
                 tileFilter: (this.searchFilter && this.searchFilter.length) ? encodeURIComponent(this.searchFilter) : "",
                 tagFilter: aFilter.length ? JSON.stringify(aFilter) : []
@@ -295,7 +298,7 @@ sap.ui.define([
         },
 
         setCategoryFilter: function (aFilter) {
-            var oParameterObject = {
+            const oParameterObject = {
                 catalogSelector: aFilter,
                 tileFilter: this.searchFilter ? encodeURIComponent(this.searchFilter) : "",
                 tagFilter: this.tagFilter.length ? JSON.stringify(this.tagFilter) : []
@@ -308,7 +311,7 @@ sap.ui.define([
         },
 
         setSearchFilter: function (aFilter) {
-            var oParameterObject = {
+            const oParameterObject = {
                 catalogSelector: this.categoryFilter ? this.categoryFilter : resources.i18n.getText("all"),
                 tileFilter: aFilter ? encodeURIComponent(aFilter) : "",
                 tagFilter: this.tagFilter.length ? JSON.stringify(this.tagFilter) : []
@@ -329,9 +332,9 @@ sap.ui.define([
          * @private
          */
         _addNavigationContextToFilter: function (oFilter) {
-            var oContext = this.oVisualizationOrganizerHelper.getNavigationContext.apply(this);
+            const oContext = this.oVisualizationOrganizerHelper.getNavigationContext.apply(this);
             if (oContext) {
-                Object.keys(oContext).forEach(function (sKey) {
+                Object.keys(oContext).forEach((sKey) => {
                     oFilter[sKey] = oContext[sKey];
                 });
             }
@@ -339,9 +342,9 @@ sap.ui.define([
         },
 
         onSearch: function (searchExp) {
-            var sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
+            const sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
             if (this.oView.getId().indexOf(sActiveMenu) !== -1) {
-                var searchTerm = searchExp.searchTerm ? searchExp.searchTerm : "";
+                const searchTerm = searchExp.searchTerm ? searchExp.searchTerm : "";
                 this.setSearchFilter(searchTerm);
             } else {
                 // For the edge case in which we return to the catalog after exiting search mode in the EAM.
@@ -350,9 +353,9 @@ sap.ui.define([
         },
 
         onTag: function (tagExp) {
-            var sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
+            const sActiveMenu = this.oSubHeaderModel.getProperty("/activeMenu");
             if (this.oView.getId().indexOf(sActiveMenu) !== -1) {
-                var tags = tagExp.selectedTags ? tagExp.selectedTags : [];
+                const tags = tagExp.selectedTags ? tagExp.selectedTags : [];
                 this.setTagsFilter(tags);
             } else {
                 // For the edge case in which we return to the catalog after exiting search mode in the EAM.
@@ -366,8 +369,8 @@ sap.ui.define([
          * @returns {string} Group context
          */
         getGroupContext: function () {
-            var oModel = this.getView().getModel();
-            var sGroupContext = oModel.getProperty("/groupContext/path");
+            const oModel = this.getView().getModel();
+            const sGroupContext = oModel.getProperty("/groupContext/path");
 
             return {
                 targetGroup: encodeURIComponent(sGroupContext || "")
@@ -375,24 +378,24 @@ sap.ui.define([
         },
 
         _isTagFilteringChanged: function (aSelectedTags) {
-            var bSameLength = aSelectedTags.length === this.tagFilter.length;
-            var bIntersect = bSameLength;
+            const bSameLength = aSelectedTags.length === this.tagFilter.length;
+            let bIntersect = bSameLength;
 
             // Checks whether there's a symmetric difference between the currently selected tags and those persisted in the URL.
             if (!bIntersect) {
                 return true;
             }
-            aSelectedTags.some(function (sTag) {
+            aSelectedTags.some((sTag) => {
                 bIntersect = this.tagFilter && Array.prototype.indexOf.call(this.tagFilter, sTag) !== -1;
 
                 return !bIntersect;
-            }.bind(this));
+            });
 
             return bIntersect;
         },
 
         _setUrlWithTagsAndSearchTerm: function (sSearchTerm, aSelectedTags) {
-            var oUrlParameterObject = {
+            const oUrlParameterObject = {
                 tileFilter: sSearchTerm && sSearchTerm.length ? encodeURIComponent(sSearchTerm) : "",
                 tagFilter: aSelectedTags.length ? JSON.stringify(aSelectedTags) : []
             };
@@ -403,14 +406,14 @@ sap.ui.define([
         },
 
         handleSearchModelChanged: function () {
-            var bSearchMode = this.oSubHeaderModel.getProperty("/search/searchMode");
-            var bTagMode = this.oSubHeaderModel.getProperty("/tag/tagMode");
-            var sSearchTerm = this.oSubHeaderModel.getProperty("/search/searchTerm");
-            var aSelectedTags = this.oSubHeaderModel.getProperty("/tag/selectedTags");
-            var aFilters = [];
-            var oTagFilterWrapper;
-            var oSearchFilterWrapper;
-            var oFilters;
+            const bSearchMode = this.oSubHeaderModel.getProperty("/search/searchMode");
+            const bTagMode = this.oSubHeaderModel.getProperty("/tag/tagMode");
+            let sSearchTerm = this.oSubHeaderModel.getProperty("/search/searchTerm");
+            const aSelectedTags = this.oSubHeaderModel.getProperty("/tag/selectedTags");
+            const aFilters = [];
+            let oTagFilterWrapper;
+            let oSearchFilterWrapper;
+            let oFilters;
 
             if (!this.PagingManager) {
                 this._setPagingManager();
@@ -422,7 +425,7 @@ sap.ui.define([
             this.oView.oCatalogsContainer.updateAllocatedUnits(this.allocateTiles);
             this.oView.oCatalogsContainer.resetCatalogPagination();
 
-            var oPage = Element.getElementById("catalogTilesDetailedPage");
+            const oPage = Element.getElementById("catalogTilesDetailedPage");
             if (oPage) {
                 oPage.scrollTo(0, 0);
             }
@@ -431,14 +434,14 @@ sap.ui.define([
 
             if (bSearchMode || bTagMode || this.resetPage) {
                 if (aSelectedTags && aSelectedTags.length > 0) {
-                    var oTagFilter = new Filter("tags", "EQ", "v");
+                    const oTagFilter = new Filter("tags", "EQ", "v");
                     oTagFilter.fnTest = function (oTags) {
                         if (aSelectedTags.length === 0) {
                             return true;
                         }
 
-                        for (var ind = 0; ind < aSelectedTags.length; ind++) {
-                            var filterByTag = aSelectedTags[ind];
+                        for (let ind = 0; ind < aSelectedTags.length; ind++) {
+                            const filterByTag = aSelectedTags[ind];
                             if (oTags.indexOf(filterByTag) === -1) {
                                 return false;
                             }
@@ -453,19 +456,19 @@ sap.ui.define([
                 sSearchTerm = sSearchTerm ? sSearchTerm.replace(/\*/g, "") : sSearchTerm;
 
                 if (sSearchTerm) {
-                    var aSearchTermParts = sSearchTerm.split(/[\s,]+/);
+                    const aSearchTermParts = sSearchTerm.split(/[\s,]+/);
                     // create search filter with all the parts for keywords and apply AND operator ('true' indicates that)
-                    var keywordsSearchFilter = new Filter(jQuery.map(aSearchTermParts, function (value) {
+                    const keywordsSearchFilter = new Filter(jQuery.map(aSearchTermParts, (value) => {
                         return (value && new Filter("keywords", FilterOperator.Contains, value));
                     }), true);
 
                     // create search filter with all the parts for title and apply AND operator ('true' indicates that)
-                    var titleSearchFilter = new Filter(jQuery.map(aSearchTermParts, function (value) {
+                    const titleSearchFilter = new Filter(jQuery.map(aSearchTermParts, (value) => {
                         return (value && new Filter("title", FilterOperator.Contains, value));
                     }), true);
 
                     // create search filter with all the parts for subtitle and apply AND operator ('true' indicates that)
-                    var subtitleSearchFilter = new Filter(jQuery.map(aSearchTermParts, function (value) {
+                    const subtitleSearchFilter = new Filter(jQuery.map(aSearchTermParts, (value) => {
                         return (value && new Filter("subtitle", FilterOperator.Contains, value));
                     }), true);
 
@@ -475,9 +478,9 @@ sap.ui.define([
                     oSearchFilterWrapper = new Filter(aFilters, false); // false mean OR between the search filters
                 }
 
-                var catalogs = this.oView.oCatalogsContainer.getCatalogs();
+                const catalogs = this.oView.oCatalogsContainer.getCatalogs();
                 this.oSearchResultsTotal = [];
-                var that = this;
+                const that = this;
 
                 // construct group filter for tag & search
                 if (oTagFilterWrapper && oTagFilterWrapper.aFilters.length > 0 && oSearchFilterWrapper) {
@@ -488,7 +491,7 @@ sap.ui.define([
                     oFilters = new Filter([oSearchFilterWrapper], true);
                 }
 
-                catalogs.forEach(function (myCatalog) {
+                catalogs.forEach((myCatalog) => {
                     myCatalog.getBinding("customTilesContainer").filter(oFilters);
                     myCatalog.getBinding("appBoxesContainer").filter(oFilters);
                 });
@@ -505,7 +508,7 @@ sap.ui.define([
             } else {
                 this.oView.oCatalogsContainer.applyPagingCategoryFilters(this.oView.oCatalogsContainer.nAllocatedUnits, this.categoryFilter);
             }
-            var sPageName = this.getView()._calculateDetailPageId();
+            const sPageName = this.getView()._calculateDetailPageId();
             this.oView.splitApp.toDetail(sPageName);
         },
 
@@ -530,8 +533,8 @@ sap.ui.define([
         },
 
         _restoreSelectedMasterItem: function () {
-            var oCatalogsList = this.oView.splitApp.getMasterPage("catalogSelect");
-            var oOrigSelectedListItem = Element.getElementById(this.selectedCategoryId);
+            const oCatalogsList = this.oView.splitApp.getMasterPage("catalogSelect");
+            const oOrigSelectedListItem = Element.getElementById(this.selectedCategoryId);
 
             if (oOrigSelectedListItem) {
                 this.categoryFilter = oOrigSelectedListItem.getTitle();
@@ -540,8 +543,8 @@ sap.ui.define([
         },
 
         handleToggleButtonModelChanged: function () {
-            var bButtonVisible = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
-            var bButtonToggled = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonToggled");
+            const bButtonVisible = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonVisible");
+            const bButtonToggled = this.oSubHeaderModel.getProperty("/openCloseSplitAppButtonToggled");
 
             // if there was a change in the boolean toggled flag
             // (this can be called via update to subheader model from AppFinder, in such a case we do not need to switch the views)
@@ -556,11 +559,11 @@ sap.ui.define([
                     // for Phone the split app is behaving differently
                 } else if (this.oView.splitApp.isMasterShown()) {
                     // calculate the relevant detailed page to nav to
-                    var oDetail = Element.getElementById(this.getView()._calculateDetailPageId());
+                    const oDetail = Element.getElementById(this.getView()._calculateDetailPageId());
                     this.oView.splitApp.toDetail(oDetail);
                 } else if (bButtonToggled) {
                     // go to master
-                    var oCatalogSelectMaster = Element.getElementById("catalogSelect");
+                    const oCatalogSelectMaster = Element.getElementById("catalogSelect");
                     this.oView.splitApp.toMaster(oCatalogSelectMaster, "show");
                 }
             }
@@ -582,10 +585,10 @@ sap.ui.define([
         },
 
         onCategoryFilter: function (oEvent) {
-            var oMasterList = oEvent.getSource();
-            var oSelectedCatalog = oMasterList.getSelectedItem();
-            var oSelectedCatalogBindingCtx = oSelectedCatalog.getBindingContext();
-            var oModel = oSelectedCatalogBindingCtx.getModel();
+            const oMasterList = oEvent.getSource();
+            const oSelectedCatalog = oMasterList.getSelectedItem();
+            const oSelectedCatalogBindingCtx = oSelectedCatalog.getBindingContext();
+            const oModel = oSelectedCatalogBindingCtx.getModel();
             if (oModel.getProperty("static", oSelectedCatalogBindingCtx)) { // show all categories
                 oModel.setProperty("/showCatalogHeaders", true);
                 this.setCategoryFilter();
@@ -600,23 +603,22 @@ sap.ui.define([
         },
 
         onTileAfterRendering: function (oEvent) {
-            var oTileElement = oEvent.oSource.getDomRef();
+            const oTileElement = oEvent.oSource.getDomRef();
             if (oTileElement) {
-                var aGenericTileElements = oTileElement.getElementsByClassName("sapMGT");
-                for (var i = 0; i < aGenericTileElements.length; i++) {
+                const aGenericTileElements = oTileElement.getElementsByClassName("sapMGT");
+                for (let i = 0; i < aGenericTileElements.length; i++) {
                     aGenericTileElements[i].setAttribute("tabindex", "-1");
                 }
             }
         },
 
-        catalogTilePress: function (/*oController*/) {
+        catalogTilePress: function (/* oController */) {
             EventBus.getInstance().publish("launchpad", "catalogTileClick");
         },
 
         onAppBoxPressed: function (oEvent) {
-            var oAppBox = oEvent.getSource();
-            var oTile = oAppBox.getBindingContext().getObject();
-            var fnPressHandler;
+            const oAppBox = oEvent.getSource();
+            const oTile = oAppBox.getBindingContext().getObject();
             if (oEvent.mParameters.srcControl.$().closest(".sapUshellPinButton").length) {
                 return;
             }
@@ -624,16 +626,18 @@ sap.ui.define([
             /**
              * @deprecated since 1.120
              */
-            fnPressHandler = this.oLaunchPageService.getAppBoxPressHandler(oTile);
+            const fnPressHandler = this.oLaunchPageService.getAppBoxPressHandler(oTile);
 
             if (fnPressHandler) {
                 fnPressHandler(oTile);
             } else {
-                var sUrl = oAppBox.getProperty("url");
+                const sUrl = oAppBox.getProperty("url");
                 if (!sUrl) {
                     Log.info("AppBox url property is not set.", null, "sap.ushell.components.Catalog.controller");
                     return;
                 }
+                const oExtension = new Extension();
+                oExtension.addNavigationSource(NavigationSource.AppFinder);
                 EventHub.emit("UITracer.trace", {
                     reason: "LaunchApp",
                     source: "Tile",
@@ -645,9 +649,9 @@ sap.ui.define([
                     hasher.setHash(sUrl);
                 } else {
                     // add the URL to recent activity log
-                    var bLogRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
+                    const bLogRecentActivity = Config.last("/core/shell/enableRecentActivity") && Config.last("/core/shell/enableRecentActivityLogging");
                     if (bLogRecentActivity) {
-                        var oRecentEntry = {
+                        const oRecentEntry = {
                             title: oAppBox.getProperty("title"),
                             appType: AppType.URL,
                             url: sUrl,
@@ -672,14 +676,14 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         onTilePinButtonClick: function (oEvent) {
-            var oLaunchPageService = this.oLaunchPageService;
-            var oDefaultGroupPromise = oLaunchPageService.getDefaultGroup();
+            const oLaunchPageService = this.oLaunchPageService;
+            const oDefaultGroupPromise = oLaunchPageService.getDefaultGroup();
 
             oDefaultGroupPromise.done((oDefaultGroup) => {
-                var oButton = oEvent.getSource();
-                var oSourceContext = oButton.getBindingContext();
-                var oModel = this.getView().getModel();
-                var sGroupModelPath = oModel.getProperty("/groupContext/path");
+                const oButton = oEvent.getSource();
+                const oSourceContext = oButton.getBindingContext();
+                const oModel = this.getView().getModel();
+                const sGroupModelPath = oModel.getProperty("/groupContext/path");
 
                 // Check if the catalog was opened in the context of a group, according to the groupContext ("/groupContext/path") in the model
                 if (sGroupModelPath) {
@@ -694,17 +698,17 @@ sap.ui.define([
                     fnTimeoutGetGroupContextFromModel();
                     // If the catalog wasn't opened in the context of a group - the action of clicking a catalog tile should open the groups popover
                 } else {
-                    var aGroups = oModel.getProperty("/groups");
-                    var oCatalogTile = this.getCatalogTileDataFromModel(oSourceContext);
-                    var aTileGroups = oCatalogTile.tileData.associatedGroups;
-                    var aGroupsInitialState = [];
+                    const aGroups = oModel.getProperty("/groups");
+                    const oCatalogTile = this.getCatalogTileDataFromModel(oSourceContext);
+                    const aTileGroups = oCatalogTile.tileData.associatedGroups;
+                    const aGroupsInitialState = [];
 
-                    var aRefinedGroups = aGroups.map((group) => {
+                    const aRefinedGroups = aGroups.map((group) => {
                         // Get the group's real ID
-                        var sGroupId = oLaunchPageService.getGroupId(group.object);
+                        const sGroupId = oLaunchPageService.getGroupId(group.object);
                         // Check if the group (i.e. real group ID) exists in the array of groups that contain the relevant Tile
                         // if so - the check box that represents this group should be initially selected
-                        var bSelected = !((aTileGroups && Array.prototype.indexOf.call(aTileGroups, sGroupId) === -1));
+                        const bSelected = !((aTileGroups && Array.prototype.indexOf.call(aTileGroups, sGroupId) === -1));
 
                         // Add the group to the array that keeps the groups initial state mainly whether or not the group included the relevant tile
                         aGroupsInitialState.push({
@@ -722,7 +726,7 @@ sap.ui.define([
 
                     // @TODO: Instead of the jQuery, we should maintain the state of the popover (i.e. opened/closed)
                     // using the afterOpen and afterClose events of sap.m.ResponsivePopover
-                    var sTileTitle;
+                    let sTileTitle;
                     sTileTitle = oLaunchPageService.getCatalogTilePreviewTitle(oModel.getProperty(oSourceContext.sPath).src);
 
                     if (!sTileTitle) {
@@ -757,10 +761,14 @@ sap.ui.define([
 
         /**
          * @deprecated since 1.120
+         *
+         * @param {object} oDefaultGroup the my home group object.
+         * @param {object} oGroupObject the given group object.
+         * @returns {string} the title of the group.
          */
         _getGroupTitle: function (oDefaultGroup, oGroupObject) {
-            var oLaunchPageService = this.oLaunchPageService;
-            var sTitle;
+            const oLaunchPageService = this.oLaunchPageService;
+            let sTitle;
 
             // check if is it a default group- change title to "my home".
             if (oDefaultGroup && (oLaunchPageService.getGroupId(oDefaultGroup) === oLaunchPageService.getGroupId(oGroupObject))) {
@@ -786,32 +794,32 @@ sap.ui.define([
                 return;
             }
 
-            var oModel = this.getView().getModel();
-            var aGroups = oModel.getProperty("/groups");
-            var aPromises = [];
+            const oModel = this.getView().getModel();
+            const aGroups = oModel.getProperty("/groups");
+            const aPromises = [];
 
-            responseData.addToGroups.forEach(function (group) {
-                var iIndex = aGroups.indexOf(group);
-                var oGroupContext = new Context(oModel, "/groups/" + iIndex);
+            responseData.addToGroups.forEach((group) => {
+                const iIndex = aGroups.indexOf(group);
+                const oGroupContext = new Context(oModel, `/groups/${iIndex}`);
 
                 aPromises.push(this._addTile(oSourceContext, oGroupContext));
-            }.bind(this));
+            });
 
-            responseData.removeFromGroups.forEach(function (group) {
-                var sTileCatalogId = oSourceContext.getModel().getProperty(oSourceContext.getPath()).id;
-                var iIndex = aGroups.indexOf(group);
+            responseData.removeFromGroups.forEach((group) => {
+                const sTileCatalogId = oSourceContext.getModel().getProperty(oSourceContext.getPath()).id;
+                const iIndex = aGroups.indexOf(group);
 
                 aPromises.push(this._removeTile(sTileCatalogId, iIndex));
-            }.bind(this));
+            });
 
-            responseData.newGroups.forEach(function (group) {
-                var sNewGroupName = (group.length > 0) ? group : resources.i18n.getText("new_group_name");
+            responseData.newGroups.forEach((group) => {
+                const sNewGroupName = (group.length > 0) ? group : resources.i18n.getText("new_group_name");
 
                 aPromises.push(this._createGroupAndSaveTile(oSourceContext, sNewGroupName));
-            }.bind(this));
+            });
 
             jQuery.when.apply(jQuery, aPromises).then(function () {
-                var aResults = Array.prototype.slice.call(arguments); // Make array-like arguments a real array
+                const aResults = Array.prototype.slice.call(arguments); // Make array-like arguments a real array
 
                 this._handlePopoverGroupsActionPromises(catalogTile, responseData, aResults);
             }.bind(this));
@@ -827,58 +835,58 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         _handlePopoverGroupsActionPromises: function (catalogTile, popoverResponse, resultList) {
-            var aErrors = resultList.filter(function (result) {
+            const aErrors = resultList.filter((result) => {
                 return !result.status;
             });
 
             if (aErrors.length) {
-                var oErrorMessageObj = this.prepareErrorMessage(aErrors, catalogTile.tileData.title);
+                const oErrorMessageObj = this.prepareErrorMessage(aErrors, catalogTile.tileData.title);
 
                 oCatalogsManager.resetAssociationOnFailure(oErrorMessageObj.messageId, oErrorMessageObj.parameters);
 
                 return;
             }
 
-            var aTileGroupIds = [];
-            var oLaunchPageService = this.oLaunchPageService;
-            popoverResponse.allGroups.forEach(function (group) {
+            const aTileGroupIds = [];
+            const oLaunchPageService = this.oLaunchPageService;
+            popoverResponse.allGroups.forEach((group) => {
                 if (group.selected) {
-                    var sGroupId = oLaunchPageService.getGroupId(group.oGroup.object);
+                    const sGroupId = oLaunchPageService.getGroupId(group.oGroup.object);
 
                     aTileGroupIds.push(sGroupId);
                 }
             });
 
-            var oModel = this.getView().getModel();
+            const oModel = this.getView().getModel();
             if (popoverResponse.newGroups.length) {
-                var aDashboardGroups = oModel.getProperty("/groups");
-                var aNewDashboardGroups = aDashboardGroups.slice(aDashboardGroups.length - popoverResponse.newGroups.length);
+                const aDashboardGroups = oModel.getProperty("/groups");
+                const aNewDashboardGroups = aDashboardGroups.slice(aDashboardGroups.length - popoverResponse.newGroups.length);
 
-                aNewDashboardGroups.forEach(function (newGroup) {
-                    var sGroupId = oLaunchPageService.getGroupId(newGroup.object);
+                aNewDashboardGroups.forEach((newGroup) => {
+                    const sGroupId = oLaunchPageService.getGroupId(newGroup.object);
 
                     aTileGroupIds.push(sGroupId);
                 });
             }
 
-            oModel.setProperty(catalogTile.bindingContextPath + "/associatedGroups", aTileGroupIds);
+            oModel.setProperty(`${catalogTile.bindingContextPath}/associatedGroups`, aTileGroupIds);
 
-            var sFirstAddedGroupTitle = popoverResponse.addToGroups[0] ? popoverResponse.addToGroups[0].title : "";
+            let sFirstAddedGroupTitle = popoverResponse.addToGroups[0] ? popoverResponse.addToGroups[0].title : "";
             if (sFirstAddedGroupTitle.length === 0 && popoverResponse.newGroups.length) {
                 sFirstAddedGroupTitle = popoverResponse.newGroups[0];
             }
 
-            var sFirstRemovedGroupTitle = popoverResponse.removeFromGroups[0] ? popoverResponse.removeFromGroups[0].title : "";
-            var iAddedGroups = popoverResponse.addToGroups.length + popoverResponse.newGroups.length;
-            var iRemovedGroups = popoverResponse.removeFromGroups.length;
-            var sDetailedMessage = this.prepareDetailedMessage(catalogTile.tileData.title, iAddedGroups, iRemovedGroups, sFirstAddedGroupTitle, sFirstRemovedGroupTitle);
+            const sFirstRemovedGroupTitle = popoverResponse.removeFromGroups[0] ? popoverResponse.removeFromGroups[0].title : "";
+            const iAddedGroups = popoverResponse.addToGroups.length + popoverResponse.newGroups.length;
+            const iRemovedGroups = popoverResponse.removeFromGroups.length;
+            const sDetailedMessage = this.prepareDetailedMessage(catalogTile.tileData.title, iAddedGroups, iRemovedGroups, sFirstAddedGroupTitle, sFirstRemovedGroupTitle);
             MessageToast.show(sDetailedMessage);
         },
 
         _getCatalogTileIndexInModel: function (oSourceContext) {
-            var sTilePath = oSourceContext.sPath;
-            var aTilePathParts = sTilePath.split("/");
-            var iTileIndex = aTilePathParts[aTilePathParts.length - 1];
+            const sTilePath = oSourceContext.sPath;
+            const aTilePathParts = sTilePath.split("/");
+            const iTileIndex = aTilePathParts[aTilePathParts.length - 1];
 
             return iTileIndex;
         },
@@ -892,45 +900,45 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         _handleTileFooterClickInGroupContext: function (oSourceContext, sGroupModelPath) {
-            var oLaunchPageService = this.oLaunchPageService;
-            var oModel = this.getView().getModel();
-            var oCatalogTile = this.getCatalogTileDataFromModel(oSourceContext);
-            var aAssociatedGroups = oCatalogTile.tileData.associatedGroups;
-            var oGroupModel = oModel.getProperty(sGroupModelPath); // Get the model of the group according to the group's model path (e.g. "groups/4")
-            var sGroupId = oLaunchPageService.getGroupId(oGroupModel.object);
-            var iCatalogTileInGroup = aAssociatedGroups ? Array.prototype.indexOf.call(aAssociatedGroups, sGroupId) : -1;
-            var sTilePath = oCatalogTile.bindingContextPath;
+            const oLaunchPageService = this.oLaunchPageService;
+            const oModel = this.getView().getModel();
+            const oCatalogTile = this.getCatalogTileDataFromModel(oSourceContext);
+            const aAssociatedGroups = oCatalogTile.tileData.associatedGroups;
+            const oGroupModel = oModel.getProperty(sGroupModelPath); // Get the model of the group according to the group's model path (e.g. "groups/4")
+            const sGroupId = oLaunchPageService.getGroupId(oGroupModel.object);
+            const iCatalogTileInGroup = aAssociatedGroups ? Array.prototype.indexOf.call(aAssociatedGroups, sGroupId) : -1;
+            const sTilePath = oCatalogTile.bindingContextPath;
 
             if (oCatalogTile.isBeingProcessed) {
                 return;
             }
 
-            oModel.setProperty(sTilePath + "/isBeingProcessed", true);
+            oModel.setProperty(`${sTilePath}/isBeingProcessed`, true);
 
-            var oTileOperationPromise;
-            var bTileAdded;
+            let oTileOperationPromise;
+            let bTileAdded;
 
             if (iCatalogTileInGroup === -1) {
-                var oGroupContext = new Context(oSourceContext.getModel(), sGroupModelPath);
+                const oGroupContext = new Context(oSourceContext.getModel(), sGroupModelPath);
                 oTileOperationPromise = this._addTile(oSourceContext, oGroupContext);
                 bTileAdded = true;
             } else {
-                var sTileCatalogId = oSourceContext.getModel().getProperty(oSourceContext.getPath("id"));
-                var iGroupIndex = parseInt(sGroupModelPath.split("/")[2], 10);
+                const sTileCatalogId = oSourceContext.getModel().getProperty(oSourceContext.getPath("id"));
+                const iGroupIndex = parseInt(sGroupModelPath.split("/")[2], 10);
                 oTileOperationPromise = this._removeTile(sTileCatalogId, iGroupIndex);
                 bTileAdded = false;
             }
 
-            oTileOperationPromise.done(function (data) {
+            oTileOperationPromise.done((data) => {
                 if (data.status) {
                     this._groupContextOperationSucceeded(oSourceContext, oCatalogTile, oGroupModel, bTileAdded);
                 } else {
                     this._groupContextOperationFailed(oCatalogTile, oGroupModel, bTileAdded);
                 }
-            }.bind(this));
+            });
 
-            oTileOperationPromise.always(function () {
-                oModel.setProperty(sTilePath + "/isBeingProcessed", false);
+            oTileOperationPromise.always(() => {
+                oModel.setProperty(`${sTilePath}/isBeingProcessed`, false);
             });
         },
 
@@ -945,10 +953,10 @@ sap.ui.define([
          * @deprecated since 1.120
          */
         _groupContextOperationSucceeded: function (oSourceContext, oCatalogTileModel, oGroupModel, bTileAdded) {
-            var oLaunchPageService = this.oLaunchPageService;
-            var sGroupId = oLaunchPageService.getGroupId(oGroupModel.object);
-            var aAssociatedGroups = oCatalogTileModel.tileData.associatedGroups;
-            var sDetailedMessage;
+            const oLaunchPageService = this.oLaunchPageService;
+            const sGroupId = oLaunchPageService.getGroupId(oGroupModel.object);
+            const aAssociatedGroups = oCatalogTileModel.tileData.associatedGroups;
+            let sDetailedMessage;
 
             // Check if this is an "add tile to group" action
             if (bTileAdded) {
@@ -956,14 +964,14 @@ sap.ui.define([
                 aAssociatedGroups.push(sGroupId);
 
                 // Update the model of the catalog tile with the updated associatedGroups
-                oSourceContext.getModel().setProperty(oCatalogTileModel.bindingContextPath + "/associatedGroups", aAssociatedGroups);
+                oSourceContext.getModel().setProperty(`${oCatalogTileModel.bindingContextPath}/associatedGroups`, aAssociatedGroups);
 
                 sDetailedMessage = this.prepareDetailedMessage(oCatalogTileModel.tileData.title, 1, 0, oGroupModel.title, "");
             } else {
                 // If this is a "remove tile from group" action
 
                 // Update the associatedGroups array of the catalog tile
-                for (var i = 0; i < aAssociatedGroups.length; i++) {
+                for (let i = 0; i < aAssociatedGroups.length; i++) {
                     if (aAssociatedGroups[i] === sGroupId) {
                         aAssociatedGroups.splice(i, 1);
                         break;
@@ -971,7 +979,7 @@ sap.ui.define([
                 }
 
                 // Update the model of the catalog tile with the updated associatedGroups
-                oSourceContext.getModel().setProperty(oCatalogTileModel.bindingContextPath + "/associatedGroups", aAssociatedGroups);
+                oSourceContext.getModel().setProperty(`${oCatalogTileModel.bindingContextPath}/associatedGroups`, aAssociatedGroups);
                 sDetailedMessage = this.prepareDetailedMessage(oCatalogTileModel.tileData.title, 0, 1, "", oGroupModel.title);
             }
 
@@ -993,7 +1001,7 @@ sap.ui.define([
          *
          */
         _groupContextOperationFailed: function (oCatalogTileModel, oGroupModel, bTileAdded) {
-            var oErrorMessage;
+            let oErrorMessage;
 
             if (bTileAdded) {
                 oErrorMessage = { messageId: "fail_tile_operation_add_to_group", parameters: [oCatalogTileModel.tileData.title, oGroupModel.title] };
@@ -1005,18 +1013,18 @@ sap.ui.define([
         },
 
         prepareErrorMessage: function (aErroneousActions, sTileTitle) {
-            var sFirstErroneousAddGroup;
-            var sFirstErroneousRemoveGroup;
-            var oMessage;
-            var iNumberOfFailAddActions = 0;
-            var iNumberOfFailDeleteActions = 0;
-            var bCreateNewGroupFailed = false;
-
-            for (var sKey in aErroneousActions) {
+            let sFirstErroneousAddGroup;
+            let sFirstErroneousRemoveGroup;
+            let oMessage;
+            let iNumberOfFailAddActions = 0;
+            let iNumberOfFailDeleteActions = 0;
+            let bCreateNewGroupFailed = false;
+
+            for (const sKey in aErroneousActions) {
                 // Get the data of the error (i.e. action name and group object)
 
-                var oGroup = aErroneousActions[sKey].group;
-                var sAction = aErroneousActions[sKey].action;
+                const oGroup = aErroneousActions[sKey].group;
+                const sAction = aErroneousActions[sKey].action;
 
                 if (sAction === "add") {
                     iNumberOfFailAddActions++;
@@ -1063,7 +1071,7 @@ sap.ui.define([
         },
 
         prepareDetailedMessage: function (tileTitle, numberOfAddedGroups, numberOfRemovedGroups, firstAddedGroupTitle, firstRemovedGroupTitle) {
-            var sMessage;
+            let sMessage;
 
             if (numberOfAddedGroups === 0) {
                 if (numberOfRemovedGroups === 1) {
@@ -1096,9 +1104,9 @@ sap.ui.define([
          * @returns {object} Returns the part of the model that contains the IDs of the groups that contain the relevant Tile
          */
         getCatalogTileDataFromModel: function (oSourceContext) {
-            var sBindingCtxPath = oSourceContext.getPath();
-            var oModel = oSourceContext.getModel();
-            var oTileData = oModel.getProperty(sBindingCtxPath);
+            const sBindingCtxPath = oSourceContext.getPath();
+            const oModel = oSourceContext.getModel();
+            const oTileData = oModel.getProperty(sBindingCtxPath);
 
             // Return an object containing the Tile in the CatalogTiles Array (in the model) ,its index and whether it's in the middle of add/removal process.
             return {
@@ -1121,13 +1129,13 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         _addTile: function (oTileContext, oGroupContext) {
-            var oDeferred = jQuery.Deferred();
-            var oPromise = oCatalogsManager.createTile({
+            const oDeferred = jQuery.Deferred();
+            const oPromise = oCatalogsManager.createTile({
                 catalogTileContext: oTileContext,
                 groupContext: oGroupContext
             });
 
-            oPromise.done(function (data) {
+            oPromise.done((data) => {
                 oDeferred.resolve(data);
             });
 
@@ -1147,15 +1155,15 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         _removeTile: function (tileCatalogId, index) {
-            var oDeferred = jQuery.Deferred();
-            var oPromise = oCatalogsManager.deleteCatalogTileFromGroup({
+            const oDeferred = jQuery.Deferred();
+            const oPromise = oCatalogsManager.deleteCatalogTileFromGroup({
                 tileId: tileCatalogId,
                 groupIndex: index
             });
 
             // The function deleteCatalogTileFromGroup always results in deferred.resolve
             // and the actual result of the action (success/failure) is contained in the data object
-            oPromise.done(function (data) {
+            oPromise.done((data) => {
                 oDeferred.resolve(data);
             });
 
@@ -1175,13 +1183,13 @@ sap.ui.define([
          * @deprecated since 1.112
          */
         _createGroupAndSaveTile: function (oTileContext, newGroupName) {
-            var oDeferred = jQuery.Deferred();
-            var oPromise = oCatalogsManager.createGroupAndSaveTile({
+            const oDeferred = jQuery.Deferred();
+            const oPromise = oCatalogsManager.createGroupAndSaveTile({
                 catalogTileContext: oTileContext,
                 newGroupName: newGroupName
             });
 
-            oPromise.done(function (data) {
+            oPromise.done((data) => {
                 oDeferred.resolve(data);
             });