geonetwork-ui 2.1.0-initial → 2.1.0

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

@@ -0,0 +1,114 @@
+import { Injectable } from '@angular/core'
+import { Observable, of, switchMap } from 'rxjs'
+import { catchError, map, shareReplay, tap } from 'rxjs/operators'
+import {
+  MeApiService,
+  RegistriesApiService,
+  SiteApiService,
+  ToolsApiService,
+  UsersApiService,
+} from '../../../../../../../libs/data-access/gn4/src'
+import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
+import { Organization } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { Gn4PlatformMapper } from './gn4-platform.mapper'
+import { ltr } from 'semver'
+import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
+
+const minApiVersion = '4.2.2'
+@Injectable()
+export class Gn4PlatformService implements PlatformServiceInterface {
+  private readonly type = 'GeoNetwork'
+  private me$: Observable<UserModel>
+  private users$: Observable<UserModel[]>
+  private isAnonymous$: Observable<boolean>
+
+  private keyTranslations$ = this.toolsApiService
+    .getTranslationsPackage1('gnui')
+    .pipe(
+      catchError(() => {
+        console.warn('Error while loading gnui language package')
+        return of({})
+      }),
+      shareReplay(1)
+    )
+
+  private settings$ = of(true).pipe(
+    switchMap(() => this.siteApiService.getSiteOrPortalDescription()),
+    shareReplay(1)
+  )
+
+  private readonly apiVersion$ = this.settings$.pipe(
+    map((info) => info['system/platform/version'] as string),
+    tap((version) => {
+      if (ltr(version, minApiVersion)) {
+        throw new Error(
+          `Gn4 API version is not compatible.\nMinimum: ${minApiVersion}\nYour version: ${version}`
+        )
+      }
+    }),
+    shareReplay(1)
+  )
+
+  constructor(
+    private siteApiService: SiteApiService,
+    private meApi: MeApiService,
+    private usersApi: UsersApiService,
+    private mapper: Gn4PlatformMapper,
+    private toolsApiService: ToolsApiService,
+    private registriesApiService: RegistriesApiService
+  ) {
+    this.me$ = this.meApi.getMe().pipe(
+      switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
+      shareReplay({ bufferSize: 1, refCount: true })
+    )
+    this.isAnonymous$ = this.me$.pipe(map((user) => !user || !('id' in user)))
+    this.users$ = this.usersApi.getUsers().pipe(
+      map((users) => users.map((user) => this.mapper.userFromApi(user))),
+      shareReplay()
+    )
+  }
+
+  getType(): string {
+    return this.type
+  }
+
+  getApiVersion(): Observable<string> {
+    return this.apiVersion$
+  }
+
+  getMe(): Observable<UserModel> {
+    return this.me$
+  }
+
+  isAnonymous(): Observable<boolean> {
+    return this.isAnonymous$
+  }
+
+  getOrganizations(): Observable<Organization[]> {
+    return undefined
+  }
+
+  getUsersByOrganization(organisation: Organization): Observable<UserModel[]> {
+    return undefined
+  }
+
+  getUsers(): Observable<UserModel[]> {
+    return this.users$
+  }
+
+  translateKey(key: string): Observable<string> {
+    return this.keyTranslations$.pipe(map((translations) => translations[key]))
+  }
+
+  getThesaurusByLang(
+    thesaurusName: string,
+    lang: string
+  ): Observable<ThesaurusModel> {
+    return this.registriesApiService
+      .searchKeywords(null, lang, 1000, 0, null, [thesaurusName])
+      .pipe(
+        map((thesaurus) => this.mapper.thesaurusFromApi(thesaurus as any[]))
+      )
+  }
+}

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

@@ -0,0 +1,80 @@
+import { Injectable } from '@angular/core'
+import { CatalogRecord } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { SelectionsApiService } from '../../../../../../../libs/data-access/gn4/src'
+import { BehaviorSubject, Observable, Subscription, map, tap } from 'rxjs'
+
+const BUCKET_ID = 'gnui'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SelectionService {
+  selectedRecordsIdentifiers$: BehaviorSubject<string[]> = new BehaviorSubject(
+    []
+  )
+  subscription: Subscription
+
+  constructor(private selectionsApi: SelectionsApiService) {
+    this.selectionsApi.get(BUCKET_ID).subscribe((selectedIds) => {
+      this.addIdsToSelected(Array.from(selectedIds))
+    })
+  }
+
+  private addIdsToSelected(ids: string[]) {
+    const currentIds = this.selectedRecordsIdentifiers$.value
+    const uniqueSet = new Set([...currentIds, ...ids])
+    this.selectedRecordsIdentifiers$.next([...uniqueSet])
+  }
+
+  private removeIdsFromSelected(ids: string[]) {
+    const filtered = this.selectedRecordsIdentifiers$.value.filter(
+      (value) => !ids.includes(value)
+    )
+    this.selectedRecordsIdentifiers$.next(filtered)
+  }
+
+  selectRecords(records: CatalogRecord[]): Observable<void> {
+    const newIds = []
+    records.map((record) => {
+      newIds.push(record.uniqueIdentifier)
+    })
+    const apiResponse = this.selectionsApi.add(BUCKET_ID, newIds)
+    return apiResponse.pipe(
+      tap(() => {
+        this.addIdsToSelected(newIds)
+      }),
+      map(() => undefined)
+    )
+  }
+
+  deselectRecords(records: CatalogRecord[]): Observable<void> {
+    const idsToBeRemoved = []
+    records.map((record) => {
+      idsToBeRemoved.push(record.uniqueIdentifier)
+    })
+    const apiResponse = this.selectionsApi.clear(BUCKET_ID, idsToBeRemoved)
+    return apiResponse.pipe(
+      tap(() => {
+        this.removeIdsFromSelected(idsToBeRemoved)
+      }),
+      map(() => undefined)
+    )
+  }
+
+  clearSelection(): Observable<void> {
+    const currentSelectedResponse = this.selectionsApi.get(BUCKET_ID)
+    let currentSelection
+    this.subscription = currentSelectedResponse.subscribe((value) => {
+      currentSelection = [...value]
+    })
+    this.selectionsApi.clear(BUCKET_ID, currentSelection)
+    const apiResponse = this.selectionsApi.clear(BUCKET_ID, currentSelection)
+
+    return apiResponse.pipe(
+      tap(() => {
+        this.removeIdsFromSelected(currentSelection)
+      }),
+      map(() => undefined)
+    )
+  }
+}

package/src/libs/common/domain/src/lib/{record → model/record}/metadata.model.ts

@@ -98,6 +98,7 @@ export type ServiceProtocol =
   | 'wps'
   | 'wmts'
   | 'esriRest'
+  | 'ogcFeatures'
   | 'other'
 
 export type DatasetDistributionType = 'service' | 'download' | 'link'

package/src/libs/common/domain/src/lib/{search → model/search}/aggregation.model.ts

@@ -1,5 +1,5 @@
 import { FieldName } from './search.model'
-import { FieldFilter } from './filter.model'
+import { FieldFilters } from './filter.model'
 
 export interface TermsAggregationParams {
   type: 'terms'
@@ -13,7 +13,7 @@ export interface HistogramAggregationParams {
   field: FieldName
   interval: number
 }
-export type FilterAggregationParams = Record<string, FieldFilter> | string
+export type FilterAggregationParams = FieldFilters | string
 export interface FiltersAggregationParams {
   type: 'filters'
   filters: Record<string, FilterAggregationParams>

package/src/libs/common/domain/src/lib/model/thesaurus/index.ts

@@ -0,0 +1 @@
+export * from './thesaurus.model'

package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts

@@ -0,0 +1,6 @@
+export interface ThesaurusItemModel {
+  key: string
+  label: string
+}
+
+export type ThesaurusModel = ThesaurusItemModel[]

package/src/libs/common/domain/src/lib/organizations.service.interface.ts

@@ -1,7 +1,6 @@
 import { Observable } from 'rxjs'
-import { FieldFilters } from './search/filter.model'
-import { Organization } from './record/organization.model'
-import { BaseRecord, CatalogRecord } from './record/metadata.model'
+import { BaseRecord, CatalogRecord, Organization } from './model/record'
+import { FieldFilters } from './model/search'
 
 export abstract class OrganizationsServiceInterface {
   public abstract organisations$: Observable<Organization[]>

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -0,0 +1,22 @@
+import type { Observable } from 'rxjs'
+import type { UserModel } from './model/user/user.model'
+import type { Organization } from './model/record/organization.model'
+import type { ThesaurusModel } from './model/thesaurus/'
+
+export abstract class PlatformServiceInterface {
+  abstract getType(): string
+  abstract getApiVersion(): Observable<string>
+
+  abstract getMe(): Observable<UserModel>
+  abstract isAnonymous(): Observable<boolean>
+  abstract getUsers(): Observable<UserModel[]>
+  abstract getUsersByOrganization(
+    organisation: Organization
+  ): Observable<UserModel[]>
+  abstract getOrganizations(): Observable<Organization[]>
+  abstract translateKey(key: string): Observable<string>
+  abstract getThesaurusByLang(
+    thesaurusName: string,
+    lang: string
+  ): Observable<ThesaurusModel>
+}

package/src/libs/common/domain/src/lib/{records-repository.interface.ts → repository/records-repository.interface.ts}

@@ -5,8 +5,8 @@ import {
   FieldFilters,
   SearchParams,
   SearchResults,
-} from './search'
-import { CatalogRecord } from './record/metadata.model'
+} from '../model/search'
+import { CatalogRecord } from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
   abstract search(params: SearchParams): Observable<SearchResults>

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -141,4 +141,9 @@ export const ES_LINK_FIXTURES: Record<string, unknown> = deepFreeze({
     name: 'Vue HTML des métadonnées sur internet',
     url: 'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480',
   },
+  geodataogcfeatures: {
+    protocol: 'OGC API - Features',
+    name: 'ogcapi features layer',
+    url: 'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?',
+  },
 })

package/src/libs/common/fixtures/src/lib/link.fixtures.ts

@@ -1,5 +1,5 @@
 import { deepFreeze } from './utils/freeze'
-import { DatasetDistribution } from '../../../../../libs/common/domain/src/lib/record'
+import { DatasetDistribution } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export const LINK_FIXTURES: Record<string, DatasetDistribution> = deepFreeze({
   readmeLink: {
@@ -151,4 +151,12 @@ export const LINK_FIXTURES: Record<string, DatasetDistribution> = deepFreeze({
       'http://catalogue.geo-ide.developpement-durable.gouv.fr/catalogue/srv/fre/catalog.search#/metadata/fr-120066022-jdd-199fd14c-2abb-4c14-b0f8-6c8d92e7b480'
     ),
   },
+  ogcApiFormat: {
+    name: 'ogc api features layer',
+    type: 'service',
+    url: new URL(
+      'https://mel.integration.apps.gs-fr-prod.camptocamp.com/data/ogcapi/collections/comptages_velo/items?'
+    ),
+    accessServiceProtocol: 'ogcFeatures',
+  },
 })

package/src/libs/common/fixtures/src/lib/organisations.fixture.ts

@@ -1,5 +1,5 @@
 import { deepFreeze } from './utils/freeze'
-import { Organization } from '../../../../../libs/common/domain/src/lib/record'
+import { Organization } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export const ORGANISATIONS_FIXTURE: Organization[] = deepFreeze([
   {
@@ -68,4 +68,22 @@ export const ORGANISATIONS_FIXTURE: Organization[] = deepFreeze([
     logoUrl: new URL('https://my-geonetwork.org/logo10.png'),
     recordCount: 2,
   },
+  {
+    name: 'wizard-org',
+    description: 'another org for testing',
+    logoUrl: new URL('https://my-geonetwork.org/logo11.png'),
+    recordCount: 2,
+  },
+  {
+    name: "Université de l'Ingénierie",
+    description: 'another org for testing',
+    logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
+    recordCount: 2,
+  },
+  {
+    name: 'ARS / Agence régionale de santé',
+    description: 'another org for testing',
+    logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
+    recordCount: 2,
+  },
 ])

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -1,4 +1,4 @@
-import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/record'
+import { DatasetRecord } from '../../../../../libs/common/domain/src/lib/model/record'
 import { deepFreeze } from './utils/freeze'
 
 export const DATASET_RECORDS: DatasetRecord[] = deepFreeze([

package/src/libs/common/fixtures/src/lib/repository.fixtures.ts

@@ -1,5 +1,5 @@
 import { deepFreeze } from './utils/freeze'
-import { SearchResults } from '../../../../../libs/common/domain/src/lib/search'
+import { SearchResults } from '../../../../../libs/common/domain/src/lib/model/search'
 import { DATASET_RECORDS } from './records.fixtures'
 
 export const SAMPLE_SEARCH_RESULTS: SearchResults = deepFreeze({

package/src/libs/common/fixtures/src/lib/search/aggregations.ts

@@ -3,7 +3,7 @@ import {
   AggregationParams,
   Aggregations,
   AggregationsParams,
-} from '../../../../../../libs/common/domain/src/lib/search'
+} from '../../../../../../libs/common/domain/src/lib/model/search'
 
 export const TERMS_AGGREGATION: AggregationParams = {
   type: 'terms',

package/src/libs/common/fixtures/src/lib/user.fixtures.ts

@@ -1,4 +1,4 @@
-import { UserModel } from '../../../../../libs/common/domain/src/lib/user.model'
+import { UserModel } from '../../../../../libs/common/domain/src/lib/model/user/user.model'
 
 export const USER_FIXTURE = (): UserModel => ({
   id: '46798',
@@ -12,8 +12,21 @@ export const USER_FIXTURE = (): UserModel => ({
     'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
 })
 
+export const USER_FIXTURE_ANON = (): UserModel => ({
+  id: '161',
+  profile: 'Administrator',
+  username: 'ghost16',
+  name: 'Ghost',
+  surname: 'Old',
+  email: 'old.ghost@wiz.fr',
+  organisation: 'wizard-org',
+  profileIcon:
+    'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
+})
+
 export const USERS_FIXTURE = (): UserModel[] => [
   USER_FIXTURE(),
+  USER_FIXTURE_ANON(),
   {
     id: '1',
     profile: 'Editor',
@@ -32,4 +45,22 @@ export const USERS_FIXTURE = (): UserModel[] => [
     email: 't.trinity@matrix.com',
     organisation: 'The matrix',
   },
+  {
+    id: '3',
+    profile: 'Editor',
+    username: 'voldy63',
+    name: 'Lord',
+    surname: 'Voldemort',
+    email: 'lord.voldy@wiz.com',
+    organisation: 'wizard-org',
+  },
+  {
+    id: '4',
+    profile: 'Editor',
+    username: 'al.dumble98',
+    name: 'Albus',
+    surname: 'Dumblerdore',
+    email: 'albus.dumble@wiz.com',
+    organisation: 'wizard-org',
+  },
 ]

package/src/libs/data-access/gn4/src/openapi/api/api.ts

@@ -1,5 +1,9 @@
+export * from './atom.api.service'
+import { AtomApiService } from './atom.api.service'
 export * from './customstyle.api.service'
 import { CustomstyleApiService } from './customstyle.api.service'
+export * from './formatters.api.service'
+import { FormattersApiService } from './formatters.api.service'
 export * from './groups.api.service'
 import { GroupsApiService } from './groups.api.service'
 export * from './harvesters.api.service'
@@ -14,6 +18,8 @@ export * from './logos.api.service'
 import { LogosApiService } from './logos.api.service'
 export * from './mapservers.api.service'
 import { MapserversApiService } from './mapservers.api.service'
+export * from './mapservices.api.service'
+import { MapservicesApiService } from './mapservices.api.service'
 export * from './me.api.service'
 import { MeApiService } from './me.api.service'
 export * from './operations.api.service'
@@ -57,7 +63,9 @@ import { UsersearchesApiService } from './usersearches.api.service'
 export * from './userselections.api.service'
 import { UserselectionsApiService } from './userselections.api.service'
 export const APIS = [
+  AtomApiService,
   CustomstyleApiService,
+  FormattersApiService,
   GroupsApiService,
   HarvestersApiService,
   IdentifiersApiService,
@@ -65,6 +73,7 @@ export const APIS = [
   LinksApiService,
   LogosApiService,
   MapserversApiService,
+  MapservicesApiService,
   MeApiService,
   OperationsApiService,
   PagesApiService,