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

package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts

@@ -1,4 +1,4 @@
-import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const GENERIC_DATASET_RECORD: DatasetRecord = {
   uniqueIdentifier: 'my-dataset-001',

package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts

@@ -1,4 +1,4 @@
-import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const GEO2FRANCE_PLU_DATASET_RECORD: DatasetRecord = {
   uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',

package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts

@@ -1,7 +1,7 @@
 import {
   DatasetRecord,
   ServiceRecord,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export const GEOCAT_CH_DATASET_RECORD: DatasetRecord = {
   uniqueIdentifier: '8698bf0b-fceb-4f0f-989b-111e7c4af0a4',

package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts

@@ -1,4 +1,7 @@
-import { Individual, Organization } from '../../../../../../libs/common/domain/src/lib/record'
+import {
+  Individual,
+  Organization,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getRoleFromRoleCode } from '../iso19139/codelists/role.mapper'
 
 export type SourceWithUnknownProps = { [key: string]: unknown }

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -23,7 +23,7 @@ import {
   DatasetDownloadDistribution,
   DatasetServiceDistribution,
   OnlineLinkResource,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { matchProtocol } from '../common/distribution.mapper'
 import { LangService } from '../../../../../../libs/util/i18n/src'
 
@@ -323,7 +323,8 @@ export class Gn4FieldMapper {
       (/^ESRI:REST/.test(protocol) && /FeatureServer/.test(url)) ||
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
-      /^OGC:WMTS/.test(protocol)
+      /^OGC:WMTS/.test(protocol) ||
+      /ogc\W*api\W*features/i.test(protocol)
     ) {
       return 'service'
     }

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.metadata.mapper.ts

@@ -1,7 +1,7 @@
 import { Gn4FieldMapper } from './gn4.field.mapper'
 import { lastValueFrom } from 'rxjs'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { MetadataBaseMapper } from '../metadata-base.mapper'
 import { Injectable } from '@angular/core'
 import { Gn4Record } from './types'
@@ -22,7 +22,6 @@ export class Gn4MetadataMapper extends MetadataBaseMapper<Gn4Record> {
     const emptyRecord: Partial<CatalogRecord> = {
       kind: 'dataset',
       status: null,
-      updateFrequency: null,
       lineage: null,
       recordUpdated: null,
       ownerOrganization: null,

package/src/libs/api/metadata-converter/src/lib/iso19139/codelists/role.mapper.ts

@@ -1,4 +1,4 @@
-import { Role } from '../../../../../../../libs/common/domain/src/lib/record'
+import { Role } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 export function getRoleFromRoleCode(roleCode: string): Role {
   if (!roleCode) return 'unspecified'

package/src/libs/api/metadata-converter/src/lib/iso19139/codelists/status.mapper.ts

@@ -1,4 +1,4 @@
-import { RecordStatus } from '../../../../../../../libs/common/domain/src/lib/record'
+import { RecordStatus } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 export function getStatusFromStatusCode(statusCode: string): RecordStatus {
   switch (statusCode) {

package/src/libs/api/metadata-converter/src/lib/iso19139/codelists/update-frequency.mapper.ts

@@ -1,4 +1,4 @@
-import { UpdateFrequency } from '../../../../../../../libs/common/domain/src/lib/record'
+import { UpdateFrequency } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 export function getUpdateFrequencyFromFrequencyCode(
   frequencyCode: string

package/src/libs/api/metadata-converter/src/lib/iso19139/converter.ts

@@ -2,7 +2,7 @@ import {
   CatalogRecord,
   DatasetRecord,
   ServiceRecord,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   createDocument,
   createElement,

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -15,7 +15,7 @@ import {
   SpatialRepresentationType,
   UpdateFrequency,
   UpdateFrequencyCustom,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getStatusFromStatusCode } from './codelists/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from './codelists/update-frequency.mapper'
 import {

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -13,7 +13,7 @@ import {
   ServiceRecord,
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   addAttribute,
   appendChildren,

package/src/libs/api/metadata-converter/src/lib/metadata-base.mapper.ts

@@ -1,7 +1,7 @@
 import {
   CatalogRecord,
   DatasetRecord,
-} from '../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../libs/common/domain/src/lib/model/record'
 
 export class MetadataMapperContext {
   readonly location?

package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts

@@ -1,14 +1,6 @@
 import { Inject, Injectable, InjectionToken, Optional } from '@angular/core'
-import {
-  MeApiService,
-  MeResponseApiModel,
-} from '../../../../../../../libs/data-access/gn4/src'
 import { LANG_2_TO_3_MAPPER } from '../../../../../../../libs/util/i18n/src'
-import { UserModel } from '../../../../../../../libs/common/domain/src/lib/user.model'
 import { TranslateService } from '@ngx-translate/core'
-import { Observable } from 'rxjs'
-import { map, shareReplay } from 'rxjs/operators'
-import { AvatarServiceInterface } from './avatar.service.interface'
 
 export const DEFAULT_GN4_LOGIN_URL = `/geonetwork/srv/\${lang3}/catalog.signin?redirect=\${current_url}`
 export const LOGIN_URL = new InjectionToken<string>('loginUrl')
@@ -17,10 +9,6 @@ export const LOGIN_URL = new InjectionToken<string>('loginUrl')
   providedIn: 'root',
 })
 export class AuthService {
-  authReady$: Observable<UserModel>
-  user$: Observable<UserModel>
-  isAnonymous$ = this.authReady().pipe(map((user) => !user || !('id' in user)))
-
   baseLoginUrl = this.baseLoginUrlToken || DEFAULT_GN4_LOGIN_URL
   get loginUrl() {
     let baseUrl = this.baseLoginUrl
@@ -41,39 +29,6 @@ export class AuthService {
     @Optional()
     @Inject(LOGIN_URL)
     private baseLoginUrlToken: string,
-    private meApi: MeApiService,
-    private translateService: TranslateService,
-    private avatarService: AvatarServiceInterface
-  ) {
-    this.user$ = this.meApi.getMe().pipe(
-      map((apiUser) => this.mapToUserModel(apiUser)),
-      shareReplay({ bufferSize: 1, refCount: true })
-    )
-  }
-
-  // TODO: refactor authReady
-  authReady(): Observable<UserModel> {
-    if (!this.authReady$) {
-      this.authReady$ = this.meApi.getMe().pipe(
-        map((apiUser) => this.mapToUserModel(apiUser)),
-        shareReplay({ bufferSize: 1, refCount: true })
-      )
-    }
-    return this.authReady$
-  }
-
-  private mapToUserModel(apiUser: MeResponseApiModel): UserModel {
-    if (!apiUser) return null
-    const {
-      hash,
-      groupsWithRegisteredUser,
-      groupsWithEditor,
-      groupsWithReviewer,
-      groupsWithUserAdmin,
-      admin,
-      ...user
-    } = apiUser
-    const icon = this.avatarService.getProfileIcon(apiUser.hash)
-    return { ...user, profileIcon: icon } as UserModel
-  }
+    private translateService: TranslateService
+  ) {}
 }

package/src/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.ts

@@ -1,4 +1,6 @@
+import { Observable } from 'rxjs'
+
 export abstract class AvatarServiceInterface {
-  public abstract placeholder: string
-  public abstract getProfileIcon(...args): string
+  public abstract getPlaceholder(): Observable<string>
+  public abstract getProfileIcon(...args): Observable<string>
 }

package/src/libs/api/repository/src/lib/gn4/auth/gravatar.service.ts

@@ -1,6 +1,8 @@
 import { Injectable } from '@angular/core'
 import { AvatarServiceInterface } from './avatar.service.interface'
 import { Gn4SettingsService } from '../settings/gn4-settings.service'
+import { map } from 'rxjs/operators'
+import { Observable } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
@@ -9,16 +11,19 @@ export class GravatarService implements AvatarServiceInterface {
   private GRAVATAR_URL = 'https://www.gravatar.com/avatar/'
   private GRAVATAR_IDENTICON = 'mp'
 
-  constructor(private gn4SettingsService: Gn4SettingsService) {
-    this.gn4SettingsService.identicon$.subscribe(
-      (identicon) =>
-        (this.GRAVATAR_IDENTICON = identicon.replace('gravatar:', ''))
-    )
-  }
+  private readonly identicon$ = this.gn4SettingsService.identicon$.pipe(
+    map((identicon) => identicon?.replace('gravatar:', ''))
+  )
+  constructor(private gn4SettingsService: Gn4SettingsService) {}
 
-  placeholder = this.getProfileIcon('')
+  getPlaceholder(): Observable<string> {
+    return this.getProfileIcon('')
+  }
 
-  getProfileIcon(hash: string): string {
-    return `${this.GRAVATAR_URL}${hash}?d=${this.GRAVATAR_IDENTICON}`
+  getProfileIcon(hash: string): Observable<string> {
+    return this.identicon$.pipe(
+      map((identicon) => identicon || this.GRAVATAR_IDENTICON),
+      map((identicon) => `${this.GRAVATAR_URL}${hash}?d=${identicon}`)
+    )
   }
 }

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

@@ -9,9 +9,11 @@ import {
   Aggregation,
   AggregationParams,
   AggregationsParams,
+  FieldFilter,
+  FieldFilters,
   FilterAggregationParams,
   SortByField,
-} from '../../../../../../../libs/common/domain/src/lib/search'
+} from '../../../../../../../libs/common/domain/src/lib/model/search'
 import { METADATA_LANGUAGE } from '../../metadata-language'
 import {
   AggregationResult,
@@ -211,17 +213,36 @@ export class ElasticsearchService {
     return this.metadataLang === 'current'
   }
 
+  private filtersToQueryString(filters: FieldFilters): string {
+    const makeQuery = (filter: FieldFilter): string => {
+      if (typeof filter === 'string') {
+        return filter
+      }
+      return Object.keys(filter)
+        .map((key) => {
+          if (filter[key] === true) {
+            return `"${key}"`
+          }
+          return `-"${key}"`
+        })
+        .join(' OR ')
+    }
+    return Object.keys(filters)
+      .filter(
+        (fieldname) =>
+          filters[fieldname] && JSON.stringify(filters[fieldname]) !== '{}'
+      )
+      .map((fieldname) => `${fieldname}:(${makeQuery(filters[fieldname])})`)
+      .join(' AND ')
+  }
+
   private buildPayloadQuery(
     { any, ...fieldSearchFilters }: SearchFilters,
     configFilters: SearchFilters,
     uuids?: string[],
     geometry?: Geometry
   ) {
-    const queryFilters = this.stateFiltersToQueryString(fieldSearchFilters)
-    const must = [this.queryFilterOnValues('isTemplate', 'n')] as Record<
-      string,
-      unknown
-    >[]
+    const must = [] as Record<string, unknown>[]
     const must_not = {
       ...this.queryFilterOnValues('resourceType', [
         'service',
@@ -231,6 +252,10 @@ export class ElasticsearchService {
       ]),
     }
     const should = [] as Record<string, unknown>[]
+    const filter = [this.queryFilterOnValues('isTemplate', 'n')] as Record<
+      string,
+      unknown
+    >[]
 
     if (any) {
       must.push({
@@ -241,15 +266,16 @@ export class ElasticsearchService {
         },
       })
     }
+    const queryFilters = this.filtersToQueryString(fieldSearchFilters)
     if (queryFilters) {
-      must.push({
+      filter.push({
         query_string: {
           query: queryFilters,
         },
       })
     }
     if (uuids) {
-      must.push({
+      filter.push({
         ids: {
           values: uuids,
         },
@@ -283,7 +309,7 @@ export class ElasticsearchService {
         must,
         must_not,
         should,
-        filter: [],
+        filter,
       },
     }
   }
@@ -376,6 +402,7 @@ export class ElasticsearchService {
    *   }
    * }
    */
+  // FIXME: this is not used anymore
   stateFiltersToQueryString(facetsState) {
     const query = []
     for (const indexKey in facetsState) {
@@ -393,6 +420,7 @@ export class ElasticsearchService {
     return this.combineQueryGroups(query)
   }
 
+  // FIXME: this is not used anymore
   private parseStateNode(nodeName, node, indexKey) {
     let queryString = ''
     if (node && typeof node === 'object') {
@@ -444,20 +472,24 @@ export class ElasticsearchService {
   }
 
   buildAggregationsPayload(aggregations: AggregationsParams): any {
-    const mapFilterAggregation = (filterAgg: FilterAggregationParams) => ({
-      match: filterAgg,
-    })
     const mapToESAggregation = (aggregation: AggregationParams) => {
       switch (aggregation.type) {
         case 'filters':
           return {
-            filters: Object.keys(aggregation.filters).reduce(
-              (prev, curr) => ({
+            filters: Object.keys(aggregation.filters).reduce((prev, curr) => {
+              const filter = aggregation.filters[curr]
+              return {
                 ...prev,
-                [curr]: mapFilterAggregation(aggregation.filters[curr]),
-              }),
-              {}
-            ),
+                [curr]: {
+                  query_string: {
+                    query:
+                      typeof filter === 'string'
+                        ? filter
+                        : this.filtersToQueryString(filter),
+                  },
+                },
+              }
+            }, {}),
           }
         case 'terms':
           return {

package/src/libs/api/repository/src/lib/gn4/favorites/favorites.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core'
 import { merge, Observable, of, Subject, throwError } from 'rxjs'
 import { UserselectionsApiService } from '../../../../../../../libs/data-access/gn4/src'
-import { AuthService } from '../auth/auth.service'
 import {
   catchError,
   map,
@@ -11,6 +10,7 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 
 const SELECTION_ID = 0 // hardcoded to always point on the first selection
 
@@ -18,8 +18,8 @@ const SELECTION_ID = 0 // hardcoded to always point on the first selection
   providedIn: 'root',
 })
 export class FavoritesService {
-  private myUserId$ = this.authService
-    .authReady()
+  private myUserId$ = this.platformService
+    .getMe()
     .pipe(map((userInfo) => (userInfo ? parseInt(userInfo.id) : null)))
 
   // this observable loads the current list of favorites from the API
@@ -52,7 +52,7 @@ export class FavoritesService {
 
   constructor(
     private userSelectionsService: UserselectionsApiService,
-    private authService: AuthService
+    private platformService: PlatformServiceInterface
   ) {}
 
   addToFavorites(uuids: string[]): Observable<void> {

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -2,22 +2,22 @@ import { Injectable } from '@angular/core'
 import { SearchApiService } from '../../../../../../libs/data-access/gn4/src'
 import { ElasticsearchService } from './elasticsearch'
 import { Observable, of, switchMap } from 'rxjs'
-import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/records-repository.interface'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import {
   SearchParams,
   SearchResults,
-} from '../../../../../../libs/common/domain/src/lib/search/search.model'
+} from '../../../../../../libs/common/domain/src/lib/model/search/search.model'
 import {
   Aggregations,
   AggregationsParams,
   FieldFilters,
-} from '../../../../../../libs/common/domain/src/lib/search'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 import { map } from 'rxjs/operators'
 import {
   Gn4MetadataMapper,
   Gn4SearchResults,
 } from '../../../../../../libs/api/metadata-converter/src'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/record'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 export class Gn4Repository implements RecordsRepositoryInterface {
@@ -39,6 +39,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
+        null,
         JSON.stringify(
           this.gn4SearchHelper.getSearchRequestBody(
             {},
@@ -67,6 +68,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'records-count',
+        null,
         JSON.stringify({
           ...this.gn4SearchHelper.getSearchRequestBody(
             {},
@@ -88,6 +90,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
+        null,
         JSON.stringify(
           this.gn4SearchHelper.getMetadataByIdPayload(uniqueIdentifier)
         )
@@ -104,6 +107,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
+        null,
         JSON.stringify(
           this.gn4SearchHelper.getRelatedRecordPayload(
             similarTo.title,
@@ -126,6 +130,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
+        null,
         JSON.stringify(this.gn4SearchHelper.getSearchRequestBody(aggregations))
       )
       .pipe(
@@ -148,6 +153,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
+        null,
         JSON.stringify(this.gn4SearchHelper.buildAutocompletePayload(query))
       )
       .pipe(

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -0,0 +1,14 @@
+import { Provider } from '@angular/core'
+import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { Gn4PlatformService } from './platform/gn4-platform.service'
+import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+
+export function provideGn4(): Provider[] {
+  return [
+    {
+      provide: PlatformServiceInterface,
+      useClass: Gn4PlatformService,
+    },
+    Gn4PlatformMapper,
+  ]
+}

package/src/libs/api/repository/src/lib/gn4/index.ts

@@ -4,3 +4,5 @@ export * from './elasticsearch'
 export * from './settings/gn4-settings.service'
 export * from './auth'
 export * from './favorites/favorites.service'
+export * from './selection/selection.service'
+export * from './gn4.provider'

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts

@@ -8,11 +8,11 @@ import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
 import { LANG_2_TO_3_MAPPER } from '../../../../../../../libs/util/i18n/src'
-import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/search'
+import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
   Organization,
-} from '../../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { OrganizationsServiceInterface } from '../../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { ElasticsearchService } from '../elasticsearch'
 import { getAsUrl, MetadataObject } from '../../../../../../../libs/api/metadata-converter/src'
@@ -29,6 +29,7 @@ export class OrganizationsFromGroupsService
   private groupsAggregation$ = this.searchApiService
     .search(
       'bucket',
+      null,
       JSON.stringify(
         this.esService.getSearchRequestBody({
           groups: {