@sapui5/sap.ushell 1.138.1 → 1.139.0

package/src/main/js/sap/ushell/services/ReferenceResolver.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview resolves references
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -18,7 +18,7 @@ sap.ui.define([
     "sap/ushell/User",
     "sap/ushell/utils",
     "sap/ushell/Container"
-], function (
+], (
     Log,
     Formatting,
     CalendarType,
@@ -32,7 +32,7 @@ sap.ui.define([
     User,
     ushellUtils,
     Container
-) {
+) => {
     "use strict";
 
     const sModuleName = "sap.ushell.services.ReferenceResolver";
@@ -116,6 +116,10 @@ sap.ui.define([
      *
      * @hideconstructor
      *
+     * @param {object} oContainerInterface the container interface, not used.
+     * @param {string} sParameter the parameter string, not used.
+     * @param {object} oConfig the service configuration.
+     *
      * @since 1.42.0
      * @private
      */
@@ -184,7 +188,7 @@ sap.ui.define([
 
                     if (typeof sRefName !== "string") {
                         bAllRefsResolvable = false;
-                        Log.error(`'${ sRefWithPrefix }' is not a legal reference name`, null, sModuleName);
+                        Log.error(`'${sRefWithPrefix}' is not a legal reference name`, null, sModuleName);
                     }
                     return {
                         full: sRefWithPrefix,
@@ -203,8 +207,6 @@ sap.ui.define([
 
             const UserDefaultParameters = await Container.getServiceAsync("UserDefaultParameters");
 
-
-
             Object.keys(oDistinctRefs).forEach((sName) => {
                 aReferencePromises.push(UserDefaultParameters.getValue(sName, oSystemContext));
             });
@@ -399,10 +401,6 @@ sap.ui.define([
          * @since 1.110.0
          */
         this._extractUrlPlaceholders = function (sUrl, sFilterRegex) {
-            let oUrl,
-             aReferences;
-            const aIgnoredReferences = [];
-
             /*
              * A typical oDataV2 call:
              *
@@ -418,11 +416,11 @@ sap.ui.define([
              */
 
             // checking if the service root URI contains any placeholders. These will lead to ignored references.
-            oUrl = /[^(?]*/.exec(sUrl);
-            aReferences = (oUrl === null) ? [] : findReferences(oUrl[0]);
+            let oUrl = /[^(?]*/.exec(sUrl);
+            let aReferences = (oUrl === null) ? [] : findReferences(oUrl[0]);
 
-            aReferences.forEach((oReference) => {
-                aIgnoredReferences.push(oReference.name);
+            const aIgnoredReferences = aReferences.map((oReference) => {
+                return oReference.name;
             });
 
             // checking if the resource path or the query path have placeholders. These will be resolved.
@@ -476,14 +474,11 @@ sap.ui.define([
 
                     if (oResolvedPlaceholder.value !== undefined) {
                         // replace the references with the actual value, encoding is required
-
                         const sFormattedValue = fnFormatODataValue(oResolvedPlaceholder.value, oResolvedPlaceholder.edmType);
-
-                        sResolvedUrl = sResolvedUrl.replace(`{${ oResolvedPlaceholder.edmType }%%${ sDefaultName }%%}`,
-                            window.encodeURIComponent(sFormattedValue));
+                        sResolvedUrl = sResolvedUrl.replace(`{${oResolvedPlaceholder.edmType}%%${sDefaultName}%%}`, window.encodeURIComponent(sFormattedValue));
                     } else {
                         bPlaceholderWithoutValue = true;
-                        sResolvedUrl = sResolvedUrl.replace(`{${ oResolvedPlaceholder.edmType }%%${ sDefaultName }%%}`, "");
+                        sResolvedUrl = sResolvedUrl.replace(`{${oResolvedPlaceholder.edmType}%%${sDefaultName}%%}`, "");
                     }
                 }
 
@@ -526,7 +521,6 @@ sap.ui.define([
          * @private
          */
         this.resolveUserDefaultParameters = async function (sUrl, oSystemContext) {
-
             const oPlaceholders = this._extractUrlPlaceholders(sUrl, /^UserDefault\.(?!extended\.).+/);
             const aSimpleUserDefaultReferences = oPlaceholders.extractedReferences;
             const aIgnoredReferences = oPlaceholders.ignoredReferences;
@@ -555,7 +549,6 @@ sap.ui.define([
                 defaultsWithoutValue: oReplacementResult.placeholdersWithoutValue,
                 ignoredReferences: aIgnoredReferences
             };
-
         };
 
         /**
@@ -639,7 +632,7 @@ sap.ui.define([
 
             const aValidODataVersions = ["2.0", "4.0"];
             if (!sODataVersion || !aValidODataVersions.includes(sODataVersion)) {
-                throw new Error(`Invalid OData version: ${ sODataVersion}`);
+                throw new Error(`Invalid OData version: ${sODataVersion}`);
             }
             const bODataV4 = sODataVersion === "4.0";
 
@@ -653,12 +646,12 @@ sap.ui.define([
                 });
                 Log.debug(
                     "Resolving semantic date ranges \n" +
-                    `- OData Version: ${ sODataVersion }\n` +
-                    `- URL: ${ sUrl }\n` +
-                    `- ignoring references: ${ JSON.stringify(aIgnoredReferences, null, 4) }\n` +
-                    `- resolved semantic date ranges: ${ JSON.stringify(aResolvedSemanticDateRanges, null, 4) }\n` +
-                    `- invalid semantic date ranges:${ JSON.stringify(oReplacementResult.placeholdersWithoutValue, null, 4) }\n` +
-                    `- final URL: ${ oReplacementResult.resolvedUrl}`, null, sModuleName);
+                    `- OData Version: ${sODataVersion}\n` +
+                    `- URL: ${sUrl}\n` +
+                    `- ignoring references: ${JSON.stringify(aIgnoredReferences, null, 4)}\n` +
+                    `- resolved semantic date ranges: ${JSON.stringify(aResolvedSemanticDateRanges, null, 4)}\n` +
+                    `- invalid semantic date ranges: ${JSON.stringify(oReplacementResult.placeholdersWithoutValue, null, 4)}\n` +
+                    `- final URL: ${oReplacementResult.resolvedUrl}`, null, sModuleName);
             }
 
             return {

package/src/main/js/sap/ushell/services/Search.js

@@ -2,9 +2,13 @@
 
 /**
  * @fileOverview The Unified Shell's search service which provides Enterprise Search via SINA.
- * @version 1.138.1
+ * @version 1.139.0
  */
-sap.ui.define(["sap/ui/core/Lib"], function (Library) {
+sap.ui.define([
+    "sap/ui/core/Lib"
+], (
+    Library
+) => {
     "use strict";
 
     /**
@@ -22,6 +26,9 @@ sap.ui.define(["sap/ui/core/Lib"], function (Library) {
      *
      * @hideconstructor
      *
+     * @param {object} oAdapter the adapter, not used.
+     * @param {object} oContainerInterface the container interface, not used.
+     *
      * @private
      */
     function Search (oAdapter, oContainerInterface) {
@@ -41,9 +48,9 @@ sap.ui.define(["sap/ui/core/Lib"], function (Library) {
                 return this.appSearchPromise;
             }
 
-            this.appSearchPromise = new Promise(function (resolve) {
-                Library.load("sap.esh.search.ui").then(function () {
-                    sap.ui.require(["sap/esh/search/ui/appsearch/AppSearch"], function (AppSearch) {
+            this.appSearchPromise = new Promise((resolve) => {
+                Library.load("sap.esh.search.ui").then(() => {
+                    sap.ui.require(["sap/esh/search/ui/appsearch/AppSearch"], (AppSearch) => {
                         resolve(new AppSearch({}));
                     });
                 });
@@ -56,26 +63,23 @@ sap.ui.define(["sap/ui/core/Lib"], function (Library) {
             return this.oAdapter.isSearchAvailable();
         },
 
-        prefetch: function () {
-            return this.getAppSearch().then(function (appSearch) {
-                return appSearch.prefetch();
-            });
+        prefetch: async function () {
+            const appSearch = await this.getAppSearch();
+            return appSearch.prefetch();
         },
 
-        queryApplications: function (query) {
+        queryApplications: async function (query) {
             query.top = query.top || 10;
             query.skip = query.skip || 0;
-            return this.getAppSearch().then(function (appSearch) {
-                return appSearch.search(query).then(function (searchResult) {
-                    return {
-                        totalResults: searchResult.totalCount,
-                        searchTerm: query.searchTerm,
-                        getElements: function () {
-                            return searchResult.tiles;
-                        }
-                    };
-                });
-            });
+            const appSearch = await this.getAppSearch();
+            const searchResult = await appSearch.search(query);
+            return {
+                totalResults: searchResult.totalCount,
+                searchTerm: query.searchTerm,
+                getElements: function () {
+                    return searchResult.tiles;
+                }
+            };
         }
     };
 

package/src/main/js/sap/ushell/services/SearchCEP.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Search for myHome.
  *
- * @version 1.138.1
+ * @version 1.139.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -12,10 +12,17 @@ sap.ui.define([
     "sap/base/util/deepExtend",
     "sap/ushell/utils/UrlParsing",
     "sap/ushell/Container"
-], function (Log, WindowUtils, EventHub, deepExtend, UrlParsing, Container) {
+], (
+    Log,
+    WindowUtils,
+    EventHub,
+    deepExtend,
+    UrlParsing,
+    Container
+) => {
     "use strict";
 
-    var EMPTY_SEARCH_RESULTS = {
+    const EMPTY_SEARCH_RESULTS = {
         count: 0,
         data: []
     };
@@ -103,19 +110,19 @@ sap.ui.define([
      *      is an intent-based-navigation intent, this will be added as parameter <code>searchTerm</code>.
      *      Can be used for launching external search apps.
      *
-     * @returns {Promise<undefined>} A <code>Promise</code> which resolves once the navigation was triggered.
+     * @returns {Promise} A <code>Promise</code> which resolves once the navigation was triggered.
      *  The <code>Promise</code> might never reject or resolve when an error occurs during the navigation.
      *
      * @private
      * @since 1.116.0
      */
-    SearchCEP.prototype.navigate = function (oSearchResult, sSearchTerm) {
-        var sUrl = oSearchResult.url;
-        var oShellHash;
+    SearchCEP.prototype.navigate = async function (oSearchResult, sSearchTerm) {
+        let sUrl = oSearchResult.url;
 
         if (!sUrl) {
-            return Promise.resolve();
+            return;
         }
+
         EventHub.emit("UITracer.trace", {
             reason: "LaunchApp",
             source: "Search",
@@ -123,26 +130,25 @@ sap.ui.define([
                 targetUrl: sUrl
             }
         });
+
         if (sUrl.startsWith("#")) {
             if (sSearchTerm) {
-                oShellHash = UrlParsing.parseShellHash(sUrl);
+                const oShellHash = UrlParsing.parseShellHash(sUrl);
                 if (oShellHash) {
                     oShellHash.params.searchTerm = sSearchTerm;
                     sUrl = UrlParsing.constructShellHash(oShellHash);
                 }
             }
 
-            return Container.getServiceAsync("Navigation").then(function (oNavigationService) {
-                return oNavigationService.navigate({
-                    target: {
-                        shellHash: sUrl
-                    }
-                });
+            const oNavigationService = await Container.getServiceAsync("Navigation");
+            return oNavigationService.navigate({
+                target: {
+                    shellHash: sUrl
+                }
             });
         }
 
         WindowUtils.openURL(sUrl);
-        return Promise.resolve();
     };
 
     /**
@@ -157,8 +163,8 @@ sap.ui.define([
      * @private
      * @since 1.116.0
      */
-    SearchCEP.prototype._registerDefaultSearchProvider = function (oProviderConfig) {
-        var oProvider = deepExtend(oProviderConfig);
+    SearchCEP.prototype.registerDefaultSearchProvider = function (oProviderConfig) {
+        const oProvider = deepExtend(oProviderConfig);
         oProvider.name = oProvider.id.replace(/\./g, "_");
         this._mSearchProviders.default[oProvider.id] = oProvider;
 
@@ -217,14 +223,14 @@ sap.ui.define([
      * @since 1.116.0
      */
     SearchCEP.prototype.registerExternalSearchProvider = function (oProviderConfig) {
-        var oProvider = deepExtend(oProviderConfig);
-        var fnNoOpFunction = Function.prototype;
-        var oParameterCheck = {
+        const oProvider = deepExtend(oProviderConfig);
+        const fnNoOpFunction = Function.prototype;
+        const oParameterCheck = {
             id: "SearchProvider needs an id",
             title: "SearchProvider needs a title",
             execSearch: "SearchProvider needs an execSearch callback"
         };
-        var oDefaults = {
+        const oDefaults = {
             minQueryLength: 1,
             maxQueryLength: 100,
             defaultItemCount: 3,
@@ -235,14 +241,14 @@ sap.ui.define([
             popoverClosed: fnNoOpFunction
         };
 
-        for (var sKey in oParameterCheck) {
+        for (const sKey in oParameterCheck) {
             if (!oProvider[sKey]) {
                 Log.error(oParameterCheck[sKey]);
                 return Promise.reject();
             }
         }
 
-        for (var sParameter in oDefaults) {
+        for (const sParameter in oDefaults) {
             if (!oProvider.hasOwnProperty(sParameter)) {
                 oProvider[sParameter] = oDefaults[sParameter];
             }
@@ -296,12 +302,12 @@ sap.ui.define([
      * @since 1.116.0
      */
     SearchCEP.prototype.getSearchProvidersPriorityArray = function () {
-        var aSorted = [];
+        const aSorted = [];
 
-        for (var sKey in this._mSearchProviders) {
+        for (const sKey in this._mSearchProviders) {
             aSorted.push.apply(aSorted, Object.values(this._mSearchProviders[sKey]));
         }
-        aSorted.sort(function (a, b) {
+        aSorted.sort((a, b) => {
             return a.priority - b.priority;
         });
         return Promise.resolve(aSorted);
@@ -316,12 +322,12 @@ sap.ui.define([
      * @since 1.116.0
      */
     SearchCEP.prototype.getExternalSearchProvidersPriorityArray = function () {
-        var aSorted = [];
+        const aSorted = [];
 
-        for (var sItem in this._mSearchProviders.external) {
+        for (const sItem in this._mSearchProviders.external) {
             aSorted.push(this._mSearchProviders.external[sItem]);
         }
-        aSorted.sort(function (a, b) {
+        aSorted.sort((a, b) => {
             return a.priority - b.priority;
         });
         return Promise.resolve(aSorted);
@@ -336,7 +342,7 @@ sap.ui.define([
      * @since 1.116.0
      */
     SearchCEP.prototype.getDefaultSearchProviders = function () {
-        var aDefaultProviders = Object.values(this._mSearchProviders.default);
+        const aDefaultProviders = Object.values(this._mSearchProviders.default);
         return Promise.resolve(aDefaultProviders);
     };
 
@@ -349,7 +355,7 @@ sap.ui.define([
      * @since 1.116.0
      */
     SearchCEP.prototype.getExternalSearchProviders = function () {
-        var aExternalProviders = Object.values(this._mSearchProviders.external);
+        const aExternalProviders = Object.values(this._mSearchProviders.external);
         return Promise.resolve(aExternalProviders);
     };