From 788069dcaf423db7d1eb684fee1a2041ac899d53 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Wed, 28 Jun 2023 09:35:01 +0200
Subject: [PATCH 1/6] feat: can add custom search buttons to datahub

---
 .../home-header/home-header.component.html    | 15 +++-
 .../home-header/home-header.component.spec.ts | 83 ++++++++++++++-----
 .../home/home-header/home-header.component.ts | 46 +++++++++-
 conf/default.toml                             | 17 +++-
 libs/util/app-config/src/lib/app-config.ts    | 49 ++++++++++-
 libs/util/app-config/src/lib/model.ts         |  5 ++
 .../shared/src/lib/models/search.model.ts     |  5 ++
 7 files changed, 189 insertions(+), 31 deletions(-)

diff --git a/apps/datahub/src/app/home/home-header/home-header.component.html b/apps/datahub/src/app/home/home-header/home-header.component.html
index 49c7c43e15..d0b5a7d567 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.html
+++ b/apps/datahub/src/app/home/home-header/home-header.component.html
@@ -25,7 +25,7 @@
           [toggled]="searchFacade.favoritesOnly$ | async"
           (action)="listFavorites($event)"
         ></datahub-header-badge-button>
-        <div *ngIf="displaySortBadges$ | async">
+        <div>
           <button
             type="button"
             class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
@@ -34,7 +34,7 @@
             <span translate="">datahub.header.lastRecords</span>
           </button>
         </div>
-        <div *ngIf="displaySortBadges$ | async">
+        <div>
           <button
             type="button"
             class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
@@ -43,6 +43,17 @@
             <span translate="">datahub.header.popularRecords</span>
           </button>
         </div>
+        <div *ngFor="let preset of searchConfig?.SEARCH_PRESET">
+          <div>
+            <button
+              type="button"
+              class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
+              (click)="clearSearchAndFilterAndSort(preset)"
+            >
+              <span translate="">{{ preset['name'] }}</span>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
     <!--
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.spec.ts b/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
index 60fff5000c..6c2ee6bc78 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
+++ b/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
@@ -20,24 +20,38 @@ jest.mock('@geonetwork-ui/util/app-config', () => ({
   getThemeConfig: () => ({
     HEADER_BACKGROUND: 'red',
   }),
+  getOptionalSearchConfig: () => ({
+    SEARCH_PRESET: [
+      {
+        _sort: '-createDate',
+        name: 'sortCeatedDateAndOrg',
+        OrgForResource: ['DREAL'],
+      },
+      {
+        _sort: '-createDate',
+        name: 'filterCarto',
+        any: 'Cartographie',
+      },
+    ],
+  }),
 }))
 
-const routerFacadeMock = {
-  goToMetadata: jest.fn(),
-  anySearch$: new BehaviorSubject('scot'),
-  currentRoute$: new BehaviorSubject({}),
+class routerFacadeMock {
+  goToMetadata = jest.fn()
+  anySearch$ = new BehaviorSubject('scot')
+  currentRoute$ = new BehaviorSubject({})
 }
 
-const searchFacadeMock = {
-  setFavoritesOnly: jest.fn(),
-  setSortBy: jest.fn(),
+class searchFacadeMock {
+  setFavoritesOnly = jest.fn()
+  setSortBy = jest.fn()
 }
 
-const searchServiceMock = {
-  updateSearchFilters: jest.fn(),
-  setSearch: jest.fn(),
-  setSortBy: jest.fn(),
-  setSortAndFilters: jest.fn(),
+class searchServiceMock {
+  updateSearchFilters = jest.fn()
+  setSearch = jest.fn()
+  setSortBy = jest.fn()
+  setSortAndFilters = jest.fn()
 }
 
 class AuthServiceMock {
@@ -49,6 +63,9 @@ describe('HeaderComponent', () => {
   let component: HomeHeaderComponent
   let fixture: ComponentFixture<HomeHeaderComponent>
   let authService: AuthService
+  let searchService: SearchService
+  let searchFacade: SearchFacade
+  let routerFacade: RouterFacade
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -58,15 +75,15 @@ describe('HeaderComponent', () => {
       providers: [
         {
           provide: RouterFacade,
-          useValue: routerFacadeMock,
+          useClass: routerFacadeMock,
         },
         {
           provide: SearchFacade,
-          useValue: searchFacadeMock,
+          useClass: searchFacadeMock,
         },
         {
           provide: SearchService,
-          useValue: searchServiceMock,
+          useClass: searchServiceMock,
         },
         {
           provide: AuthService,
@@ -75,6 +92,9 @@ describe('HeaderComponent', () => {
       ],
     }).compileComponents()
     authService = TestBed.inject(AuthService)
+    searchService = TestBed.inject(SearchService)
+    searchFacade = TestBed.inject(SearchFacade)
+    routerFacade = TestBed.inject(RouterFacade)
   })
 
   beforeEach(() => {
@@ -119,25 +139,25 @@ describe('HeaderComponent', () => {
         component.listFavorites(true)
       })
       it('calls searchFacade setFavoritesOnly with correct value', () => {
-        expect(searchFacadeMock.setFavoritesOnly).toHaveBeenCalledWith(true)
+        expect(searchFacade.setFavoritesOnly).toHaveBeenCalledWith(true)
       })
     })
   })
   describe('sort badges', () => {
     describe('navigate to search route', () => {
       beforeEach(() => {
-        routerFacadeMock.currentRoute$.next({
+        ;(routerFacade.currentRoute$ as any).next({
           url: [{ path: ROUTER_ROUTE_SEARCH }],
         })
       })
-      it('does not display sort badges on search route', async () => {
+      it('displays sort badges on search route', async () => {
         const displaySortBadges = await readFirst(component.displaySortBadges$)
-        expect(displaySortBadges).toEqual(false)
+        expect(displaySortBadges).toEqual(true)
       })
     })
     describe('navigate to news route', () => {
       beforeEach(() => {
-        routerFacadeMock.currentRoute$.next({
+        ;(routerFacade.currentRoute$ as any).next({
           url: [{ path: ROUTER_ROUTE_NEWS }],
         })
       })
@@ -154,7 +174,7 @@ describe('HeaderComponent', () => {
           latestBadge.nativeElement.click()
         })
         it('resets filters and sort', () => {
-          expect(searchServiceMock.setSortAndFilters).toHaveBeenCalledWith(
+          expect(searchService.setSortAndFilters).toHaveBeenCalledWith(
             {},
             SortByEnum.CREATE_DATE
           )
@@ -168,12 +188,31 @@ describe('HeaderComponent', () => {
           mostPopularBadge.nativeElement.click()
         })
         it('resets filters and sort', () => {
-          expect(searchServiceMock.setSortAndFilters).toHaveBeenCalledWith(
+          expect(searchService.setSortAndFilters).toHaveBeenCalledWith(
             {},
             SortByEnum.POPULARITY
           )
         })
       })
+
+      describe('given predefined search params', () => {
+        it('should render badges', () => {
+          const allBadges = fixture.debugElement.queryAll(By.css('.badge-btn'))
+          expect(allBadges.length).toBe(4)
+        })
+        beforeEach(() => {
+          const firstCustomBadge = fixture.debugElement.queryAll(
+            By.css('.badge-btn')
+          )[2]
+          firstCustomBadge.nativeElement.click()
+        })
+        it('should redirect correctly', () => {
+          expect(searchService.setSortAndFilters).toHaveBeenCalledWith(
+            { OrgForResource: { DREAL: true } },
+            SortByEnum.CREATE_DATE
+          )
+        })
+      })
     })
   })
 })
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.ts b/apps/datahub/src/app/home/home-header/home-header.component.ts
index 54e388f61c..10736d0c61 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.ts
+++ b/apps/datahub/src/app/home/home-header/home-header.component.ts
@@ -6,8 +6,17 @@ import {
   ROUTER_ROUTE_SEARCH,
 } from '@geonetwork-ui/feature/router'
 import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search'
-import { getThemeConfig } from '@geonetwork-ui/util/app-config'
-import { MetadataRecord, SortByEnum } from '@geonetwork-ui/util/shared'
+import {
+  getOptionalSearchConfig,
+  getThemeConfig,
+  SearchConfig,
+} from '@geonetwork-ui/util/app-config'
+import {
+  MetadataRecord,
+  RawCustomSearchFilters,
+  SearchFilters,
+  SortByEnum,
+} from '@geonetwork-ui/util/shared'
 import { map } from 'rxjs/operators'
 import { ROUTER_ROUTE_NEWS } from '../../router/constants'
 
@@ -30,6 +39,7 @@ export class HomeHeaderComponent {
 
   ROUTE_SEARCH = `${ROUTER_ROUTE_SEARCH}`
   SORT_BY_PARAMS = SortByEnum
+  searchConfig: SearchConfig = getOptionalSearchConfig()
 
   constructor(
     public routerFacade: RouterFacade,
@@ -39,13 +49,36 @@ export class HomeHeaderComponent {
   ) {}
 
   displaySortBadges$ = this.routerFacade.currentRoute$.pipe(
-    map((route) => route.url[0].path === ROUTER_ROUTE_NEWS)
+    map(
+      (route) =>
+        route.url[0].path === ROUTER_ROUTE_NEWS ||
+        route.url[0].path === ROUTER_ROUTE_SEARCH
+    )
   )
 
   isAuthenticated$ = this.authService
     .authReady()
     .pipe(map((user) => !!user?.id))
 
+  private mapArrayIntoSearchFiltersObject(
+    customSearchParameters: RawCustomSearchFilters
+  ): SearchFilters {
+    const searchFilters = {}
+    for (const [key, value] of Object.entries(customSearchParameters)) {
+      if (value instanceof Array) {
+        const searchFilterProperty = {}
+        customSearchParameters[key].forEach((element) => {
+          searchFilterProperty[element] = true
+        })
+        searchFilters[key] = searchFilterProperty
+      } else if (key === 'any' && value) {
+        searchFilters[key] = value
+      }
+    }
+
+    return searchFilters
+  }
+
   onFuzzySearchSelection(record: MetadataRecord) {
     this.routerFacade.goToMetadata(record)
   }
@@ -57,4 +90,11 @@ export class HomeHeaderComponent {
   clearSearchAndSort(sort: SortByEnum): void {
     this.searchService.setSortAndFilters({}, sort)
   }
+
+  clearSearchAndFilterAndSort(customSearchParameters: any): void {
+    this.searchService.setSortAndFilters(
+      this.mapArrayIntoSearchFiltersObject(customSearchParameters),
+      customSearchParameters._sort
+    )
+  }
 }
diff --git a/conf/default.toml b/conf/default.toml
index 43c9a2bf0f..8aff71b1c1 100644
--- a/conf/default.toml
+++ b/conf/default.toml
@@ -21,7 +21,7 @@ proxy_path = ""
 #  - ${lang2}, ${lang3}: indicates if and where the current language should be part of the login URL in language 2 or 3 letter code
 # Example to use the georchestra login page:
 # login_url = "/cas/login?service=${current_url}"
-# This optional URL should point to the static html page wc-embedder.html which allows to display a web component (like chart and table) via a permalink. 
+# This optional URL should point to the static html page wc-embedder.html which allows to display a web component (like chart and table) via a permalink.
 # URLs can be indicated from the root of the same server starting with a "/" or as an external URL. Be conscious of potential CORS issues when using an external URL.
 # The default location in the dockerized datahub app for example is "/datahub/wc-embedder.html".
 # If the URL is not indicated, no permalinks will show up in the UI.
@@ -63,6 +63,21 @@ background_color = "#fdfbff"
 # Note: if the GeoJSON object contains multiple features, only the geometry of the first one will be kept!
 # filter_geometry_url = "https://my.domain.org/assets/boundary.geojson"
 # filter_geometry_data = '{ "coordinates": [...], "type": "Polygon" }'
+# [[search_preset]]
+# _sort = "-createDate"
+# name = 'filterByOrgs'
+# any = 'Carto'
+# organisation = ['DREAL', 'atmo Hauts-de-France']
+# format = ['ESRI Shapefile']
+# standard = ['iso19115-3.2018']
+# #inspireKeyword = []
+# topic = ['boundaries']
+# publicationYear = ['2023', '2022']
+# spatial = ['yes']
+# license = ['unknown']
+# [[search_preset]]
+# name = 'Wind turbines'
+# any = 'wind'
 
 ### MAP SETTINGS
 
diff --git a/libs/util/app-config/src/lib/app-config.ts b/libs/util/app-config/src/lib/app-config.ts
index ba8eafc5a2..517b25fce0 100644
--- a/libs/util/app-config/src/lib/app-config.ts
+++ b/libs/util/app-config/src/lib/app-config.ts
@@ -14,35 +14,41 @@ import {
   SearchConfig,
   ThemeConfig,
 } from './model'
+import { RawCustomSearchFilters } from '@geonetwork-ui/util/shared'
 
 const MISSING_CONFIG_ERROR = `Application configuration was not initialized correctly.
-This error might show up in case of an invalid/malformed configuration file. 
+This error might show up in case of an invalid/malformed configuration file.
 
 Note: make sure that you have called \`loadAppConfig\` from '@geonetwork-ui/util/app-config' before starting the Angular application.`
 
 let globalConfig: GlobalConfig = null
+
 export function getGlobalConfig(): GlobalConfig {
   if (globalConfig === null) throw new Error(MISSING_CONFIG_ERROR)
   return globalConfig
 }
 
 let themeConfig: ThemeConfig = null
+
 export function getThemeConfig(): ThemeConfig {
   if (themeConfig === null) throw new Error(MISSING_CONFIG_ERROR)
   return themeConfig
 }
 
 let mapConfig: MapConfig = null
+
 export function getOptionalMapConfig(): MapConfig | null {
   return mapConfig
 }
 
 let searchConfig: SearchConfig = null
+
 export function getOptionalSearchConfig(): SearchConfig | null {
   return searchConfig
 }
 
 let customTranslations: CustomTranslationsAllLanguages = null
+
 export function getCustomTranslations(langCode: string): CustomTranslations {
   if (customTranslations === null) throw new Error(MISSING_CONFIG_ERROR)
   return langCode in customTranslations ? customTranslations[langCode] : {}
@@ -103,6 +109,26 @@ export function loadAppConfig() {
                 parsedGlobalSection.web_component_embedder_url,
             } as GlobalConfig)
 
+      const parsedSearchParams = parseMultiConfigSection(
+        parsed,
+        'search_preset',
+        ['name'],
+        [
+          '_sort',
+          'any',
+          'organisation',
+          'format',
+          'standard',
+          'inspireKeyword',
+          'topic',
+          'publicationYear',
+          'spatial',
+          'license',
+        ],
+        warnings,
+        errors
+      )
+
       const parsedLayersSections = parseMultiConfigSection(
         parsed,
         'map_layer',
@@ -185,7 +211,7 @@ export function loadAppConfig() {
         parsed,
         'search',
         [],
-        ['filter_geometry_data', 'filter_geometry_url'],
+        ['filter_geometry_data', 'filter_geometry_url', 'search_preset'],
         warnings,
         errors
       )
@@ -195,7 +221,24 @@ export function loadAppConfig() {
           : ({
               FILTER_GEOMETRY_DATA: parsedSearchSection.filter_geometry_data,
               FILTER_GEOMETRY_URL: parsedSearchSection.filter_geometry_url,
-            } as SearchConfig)
+              SEARCH_PRESET: parsedSearchParams.map(
+                (param) =>
+                  ({
+                    _sort: param._sort,
+                    name: param.name,
+                    any: param.any,
+                    OrgForResource: param.organisation,
+                    format: param.format,
+                    documentStandard: param.standard,
+                    'th_httpinspireeceuropaeutheme-theme_tree.default':
+                      param.inspireKeyword,
+                    'cl_topic.key': param.topic,
+                    publicationYearForResource: param.publicationYear,
+                    isSpatial: param.spatial,
+                    license: param.license,
+                  } as RawCustomSearchFilters)
+              ),
+            } as any)
 
       customTranslations = parseTranslationsConfigSection(
         parsed,
diff --git a/libs/util/app-config/src/lib/model.ts b/libs/util/app-config/src/lib/model.ts
index 5c1afc6f88..eb59e6e175 100644
--- a/libs/util/app-config/src/lib/model.ts
+++ b/libs/util/app-config/src/lib/model.ts
@@ -40,6 +40,11 @@ export interface ThemeConfig {
 export interface SearchConfig {
   FILTER_GEOMETRY_URL?: string
   FILTER_GEOMETRY_DATA?: string
+  SEARCH_PRESET?: {
+    _sort: string
+    _filters: unknown
+    name: string
+  }[]
 }
 
 export type CustomTranslations = { [translationKey: string]: string }
diff --git a/libs/util/shared/src/lib/models/search.model.ts b/libs/util/shared/src/lib/models/search.model.ts
index 0ffb128edb..a25d02130a 100644
--- a/libs/util/shared/src/lib/models/search.model.ts
+++ b/libs/util/shared/src/lib/models/search.model.ts
@@ -3,6 +3,11 @@ export interface SearchFilters {
   [x: string]: any
 }
 
+export interface RawCustomSearchFilters {
+  any?: string
+  [x: string]: any
+}
+
 type SearchFiltersFields = {
   [key: string]: SearchFiltersFields | SearchFiltersFieldsLeaf
 }

From b2570a4e55cff2bba832e6d11ced5bf7f127c24d Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Wed, 28 Jun 2023 11:10:15 +0200
Subject: [PATCH 2/6] feat: update fixture and test

---
 .../app-config/src/lib/app-config.spec.ts     | 12 ++++++
 libs/util/app-config/src/lib/app-config.ts    | 39 +++++++++----------
 libs/util/app-config/src/lib/fixtures.ts      | 10 +++++
 .../src/lib/services/proxy.service.spec.ts    |  2 +-
 4 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/libs/util/app-config/src/lib/app-config.spec.ts b/libs/util/app-config/src/lib/app-config.spec.ts
index 42c470848c..6a01fdc344 100644
--- a/libs/util/app-config/src/lib/app-config.spec.ts
+++ b/libs/util/app-config/src/lib/app-config.spec.ts
@@ -158,6 +158,18 @@ describe('app config utils', () => {
       it('returns the search config', () => {
         expect(getOptionalSearchConfig()).toEqual({
           FILTER_GEOMETRY_URL: 'https://my.domain.org/geom.json',
+          SEARCH_PRESET: [
+            {
+              name: 'filterByOrgs',
+              _sort: '-createDate',
+              any: 'Carto',
+              OrgForResource: ['Org1', 'Org2'],
+              'cl_topic.key': ['boundaries'],
+              format: ['ESRI Shapefile'],
+              isSpatial: ['yes'],
+              publicationYearForResource: ['2023', '2022'],
+            },
+          ],
         })
       })
     })
diff --git a/libs/util/app-config/src/lib/app-config.ts b/libs/util/app-config/src/lib/app-config.ts
index 517b25fce0..e7170c08d0 100644
--- a/libs/util/app-config/src/lib/app-config.ts
+++ b/libs/util/app-config/src/lib/app-config.ts
@@ -109,26 +109,6 @@ export function loadAppConfig() {
                 parsedGlobalSection.web_component_embedder_url,
             } as GlobalConfig)
 
-      const parsedSearchParams = parseMultiConfigSection(
-        parsed,
-        'search_preset',
-        ['name'],
-        [
-          '_sort',
-          'any',
-          'organisation',
-          'format',
-          'standard',
-          'inspireKeyword',
-          'topic',
-          'publicationYear',
-          'spatial',
-          'license',
-        ],
-        warnings,
-        errors
-      )
-
       const parsedLayersSections = parseMultiConfigSection(
         parsed,
         'map_layer',
@@ -215,6 +195,25 @@ export function loadAppConfig() {
         warnings,
         errors
       )
+      const parsedSearchParams = parseMultiConfigSection(
+        parsed,
+        'search_preset',
+        ['name'],
+        [
+          '_sort',
+          'any',
+          'organisation',
+          'format',
+          'standard',
+          'inspireKeyword',
+          'topic',
+          'publicationYear',
+          'spatial',
+          'license',
+        ],
+        warnings,
+        errors
+      )
       searchConfig =
         parsedSearchSection === null
           ? null
diff --git a/libs/util/app-config/src/lib/fixtures.ts b/libs/util/app-config/src/lib/fixtures.ts
index 7f9a864990..ff93ec26c0 100644
--- a/libs/util/app-config/src/lib/fixtures.ts
+++ b/libs/util/app-config/src/lib/fixtures.ts
@@ -38,6 +38,16 @@ fonts_stylesheet_url = "https://fonts.googleapis.com/css2?family=Open+Sans"
 [search]
 filter_geometry_url = 'https://my.domain.org/geom.json'
 
+[[search_preset]]
+_sort = "-createDate"
+name = 'filterByOrgs'
+any = 'Carto'
+organisation = ['Org1', 'Org2']
+format = ['ESRI Shapefile']
+topic = ['boundaries']
+publicationYear = ['2023', '2022']
+spatial = ['yes']
+
 [translations.en]
 "my.first.key" = 'First label.'
 "my.second.key" = """
diff --git a/libs/util/shared/src/lib/services/proxy.service.spec.ts b/libs/util/shared/src/lib/services/proxy.service.spec.ts
index 037eea7e21..03435bff4a 100644
--- a/libs/util/shared/src/lib/services/proxy.service.spec.ts
+++ b/libs/util/shared/src/lib/services/proxy.service.spec.ts
@@ -2,7 +2,7 @@ import { PROXY_PATH, ProxyService } from './proxy.service'
 import { TestBed } from '@angular/core/testing'
 
 // mock window.location
-;(global as any).window = Object.create(window)
+;(global as any).window ??= Object.create(window)
 Object.defineProperty(window, 'location', {
   value: new URL('http://myhost:1234/my/path?abc'),
 })

From 814383c1f3f85217142feee25db52dd26f60563a Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Thu, 29 Jun 2023 10:03:29 +0200
Subject: [PATCH 3/6] feat: update buttons opacity

---
 apps/datahub/src/app/app.module.ts                          | 2 +-
 .../src/app/home/home-header/home-header.component.html     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/datahub/src/app/app.module.ts b/apps/datahub/src/app/app.module.ts
index db0acbdeca..77da9b6898 100644
--- a/apps/datahub/src/app/app.module.ts
+++ b/apps/datahub/src/app/app.module.ts
@@ -184,7 +184,7 @@ export class AppModule {
     ThemeService.generateBgOpacityClasses(
       'primary',
       getThemeConfig().PRIMARY_COLOR,
-      [10, 25, 75]
+      [10, 25, 50, 75, 100]
     )
   }
 }
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.html b/apps/datahub/src/app/home/home-header/home-header.component.html
index d0b5a7d567..b93f10e18b 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.html
+++ b/apps/datahub/src/app/home/home-header/home-header.component.html
@@ -28,7 +28,7 @@
         <div>
           <button
             type="button"
-            class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
+            class="badge-btn bg-primary-opacity-50 hover-bg-primary-opacity-100"
             (click)="clearSearchAndSort(SORT_BY_PARAMS.CREATE_DATE)"
           >
             <span translate="">datahub.header.lastRecords</span>
@@ -37,7 +37,7 @@
         <div>
           <button
             type="button"
-            class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
+            class="badge-btn bg-primary-opacity-50 hover-bg-primary-opacity-100"
             (click)="clearSearchAndSort(SORT_BY_PARAMS.POPULARITY)"
           >
             <span translate="">datahub.header.popularRecords</span>
@@ -47,7 +47,7 @@
           <div>
             <button
               type="button"
-              class="badge-btn bg-primary-opacity-25 hover-bg-primary-opacity-75"
+              class="badge-btn bg-primary-opacity-50 hover-bg-primary-opacity-100"
               (click)="clearSearchAndFilterAndSort(preset)"
             >
               <span translate="">{{ preset['name'] }}</span>

From c5a8b64ab4a1f0007a6508ed4e84954cd1315f9b Mon Sep 17 00:00:00 2001
From: Olivia Guyot <olivia.guyot@camptocamp.com>
Date: Mon, 3 Jul 2023 14:11:37 +0200
Subject: [PATCH 4/6] feat(datahub): do the field name mapping in the
 home-header

---
 .../home-header/home-header.component.spec.ts | 26 +++++++---
 .../home/home-header/home-header.component.ts | 49 +++++++------------
 conf/default.toml                             | 32 +++++++-----
 .../src/lib/utils/service/fields.service.ts   |  4 +-
 .../app-config/src/lib/app-config.spec.ts     | 16 +++---
 libs/util/app-config/src/lib/app-config.ts    | 46 ++++++-----------
 libs/util/app-config/src/lib/fixtures.ts      | 14 +++---
 libs/util/app-config/src/lib/model.ts         | 12 +++--
 libs/util/app-config/src/lib/parse-utils.ts   |  2 +-
 9 files changed, 101 insertions(+), 100 deletions(-)

diff --git a/apps/datahub/src/app/home/home-header/home-header.component.spec.ts b/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
index 6c2ee6bc78..07858c10aa 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
+++ b/apps/datahub/src/app/home/home-header/home-header.component.spec.ts
@@ -6,11 +6,15 @@ import {
   RouterFacade,
   ROUTER_ROUTE_SEARCH,
 } from '@geonetwork-ui/feature/router'
-import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search'
+import {
+  FieldsService,
+  SearchFacade,
+  SearchService,
+} from '@geonetwork-ui/feature/search'
 import { SortByEnum } from '@geonetwork-ui/util/shared'
 import { TranslateModule } from '@ngx-translate/core'
 import { readFirst } from '@nrwl/angular/testing'
-import { BehaviorSubject } from 'rxjs'
+import { BehaviorSubject, of } from 'rxjs'
 import { ROUTER_ROUTE_NEWS } from '../../router/constants'
 import { HeaderBadgeButtonComponent } from '../header-badge-button/header-badge-button.component'
 import { HomeHeaderComponent } from './home-header.component'
@@ -23,14 +27,14 @@ jest.mock('@geonetwork-ui/util/app-config', () => ({
   getOptionalSearchConfig: () => ({
     SEARCH_PRESET: [
       {
-        _sort: '-createDate',
+        sort: '-createDate',
         name: 'sortCeatedDateAndOrg',
-        OrgForResource: ['DREAL'],
+        filters: { publisher: ['DREAL'] },
       },
       {
-        _sort: '-createDate',
+        sort: '-createDate',
         name: 'filterCarto',
-        any: 'Cartographie',
+        filters: { q: 'Cartographie' },
       },
     ],
   }),
@@ -59,6 +63,10 @@ class AuthServiceMock {
   _authSubject$ = new BehaviorSubject({})
 }
 
+class FieldsServiceMock {
+  buildFiltersFromFieldValues = jest.fn(() => of({ thisIs: 'a fake filter' }))
+}
+
 describe('HeaderComponent', () => {
   let component: HomeHeaderComponent
   let fixture: ComponentFixture<HomeHeaderComponent>
@@ -89,6 +97,10 @@ describe('HeaderComponent', () => {
           provide: AuthService,
           useClass: AuthServiceMock,
         },
+        {
+          provide: FieldsService,
+          useClass: FieldsServiceMock,
+        },
       ],
     }).compileComponents()
     authService = TestBed.inject(AuthService)
@@ -208,7 +220,7 @@ describe('HeaderComponent', () => {
         })
         it('should redirect correctly', () => {
           expect(searchService.setSortAndFilters).toHaveBeenCalledWith(
-            { OrgForResource: { DREAL: true } },
+            { thisIs: 'a fake filter' },
             SortByEnum.CREATE_DATE
           )
         })
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.ts b/apps/datahub/src/app/home/home-header/home-header.component.ts
index 10736d0c61..567a336bcb 100644
--- a/apps/datahub/src/app/home/home-header/home-header.component.ts
+++ b/apps/datahub/src/app/home/home-header/home-header.component.ts
@@ -5,20 +5,22 @@ import {
   RouterFacade,
   ROUTER_ROUTE_SEARCH,
 } from '@geonetwork-ui/feature/router'
-import { SearchFacade, SearchService } from '@geonetwork-ui/feature/search'
+import {
+  FieldValues,
+  FieldsService,
+  SearchFacade,
+  SearchService,
+} from '@geonetwork-ui/feature/search'
 import {
   getOptionalSearchConfig,
   getThemeConfig,
   SearchConfig,
+  SearchPreset,
 } from '@geonetwork-ui/util/app-config'
-import {
-  MetadataRecord,
-  RawCustomSearchFilters,
-  SearchFilters,
-  SortByEnum,
-} from '@geonetwork-ui/util/shared'
+import { MetadataRecord, SortByEnum } from '@geonetwork-ui/util/shared'
 import { map } from 'rxjs/operators'
 import { ROUTER_ROUTE_NEWS } from '../../router/constants'
+import { lastValueFrom } from 'rxjs'
 
 marker('datahub.header.myfavorites')
 marker('datahub.header.lastRecords')
@@ -45,7 +47,8 @@ export class HomeHeaderComponent {
     public routerFacade: RouterFacade,
     public searchFacade: SearchFacade,
     private searchService: SearchService,
-    private authService: AuthService
+    private authService: AuthService,
+    private fieldsService: FieldsService
   ) {}
 
   displaySortBadges$ = this.routerFacade.currentRoute$.pipe(
@@ -60,25 +63,6 @@ export class HomeHeaderComponent {
     .authReady()
     .pipe(map((user) => !!user?.id))
 
-  private mapArrayIntoSearchFiltersObject(
-    customSearchParameters: RawCustomSearchFilters
-  ): SearchFilters {
-    const searchFilters = {}
-    for (const [key, value] of Object.entries(customSearchParameters)) {
-      if (value instanceof Array) {
-        const searchFilterProperty = {}
-        customSearchParameters[key].forEach((element) => {
-          searchFilterProperty[element] = true
-        })
-        searchFilters[key] = searchFilterProperty
-      } else if (key === 'any' && value) {
-        searchFilters[key] = value
-      }
-    }
-
-    return searchFilters
-  }
-
   onFuzzySearchSelection(record: MetadataRecord) {
     this.routerFacade.goToMetadata(record)
   }
@@ -91,10 +75,15 @@ export class HomeHeaderComponent {
     this.searchService.setSortAndFilters({}, sort)
   }
 
-  clearSearchAndFilterAndSort(customSearchParameters: any): void {
+  async clearSearchAndFilterAndSort(customSearchParameters: SearchPreset) {
+    const searchFilters = await lastValueFrom(
+      this.fieldsService.buildFiltersFromFieldValues(
+        customSearchParameters.filters
+      )
+    )
     this.searchService.setSortAndFilters(
-      this.mapArrayIntoSearchFiltersObject(customSearchParameters),
-      customSearchParameters._sort
+      searchFilters,
+      customSearchParameters.sort as SortByEnum
     )
   }
 }
diff --git a/conf/default.toml b/conf/default.toml
index 8aff71b1c1..90568614c2 100644
--- a/conf/default.toml
+++ b/conf/default.toml
@@ -63,21 +63,31 @@ background_color = "#fdfbff"
 # Note: if the GeoJSON object contains multiple features, only the geometry of the first one will be kept!
 # filter_geometry_url = "https://my.domain.org/assets/boundary.geojson"
 # filter_geometry_data = '{ "coordinates": [...], "type": "Polygon" }'
+
+# One or several search presets can be defined here; every search preset is composed of:
+# - a name (which can be a translation key)
+# - a sort criteria: either `createDate`, `userSavedCount` or `_score` (prepend with `-` for descending sort)
+# - filters which can be expressed like so:
+# [[search_preset]]
+#     filters.q = 'Full text search
+#     filters.publisher = ['Org 1', 'Org 2']
+#     filters.format = ['format 1', 'format 2']
+#     filters.documentStandard = ['iso19115-3.2018']
+#     filters.inspireKeyword = ['keyword 1', 'keyword 2']
+#     filters.topic = ['boundaries']
+#     filters.publicationYear = ['2023', '2022']
+#     filters.isSpatial = ['yes']
+#     filters.license = ['unknown']
+#
+# Search presets will be advertised to the user along the main search field.
+
 # [[search_preset]]
-# _sort = "-createDate"
+# sort = "-createDate"
 # name = 'filterByOrgs'
-# any = 'Carto'
-# organisation = ['DREAL', 'atmo Hauts-de-France']
-# format = ['ESRI Shapefile']
-# standard = ['iso19115-3.2018']
-# #inspireKeyword = []
-# topic = ['boundaries']
-# publicationYear = ['2023', '2022']
-# spatial = ['yes']
-# license = ['unknown']
+# filters.publisher = ['DREAL', 'atmo Hauts-de-France', 'blargz']
 # [[search_preset]]
 # name = 'Wind turbines'
-# any = 'wind'
+# filters.q = 'wind'
 
 ### MAP SETTINGS
 
diff --git a/libs/feature/search/src/lib/utils/service/fields.service.ts b/libs/feature/search/src/lib/utils/service/fields.service.ts
index 3c4eccb193..02181c2714 100644
--- a/libs/feature/search/src/lib/utils/service/fields.service.ts
+++ b/libs/feature/search/src/lib/utils/service/fields.service.ts
@@ -10,8 +10,8 @@ import {
   SimpleSearchField,
   TopicSearchField,
 } from './fields'
-import { combineLatest, forkJoin, Observable, of, takeLast } from 'rxjs'
-import { map, mergeScan } from 'rxjs/operators'
+import { forkJoin, Observable, of } from 'rxjs'
+import { map } from 'rxjs/operators'
 
 // key is the field name
 export type FieldValues = Record<string, FieldValue[] | FieldValue>
diff --git a/libs/util/app-config/src/lib/app-config.spec.ts b/libs/util/app-config/src/lib/app-config.spec.ts
index 6a01fdc344..5c0ba7a724 100644
--- a/libs/util/app-config/src/lib/app-config.spec.ts
+++ b/libs/util/app-config/src/lib/app-config.spec.ts
@@ -161,13 +161,15 @@ describe('app config utils', () => {
           SEARCH_PRESET: [
             {
               name: 'filterByOrgs',
-              _sort: '-createDate',
-              any: 'Carto',
-              OrgForResource: ['Org1', 'Org2'],
-              'cl_topic.key': ['boundaries'],
-              format: ['ESRI Shapefile'],
-              isSpatial: ['yes'],
-              publicationYearForResource: ['2023', '2022'],
+              sort: '-createDate',
+              filters: {
+                q: 'Carto',
+                organisation: ['Org1', 'Org2'],
+                topic: ['boundaries'],
+                format: ['ESRI Shapefile'],
+                spatial: ['yes'],
+                publicationYear: ['2023', '2022'],
+              },
             },
           ],
         })
diff --git a/libs/util/app-config/src/lib/app-config.ts b/libs/util/app-config/src/lib/app-config.ts
index e7170c08d0..393acdc050 100644
--- a/libs/util/app-config/src/lib/app-config.ts
+++ b/libs/util/app-config/src/lib/app-config.ts
@@ -14,7 +14,6 @@ import {
   SearchConfig,
   ThemeConfig,
 } from './model'
-import { RawCustomSearchFilters } from '@geonetwork-ui/util/shared'
 
 const MISSING_CONFIG_ERROR = `Application configuration was not initialized correctly.
 This error might show up in case of an invalid/malformed configuration file.
@@ -199,18 +198,7 @@ export function loadAppConfig() {
         parsed,
         'search_preset',
         ['name'],
-        [
-          '_sort',
-          'any',
-          'organisation',
-          'format',
-          'standard',
-          'inspireKeyword',
-          'topic',
-          'publicationYear',
-          'spatial',
-          'license',
-        ],
+        ['sort', 'filters'],
         warnings,
         errors
       )
@@ -220,23 +208,21 @@ export function loadAppConfig() {
           : ({
               FILTER_GEOMETRY_DATA: parsedSearchSection.filter_geometry_data,
               FILTER_GEOMETRY_URL: parsedSearchSection.filter_geometry_url,
-              SEARCH_PRESET: parsedSearchParams.map(
-                (param) =>
-                  ({
-                    _sort: param._sort,
-                    name: param.name,
-                    any: param.any,
-                    OrgForResource: param.organisation,
-                    format: param.format,
-                    documentStandard: param.standard,
-                    'th_httpinspireeceuropaeutheme-theme_tree.default':
-                      param.inspireKeyword,
-                    'cl_topic.key': param.topic,
-                    publicationYearForResource: param.publicationYear,
-                    isSpatial: param.spatial,
-                    license: param.license,
-                  } as RawCustomSearchFilters)
-              ),
+              SEARCH_PRESET: parsedSearchParams.map((param) => ({
+                sort: param.sort,
+                name: param.name,
+                filters: param.filters,
+                // any: param.any,
+                // OrgForResource: param.organisation,
+                // format: param.format,
+                // documentStandard: param.standard,
+                // 'th_httpinspireeceuropaeutheme-theme_tree.default':
+                //   param.inspireKeyword,
+                // 'cl_topic.key': param.topic,
+                // publicationYearForResource: param.publicationYear,
+                // isSpatial: param.spatial,
+                // license: param.license,
+              })),
             } as any)
 
       customTranslations = parseTranslationsConfigSection(
diff --git a/libs/util/app-config/src/lib/fixtures.ts b/libs/util/app-config/src/lib/fixtures.ts
index ff93ec26c0..45fa72e0d6 100644
--- a/libs/util/app-config/src/lib/fixtures.ts
+++ b/libs/util/app-config/src/lib/fixtures.ts
@@ -39,14 +39,14 @@ fonts_stylesheet_url = "https://fonts.googleapis.com/css2?family=Open+Sans"
 filter_geometry_url = 'https://my.domain.org/geom.json'
 
 [[search_preset]]
-_sort = "-createDate"
+sort = "-createDate"
 name = 'filterByOrgs'
-any = 'Carto'
-organisation = ['Org1', 'Org2']
-format = ['ESRI Shapefile']
-topic = ['boundaries']
-publicationYear = ['2023', '2022']
-spatial = ['yes']
+filters.q = 'Carto'
+filters.organisation = ['Org1', 'Org2']
+filters.format = ['ESRI Shapefile']
+filters.topic = ['boundaries']
+filters.publicationYear = ['2023', '2022']
+filters.spatial = ['yes']
 
 [translations.en]
 "my.first.key" = 'First label.'
diff --git a/libs/util/app-config/src/lib/model.ts b/libs/util/app-config/src/lib/model.ts
index eb59e6e175..0af2c0dd37 100644
--- a/libs/util/app-config/src/lib/model.ts
+++ b/libs/util/app-config/src/lib/model.ts
@@ -37,14 +37,16 @@ export interface ThemeConfig {
   FONTS_STYLESHEET_URL?: string
 }
 
+export interface SearchPreset {
+  sort: string
+  name: string
+  filters: Record<string, string[] | string>
+}
+
 export interface SearchConfig {
   FILTER_GEOMETRY_URL?: string
   FILTER_GEOMETRY_DATA?: string
-  SEARCH_PRESET?: {
-    _sort: string
-    _filters: unknown
-    name: string
-  }[]
+  SEARCH_PRESET?: SearchPreset[]
 }
 
 export type CustomTranslations = { [translationKey: string]: string }
diff --git a/libs/util/app-config/src/lib/parse-utils.ts b/libs/util/app-config/src/lib/parse-utils.ts
index b21965cb14..01528207c1 100644
--- a/libs/util/app-config/src/lib/parse-utils.ts
+++ b/libs/util/app-config/src/lib/parse-utils.ts
@@ -54,7 +54,7 @@ export function parseConfigSection(
     return null
   }
 
-  const sectionConf = flatten('', fullConfigObj[sectionName])
+  const sectionConf = fullConfigObj[sectionName] as Record<string, string>
   const keysCheck = checkKeys(sectionConf, mandatoryKeys, optionalKeys)
 
   if (keysCheck.missing.length) {

From 09fb518ee082dc7eeceee8bd72272f2d94396811 Mon Sep 17 00:00:00 2001
From: Olivia Guyot <olivia.guyot@camptocamp.com>
Date: Mon, 3 Jul 2023 14:40:15 +0200
Subject: [PATCH 5/6] fix(fields): do not crash when filtering on non existent
 org

---
 libs/feature/search/src/lib/utils/service/fields.spec.ts | 1 +
 libs/feature/search/src/lib/utils/service/fields.ts      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/feature/search/src/lib/utils/service/fields.spec.ts b/libs/feature/search/src/lib/utils/service/fields.spec.ts
index d433e222d5..9287e7ff0b 100644
--- a/libs/feature/search/src/lib/utils/service/fields.spec.ts
+++ b/libs/feature/search/src/lib/utils/service/fields.spec.ts
@@ -528,6 +528,7 @@ describe('search fields implementations', () => {
           searchField.getFiltersForValues([
             'Municipalité de Köniz',
             'Office fédéral de la communication OFCOM',
+            'Non existent org',
           ])
         )
       })
diff --git a/libs/feature/search/src/lib/utils/service/fields.ts b/libs/feature/search/src/lib/utils/service/fields.ts
index a4acfd2b95..b6beefdc2a 100644
--- a/libs/feature/search/src/lib/utils/service/fields.ts
+++ b/libs/feature/search/src/lib/utils/service/fields.ts
@@ -279,7 +279,9 @@ export class OrganizationSearchField implements AbstractSearchField {
   getFiltersForValues(values: FieldValue[]): Observable<SearchFilters> {
     return this.orgsService.organisations$.pipe(
       map((orgs) =>
-        values.map((name) => orgs.find((org) => org.name === name))
+        values
+          .map((name) => orgs.find((org) => org.name === name))
+          .filter((org) => org !== undefined)
       ),
       switchMap((selectedOrgs) =>
         this.orgsService.getFiltersForOrgs(selectedOrgs)

From 3a7293fd2d35901e19bb1e5bfa185a0cc06e6ae6 Mon Sep 17 00:00:00 2001
From: Angelika Kinas <angelika.kinas@camptocamp.com>
Date: Mon, 3 Jul 2023 15:47:34 +0200
Subject: [PATCH 6/6] fix(test): Fix test, remove uncommented properties

---
 libs/util/app-config/src/lib/app-config.ts       | 10 ----------
 libs/util/app-config/src/lib/parse-utils.spec.ts | 14 +++++++++-----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/libs/util/app-config/src/lib/app-config.ts b/libs/util/app-config/src/lib/app-config.ts
index 393acdc050..6395d53ced 100644
--- a/libs/util/app-config/src/lib/app-config.ts
+++ b/libs/util/app-config/src/lib/app-config.ts
@@ -212,16 +212,6 @@ export function loadAppConfig() {
                 sort: param.sort,
                 name: param.name,
                 filters: param.filters,
-                // any: param.any,
-                // OrgForResource: param.organisation,
-                // format: param.format,
-                // documentStandard: param.standard,
-                // 'th_httpinspireeceuropaeutheme-theme_tree.default':
-                //   param.inspireKeyword,
-                // 'cl_topic.key': param.topic,
-                // publicationYearForResource: param.publicationYear,
-                // isSpatial: param.spatial,
-                // license: param.license,
               })),
             } as any)
 
diff --git a/libs/util/app-config/src/lib/parse-utils.spec.ts b/libs/util/app-config/src/lib/parse-utils.spec.ts
index f7a0003dc2..971e831c3d 100644
--- a/libs/util/app-config/src/lib/parse-utils.spec.ts
+++ b/libs/util/app-config/src/lib/parse-utils.spec.ts
@@ -129,16 +129,20 @@ describe('parse utils', () => {
             },
           },
           'test',
-          ['mandatory1.path.local'],
-          ['mandatory1.path.global'],
+          ['mandatory1'],
+          [],
           warnings,
           errors
         )
       })
-      it('returns an object with flattened properties', () => {
+      it('returns the nested object as is', () => {
         expect(result).toEqual({
-          ['mandatory1.path.local']: '/aaa/bbb',
-          ['mandatory1.path.global']: 'https://hello',
+          mandatory1: {
+            path: {
+              local: '/aaa/bbb',
+              global: 'https://hello',
+            },
+          },
         })
       })
     })