geocat: add location filter in search & location input in home page

apps/datahub/src/app/app.module.ts

@@ -70,6 +70,7 @@ import { METADATA_LANGUAGE } from '@geonetwork-ui/api/repository'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { GN_UI_VERSION } from '@geonetwork-ui/feature/record'
 import { LOGIN_URL } from '@geonetwork-ui/api/repository/gn4'
+import { ORGANIZATIONS_STRATEGY } from '@geonetwork-ui/api/repository/gn4'
 
 export const metaReducers: MetaReducer[] = !environment.production ? [] : []
 // https://github.com/nrwl/nx/issues/191
@@ -190,6 +191,10 @@ export const metaReducers: MetaReducer[] = !environment.production ? [] : []
       provide: ORGANIZATION_URL_TOKEN,
       useValue: `${ROUTER_ROUTE_SEARCH}?${ROUTE_PARAMS.PUBLISHER}=\${name}`,
     },
+    {
+      provide: ORGANIZATIONS_STRATEGY,
+      useValue: 'groups',
+    },
   ],
   bootstrap: [AppComponent],
 })

apps/datahub/src/app/home/home-header/home-header.component.html

@@ -13,10 +13,17 @@
         [style.opacity]="expandRatio"
         [innerHTML]="'datahub.header.title.html' | translate"
       ></div>
-      <gn-ui-fuzzy-search
-        class="text-[18px]"
-        (itemSelected)="onFuzzySearchSelection($event)"
-      ></gn-ui-fuzzy-search>
+      <div class="flex flex-wrap gap-4">
+        <gn-ui-fuzzy-search
+          class="text-[18px] grow"
+          (itemSelected)="onFuzzySearchSelection($event)"
+          (inputSubmitted)="updateLocationFilter()"
+        ></gn-ui-fuzzy-search>
+        <gn-ui-location-search
+          class="text-[18px] grow"
+          (inputSubmitted)="updateTextFilter()"
+        ></gn-ui-location-search>
+      </div>
       <div class="flex h-0 py-5 gap-3" [style.opacity]="-0.6 + expandRatio * 2">
         <datahub-header-badge-button
           [routerLink]="ROUTE_SEARCH"

apps/datahub/src/app/home/home-header/home-header.component.ts

@@ -1,11 +1,18 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  ViewChild,
+} from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
   RouterFacade,
   ROUTER_ROUTE_SEARCH,
 } from '@geonetwork-ui/feature/router'
 import {
   FieldsService,
+  FuzzySearchComponent,
+  LocationSearchComponent,
   SearchFacade,
   SearchService,
 } from '@geonetwork-ui/feature/search'
@@ -37,6 +44,11 @@ marker('datahub.header.popularRecords')
 export class HomeHeaderComponent {
   @Input() expandRatio: number
 
+  // specific geocat: used to trigger the other field when one is triggered
+  @ViewChild(FuzzySearchComponent)
+  textSearch: FuzzySearchComponent
+  @ViewChild(LocationSearchComponent) locationSearch: LocationSearchComponent
+
   backgroundCss =
     getThemeConfig().HEADER_BACKGROUND ||
     `center /cover url('assets/img/header_bg.webp')`
@@ -91,4 +103,12 @@ export class HomeHeaderComponent {
       this.searchService.setFilters(searchFilters)
     }
   }
+
+  // specific geocat
+  updateLocationFilter() {
+    this.locationSearch.trigger()
+  }
+  updateTextFilter() {
+    this.textSearch.trigger()
+  }
 }

libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.spec.ts

@@ -298,7 +298,26 @@ describe('ElasticsearchService', () => {
         )
         expect(query).toEqual({
           bool: {
-            filter: [],
+            filter: [
+              {
+                geo_shape: {
+                  geom: {
+                    relation: 'intersects',
+                    shape: {
+                      coordinates: [
+                        [
+                          [3.017921158755172, 50.65759907920972],
+                          [3.017921158755172, 50.613483610573155],
+                          [3.1098886148436122, 50.613483610573155],
+                          [3.017921158755172, 50.65759907920972],
+                        ],
+                      ],
+                      type: 'Polygon',
+                    },
+                  },
+                },
+              },
+            ],
             must: [
               {
                 terms: {
@@ -340,15 +359,6 @@ describe('ElasticsearchService', () => {
                   boost: 10.0,
                 },
               },
-              {
-                geo_shape: {
-                  geom: {
-                    shape: geojsonPolygon,
-                    relation: 'intersects',
-                  },
-                  boost: 7.0,
-                },
-              },
             ],
           },
         })

libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -197,6 +197,7 @@ export class ElasticsearchService {
       ]),
     }
     const should = [] as Record<string, unknown>[]
+    const filter = [] as Record<string, unknown>[]
 
     if (any) {
       must.push({
@@ -225,34 +226,32 @@ export class ElasticsearchService {
       })
     }
     if (geometry) {
-      should.push(
-        {
-          geo_shape: {
-            geom: {
-              shape: geometry,
-              relation: 'within',
-            },
-            boost: 10.0,
+      // geocat specific: exclude records outside of geometry
+      should.push({
+        geo_shape: {
+          geom: {
+            shape: geometry,
+            relation: 'within',
           },
+          boost: 10.0,
         },
-        {
-          geo_shape: {
-            geom: {
-              shape: geometry,
-              relation: 'intersects',
-            },
-            boost: 7.0,
+      })
+      filter.push({
+        geo_shape: {
+          geom: {
+            shape: geometry,
+            relation: 'intersects',
           },
-        }
-      )
+        },
+      })
     }
 
     return {
       bool: {
         must,
         must_not,
         should,
-        filter: [],
+        filter,
       },
     }
   }

libs/feature/router/src/lib/default/constants.ts

@@ -7,5 +7,7 @@ export enum ROUTE_PARAMS {
   SORT = '_sort',
   PUBLISHER = 'publisher', // FIXME: this shouldn't be here as it is a search field
   PAGE = '_page',
+  LOCATION = 'location',
+  BBOX = 'bbox',
 }
 export type SearchRouteParams = Record<string, string | string[] | number>

libs/feature/router/src/lib/default/services/router-search.service.spec.ts

@@ -1,8 +1,13 @@
-import { FieldsService, SearchFacade } from '@geonetwork-ui/feature/search'
+import {
+  FieldsService,
+  LocationBbox,
+  SearchFacade,
+} from '@geonetwork-ui/feature/search'
 import { SortByEnum, SortByField } from '@geonetwork-ui/common/domain/search'
 import { BehaviorSubject, of } from 'rxjs'
 import { RouterFacade } from '../state'
 import { RouterSearchService } from './router-search.service'
+import { RouterService } from '../router.service'
 
 let state = {}
 class SearchFacadeMock {
@@ -13,6 +18,7 @@ class SearchFacadeMock {
 class RouterFacadeMock {
   setSearch = jest.fn()
   updateSearch = jest.fn()
+  go = jest.fn()
 }
 
 class FieldsServiceMock {
@@ -40,18 +46,29 @@ class FieldsServiceMock {
   )
 }
 
+class RouterServiceMock {
+  getSearchRoute = jest.fn().mockReturnValue('/test/path')
+}
+
 describe('RouterSearchService', () => {
   let service: RouterSearchService
   let routerFacade: RouterFacade
   let searchFacade: SearchFacade
   let fieldsService: FieldsService
+  let routerService: RouterService
 
   beforeEach(() => {
     state = { OrgForResource: { mel: true } }
     routerFacade = new RouterFacadeMock() as any
     searchFacade = new SearchFacadeMock() as any
     fieldsService = new FieldsServiceMock() as any
-    service = new RouterSearchService(searchFacade, routerFacade, fieldsService)
+    routerService = new RouterServiceMock() as any
+    service = new RouterSearchService(
+      searchFacade,
+      routerFacade,
+      fieldsService,
+      routerService
+    )
   })
 
   it('should be created', () => {
@@ -115,4 +132,40 @@ describe('RouterSearchService', () => {
       })
     })
   })
+
+  describe('#setLocationFilter', () => {
+    beforeEach(() => {
+      const location: LocationBbox = {
+        label: 'New location',
+        bbox: [4, 5, 6, 7],
+      }
+      service.setLocationFilter(location)
+    })
+    it('dispatch setLocationFilter with merged mapped params', () => {
+      expect(routerFacade.go).toHaveBeenCalledWith({
+        path: '/test/path',
+        query: {
+          location: 'New location',
+          bbox: '4,5,6,7',
+        },
+        queryParamsHandling: 'merge',
+      })
+    })
+  })
+
+  describe('#clearLocationFilter', () => {
+    beforeEach(() => {
+      service.clearLocationFilter()
+    })
+    it('dispatch clearLocationFilter with merged mapped params', () => {
+      expect(routerFacade.go).toHaveBeenCalledWith({
+        path: '/test/path',
+        query: {
+          location: undefined,
+          bbox: undefined,
+        },
+        queryParamsHandling: 'merge',
+      })
+    })
+  })
 })

libs/feature/router/src/lib/default/services/router-search.service.ts

@@ -1,21 +1,24 @@
 import { Injectable } from '@angular/core'
 import {
   FieldsService,
+  LocationBbox,
   SearchFacade,
   SearchServiceI,
 } from '@geonetwork-ui/feature/search'
 import { FieldFilters, SortByField } from '@geonetwork-ui/common/domain/search'
 import { ROUTE_PARAMS, SearchRouteParams } from '../constants'
 import { RouterFacade } from '../state/router.facade'
 import { firstValueFrom } from 'rxjs'
+import { RouterService } from '../router.service'
 import { sortByToString } from '@geonetwork-ui/util/shared'
 
 @Injectable()
 export class RouterSearchService implements SearchServiceI {
   constructor(
     private searchFacade: SearchFacade,
     private facade: RouterFacade,
-    private fieldsService: FieldsService
+    private fieldsService: FieldsService,
+    private routerService: RouterService
   ) {}
 
   setSortAndFilters(filters: FieldFilters, sortBy: SortByField) {
@@ -62,4 +65,20 @@ export class RouterSearchService implements SearchServiceI {
       [ROUTE_PARAMS.PAGE]: page,
     })
   }
+
+  setLocationFilter(location: LocationBbox) {
+    this.facade.go({
+      path: this.routerService.getSearchRoute(),
+      query: { location: location.label, bbox: location.bbox.join() },
+      queryParamsHandling: 'merge',
+    })
+  }
+
+  clearLocationFilter() {
+    this.facade.go({
+      path: this.routerService.getSearchRoute(),
+      query: { location: undefined, bbox: undefined },
+      queryParamsHandling: 'merge',
+    })
+  }
 }