geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.73bac9979

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

@@ -56,7 +56,10 @@ export class AddSearch implements Action {
 export class SetConfigFilters extends AbstractAction implements Action {
   readonly type = SET_CONFIG_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -64,7 +67,10 @@ export class SetConfigFilters extends AbstractAction implements Action {
 export class SetFilters extends AbstractAction implements Action {
   readonly type = SET_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -72,7 +78,10 @@ export class SetFilters extends AbstractAction implements Action {
 export class UpdateFilters extends AbstractAction implements Action {
   readonly type = UPDATE_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -80,27 +89,39 @@ export class UpdateFilters extends AbstractAction implements Action {
 export class SetSearch extends AbstractAction implements Action {
   readonly type = SET_SEARCH
 
-  constructor(public payload: SearchStateParams, id?: string) {
+  constructor(
+    public payload: SearchStateParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetFavoritesOnly extends AbstractAction implements Action {
   readonly type = SET_FAVORITES_ONLY
-  constructor(public favoritesOnly: boolean, id?: string) {
+  constructor(
+    public favoritesOnly: boolean,
+    id?: string
+  ) {
     super(id)
   }
 }
 export class SetSortBy extends AbstractAction implements Action {
   readonly type = SET_SORT_BY
-  constructor(public sortBy: SortByField, id?: string) {
+  constructor(
+    public sortBy: SortByField,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetPageSize extends AbstractAction implements Action {
   readonly type = SET_PAGE_SIZE
-  constructor(public limit: number, id?: string) {
+  constructor(
+    public limit: number,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -108,7 +129,10 @@ export class SetPageSize extends AbstractAction implements Action {
 export class Paginate extends AbstractAction implements Action {
   readonly type = PAGINATE
   // Note: page number is one-based!!
-  constructor(public pageNumber: number, id?: string) {
+  constructor(
+    public pageNumber: number,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -116,7 +140,10 @@ export class Paginate extends AbstractAction implements Action {
 export class SetResultsLayout extends AbstractAction implements Action {
   readonly type = SET_RESULTS_LAYOUT
 
-  constructor(public resultsLayout: string, id?: string) {
+  constructor(
+    public resultsLayout: string,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -124,7 +151,10 @@ export class SetResultsLayout extends AbstractAction implements Action {
 export class AddResults extends AbstractAction implements Action {
   readonly type = ADD_RESULTS
 
-  constructor(public payload: CatalogRecord[], id?: string) {
+  constructor(
+    public payload: CatalogRecord[],
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -156,35 +186,50 @@ export class RequestNewResults extends AbstractAction implements Action {
 export class SetResultsAggregations extends AbstractAction implements Action {
   readonly type = SET_RESULTS_AGGREGATIONS
 
-  constructor(public payload: Aggregations, id?: string) {
+  constructor(
+    public payload: Aggregations,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetResultsHits extends AbstractAction implements Action {
   readonly type = SET_RESULTS_HITS
-  constructor(public payload: number, id?: string) {
+  constructor(
+    public payload: number,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetConfigAggregations extends AbstractAction implements Action {
   readonly type = SET_CONFIG_AGGREGATIONS
-  constructor(public payload: AggregationsParams, id?: string) {
+  constructor(
+    public payload: AggregationsParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class UpdateConfigAggregations extends AbstractAction implements Action {
   readonly type = UPDATE_CONFIG_AGGREGATIONS
-  constructor(public payload: AggregationsParams, id?: string) {
+  constructor(
+    public payload: AggregationsParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetConfigRequestFields extends AbstractAction implements Action {
   readonly type = SET_CONFIG_REQUEST_FIELDS
-  constructor(public payload: FieldName[], id?: string) {
+  constructor(
+    public payload: FieldName[],
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -226,7 +271,11 @@ export class PatchResultsAggregations extends AbstractAction implements Action {
 export class SetError extends AbstractAction implements Action {
   readonly type = SET_ERROR
 
-  constructor(public code: number, public message: string, id?: string) {
+  constructor(
+    public code: number,
+    public message: string,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -241,7 +290,10 @@ export class ClearError extends AbstractAction implements Action {
 
 export class SetSpatialFilterEnabled extends AbstractAction implements Action {
   readonly type = SET_SPATIAL_FILTER_ENABLED
-  constructor(public enabled: boolean, id?: string) {
+  constructor(
+    public enabled: boolean,
+    id?: string
+  ) {
     super(id)
   }
 }

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

@@ -154,7 +154,7 @@ export class SearchEffects {
             ([state, favorites, geometry]: [
               SearchStateSearch,
               string[],
-              Geometry | undefined
+              Geometry | undefined,
             ]) => {
               const { currentPage, pageSize, sort } = state.params
               const filters = {

package/src/libs/feature/search/src/lib/state/fixtures/search-state.fixtures.ts

@@ -1,4 +1,4 @@
-export const SEARCH_STATE_FILTERS_FIXTURE = {
+export const searchStateFiltersFixture = () => ({
   recursiveTerms: {
     resourceType: {
       service: {
@@ -26,4 +26,4 @@ export const SEARCH_STATE_FILTERS_FIXTURE = {
       availableInViewService: '+linkProtocol:/OGC:WMS.*/',
     },
   },
-}
+})

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

@@ -8,6 +8,7 @@ import {
   Paginate,
   RequestMoreOnAggregation,
   RequestMoreResults,
+  RequestNewResults,
   SetConfigAggregations,
   SetConfigFilters,
   SetConfigRequestFields,
@@ -37,8 +38,6 @@ import {
   getSearchResultsLoading,
   getSearchSortBy,
   getSpatialFilterEnabled,
-  isBeginningOfResults,
-  isEndOfResults,
   totalPages,
 } from './selectors'
 import { FILTER_GEOMETRY } from '../filter-geometry.token'
@@ -59,8 +58,6 @@ export class SearchFacade {
   layout$: Observable<string>
   sortBy$: Observable<SortByField>
   isLoading$: Observable<boolean>
-  isBeginningOfResults$: Observable<boolean>
-  isEndOfResults$: Observable<boolean>
   totalPages$: Observable<number>
   currentPage$: Observable<number>
   pageSize$: Observable<number>
@@ -100,10 +97,6 @@ export class SearchFacade {
     this.isLoading$ = this.store.pipe(select(getSearchResultsLoading, searchId))
     this.searchFilters$ = this.store.pipe(select(getSearchFilters, searchId))
     this.resultsHits$ = this.store.pipe(select(getSearchResultsHits, searchId))
-    this.isBeginningOfResults$ = this.store.pipe(
-      select(isBeginningOfResults, searchId)
-    )
-    this.isEndOfResults$ = this.store.pipe(select(isEndOfResults, searchId))
     this.totalPages$ = this.store.pipe(select(totalPages, searchId))
     this.currentPage$ = this.store.pipe(select(currentPage, searchId))
     this.pageSize$ = this.store.pipe(select(getPageSize, searchId))
@@ -151,6 +144,11 @@ export class SearchFacade {
     return this
   }
 
+  requestNewResults(): SearchFacade {
+    this.store.dispatch(new RequestNewResults(this.searchId))
+    return this
+  }
+
   requestMoreOnAggregation(key: string, increment: number): SearchFacade {
     this.store.dispatch(
       new RequestMoreOnAggregation(key, increment, this.searchId)

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

@@ -50,24 +50,6 @@ export const getSearchResultsHits = createSelector(
   (state: SearchStateSearch) => state.results.count
 )
 
-export const isBeginningOfResults = createSelector(
-  getSearchStateSearch,
-  (state: SearchStateSearch) => {
-    return state.params.currentPage === 0
-  }
-)
-
-export const isEndOfResults = createSelector(
-  getSearchStateSearch,
-  (state: SearchStateSearch) => {
-    return (
-      state.params.currentPage * state.params.pageSize +
-        state.params.pageSize >=
-      state.results.count
-    )
-  }
-)
-
 export const totalPages = createSelector(
   getSearchStateSearch,
   (state: SearchStateSearch) => {

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

@@ -1,6 +1,7 @@
 import { Injectable, Injector } from '@angular/core'
 import {
   AbstractSearchField,
+  DateRangeSearchField,
   FieldValue,
   FullTextSearchField,
   IsSpatialSearchField,
@@ -10,14 +11,16 @@ import {
   OwnerSearchField,
   SimpleSearchField,
   TranslatedSearchField,
+  UserSearchField,
 } from './fields'
 import { forkJoin, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { DateRange } from '../../../../../../../libs/api/repository/src'
 
 // key is the field name
-export type FieldValues = Record<string, FieldValue[] | FieldValue>
+export type FieldValues = Record<string, FieldValue[] | FieldValue | DateRange>
 
 marker('search.filters.format')
 marker('search.filters.inspireKeyword')
@@ -25,19 +28,23 @@ marker('search.filters.keyword')
 marker('search.filters.isSpatial')
 marker('search.filters.license')
 marker('search.filters.publicationYear')
-marker('search.filters.publisher')
+marker('search.filters.organization')
 marker('search.filters.representationType')
 marker('search.filters.resourceType')
 marker('search.filters.standard')
 marker('search.filters.topic')
 marker('search.filters.contact')
+marker('search.filters.producerOrg')
+marker('search.filters.publisherOrg')
+marker('search.filters.user')
+marker('search.filters.changeDate')
 
 @Injectable({
   providedIn: 'root',
 })
 export class FieldsService {
   protected fields = {
-    publisher: new OrganizationSearchField(this.injector),
+    organization: new OrganizationSearchField(this.injector),
     format: new SimpleSearchField('format', this.injector, 'asc'),
     resourceType: new TranslatedSearchField(
       'resourceType',
@@ -70,6 +77,20 @@ export class FieldsService {
     q: new FullTextSearchField(),
     license: new LicenseSearchField(this.injector),
     owner: new OwnerSearchField(this.injector),
+    producerOrg: new MultilingualSearchField(
+      'originatorOrgForResourceObject',
+      this.injector,
+      'asc',
+      'key'
+    ),
+    publisherOrg: new MultilingualSearchField(
+      'distributorOrgForResourceObject',
+      this.injector,
+      'asc',
+      'key'
+    ),
+    user: new UserSearchField(this.injector),
+    changeDate: new DateRangeSearchField('changeDate', this.injector, 'desc'),
   } as Record<string, AbstractSearchField>
 
   get supportedFields() {
@@ -84,13 +105,20 @@ export class FieldsService {
     return this.fields[fieldName].getAvailableValues()
   }
 
-  private getFiltersForValues(fieldName: string, values: FieldValue[]) {
+  private getFiltersForValues(
+    fieldName: string,
+    values: FieldValue[] | DateRange[]
+  ) {
     return this.fields[fieldName].getFiltersForValues(values)
   }
   private getValuesForFilters(fieldName: string, filters: FieldFilters) {
     return this.fields[fieldName].getValuesForFilter(filters)
   }
 
+  getFieldType(fieldName: string) {
+    return this.fields[fieldName].getType()
+  }
+
   buildFiltersFromFieldValues(
     fieldValues: FieldValues
   ): Observable<FieldFilters> {
@@ -102,7 +130,10 @@ export class FieldsService {
       const values = Array.isArray(fieldValues[fieldName])
         ? fieldValues[fieldName]
         : [fieldValues[fieldName]]
-      return this.getFiltersForValues(fieldName, values as FieldValue[])
+      return this.getFiltersForValues(
+        fieldName,
+        values as FieldValue[] | DateRange[]
+      )
     })
     return forkJoin(filtersByField$).pipe(
       map((filters) =>

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

@@ -14,10 +14,15 @@ import {
   TermBucket,
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
+  DateRange,
   ElasticsearchService,
+  isDateRange,
   METADATA_LANGUAGE,
 } from '../../../../../../../libs/api/repository/src'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
+import { formatUserInfo } from '../../../../../../../libs/util/shared/src'
+
+export type FieldType = 'values' | 'dateRange'
 
 export type FieldValue = string | number
 export interface FieldAvailableValue {
@@ -26,9 +31,14 @@ export interface FieldAvailableValue {
 }
 
 export abstract class AbstractSearchField {
-  abstract getAvailableValues(): Observable<FieldAvailableValue[]>
-  abstract getFiltersForValues(values: FieldValue[]): Observable<FieldFilters>
-  abstract getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]>
+  abstract getAvailableValues(): Observable<FieldAvailableValue[] | DateRange[]>
+  abstract getFiltersForValues(
+    values: FieldValue[] | DateRange[]
+  ): Observable<FieldFilters>
+  abstract getValuesForFilter(
+    filters: FieldFilters
+  ): Observable<FieldValue[] | FieldValue | DateRange>
+  abstract getType(): FieldType
 }
 
 export class SimpleSearchField implements AbstractSearchField {
@@ -74,22 +84,47 @@ export class SimpleSearchField implements AbstractSearchField {
       })
     )
   }
-  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
+  getFiltersForValues(
+    values: FieldValue[] | DateRange[]
+  ): Observable<FieldFilters> {
+    // FieldValue[]
+    if (this.getType() === 'values') {
+      return of({
+        [this.esFieldName]: (values as FieldValue[]).reduce((acc, val) => {
+          const value = val.toString()
+          if (value !== '') {
+            return { ...acc, [value]: true }
+          }
+          return acc
+        }, {}),
+      })
+    }
+    // DateRange
     return of({
-      [this.esFieldName]: values.reduce((acc, val) => {
-        return { ...acc, [val.toString()]: true }
-      }, {}),
+      [this.esFieldName]: values[0] !== '' ? values[0] : {},
     })
   }
-  getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
+  getValuesForFilter(
+    filters: FieldFilters
+  ): Observable<FieldValue[] | FieldValue | DateRange> {
     const filter = filters[this.esFieldName]
     if (!filter) return of([])
-    const values =
-      typeof filter === 'string'
-        ? [filter]
-        : Object.keys(filter).filter((v) => filter[v])
+    // filter by expression
+    if (typeof filter === 'string') {
+      return of([filter])
+    }
+    // filter by date range
+    if (isDateRange(filter)) {
+      return of(filter)
+    }
+    // filter by values
+    const values = Object.keys(filter).filter((v) => filter[v])
     return of(values)
   }
+
+  getType(): FieldType {
+    return 'values'
+  }
 }
 
 export class TranslatedSearchField extends SimpleSearchField {
@@ -163,6 +198,9 @@ export class FullTextSearchField implements AbstractSearchField {
   getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
     return of(filters.any ? [filters.any as FieldFilterByExpression] : [])
   }
+  getType(): FieldType {
+    return 'values'
+  }
 }
 
 marker('search.filters.isSpatial.yes')
@@ -336,6 +374,10 @@ export class OrganizationSearchField implements AbstractSearchField {
       )
     )
   }
+
+  getType(): FieldType {
+    return 'values'
+  }
 }
 export class OwnerSearchField extends SimpleSearchField {
   constructor(injector: Injector) {
@@ -346,3 +388,40 @@ export class OwnerSearchField extends SimpleSearchField {
     return of([])
   }
 }
+
+export class UserSearchField extends SimpleSearchField {
+  constructor(injector: Injector) {
+    super('userinfo.keyword', injector, 'asc')
+  }
+
+  getAvailableValues(): Observable<FieldAvailableValue[]> {
+    return super.getAvailableValues().pipe(
+      map((values) =>
+        values.map((v) => ({
+          ...v,
+          label: formatUserInfo(v.label, true),
+        }))
+      )
+    )
+  }
+}
+
+export class DateRangeSearchField extends SimpleSearchField {
+  constructor(
+    protected esFieldName: string,
+    protected injector: Injector,
+    protected order: 'asc' | 'desc' = 'asc',
+    protected orderType: 'key' | 'count' = 'key'
+  ) {
+    super(esFieldName, injector, order, orderType)
+  }
+
+  getAvailableValues(): Observable<FieldAvailableValue[]> {
+    // TODO: return an array of dates to show which one are available in the date picker
+    return of([])
+  }
+
+  getType(): FieldType {
+    return 'dateRange'
+  }
+}

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

@@ -1,4 +1,3 @@
-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'

package/src/libs/ui/catalog/src/lib/catalog-title/catalog-title.component.ts

@@ -1,9 +1,12 @@
 import { Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-catalog-title',
   templateUrl: './catalog-title.component.html',
   styleUrls: ['./catalog-title.component.css'],
+  standalone: true,
+  imports: [CommonModule],
 })
 export class CatalogTitleComponent {
   @Input() name: string

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

@@ -1,6 +1,6 @@
 <gn-ui-dropdown-selector
   [title]="'languages'"
-  [choices]="languageList"
+  [choices]="languageChoices"
   (selectValue)="changeLanguage($event)"
   [selected]="currentLang"
   ariaName="languages"

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

@@ -1,12 +1,7 @@
-import {
-  Component,
-  Inject,
-  InjectionToken,
-  OnInit,
-  Optional,
-} from '@angular/core'
+import { Component, Inject, InjectionToken, Optional } from '@angular/core'
 import { LANGUAGE_STORAGE_KEY } from '../../../../../../libs/util/i18n/src'
 import { TranslateService } from '@ngx-translate/core'
+import { DropdownSelectorComponent } from '../../../../../../libs/ui/inputs/src'
 
 export const LANGUAGES_LIST = new InjectionToken<string[]>('languages-list')
 
@@ -16,14 +11,21 @@ const DEFAULT_LANGUAGES = ['en', 'fr']
   selector: 'gn-ui-language-switcher',
   templateUrl: './language-switcher.component.html',
   styleUrls: ['./language-switcher.component.css'],
+  imports: [DropdownSelectorComponent],
+  standalone: true,
 })
-export class LanguageSwitcherComponent implements OnInit {
-  languageList = this.languagePlaceholder || DEFAULT_LANGUAGES
+export class LanguageSwitcherComponent {
+  languageChoices = (this.languagesList || DEFAULT_LANGUAGES).map(
+    (language) => ({
+      label: `${language}`.toUpperCase(),
+      value: language,
+    })
+  )
 
   constructor(
     @Optional()
     @Inject(LANGUAGES_LIST)
-    private languagePlaceholder,
+    private languagesList: string[],
     private translate: TranslateService
   ) {}
 
@@ -31,22 +33,14 @@ export class LanguageSwitcherComponent implements OnInit {
     return this.translate.currentLang
   }
 
-  ngOnInit(): void {
-    const languages = this.languagePlaceholder || DEFAULT_LANGUAGES
-    this.languageList = languages.map((language) => ({
-      label: `${language}`.toUpperCase(),
-      value: language,
-    }))
-  }
-
-  changeLanguage(value) {
+  changeLanguage(value: unknown) {
     try {
-      localStorage.setItem(LANGUAGE_STORAGE_KEY, value)
+      localStorage.setItem(LANGUAGE_STORAGE_KEY, value as string)
       location.reload()
     } catch (error) {
       console.warn(`Language choice could not be persisted`, error)
     }
 
-    this.translate.use(value)
+    this.translate.use(value as string)
   }
 }

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

@@ -27,9 +27,8 @@
         {{ organization.description }}
       </p>
       <div class="shrink-0 text-primary opacity-50 flex leading-6">
-        <mat-icon class="material-symbols-outlined text-primary opacity-50 mr-1"
-          >folder_open
-        </mat-icon>
+        <ng-icon class="text-primary opacity-50 mr-1" name="tablerFolderOpen">
+        </ng-icon>
         <span class="mx-1" data-cy="organizationRecordsCount">{{
           organization.recordCount
         }}</span>

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

@@ -6,12 +6,23 @@ import {
   Output,
 } from '@angular/core'
 import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ThumbnailComponent } from '../../../../../../libs/ui/elements/src'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { tablerFolderOpen } from '@ng-icons/tabler-icons'
+import { TranslateModule } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-organisation-preview',
   templateUrl: './organisation-preview.component.html',
   styleUrls: ['./organisation-preview.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [ThumbnailComponent, NgIcon, TranslateModule],
+  viewProviders: [
+    provideIcons({
+      tablerFolderOpen,
+    }),
+  ],
+  standalone: true,
 })
 export class OrganisationPreviewComponent {
   @Input() organization: Organization