@sapui5/sap.ushell 1.138.1 → 1.139.0

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

@@ -23,7 +23,7 @@ sap.ui.define([
     "sap/ushell/ui/launchpad/CatalogsContainer",
     "sap/ushell/ui/launchpad/Tile",
     "sap/ushell/resources"
-], function (
+], (
     BusyIndicator,
     mobileLibrary,
     List,
@@ -46,27 +46,27 @@ sap.ui.define([
     CatalogsContainer,
     Tile,
     resources
-) {
+) => {
     "use strict";
 
     // shortcut for sap.m.ListSeparators
-    var ListSeparators = mobileLibrary.ListSeparators;
+    const ListSeparators = mobileLibrary.ListSeparators;
 
     // shortcut for sap.m.ListMode
-    var ListMode = mobileLibrary.ListMode;
+    const ListMode = mobileLibrary.ListMode;
 
     // shortcut for sap.ui.core.AccessibleLandmarkRole
-    var AccessibleLandmarkRole = coreLibrary.AccessibleLandmarkRole;
+    const AccessibleLandmarkRole = coreLibrary.AccessibleLandmarkRole;
 
     return View.extend("sap.ushell.components.appfinder.CatalogView", {
         oController: null,
         oVisualizationOrganizerHelper: VisualizationOrganizerHelper.getInstance(),
 
         formatPinButtonTooltip: function (aGroupsIDs, oGroupContext) {
-            var sText;
+            let sText;
 
             if (oGroupContext.path) {
-                var iCatalogTileInGroup = aGroupsIDs ? Array.prototype.indexOf.call(aGroupsIDs, oGroupContext.id) : -1;
+                const iCatalogTileInGroup = aGroupsIDs ? Array.prototype.indexOf.call(aGroupsIDs, oGroupContext.id) : -1;
                 sText = iCatalogTileInGroup !== -1 ? "removeAssociatedTileFromContextGroup" : "addAssociatedTileToContextGroup";
 
                 return resources.i18n.getText(sText, [oGroupContext.title]);
@@ -79,19 +79,19 @@ sap.ui.define([
         formatPinButtonSelectState: function (aAssociatedGroups, associatedGroupsLength, sGroupContextModelPath, sGroupContextId) {
             if (sGroupContextModelPath) {
                 // If in group context - the icon is determined according to whether this catalog tile exists in the group or not
-                var iCatalogTileInGroup = aAssociatedGroups ? Array.prototype.indexOf.call(aAssociatedGroups, sGroupContextId) : -1;
+                const iCatalogTileInGroup = aAssociatedGroups ? Array.prototype.indexOf.call(aAssociatedGroups, sGroupContextId) : -1;
                 return iCatalogTileInGroup !== -1;
             }
             return !!associatedGroupsLength;
         },
 
         createContent: function (oController) {
-            var that = this;
+            const that = this;
 
             this.oViewData = this.getViewData();
             this.parentComponent = this.oViewData.parentComponent;
 
-            var oModel = this.parentComponent.getModel();
+            const oModel = this.parentComponent.getModel();
             this.setModel(oModel);
             this.setModel(this.oViewData.subHeaderModel, "subHeaderModel");
             this.oVisualizationOrganizerHelper.setModel(oModel);
@@ -101,7 +101,7 @@ sap.ui.define([
                 return ((sLong !== null) && (sLong === "1x2" || sLong === "2x2")) || false;
             }
 
-            var oTilePinButton = new PinButton({
+            const oTilePinButton = new PinButton({
                 icon: { path: "id", formatter: this.oVisualizationOrganizerHelper.formatPinButtonIcon },
                 type: { path: "id", formatter: this.oVisualizationOrganizerHelper.formatPinButtonType },
                 selected: {
@@ -116,7 +116,7 @@ sap.ui.define([
                 visible: false
             });
 
-            var oAppBoxPinButton = new PinButton({
+            const oAppBoxPinButton = new PinButton({
                 icon: { path: "id", formatter: this.oVisualizationOrganizerHelper.formatPinButtonIcon },
                 type: { path: "id", formatter: this.oVisualizationOrganizerHelper.formatPinButtonType },
                 selected: {
@@ -142,7 +142,7 @@ sap.ui.define([
                 press: [oController.onAppBoxPressed, oController]
             });
 
-            this.oVisualizationOrganizerHelper.shouldPinButtonBeVisible().then(function (bEnabled) {
+            this.oVisualizationOrganizerHelper.shouldPinButtonBeVisible().then((bEnabled) => {
                 oAppBoxPinButton.setVisible(bEnabled);
                 oTilePinButton.setVisible(bEnabled);
             });
@@ -202,13 +202,13 @@ sap.ui.define([
 
             // override original onAfterRendering as currently sap.m.Select does not support afterRendering handler in the constructor
             // this is done to support tab order accessibility
-            var origCatalogSelectOnAfterRendering = this.oCatalogSelect.onAfterRendering;
+            const origCatalogSelectOnAfterRendering = this.oCatalogSelect.onAfterRendering;
             if (Device.system.desktop) {
                 sap.ui.require([
                     "sap/ushell/components/ComponentKeysHandler",
                     "sap/ushell/renderer/AccessKeysHandler"
-                ], function (ComponentKeysHandler, AccessKeysHandler) {
-                    ComponentKeysHandler.getInstance().then(function (ComponentKeysHandlerInstance) {
+                ], (ComponentKeysHandler, AccessKeysHandler) => {
+                    ComponentKeysHandler.getInstance().then((ComponentKeysHandlerInstance) => {
                         this.oCatalogSelect.addEventDelegate({
                             onsaptabnext: function (oEvent) {
                                 try {
@@ -232,7 +232,7 @@ sap.ui.define([
                                 try {
                                     oEvent.preventDefault();
                                     AccessKeysHandler.setIsFocusHandledByAnotherHandler(true);
-                                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
+                                    const openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                                     if (openCloseSplitAppButton.getVisible()) {
                                         openCloseSplitAppButton.focus();
                                     } else {
@@ -243,8 +243,8 @@ sap.ui.define([
                                 }
                             }
                         });
-                    }.bind(this));
-                }.bind(this));
+                    });
+                });
             }
             // if xRay is enabled
             if (oModel.getProperty("/enableHelp")) {
@@ -252,16 +252,16 @@ sap.ui.define([
             }
 
             this.setCategoryFilterSelection = function (sSelection, shouldFocusOnCategory) {
-                var oCatalogSelection = that.getCatalogSelect();
-                var aCatalogListItems = oCatalogSelection.getItems();
-                var sSelected = sSelection;
-                var selectedIndex = 0;
+                const oCatalogSelection = that.getCatalogSelect();
+                const aCatalogListItems = oCatalogSelection.getItems();
+                let sSelected = sSelection;
+                let selectedIndex = 0;
 
                 if (!sSelected || sSelected === "") {
                     sSelected = resources.i18n.getText("all");
                 }
 
-                aCatalogListItems.forEach(function (oListItem, nIndex) {
+                aCatalogListItems.forEach((oListItem, nIndex) => {
                     if (oListItem.getTitle() === sSelected) {
                         selectedIndex = nIndex;
                         oCatalogSelection.setSelectedItem(oListItem);
@@ -275,7 +275,7 @@ sap.ui.define([
 
             this.oCatalogSelect.onAfterRendering = function () {
                 // set the selected item.
-                var sSelected = that.oController.categoryFilter || resources.i18n.getText("all");
+                const sSelected = that.oController.categoryFilter || resources.i18n.getText("all");
 
                 that.setCategoryFilterSelection(sSelected);
 
@@ -288,8 +288,8 @@ sap.ui.define([
                 }
 
                 // set focus on first segmented button
-                setTimeout(function () {
-                    var oSegmentedButton = Element.getElementById("appFinderSegmentedButtons");
+                setTimeout(() => {
+                    const oSegmentedButton = Element.getElementById("appFinderSegmentedButtons");
                     if (oSegmentedButton) {
                         oSegmentedButton.focus();
                     }
@@ -297,7 +297,7 @@ sap.ui.define([
             };
 
             // setting followOf to false, so the popover won't close on IE.
-            var origOnAfterRenderingPopover = this.oCatalogSelect._onAfterRenderingPopover;
+            const origOnAfterRenderingPopover = this.oCatalogSelect._onAfterRenderingPopover;
             this.oCatalogSelect._onAfterRenderingPopover = function () {
                 if (this._oPopover) {
                     this._oPopover.setFollowOf(false);
@@ -307,9 +307,9 @@ sap.ui.define([
                 }
             };
 
-            var oEventBus = EventBus.getInstance();
-            var sDetailPageId;
-            var fnUpdateMasterDetail = function () {
+            const oEventBus = EventBus.getInstance();
+            let sDetailPageId;
+            const fnUpdateMasterDetail = function () {
                 this.splitApp.toMaster("catalogSelect", "show");
                 if (!Device.system.phone) {
                     sDetailPageId = this._calculateDetailPageId();
@@ -319,12 +319,12 @@ sap.ui.define([
                 }
             }.bind(this);
 
-            oEventBus.subscribe("launchpad", "catalogContentLoaded", function () {
+            oEventBus.subscribe("launchpad", "catalogContentLoaded", () => {
                 setTimeout(fnUpdateMasterDetail, 500);
             }, this);
             oEventBus.subscribe("launchpad", "afterCatalogSegment", fnUpdateMasterDetail, this);
 
-            var oCatalogTemplate = new CatalogEntryContainer({
+            const oCatalogTemplate = new CatalogEntryContainer({
                 header: "{title}",
                 customTilesContainer: {
                     path: "customTiles",
@@ -344,18 +344,18 @@ sap.ui.define([
                 description: " "
             }).addEventDelegate({
                 onAfterRendering: function () {
-                    var oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
+                    const oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
                     if (oIllustratedMessageDomRef) {
-                        var aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
+                        const aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
                         if (aIllustratedMessageMainTexts.length) {
                             aIllustratedMessageMainTexts[0].setAttribute("tabindex", "0");
                         }
                     }
                 }.bind(this),
                 onBeforeRendering: function () {
-                    var oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
+                    const oIllustratedMessageDomRef = this.oIllustratedMessage.getDomRef();
                     if (oIllustratedMessageDomRef) {
-                        var aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
+                        const aIllustratedMessageMainTexts = oIllustratedMessageDomRef.getElementsByClassName("sapMTitle");
                         if (aIllustratedMessageMainTexts.length) {
                             aIllustratedMessageMainTexts[0].removeAttribute("tabindex");
                         }
@@ -377,17 +377,17 @@ sap.ui.define([
 
             this.oCatalogsContainer.addEventDelegate({
                 onsaptabprevious: function (oEvent) {
-                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
-                    var oDomRef = oEvent.srcControl.getDomRef();
+                    const openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
+                    const oDomRef = oEvent.srcControl.getDomRef();
                     if (openCloseSplitAppButton.getVisible() && !openCloseSplitAppButton.getPressed() &&
                         !oDomRef.classList.contains("sapUshellPinButton")) {
                         oEvent.preventDefault();
-                        var appFinderSearch = Element.getElementById("appFinderSearch");
+                        const appFinderSearch = Element.getElementById("appFinderSearch");
                         appFinderSearch.focus();
                     }
                 },
                 onsapskipback: function (oEvent) {
-                    var openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
+                    const openCloseSplitAppButton = Element.getElementById("openCloseButtonAppFinderSubheader");
                     if (openCloseSplitAppButton.getVisible() && !openCloseSplitAppButton.getPressed()) {
                         oEvent.preventDefault();
                         openCloseSplitAppButton.focus();
@@ -396,7 +396,7 @@ sap.ui.define([
             });
 
             this.oCatalogsContainer.onAfterRendering = function () {
-                var oCatalogTilesDetailedPage = Element.getElementById("catalogTilesDetailedPage");
+                const oCatalogTilesDetailedPage = Element.getElementById("catalogTilesDetailedPage");
                 if (!this.getBusy()) {
                     oCatalogTilesDetailedPage.setBusy(false);
                     Measurement.end("FLP:AppFinderLoadingStartToEnd");
@@ -404,24 +404,24 @@ sap.ui.define([
                     oCatalogTilesDetailedPage.setBusy(true);
                 }
 
-                document.getElementById("catalogTilesDetailedPage-cont").addEventListener("scroll", function () {
-                    var oPage = Element.getElementById("catalogTilesDetailedPage");
-                    var scroll = oPage.getScrollDelegate();
-                    var currentPos = scroll.getScrollTop();
-                    var max = scroll.getMaxScrollTop();
+                document.getElementById("catalogTilesDetailedPage-cont").addEventListener("scroll", () => {
+                    const oPage = Element.getElementById("catalogTilesDetailedPage");
+                    const scroll = oPage.getScrollDelegate();
+                    const currentPos = scroll.getScrollTop();
+                    const max = scroll.getMaxScrollTop();
 
                     if (max - currentPos <= 30 + 3 * that.oController.PagingManager.getTileHeight() && that.oController.bIsInProcess === false) {
                         that.oController.bIsInProcess = true;
                         that.oController.allocateNextPage();
                         setTimeout(
-                            function () {
+                            () => {
                                 that.oController.bIsInProcess = false;
                             }, 0);
                     }
                 });
             };
 
-            var oCatalogDetailedPage = new Page("catalogTilesDetailedPage", {
+            const oCatalogDetailedPage = new Page("catalogTilesDetailedPage", {
                 showHeader: false,
                 showFooter: false,
                 showNavButton: false,
@@ -435,14 +435,14 @@ sap.ui.define([
                 })
             });
 
-            var oCatalogMessage = new Page("catalogMessagePage", {
+            const oCatalogMessage = new Page("catalogMessagePage", {
                 showHeader: false,
                 showFooter: false,
                 showNavButton: false,
                 content: [this.oIllustratedMessage]
             });
 
-            var oSelectBusyIndicator = new BusyIndicator("catalogSelectBusyIndicator", { size: "1rem" });
+            const oSelectBusyIndicator = new BusyIndicator("catalogSelectBusyIndicator", { size: "1rem" });
             this.splitApp = new SplitApp("catalogViewMasterDetail", {
                 masterPages: [oSelectBusyIndicator, this.oCatalogSelect],
                 detailPages: [oCatalogDetailedPage, oCatalogMessage],
@@ -454,11 +454,11 @@ sap.ui.define([
 
         // calculate what is the relevant current detail page according to configuration and state of the view
         _calculateDetailPageId: function () {
-            var oSubHeaderModel = this.getModel("subHeaderModel");
-            var bSearchMode = oSubHeaderModel.getProperty("/search/searchMode");
-            var bTagMode = oSubHeaderModel.getProperty("/tag/tagMode");
-            var bNoCatalogs = !!this.getModel().getProperty("/catalogsNoDataText");
-            var sId;
+            const oSubHeaderModel = this.getModel("subHeaderModel");
+            const bSearchMode = oSubHeaderModel.getProperty("/search/searchMode");
+            const bTagMode = oSubHeaderModel.getProperty("/tag/tagMode");
+            const bNoCatalogs = !!this.getModel().getProperty("/catalogsNoDataText");
+            let sId;
             if (bSearchMode || bTagMode) {
                 sId = this.getController().bSearchResults ? "catalogTilesDetailedPage" : "catalogMessagePage";
             } else if (bNoCatalogs) {

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

@@ -9,7 +9,7 @@ sap.ui.define([
     "sap/ushell/components/SharedComponentUtils",
     "sap/base/util/UriParameters",
     "sap/ushell/Container"
-], function (
+], (
     UIComponent,
     hasher,
     CatalogsManager,
@@ -19,7 +19,7 @@ sap.ui.define([
     oSharedComponentUtils,
     UriParameters,
     Container
-) {
+) => {
     "use strict";
 
     return UIComponent.extend("sap.ushell.components.appfinder.Component", {
@@ -39,10 +39,7 @@ sap.ui.define([
 
             // Model defaults are set now --- let`s continue.
 
-            var sHash,
-                mParameters,
-                oComponentConfig;
-            var bPersonalizationActive = Config.last("/core/shell/enablePersonalization");
+            const bPersonalizationActive = Config.last("/core/shell/enablePersonalization");
 
             if (bPersonalizationActive) {
                 // trigger the reading of the homepage group display personalization
@@ -62,19 +59,19 @@ sap.ui.define([
             this.setModel(resources.i18nModel, "i18n");
 
             oSharedComponentUtils.toggleUserActivityLog();
-            //handle direct navigation with the old catalog intent format
-            sHash = hasher.getHash();
+            // handle direct navigation with the old catalog intent format
+            const sHash = hasher.getHash();
 
             Promise.all([
                 Container.getServiceAsync("ShellNavigationInternal"),
                 Container.getServiceAsync("URLParsing")
-            ]).then(function (aServices) {
-                var oShellNavigationInternal = aServices[0];
-                var oUrlParsing = aServices[1];
-                var oShellHash = oUrlParsing.parseShellHash(sHash);
+            ]).then((aServices) => {
+                const oShellNavigationInternal = aServices[0];
+                const oUrlParsing = aServices[1];
+                const oShellHash = oUrlParsing.parseShellHash(sHash);
                 if (oShellHash && oShellHash.semanticObject === "shell" && oShellHash.action === "catalog") {
-                    mParameters = this.parseOldCatalogParams(sHash);
-                    oComponentConfig = this.getManifestEntry("/sap.ui5/config");
+                    const mParameters = this.parseOldCatalogParams(sHash);
+                    const oComponentConfig = this.getManifestEntry("/sap.ui5/config");
 
                     oShellNavigationInternal.toExternal({
                         target: {
@@ -87,7 +84,7 @@ sap.ui.define([
                         filters: JSON.stringify(mParameters)
                     });
                 }
-            }.bind(this));
+            });
         },
 
         parseOldCatalogParams: function (sUrl) {
@@ -111,5 +108,4 @@ sap.ui.define([
             ]);
         }
     });
-
 });