fix(wc): remove ConfigFilters specificity

filters are SearchFilters like others and are merged with state filters before building the ES payload
geonetwork · Aug 25, 2023 · 4ebbe7c · 4ebbe7c
1 parent d24311e
commit 4ebbe7c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 104 deletions.
diff --git a/apps/webcomponents/src/app/components/gn-results-list/gn-results-list-filter.sample.html b/apps/webcomponents/src/app/components/gn-results-list/gn-results-list-filter.sample.html
@@ -36,41 +36,24 @@
           You can add filters for the search in your
           <b><i>gn-results-list</i></b> web component
         </p>
-        <p>eg. Filter on <i>service</i> records:</p>
+        <p>eg. Filter on <i>dataset</i> records:</p>
         <ul>
           <li>
-            <p>With Elasticsearch syntax</p>
-            <code>
-              {"elastic": [{ "term": { "cl_hierarchyLevel.key": "service" } }]}
-            </code>
-          </li>
-          <li>
-            <p>With GN configuration</p>
-            <code>
-              {"custom": { "cl_hierarchyLevel.key": { "service": true } }}
-            </code>
+            <p>With GNUI syntax</p>
+            <code> {"cl_hierarchyLevel.key": { "service": true } } </code>
           </li>
         </ul>
       </div>
 
-      <h1>Filter on services</h1>
-      <h2>elasticsearch object</h2>
-      <gn-results-list
-        api-url="https://apps.titellus.net/geonetwork/srv/api"
-        size="5"
-        layout="TITLE"
-        search-id="elastic"
-        filter='{"elastic": [{ "term": { "cl_hierarchyLevel.key": "service" } }]}'
-      ></gn-results-list>
-      <h2>custom object</h2>
+      <h1>Filter on datasets</h1>
       <gn-results-list
         api-url="https://apps.titellus.net/geonetwork/srv/api"
         size="5"
         layout="TITLE"
         search-id="custom"
         primary-color="#0f4395"
         main-font="'Inter', sans-serif"
-        filter='{"custom": { "cl_hierarchyLevel.key": { "service": true } }}'
+        filter='{"cl_hierarchyLevel.key": { "dataset": true } }'
       ></gn-results-list>
     </main>
   </body>

diff --git a/.../webcomponents/src/app/components/gn-search-input/gn-search-input-and-results.sample.html b/.../webcomponents/src/app/components/gn-search-input/gn-search-input-and-results.sample.html
@@ -54,7 +54,7 @@
         main-color="#555"
         background-color="#fdfbff"
         main-font="'Inter', sans-serif"
-        filter='{"elastic": [{ "term": { "OrgForResource": "Géo2France" } }]}'
+        filter='{"OrgForResource": { "Géo2France": true } }'
         title-font="'DM Serif Display', serif"
         show-more="auto"
       ></gn-results-list>

diff --git a/libs/api/metadata-converter/src/lib/gn4/types/search.model.ts b/libs/api/metadata-converter/src/lib/gn4/types/search.model.ts
@@ -7,11 +7,6 @@ export interface SearchFilters {
 
 type SearchFiltersFieldsLeaf = Record<string, boolean>
 
-export interface StateConfigFilters {
-  custom?: SearchFilters
-  elastic?: any
-}
-
 export interface Organisation {
   name: string
   description?: string

diff --git a/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.spec.ts b/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.spec.ts
@@ -356,58 +356,6 @@ describe('ElasticsearchService', () => {
     })
   })
 
-  describe('#buildPayloadFilter', () => {
-    describe('when elastic object config', () => {
-      it('returns the input config', () => {
-        const filter = service['buildPayloadFilter']({
-          elastic: { term: { 'cl_hierarchyLevel.key': 'service' } },
-        })
-        expect(filter).toEqual([
-          { term: { 'cl_hierarchyLevel.key': 'service' } },
-        ])
-      })
-    })
-    describe('when elastic array config', () => {
-      it('returns the input config', () => {
-        const filter = service['buildPayloadFilter']({
-          elastic: [{ term: { 'cl_hierarchyLevel.key': 'service' } }],
-        })
-        expect(filter).toEqual([
-          { term: { 'cl_hierarchyLevel.key': 'service' } },
-        ])
-      })
-    })
-    describe('when custom config', () => {
-      it('returns the corresponding query_string', () => {
-        const filter = service['buildPayloadFilter']({
-          custom: {
-            'cl_hierarchyLevel.key': {
-              service: true,
-            },
-          },
-        })
-        expect(filter).toEqual([
-          { query_string: { query: '(cl_hierarchyLevel.key:"service")' } },
-        ])
-      })
-    })
-    describe('when having both config', () => {
-      it('elastic config priors', () => {
-        const filter = service['buildPayloadFilter']({
-          elastic: [{ term: { 'cl_hierarchyLevel.key': 'service' } }],
-          custom: {
-            'cl_hierarchyLevel.key': {
-              service: true,
-            },
-          },
-        })
-        expect(filter).toEqual([
-          { term: { 'cl_hierarchyLevel.key': 'service' } },
-        ])
-      })
-    })
-  })
-
   describe('#buildAutocompletePayload', () => {
     describe('given an autocomplete config', () => {
       it('returns the search payload', () => {

diff --git a/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts b/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts
@@ -17,7 +17,6 @@ import {
   RequestFields,
   SearchFilters,
   SortParams,
-  StateConfigFilters,
   TermsAggregationResult,
 } from '@geonetwork-ui/api/metadata-converter'
 
@@ -40,7 +39,7 @@ export class ElasticsearchService {
     sortBy: SortByField = null,
     requestFields: RequestFields = [],
     searchFilters: SearchFilters = {},
-    configFilters: StateConfigFilters = {},
+    configFilters: SearchFilters = {},
     uuids?: string[],
     geometry?: Geometry
   ): EsSearchParams {
@@ -180,7 +179,7 @@ export class ElasticsearchService {
 
   private buildPayloadQuery(
     { any, ...fieldSearchFilters }: SearchFilters,
-    configFilters: StateConfigFilters,
+    configFilters: SearchFilters,
     uuids?: string[],
     geometry?: Geometry
   ) {
@@ -198,7 +197,6 @@ export class ElasticsearchService {
       ]),
     }
     const should = [] as Record<string, unknown>[]
-    const filter = this.buildPayloadFilter(configFilters)
 
     if (any) {
       must.push({
@@ -254,34 +252,16 @@ export class ElasticsearchService {
         must,
         must_not,
         should,
-        filter,
+        filter: [],
       },
     }
   }
 
-  private buildPayloadFilter({ custom, elastic }: StateConfigFilters) {
-    const query = []
-    if (elastic) {
-      if (!Array.isArray(elastic)) {
-        query.push(elastic)
-      } else {
-        query.push(...elastic)
-      }
-    } else if (custom) {
-      query.push({
-        query_string: {
-          query: this.stateFiltersToQueryString(custom),
-        },
-      })
-    }
-    return query
-  }
-
   buildMoreOnAggregationPayload(
     aggregations: any,
     key: string,
     searchFilters: SearchFilters,
-    configFilters: StateConfigFilters
+    configFilters: SearchFilters
   ): EsSearchParams {
     return {
       aggregations: { [key]: aggregations[key] },