@sapui5/sap.ushell 1.138.0 → 1.139.0

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,12 +2,12 @@
 
 /**
  * @fileOverview
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell/Container"
-], function (Log, Container) {
+], (Log, Container) => {
     "use strict";
 
     /**
@@ -15,7 +15,7 @@ sap.ui.define([
      * @since 1.101.0
      * @private
      */
-    var FrequentActivityProvider = function () {};
+    function FrequentActivityProvider () {}
 
     /**
      * returns the name of the search provider
@@ -32,36 +32,37 @@ sap.ui.define([
     /**
      * provide the frequent activity of the user
      *
+     * @param {string} sQuery the search query.
+     * @param {string} sGroupName the group name.
      * @returns {Promise} when resolved, contains the frequent activity array
      *
      * @since 1.101.0
      * @private
      */
     FrequentActivityProvider.prototype.execSearch = function (sQuery, sGroupName) {
-        return Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
-            return UserRecentsService.getFrequentActivity().then(function (oRecents) {
-                var aFinalResult = [],
-                    oMapping = {
-                        frequentApplications: {
-                            "Application": {
-                                icon: "sap-icon://SAP-icons-TNT/application"
-                            },
-                            "External Link": {
-                                icon: "sap-icon://internet-browser"
-                            }
+        return Container.getServiceAsync("UserRecents").then((UserRecentsService) => {
+            return UserRecentsService.getFrequentActivity().then((oRecents) => {
+                let aFinalResult = [];
+                const oMapping = {
+                    frequentApplications: {
+                        Application: {
+                            icon: "sap-icon://SAP-icons-TNT/application"
                         },
-                        frequentProducts: {
-                            "Product": {
-                                icon: "sap-icon://product"
-                            }
+                        "External Link": {
+                            icon: "sap-icon://internet-browser"
                         }
-                    };
+                    },
+                    frequentProducts: {
+                        Product: {
+                            icon: "sap-icon://product"
+                        }
+                    }
+                };
 
                 if (oRecents && Array.isArray(oRecents) && oRecents.length > 0) {
-
-                    aFinalResult = oRecents.filter(function (item) {
+                    aFinalResult = oRecents.filter((item) => {
                         return oMapping[sGroupName].hasOwnProperty(item.appType);
-                    }).map(function (item) {
+                    }).map((item) => {
                         item.text = item.text || item.title;
                         item.icon = item.icon || oMapping[sGroupName][item.appType].icon;
                         return item;
@@ -69,8 +70,8 @@ sap.ui.define([
                 }
 
                 return aFinalResult;
-            }, function (sError) {
-                Log.error("Frequent Activity Provider failed", "error: " + sError, "sap.ushell.components.shell.SearchCEP.SearchProviders.FrequentActivityProvider::execSearch");
+            }, (sError) => {
+                Log.error("Frequent Activity Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.FrequentActivityProvider::execSearch");
                 return [];
             });
         });

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,12 +2,12 @@
 
 /**
  * @fileOverview
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
     "sap/ushell/Container"
-], function (Log, Container) {
+], (Log, Container) => {
     "use strict";
 
     /**
@@ -15,7 +15,7 @@ sap.ui.define([
      * @since 1.101.0
      * @private
      */
-    var RecentSearchProvider = function () {};
+    function RecentSearchProvider () {}
 
     /**
      * returns the name of the search provider
@@ -38,12 +38,12 @@ sap.ui.define([
      * @private
      */
     RecentSearchProvider.prototype.execSearch = function () {
-        return Container.getServiceAsync("UserRecents").then(function (UserRecentsService) {
-            return UserRecentsService.getRecentSearches().then(function (aRecents) {
-                var aFinalResult = [];
+        return Container.getServiceAsync("UserRecents").then((UserRecentsService) => {
+            return UserRecentsService.getRecentSearches().then((aRecents) => {
+                let aFinalResult = [];
                 if (Array.isArray(aRecents) && aRecents.length > 0) {
                     aFinalResult = aRecents.map(
-                        function (item) {
+                        (item) => {
                             return {
                                 text: item.sTerm,
                                 icon: item.icon || "sap-icon://history"
@@ -52,8 +52,8 @@ sap.ui.define([
                 }
 
                 return aFinalResult;
-            }, function (sError) {
-                Log.error("Recent Search Terms Provider failed", "error: " + sError, "sap.ushell.components.shell.SearchCEP.SearchProviders.RecentSearchProvider::execSearch");
+            }, (sError) => {
+                Log.error("Recent Search Terms Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.RecentSearchProvider::execSearch");
                 return [];
             });
         });

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,22 +2,22 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/ushell/resources",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider"
-], function (
+], (
     ushellResources,
     FrequentActivityProvider,
     RecentSearchProvider,
     SearchServiceProvider
-) {
+) => {
     "use strict";
 
-    var SearchProvider = {
+    const SearchProvider = {
         _defaultProviders: null
     };
 

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider.js

@@ -2,21 +2,19 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.138.0
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
-    "sap/ushell/Config",
     "sap/ushell/resources",
     "sap/base/util/ObjectPath",
     "sap/ushell/Container"
-], function (
+], (
     Log,
-    Config,
     resources,
     ObjectPath,
     Container
-) {
+) => {
     "use strict";
 
     /**
@@ -24,7 +22,7 @@ sap.ui.define([
      * @since 1.101.0
      * @private
      */
-    var SearchServiceProvider = function () {};
+    function SearchServiceProvider () {}
 
     /**
      * returns the name of the search provider
@@ -38,6 +36,37 @@ sap.ui.define([
         return "Search Service Provider";
     };
 
+    /**
+     * adds the enterprise search as an external search provider
+     * added only in CEP Standard and when enterprise search is enabled in the site
+     *
+     * @param {oResult} aResult the search result array returned from the navigation service
+     * @param {string} sQuery the string to search
+     *
+     * @since 1.106.0
+     * @private
+     */
+    function _addESToResult (aResult, sQuery) {
+        const sHash = `#Action-search&/top=20&filter={"dataSource":{"type":"Category","id":"All","label":"All","labelPlural":"All"},"searchTerm":"${
+            sQuery}","rootCondition":{"type":"Complex","operator":"And","conditions":[]}}`;
+        const sUrl = Container.getFLPUrl() + sHash;
+        const oESearch = {
+            text: resources.i18n.getText("enterprise_search"),
+            description: resources.i18n.getText("enterprise_search"),
+            icon: "sap-icon://search",
+            inboundIdentifier: "38cd162a-e185-448c-9c37-a4fc02b3d39d___GenericDefaultSemantic-__GenericDefaultAction",
+            url: sUrl,
+            target: "_blank",
+            recent: false,
+            semanticObject: "Action",
+            semanticObjectAction: "search",
+            _type: "app",
+            isEnterpriseSearch: true
+        };
+
+        aResult.push(oESearch);
+    }
+
     /**
      * provide search results from the navigation service search api
      *
@@ -49,7 +78,7 @@ sap.ui.define([
      * @private
      */
     SearchServiceProvider.prototype.execSearch = function (sQuery, sGroupName) {
-        var oParams = {
+        const oParams = {
             top: 12,
             skip: 0,
             sort: {
@@ -67,18 +96,18 @@ sap.ui.define([
                 };
                 oParams.includeAppsWithoutVisualizations = true;
                 break;
-                case "applications":
-                    oParams.searchTerm = sQuery;
-                    oParams.filter = {
-                        filters: [{
-                                path: "technicalAttributes",
-                                operator: "NotContains",
-                                value1: "APPTYPE_SEARCHAPP"
-                            }, {
-                                path: "technicalAttributes",
-                            operator: "NotContains",
-                            value1: "APPTYPE_HOMEPAGE"
-                        }],
+            case "applications":
+                oParams.searchTerm = sQuery;
+                oParams.filter = {
+                    filters: [{
+                        path: "technicalAttributes",
+                        operator: "NotContains",
+                        value1: "APPTYPE_SEARCHAPP"
+                    }, {
+                        path: "technicalAttributes",
+                        operator: "NotContains",
+                        value1: "APPTYPE_HOMEPAGE"
+                    }],
                     and: true
                 };
                 break;
@@ -95,21 +124,21 @@ sap.ui.define([
                 break;
         }
 
-        return Container.getServiceAsync("SearchCEP").then(function (SearchCEPService) {
-            return SearchCEPService.suggest(oParams).then(function (oResult) {
-                var bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined,
-                    sPlatform = Container.getFLPPlatform(true),
-                    bIsCEPStandard = bIsSearchCEPEnabled === true && sPlatform === "cFLP",
-                    aFinalResult = [],
-                    bESSearchEnabled = ObjectPath.get("sap-ushell-config.renderers.fiori2.componentData.config.searchBusinessObjects"),
-                    oDefaultIcons = {
-                        applications: "sap-icon://SAP-icons-TNT/application",
-                        homePageApplications: "sap-icon://SAP-icons-TNT/product",
-                        externalSearchApplications: "sap-icon://world"
-                    };
+        return Container.getServiceAsync("SearchCEP").then((SearchCEPService) => {
+            return SearchCEPService.suggest(oParams).then((oResult) => {
+                const bIsSearchCEPEnabled = ObjectPath.get("sap-ushell-config.services.SearchCEP") !== undefined;
+                const sPlatform = Container.getFLPPlatform(true);
+                const bIsCEPStandard = bIsSearchCEPEnabled === true && sPlatform === "cFLP";
+                let aFinalResult = [];
+                const bESSearchEnabled = ObjectPath.get("sap-ushell-config.renderers.fiori2.componentData.config.searchBusinessObjects");
+                const oDefaultIcons = {
+                    applications: "sap-icon://SAP-icons-TNT/application",
+                    homePageApplications: "sap-icon://SAP-icons-TNT/product",
+                    externalSearchApplications: "sap-icon://world"
+                };
 
                 if (oResult) {
-                    aFinalResult = oResult.data.map(function (item) {
+                    aFinalResult = oResult.data.map((item) => {
                         item.text = item.text || item.label || item.title;
                         item.icon = item.icon || oDefaultIcons[sGroupName];
                         return item;
@@ -121,42 +150,11 @@ sap.ui.define([
                 }
                 return aFinalResult;
             });
-        }, function (sError) {
-            Log.error("Search service Provider failed", "error: " + sError, "sap.ushell.components.shell.SearchCEP.SearchProviders.SearchServiceProvider::execSearch");
+        }, (sError) => {
+            Log.error("Search service Provider failed", `error: ${sError}`, "sap.ushell.components.shell.SearchCEP.SearchProviders.SearchServiceProvider::execSearch");
             return [];
         });
     };
 
-    /**
-     * adds the enterprise search as an external search provider
-     * added only in CEP Standard and when enterprise search is enabled in the site
-     *
-     * @param {oResult} aResult the search result array returned from the navigation service
-     * @param {string} sQuery the string to search
-     *
-     * @since 1.106.0
-     * @private
-     */
-    function _addESToResult (aResult, sQuery) {
-        var sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"All\",\"label\":\"All\",\"labelPlural\":\"All\"},\"searchTerm\":\"" +
-            sQuery + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}",
-            sUrl = Container.getFLPUrl() + sHash,
-            oESearch = {
-                "text": resources.i18n.getText("enterprise_search"),
-                "description": resources.i18n.getText("enterprise_search"),
-                "icon": "sap-icon://search",
-                "inboundIdentifier": "38cd162a-e185-448c-9c37-a4fc02b3d39d___GenericDefaultSemantic-__GenericDefaultAction",
-                "url": sUrl,
-                "target": "_blank",
-                "recent": false,
-                "semanticObject": "Action",
-                "semanticObjectAction": "search",
-                "_type": "app",
-                "isEnterpriseSearch": true
-            };
-
-        aResult.push(oESearch);
-    }
-
     return new SearchServiceProvider();
 }, false);