geonetwork-ui 2.1.0-initial → 2.2.0-dev.0f95f702

package/src/libs/feature/record/src/lib/state/mdview.reducer.ts

@@ -1,7 +1,7 @@
 import { Action, createReducer, on } from '@ngrx/store'
 import * as MdViewActions from './mdview.actions'
-import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/dataviz-configuration.model'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const MD_VIEW_FEATURE_STATE_KEY = 'mdView'
 

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

@@ -4,7 +4,10 @@ import {
   SearchFacade,
   SearchServiceI,
 } from '../../../../../../../libs/feature/search/src'
-import { FieldFilters, SortByField } from '../../../../../../../libs/common/domain/src/lib/search'
+import {
+  FieldFilters,
+  SortByField,
+} from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { ROUTE_PARAMS, SearchRouteParams } from '../constants'
 import { RouterFacade } from '../state/router.facade'
 import { firstValueFrom } from 'rxjs'

package/src/libs/feature/router/src/lib/default/state/router.effects.ts

@@ -9,7 +9,10 @@ import {
   SetFilters,
   SetSortBy,
 } from '../../../../../../../libs/feature/search/src'
-import { FieldFilters, SortByEnum } from '../../../../../../../libs/common/domain/src/lib/search'
+import {
+  FieldFilters,
+  SortByEnum,
+} from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { navigation } from '@ngrx/router-store/data-persistence'
 import { of, pairwise, startWith, withLatestFrom } from 'rxjs'

package/src/libs/feature/router/src/lib/default/state/router.facade.ts

@@ -16,7 +16,7 @@ import {
   RouterGoActionPayload,
 } from './router.actions'
 import { selectCurrentRoute, selectRouteParams } from './router.selectors'
-import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 export class RouterFacade {

package/src/libs/feature/search/src/lib/constants.ts

@@ -1,4 +1,4 @@
-import { FieldName } from '../../../../../libs/common/domain/src/lib/search'
+import { FieldName } from '../../../../../libs/common/domain/src/lib/model/search'
 
 export const DEFAULT_PAGE_SIZE = 10
 

package/src/libs/feature/search/src/lib/facets/facets-container/facets-container.component.ts

@@ -5,7 +5,7 @@ import { map, take } from 'rxjs/operators'
 import { SearchFacade } from '../../state/search.facade'
 import { FacetsService } from '../facets.service'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/search'
+import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { EsRequestAggTerm } from '../../../../../../../libs/api/metadata-converter/src'
 
 marker('facets.block.title.OrgForResource')

package/src/libs/feature/search/src/lib/facets/facets.service.ts

@@ -1,7 +1,10 @@
 import { Injectable } from '@angular/core'
 import { LogService, parse, PARSE_DELIMITER } from '../../../../../../libs/util/shared/src'
 import { FacetPath, ModelBlock, ModelItem } from '../../../../../../libs/ui/search/src'
-import { FieldFilter, FieldFilters } from '../../../../../../libs/common/domain/src/lib/search'
+import {
+  FieldFilter,
+  FieldFilters,
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 
 @Injectable({
   providedIn: 'root',

package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.ts

@@ -13,11 +13,12 @@ import tippy from 'tippy.js'
 import { TranslateService } from '@ngx-translate/core'
 import { StarToggleComponent } from '../../../../../../../libs/ui/inputs/src'
 import { Observable, Subscription } from 'rxjs'
-import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
   AuthService,
   FavoritesService,
 } from '../../../../../../../libs/api/repository/src/lib/gn4'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 @Component({
   selector: 'gn-ui-favorite-star',
@@ -39,7 +40,7 @@ export class FavoriteStarComponent implements AfterViewInit, OnDestroy {
   isFavorite$ = this.favoritesService.myFavoritesUuid$.pipe(
     map((favorites) => favorites.indexOf(this.record.uniqueIdentifier) > -1)
   )
-  isAnonymous$ = this.authService.isAnonymous$
+  isAnonymous$ = this.platformService.isAnonymous()
   record_: CatalogRecord
   favoriteCount: number | null
   loading = false
@@ -61,8 +62,9 @@ export class FavoriteStarComponent implements AfterViewInit, OnDestroy {
 
   constructor(
     private favoritesService: FavoritesService,
-    private authService: AuthService,
+    private platformService: PlatformServiceInterface,
     private changeDetector: ChangeDetectorRef,
+    private authService: AuthService,
     private translateService: TranslateService
   ) {}
 

package/src/libs/feature/search/src/lib/feature-search.module.ts

@@ -22,7 +22,7 @@ import { MatIconModule } from '@angular/material/icon'
 import { FilterDropdownComponent } from './filter-dropdown/filter-dropdown.component'
 import { Geometry } from 'geojson'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { RecordsRepositoryInterface } from '../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { Gn4Repository } from '../../../../../libs/api/repository/src/lib/gn4'
 
 // this geometry will be used to filter & boost results accordingly

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.html

@@ -7,4 +7,5 @@
   (inputCleared)="handleInputCleared()"
   [value]="searchInputValue$ | async"
   [clearOnSelection]="true"
+  [autoFocus]="autoFocus"
 ></gn-ui-autocomplete>

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.ts

@@ -2,6 +2,7 @@ import {
   ChangeDetectionStrategy,
   Component,
   EventEmitter,
+  Input,
   OnInit,
   Output,
   ViewChild,
@@ -14,8 +15,8 @@ import { Observable } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { SearchFacade } from '../state/search.facade'
 import { SearchService } from '../utils/service/search.service'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Component({
   selector: 'gn-ui-fuzzy-search',
@@ -25,6 +26,7 @@ import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain
 })
 export class FuzzySearchComponent implements OnInit {
   @ViewChild(AutocompleteComponent) autocomplete: AutocompleteComponent
+  @Input() autoFocus = false
   @Output() itemSelected = new EventEmitter<CatalogRecord>()
   @Output() inputSubmitted = new EventEmitter<string>()
   searchInputValue$: Observable<{ title: string }>

package/src/libs/feature/search/src/lib/records-metrics/records-metrics.component.ts

@@ -1,12 +1,12 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
 import { Observable } from 'rxjs'
 import { map, share } from 'rxjs/operators'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import {
   AggregationBuckets,
   Aggregations,
   TermBucket,
-} from '../../../../../../libs/common/domain/src/lib/search'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 import { RecordMetric } from '../../../../../../libs/api/metadata-converter/src'
 
 @Component({

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.html

@@ -2,12 +2,13 @@
   <gn-ui-results-list
     [records]="facade.results$ | async"
     [layoutConfig]="layoutConfig$ | async"
-    [metadataQualityDisplay]="metadataQualityDisplay"
+    [metadataQualityDisplay]="
+      metadataQualityDisplay && (pipelineForQualityScoreActivated | async)
+    "
     [favoriteTemplate]="favoriteToggle"
     [recordUrlGetter]="recordUrlGetter"
     (mdSelect)="onMetadataSelection($event)"
   ></gn-ui-results-list>
-
   <ng-container
     *ngIf="
       (facade.isLoading$ | async) === false &&

package/src/libs/feature/search/src/lib/results-list/results-list.container.component.ts

@@ -7,18 +7,18 @@ import {
   Optional,
   Output,
 } from '@angular/core'
-import { Observable } from 'rxjs'
+import { Observable, tap } from 'rxjs'
 import { filter, map } from 'rxjs/operators'
 import { SearchFacade } from '../state/search.facade'
 import { SearchError } from '../state/reducer'
-import { ErrorType, MetadataQualityDisplay } from '../../../../../../libs/ui/elements/src'
+import { ErrorType } from '../../../../../../libs/ui/elements/src'
 import {
   RESULTS_LAYOUT_CONFIG,
   ResultsLayoutConfigItem,
   ResultsLayoutConfigModel,
 } from '../../../../../../libs/ui/search/src'
 import { RECORD_URL_TOKEN } from '../feature-search.module'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export type ResultsListShowMoreStrategy = 'auto' | 'button' | 'none'
 
@@ -28,7 +28,7 @@ export type ResultsListShowMoreStrategy = 'auto' | 'button' | 'none'
   styleUrls: ['./results-list.container.component.css'],
 })
 export class ResultsListContainerComponent implements OnInit {
-  @Input() metadataQualityDisplay: MetadataQualityDisplay
+  @Input() metadataQualityDisplay: boolean
   @Input() layout: string
   @Input() showMore: ResultsListShowMoreStrategy = 'auto'
   @Output() mdSelect = new EventEmitter<CatalogRecord>()
@@ -38,6 +38,7 @@ export class ResultsListContainerComponent implements OnInit {
   error$: Observable<SearchError>
   errorCode$: Observable<number>
   errorMessage$: Observable<string>
+  pipelineForQualityScoreActivated: Observable<boolean>
 
   errorTypes = ErrorType
   recordUrlGetter = this.getRecordUrl.bind(this)
@@ -60,6 +61,17 @@ export class ResultsListContainerComponent implements OnInit {
       this.facade.setResultsLayout(this.layout)
     }
 
+    this.pipelineForQualityScoreActivated = this.facade.results$.pipe(
+      tap((records) => {
+        if (records?.length > 0 && !records[0].extras?.qualityScore) {
+          console.warn(
+            'It looks like the metadata quality indicator is not available on these records, probably due to a missing indexing pipeline'
+          )
+        }
+      }),
+      map((records) => !!records[0]?.extras.qualityScore)
+    )
+
     this.error$ = this.facade.error$
     this.errorCode$ = this.error$.pipe(
       filter((error) => error !== null),

package/src/libs/feature/search/src/lib/sort-by/sort-by.component.ts

@@ -1,6 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { SortByEnum, SortByField } from '../../../../../../libs/common/domain/src/lib/search'
+import {
+  SortByEnum,
+  SortByField,
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 import { SearchFacade } from '../state/search.facade'
 import { SearchService } from '../utils/service/search.service'
 import { filter, map } from 'rxjs/operators'

package/src/libs/feature/search/src/lib/state/actions.ts

@@ -7,8 +7,8 @@ import {
   FieldFilters,
   FieldName,
   SortByField,
-} from '../../../../../../libs/common/domain/src/lib/search'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const ADD_SEARCH = '[Search] Add search instance'
 export const SET_FILTERS = '[Search] Set Filters'

package/src/libs/feature/search/src/lib/state/effects.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable, Optional } from '@angular/core'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { select, Store } from '@ngrx/store'
-import { buffer, combineLatestWith, debounceTime, from, of } from 'rxjs'
+import { buffer, combineLatestWith, debounceTime, from, of, tap } from 'rxjs'
 import {
   catchError,
   map,
@@ -42,11 +42,10 @@ import { HttpErrorResponse } from '@angular/common/http'
 import { switchMapWithSearchId } from '../utils/operators/search.operator'
 import { Geometry } from 'geojson'
 import { FILTER_GEOMETRY } from '../feature-search.module'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
-import {
-  AuthService,
-  FavoritesService,
-} from '../../../../../../libs/api/repository/src/lib/gn4'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { FavoritesService } from '../../../../../../libs/api/repository/src/lib/gn4'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { valid as validGeoJson } from 'geojson-validation'
 
 @Injectable()
 export class SearchEffects {
@@ -58,8 +57,8 @@ export class SearchEffects {
     private actions$: Actions,
     private store$: Store<SearchState>,
     private recordsRepository: RecordsRepositoryInterface,
-    private authService: AuthService,
     private favoritesService: FavoritesService,
+    private platformService: PlatformServiceInterface,
     @Optional()
     @Inject(FILTER_GEOMETRY)
     private filterGeometry: Promise<Geometry>
@@ -110,7 +109,7 @@ export class SearchEffects {
     this.actions$.pipe(
       ofType(REQUEST_MORE_RESULTS, REQUEST_NEW_RESULTS),
       switchMapWithSearchId((action: SearchActions) =>
-        this.authService.authReady().pipe(
+        this.platformService.getMe().pipe(
           withLatestFrom(
             this.store$.pipe(select(getSearchStateSearch, action.id))
           ),
@@ -130,8 +129,24 @@ export class SearchEffects {
               return of([state, favorites, null])
             }
             return this.filterGeometry$.pipe(
+              tap((geom) => {
+                try {
+                  const trace = validGeoJson(geom, true) as string[]
+                  if (trace?.length > 0) {
+                    throw new Error(trace.join('\n'))
+                  }
+                } catch (error) {
+                  console.warn(
+                    'Error while parsing the geometry filter\n',
+                    error
+                  )
+                  throw new Error()
+                }
+              }),
               map((geom) => [state, favorites, geom]),
-              catchError(() => of([state, favorites, null])) // silently opt out of spatial filter if an error happens
+              catchError((e) => {
+                return of([state, favorites, null])
+              })
             )
           }),
           switchMap(
@@ -194,7 +209,7 @@ export class SearchEffects {
         REQUEST_MORE_ON_AGGREGATION
       ),
       switchMap((action) =>
-        this.authService.authReady().pipe(
+        this.platformService.getMe().pipe(
           withLatestFrom(
             this.store$.pipe(select(getSearchStateSearch, action.id))
           ),

package/src/libs/feature/search/src/lib/state/reducer.ts

@@ -6,9 +6,9 @@ import {
   FieldFilters,
   FieldName,
   SortByField,
-} from '../../../../../../libs/common/domain/src/lib/search'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 import { DEFAULT_PAGE_SIZE, FIELDS_SUMMARY } from '../constants'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const SEARCH_FEATURE_KEY = 'searchState'
 

package/src/libs/feature/search/src/lib/state/search.facade.ts

@@ -27,6 +27,7 @@ import {
   currentPage,
   getError,
   getFavoritesOnly,
+  getPageSize,
   getSearchConfigAggregations,
   getSearchFilters,
   getSearchResults,
@@ -35,7 +36,6 @@ import {
   getSearchResultsLayout,
   getSearchResultsLoading,
   getSearchSortBy,
-  getPageSize,
   getSpatialFilterEnabled,
   isEndOfResults,
   totalPages,
@@ -49,8 +49,8 @@ import {
   FieldFilters,
   FieldName,
   SortByField,
-} from '../../../../../../libs/common/domain/src/lib/search'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 export class SearchFacade {

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -1,17 +1,19 @@
 import { Injectable, Injector } from '@angular/core'
 import {
   AbstractSearchField,
-  GnUiTranslationSearchField,
   FieldValue,
   FullTextSearchField,
   IsSpatialSearchField,
+  KeySearchField,
   LicenseSearchField,
   OrganizationSearchField,
+  OwnerSearchField,
   SimpleSearchField,
+  ThesaurusField,
 } from './fields'
 import { forkJoin, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
-import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/search'
+import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 
 // key is the field name
@@ -27,6 +29,7 @@ marker('search.filters.representationType')
 marker('search.filters.resourceType')
 marker('search.filters.standard')
 marker('search.filters.topic')
+marker('search.filters.contact')
 
 @Injectable({
   providedIn: 'root',
@@ -35,12 +38,8 @@ export class FieldsService {
   private fields = {
     publisher: new OrganizationSearchField(this.injector),
     format: new SimpleSearchField('format', 'asc', this.injector),
-    resourceType: new GnUiTranslationSearchField(
-      'resourceType',
-      'asc',
-      this.injector
-    ),
-    representationType: new GnUiTranslationSearchField(
+    resourceType: new KeySearchField('resourceType', 'asc', this.injector),
+    representationType: new KeySearchField(
       'cl_spatialRepresentationType.key',
       'asc',
       this.injector
@@ -50,9 +49,10 @@ export class FieldsService {
       'desc',
       this.injector
     ),
-    topic: new GnUiTranslationSearchField('cl_topic.key', 'asc', this.injector),
-    inspireKeyword: new SimpleSearchField(
-      'th_httpinspireeceuropaeutheme-theme_tree.default',
+    topic: new KeySearchField('cl_topic.key', 'asc', this.injector),
+    inspireKeyword: new ThesaurusField(
+      'th_httpinspireeceuropaeutheme-theme.link',
+      'external.theme.httpinspireeceuropaeutheme-theme',
       'asc',
       this.injector
     ),
@@ -64,6 +64,7 @@ export class FieldsService {
     isSpatial: new IsSpatialSearchField(this.injector),
     q: new FullTextSearchField(),
     license: new LicenseSearchField(this.injector),
+    owner: new OwnerSearchField(this.injector),
   } as Record<string, AbstractSearchField>
 
   get supportedFields() {

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -1,19 +1,20 @@
-import { firstValueFrom, Observable, of, switchMap } from 'rxjs'
-import { ToolsApiService } from '../../../../../../../libs/data-access/gn4/src'
+import { firstValueFrom, Observable, of, switchMap, tap } from 'rxjs'
 import { catchError, map, shareReplay } from 'rxjs/operators'
 import { Injector } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { OrganizationsServiceInterface } from '../../../../../../../libs/common/domain/src/lib/organizations.service.interface'
+import { RecordsRepositoryInterface } from '../../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import {
   AggregationBuckets,
   AggregationsParams,
   FieldFilterByExpression,
   FieldFilters,
   TermBucket,
-} from '../../../../../../../libs/common/domain/src/lib/search'
-import { RecordsRepositoryInterface } from '../../../../../../../libs/common/domain/src/lib/records-repository.interface'
+} from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { ElasticsearchService } from '../../../../../../../libs/api/repository/src/lib/gn4'
+import { LangService } from '../../../../../../../libs/util/i18n/src'
 
 export type FieldValue = string | number
 export interface FieldAvailableValue {
@@ -87,28 +88,11 @@ export class SimpleSearchField implements AbstractSearchField {
   }
 }
 
-export class GnUiTranslationSearchField extends SimpleSearchField {
-  private toolsApiService = this.injector.get(ToolsApiService)
-  allTranslations = this.toolsApiService.getTranslationsPackage1('gnui').pipe(
-    catchError(() => {
-      console.warn('Error while loading gnui language package')
-      return of({})
-    }),
-    shareReplay(1)
-  )
+export class KeySearchField extends SimpleSearchField {
+  protected platformService = this.injector.get(PlatformServiceInterface)
 
-  constructor(
-    esFieldName: string,
-    order: 'asc' | 'desc' = 'asc',
-    injector: Injector
-  ) {
-    super(esFieldName, order, injector)
-  }
-
-  private async getTranslation(topicKey: string) {
-    return firstValueFrom(
-      this.allTranslations.pipe(map((translations) => translations[topicKey]))
-    )
+  protected async getTranslation(key: string) {
+    return firstValueFrom(this.platformService.translateKey(key))
   }
 
   protected async getBucketLabel(bucket: TermBucket) {
@@ -127,6 +111,37 @@ export class GnUiTranslationSearchField extends SimpleSearchField {
   }
 }
 
+export class ThesaurusField extends KeySearchField {
+  private langService = this.injector.get(LangService)
+  private thesaurus$ = this.platformService
+    .getThesaurusByLang(this.thesaurusName, this.langService.iso3)
+    .pipe(
+      catchError(() => {
+        console.warn('Error while loading thesaurus language package')
+        return of([])
+      }),
+      shareReplay(1)
+    )
+
+  constructor(
+    esFieldName: string,
+    protected thesaurusName: string,
+    order: 'asc' | 'desc' = 'asc',
+    injector: Injector
+  ) {
+    super(esFieldName, order, injector)
+  }
+  protected async getTranslation(key: string) {
+    return firstValueFrom(
+      this.thesaurus$.pipe(
+        map(
+          (thesaurus) => thesaurus.find((keyword) => keyword.key === key)?.label
+        )
+      )
+    )
+  }
+}
+
 export class FullTextSearchField implements AbstractSearchField {
   getAvailableValues(): Observable<FieldAvailableValue[]> {
     return of([])
@@ -313,3 +328,12 @@ export class OrganizationSearchField implements AbstractSearchField {
     )
   }
 }
+export class OwnerSearchField extends SimpleSearchField {
+  constructor(injector: Injector) {
+    super('owner', 'asc', injector)
+  }
+
+  getAvailableValues(): Observable<FieldAvailableValue[]> {
+    return of([])
+  }
+}

package/src/libs/feature/search/src/lib/utils/service/search.service.ts

@@ -1,6 +1,9 @@
 import { Injectable } from '@angular/core'
 import { SearchFacade } from '../../state/search.facade'
-import { FieldFilters, SortByField } from '../../../../../../../libs/common/domain/src/lib/search'
+import {
+  FieldFilters,
+  SortByField,
+} from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { first, map } from 'rxjs/operators'
 
 export interface SearchServiceI {
@@ -40,4 +43,8 @@ export class SearchService implements SearchServiceI {
   setPage(page: number): void {
     this.facade.paginate(page)
   }
+
+  resetSearch(): void {
+    this.facade.resetSearch()
+  }
 }

package/src/libs/ui/catalog/src/index.ts

@@ -2,4 +2,5 @@ export * from './lib/ui-catalog.module'
 export * from './lib/catalog-title/catalog-title.component'
 export * from './lib/language-switcher/language-switcher.component'
 export * from './lib/organisation-preview/organisation-preview.component'
-export * from './lib/organisations-sort/organisations-sort.component'
+export * from './lib/organisations-filter/organisations-filter.component'
+export * from './lib/organisations-result/organisations-result.component'

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts

@@ -42,6 +42,7 @@ export class LanguageSwitcherComponent implements OnInit {
   changeLanguage(value) {
     try {
       localStorage.setItem(LANGUAGE_STORAGE_KEY, value)
+      location.reload()
     } catch (error) {
       console.warn(`Language choice could not be persisted`, error)
     }

package/src/libs/ui/catalog/src/lib/organisation-preview/organisation-preview.component.ts

@@ -5,7 +5,7 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { Organization } from '../../../../../../libs/common/domain/src/lib/record'
+import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-organisation-preview',

package/src/libs/ui/catalog/src/lib/{organisations-sort/organisations-sort.component.html → organisations-filter/organisations-filter.component.html}

@@ -1,8 +1,11 @@
 <div
-  class="flex flex-wrap sm:flex-nowrap bg-primary text-white px-6 py-7 mt-4 mb-8 rounded-lg"
+  class="flex flex-wrap sm:flex-nowrap justify-between bg-white shadow-xl p-5 rounded-lg"
 >
-  <span class="grow mb-4 mr-4 sm:mb-0 sm:mr-16">
-    <p translate>organisation.sort.intro</p>
+  <span class="grow mb-4 mr-4 sm:mb-0 sm:mr-16 sm:max-w-sm">
+    <gn-ui-search-input
+      (valueChange)="filterOrganisations($event)"
+      [placeholder]="'organisation.filter.placeholder' | translate"
+    ></gn-ui-search-input>
   </span>
   <span class="flex flex-wrap sm:flex-nowrap sm:shrink-0">
     <gn-ui-dropdown-selector