updates based on PR comments

elastic · Jan 19, 2023 · 0918192 · 0918192
1 parent fa9cfc9
commit 0918192
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 38 deletions.
diff --git a/packages/search-ui-elasticsearch-connector/src/handlers/autocomplete/index.ts b/packages/search-ui-elasticsearch-connector/src/handlers/autocomplete/index.ts
@@ -107,21 +107,21 @@ export default async function handleRequest(
   );
 
   const results: AutocompleteResponseState = response.reduce(
-    (sum, suggestion) => {
+    (acc, suggestion) => {
       const { identifier } = suggestion;
 
       if (identifier === "hits-suggestions") {
         return {
-          ...sum,
+          ...acc,
           autocompletedResults: suggestion.hits.map(fieldResponseMapper)
         };
       } else if (identifier.startsWith("suggestions-completion-")) {
         const name = identifier.replace("suggestions-completion-", "");
 
         return {
-          ...sum,
+          ...acc,
           autocompletedSuggestions: {
-            ...sum.autocompletedSuggestions,
+            ...acc.autocompletedSuggestions,
             [name]: suggestion.suggestions.map((suggestion) => {
               return {
                 suggestion: suggestion
@@ -135,9 +135,9 @@ export default async function handleRequest(
           name
         ] as ResultSuggestionConfiguration;
         return {
-          ...sum,
+          ...acc,
           autocompletedSuggestions: {
-            ...sum.autocompletedSuggestions,
+            ...acc.autocompletedSuggestions,
             [name]: suggestion.hits.map((hit) => ({
               queryType: config.queryType,
               result: fieldResponseMapper(hit)

diff --git a/packages/search-ui-elasticsearch-connector/src/handlers/search/Configuration.ts b/packages/search-ui-elasticsearch-connector/src/handlers/search/Configuration.ts
@@ -32,12 +32,12 @@ export function getResultFields(
 } {
   const hitFields = Object.keys(resultFields);
 
-  const highlightFields = Object.keys(resultFields).reduce((sum, fieldKey) => {
+  const highlightFields = Object.keys(resultFields).reduce((acc, fieldKey) => {
     const fieldConfiguration = resultFields[fieldKey];
     if (fieldConfiguration.snippet) {
-      sum.push(fieldKey);
+      acc.push(fieldKey);
     }
-    return sum;
+    return acc;
   }, []);
 
   return { hitFields, highlightFields };
@@ -67,14 +67,14 @@ export function isRangeFilter(
 }
 
 export function buildBaseFilters(baseFilters: Filter[]): BaseFilters {
-  const filters = (baseFilters || []).reduce((sum, filter) => {
+  const filters = (baseFilters || []).reduce((acc, filter) => {
     const boolType = {
       all: "filter",
       any: "should",
       none: "must_not"
     }[filter.type];
     return [
-      ...sum,
+      ...acc,
       {
         bool: {
           [boolType]: filter.values.map((value: FilterValue) => {
@@ -144,9 +144,9 @@ function buildConfiguration({
   const filtersConfig: BaseFilter[] = Object.values(
     (state.filters || [])
       .filter((f) => !queryConfig.facets[f.field]) //exclude all filters that are defined as facets
-      .reduce((sum, f) => {
+      .reduce((acc, f) => {
         return {
-          ...sum,
+          ...acc,
           [f.field]: new SKFilter({
             field: f.field,
             identifier: f.field,
@@ -157,11 +157,11 @@ function buildConfiguration({
   );
 
   const facets = Object.keys(queryConfig.facets || {}).reduce(
-    (sum, facetKey) => {
+    (acc, facetKey) => {
       const facetConfiguration = queryConfig.facets[facetKey];
       const isDisJunctive = queryConfig.disjunctiveFacets?.includes(facetKey);
       if (facetConfiguration.type === "value") {
-        sum.push(
+        acc.push(
           new RefinementSelectFacet({
             identifier: facetKey,
             field: facetKey,
@@ -175,7 +175,7 @@ function buildConfiguration({
         facetConfiguration.type === "range" &&
         !facetConfiguration.center
       ) {
-        sum.push(
+        acc.push(
           new MultiQueryOptionsFacet({
             identifier: facetKey,
             field: facetKey,
@@ -200,7 +200,7 @@ function buildConfiguration({
         facetConfiguration.type === "range" &&
         facetConfiguration.center
       ) {
-        sum.push(
+        acc.push(
           new GeoDistanceOptionsFacet({
             identifier: facetKey,
             field: facetKey,
@@ -219,7 +219,7 @@ function buildConfiguration({
         );
       }
 
-      return sum;
+      return acc;
     },
     []
   );

diff --git a/packages/search-ui-elasticsearch-connector/src/handlers/search/Request.ts b/packages/search-ui-elasticsearch-connector/src/handlers/search/Request.ts
@@ -16,7 +16,7 @@ export function getFilters(
   baseFilters: Filter[] = []
 ): MixedFilter[] {
   return filters.reduce((acc, f) => {
-    const isBaseFilter = baseFilters.find((bf) => bf === f);
+    const isBaseFilter = baseFilters.includes(f);
     if (isBaseFilter) return acc;
 
     const subFilters = f.values.map((v) => {

diff --git a/packages/search-ui-engines-connector/src/handlers/autocomplete/index.ts b/packages/search-ui-engines-connector/src/handlers/autocomplete/index.ts
@@ -102,21 +102,21 @@ export default async function handleRequest(
   ).executeSuggestions(state.searchTerm);
 
   const results: AutocompleteResponseState = response.reduce(
-    (sum, suggestion) => {
+    (acc, suggestion) => {
       const { identifier } = suggestion;
 
       if (identifier === "hits-suggestions") {
         return {
-          ...sum,
+          ...acc,
           autocompletedResults: suggestion.hits.map(fieldResponseMapper)
         };
       } else if (identifier.startsWith("suggestions-completion-")) {
         const name = identifier.replace("suggestions-completion-", "");
 
         return {
-          ...sum,
+          ...acc,
           autocompletedSuggestions: {
-            ...sum.autocompletedSuggestions,
+            ...acc.autocompletedSuggestions,
             [name]: suggestion.suggestions.map((suggestion) => {
               return {
                 suggestion: suggestion
@@ -130,9 +130,9 @@ export default async function handleRequest(
           name
         ] as ResultSuggestionConfiguration;
         return {
-          ...sum,
+          ...acc,
           autocompletedSuggestions: {
-            ...sum.autocompletedSuggestions,
+            ...acc.autocompletedSuggestions,
             [name]: suggestion.hits.map((hit) => ({
               queryType: config.queryType,
               result: fieldResponseMapper(hit)

diff --git a/packages/search-ui-engines-connector/src/handlers/search/Configuration.ts b/packages/search-ui-engines-connector/src/handlers/search/Configuration.ts
@@ -28,12 +28,12 @@ export function getResultFields(
 } {
   const hitFields = Object.keys(resultFields);
 
-  const highlightFields = Object.keys(resultFields).reduce((sum, fieldKey) => {
+  const highlightFields = Object.keys(resultFields).reduce((acc, fieldKey) => {
     const fieldConfiguration = resultFields[fieldKey];
     if (fieldConfiguration.snippet) {
-      sum.push(fieldKey);
+      acc.push(fieldKey);
     }
-    return sum;
+    return acc;
   }, []);
 
   return { hitFields, highlightFields };
@@ -63,14 +63,14 @@ export function isRangeFilter(
 }
 
 export function buildBaseFilters(baseFilters: Filter[]): BaseFilters {
-  const filters = (baseFilters || []).reduce((sum, filter) => {
+  const filters = (baseFilters || []).reduce((acc, filter) => {
     const boolType = {
       all: "filter",
       any: "should",
       none: "must_not"
     }[filter.type];
     return [
-      ...sum,
+      ...acc,
       {
         bool: {
           [boolType]: filter.values.map((value: FilterValue) => {
@@ -134,9 +134,9 @@ function buildConfiguration({
   const filtersConfig: BaseFilter[] = Object.values(
     (state.filters || [])
       .filter((f) => !queryConfig.facets[f.field]) //exclude all filters that are defined as facets
-      .reduce((sum, f) => {
+      .reduce((acc, f) => {
         return {
-          ...sum,
+          ...acc,
           [f.field]: new SKFilter({
             field: f.field,
             identifier: f.field,
@@ -147,11 +147,11 @@ function buildConfiguration({
   );
 
   const facets = Object.keys(queryConfig.facets || {}).reduce(
-    (sum, facetKey) => {
+    (acc, facetKey) => {
       const facetConfiguration = queryConfig.facets[facetKey];
       const isDisJunctive = queryConfig.disjunctiveFacets?.includes(facetKey);
       if (facetConfiguration.type === "value") {
-        sum.push(
+        acc.push(
           new RefinementSelectFacet({
             identifier: facetKey,
             field: facetKey,
@@ -165,7 +165,7 @@ function buildConfiguration({
         facetConfiguration.type === "range" &&
         !facetConfiguration.center
       ) {
-        sum.push(
+        acc.push(
           new MultiQueryOptionsFacet({
             identifier: facetKey,
             field: facetKey,
@@ -190,7 +190,7 @@ function buildConfiguration({
         facetConfiguration.type === "range" &&
         facetConfiguration.center
       ) {
-        sum.push(
+        acc.push(
           new GeoDistanceOptionsFacet({
             identifier: facetKey,
             field: facetKey,
@@ -209,7 +209,7 @@ function buildConfiguration({
         );
       }
 
-      return sum;
+      return acc;
     },
     []
   );

diff --git a/packages/search-ui-engines-connector/src/handlers/search/Request.ts b/packages/search-ui-engines-connector/src/handlers/search/Request.ts
@@ -16,7 +16,7 @@ export function getFilters(
   baseFilters: Filter[] = []
 ): MixedFilter[] {
   return filters.reduce((acc, f) => {
-    const isBaseFilter = baseFilters.find((bf) => bf === f);
+    const isBaseFilter = baseFilters.includes(f);
     if (isBaseFilter) return acc;
 
     const subFilters = f.values.map((v) => {