geonetwork-ui 2.2.0-dev.886aae61 → 2.2.0-dev.8a17994e

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

@@ -25,7 +25,14 @@ import {
   SourceWithUnknownProps,
 } from '../../../../../../../libs/api/metadata-converter/src'
 import { combineLatest, Observable, of, switchMap, takeLast } from 'rxjs'
-import { filter, map, shareReplay, startWith, tap } from 'rxjs/operators'
+import {
+  filter,
+  map,
+  shareReplay,
+  startWith,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
@@ -296,15 +303,28 @@ export class OrganizationsFromMetadataService
 
     const ownerOrganization = allContactOrgs[0]
 
+    // read the owner group as well to have a fallback logo
+    const groupId = selectField(source, 'groupOwner')
+    const group$ = this.groups$.pipe(
+      map((groups) =>
+        groups.find((group) => {
+          return group.id === Number(groupId)
+        })
+      )
+    )
+
     return this.organisations$.pipe(
       takeLast(1),
-      map((organisations: IncompleteOrganization[]) => {
+      withLatestFrom(group$),
+      map(([organisations, group]: [Organization[], GroupApiModel]) => {
         const recordOrganisation = organisations.filter(
           (org) => org.name === ownerOrganization.name
         )[0]
+        const logoUrl = group?.logo && getAsUrl(`${IMAGE_URL}${group.logo}`)
         return {
           ...record,
           ownerOrganization: {
+            logoUrl,
             ...ownerOrganization,
             ...recordOrganisation,
           },

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

@@ -45,12 +45,23 @@ export class Gn4PlatformMapper {
     return { ...apiUser, id: id.toString() } as UserModel
   }
 
-  thesaurusFromApi(thesaurus: any[]): ThesaurusModel {
+  thesaurusFromApi(thesaurus: any[], lang3?: string): ThesaurusModel {
     return thesaurus.map((keyword) => {
-      const { uri, value } = keyword
+      let key = keyword.uri
+      // sometines GN can prefix an URI with an "all thesaurus" URI; only keep the last one
+      if (key.indexOf('@@@') > -1) {
+        key = key.split('@@@')[1]
+      }
+      const label =
+        lang3 && lang3 in keyword.values ? keyword.values[lang3] : keyword.value
+      const description =
+        lang3 && lang3 in keyword.definitions
+          ? keyword.definitions[lang3]
+          : keyword.definition
       return {
-        key: uri,
-        label: value,
+        key,
+        label,
+        description,
       }
     })
   }

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

@@ -14,8 +14,10 @@ import { Organization } from '../../../../../../../libs/common/domain/src/lib/mo
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
+import { LangService } from '../../../../../../../libs/util/i18n/src'
 
 const minApiVersion = '4.2.2'
+
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
@@ -50,13 +52,20 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     shareReplay(1)
   )
 
+  /**
+   * A map of already loaded thesauri (groups of keywords); the key is a URI
+   * @private
+   */
+  private thesauri: Record<string, Observable<ThesaurusModel>> = {}
+
   constructor(
     private siteApiService: SiteApiService,
     private meApi: MeApiService,
     private usersApi: UsersApiService,
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
-    private registriesApiService: RegistriesApiService
+    private registriesApiService: RegistriesApiService,
+    private langService: LangService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -98,17 +107,47 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   }
 
   translateKey(key: string): Observable<string> {
+    // if the key is a URI, use the registries API to look for the translation
+    if (key.match(/^https?:\/\//)) {
+      // the thesaurus URI is inferred by removing a part of the keyword URI
+      // this is not exact science but it's OK, we'll still end up loading a bunch of keywords at once anyway
+      const thesaurusUri = key.replace(/\/([^/]+)$/, '/')
+      return this.getThesaurusByUri(thesaurusUri).pipe(
+        map((thesaurus) => {
+          for (const item of thesaurus) {
+            if (item.key === key) return item.label
+          }
+          return key
+        })
+      )
+    }
     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])
+  getThesaurusByUri(uri: string): Observable<ThesaurusModel> {
+    if (this.thesauri[uri]) {
+      return this.thesauri[uri]
+    }
+    this.thesauri[uri] = this.registriesApiService
+      .searchKeywords(
+        null,
+        this.langService.iso3,
+        1000,
+        0,
+        null,
+        null,
+        null,
+        `${uri}*`
+      )
       .pipe(
-        map((thesaurus) => this.mapper.thesaurusFromApi(thesaurus as any[]))
+        map((thesaurus) =>
+          this.mapper.thesaurusFromApi(
+            thesaurus as any[],
+            this.langService.iso3
+          )
+        ),
+        shareReplay(1)
       )
+    return this.thesauri[uri]
   }
 }

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

@@ -1,7 +1,7 @@
 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'
+import { BehaviorSubject, firstValueFrom } from 'rxjs'
 
 const BUCKET_ID = 'gnui'
 
@@ -12,7 +12,6 @@ export class SelectionService {
   selectedRecordsIdentifiers$: BehaviorSubject<string[]> = new BehaviorSubject(
     []
   )
-  subscription: Subscription
 
   constructor(private selectionsApi: SelectionsApiService) {
     this.selectionsApi.get(BUCKET_ID).subscribe((selectedIds) => {
@@ -33,48 +32,25 @@ export class SelectionService {
     this.selectedRecordsIdentifiers$.next(filtered)
   }
 
-  selectRecords(records: CatalogRecord[]): Observable<void> {
-    const newIds = []
-    records.map((record) => {
-      newIds.push(record.uniqueIdentifier)
+  selectRecords(records: CatalogRecord[]) {
+    const newIds = records.map((record) => record.uniqueIdentifier)
+    this.selectionsApi.add(BUCKET_ID, newIds).subscribe(() => {
+      this.addIdsToSelected(newIds)
     })
-    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)
+  deselectRecords(records: CatalogRecord[]) {
+    const idsToBeRemoved = records.map((record) => record.uniqueIdentifier)
+    this.selectionsApi.clear(BUCKET_ID, idsToBeRemoved).subscribe(() => {
+      this.removeIdsFromSelected(idsToBeRemoved)
     })
-    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]
+  async clearSelection() {
+    const response = await firstValueFrom(this.selectionsApi.get(BUCKET_ID))
+    const currentSelection = Array.from(response)
+    this.selectionsApi.clear(BUCKET_ID, currentSelection).subscribe(() => {
+      this.removeIdsFromSelected(currentSelection)
     })
-    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/index.ts

@@ -0,0 +1,2 @@
+export * from './organizations.service.interface'
+export * from './platform.service.interface'

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

@@ -1,6 +1,7 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { Individual } from './contact.model'
-import { Organization } from './organization.model'
+import type { Individual } from './contact.model'
+import type { Organization } from './organization.model'
+import type { Geometry } from 'geojson'
 
 type Uuid = string
 
@@ -47,13 +48,7 @@ export const RecordStatusValues = [
 ]
 export type RecordStatus = typeof RecordStatusValues[number]
 
-export type AccessConstraintType = 'security' | 'privacy' | 'legal' | 'other'
-export interface AccessConstraint {
-  text: string
-  type: AccessConstraintType
-}
-
-export type License = {
+export type Constraint = {
   text: string
   url?: URL
 }
@@ -65,6 +60,22 @@ export type SpatialRepresentationType =
   | 'table'
   | 'point'
 
+export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
+
+export type KeywordThesaurus = {
+  id: string
+  name?: string
+  url?: URL
+}
+
+export interface Keyword {
+  label: string
+  type: KeywordType
+  thesaurus?: KeywordThesaurus
+}
+// languages should be expressed using two-letters ISO 639-1 codes
+export type LanguageCode = string
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -73,19 +84,20 @@ export interface BaseRecord {
   abstract: string
   recordCreated?: Date
   recordUpdated: Date
+  recordPublished?: Date
+  languages: Array<LanguageCode>
   kind: RecordKind
-  themes: Array<string> // TODO: handle codelists
-  keywords: Array<string> // TODO: handle thesaurus and id
-  accessConstraints: Array<AccessConstraint>
-  useLimitations: Array<string>
-  legalConstraints?: Array<string>
-  licenses: Array<License>
+  topics: Array<string> // TODO: handle codelists
+  keywords: Array<Keyword>
+  licenses: Array<Constraint>
+  legalConstraints: Array<Constraint>
+  securityConstraints: Array<Constraint>
+  otherConstraints: Array<Constraint>
   overviews: Array<GraphicOverview>
   extras?: Record<string, unknown>
   landingPage?: URL
   updateFrequency?: UpdateFrequency
 
-  // to add: iso19139.topicCategory
   // to add: canonical url
   // to add: source catalog (??)
   // to add: is open data ?
@@ -122,6 +134,7 @@ export interface DatasetDownloadDistribution {
   // textEncoding?: string
   name?: string
   description?: string
+  accessServiceProtocol?: ServiceProtocol
 }
 
 export interface OnlineLinkResource {
@@ -145,13 +158,16 @@ export interface GraphicOverview {
 }
 
 export interface DatasetSpatialExtent {
-  geometry: unknown // GeoJSON
+  geometry: Geometry
   description?: string
 }
 
+/**
+ * At least a start or an end date should be provided
+ */
 export interface DatasetTemporalExtent {
-  start: Date
-  end: Date
+  start?: Date
+  end?: Date
   description?: string
 }
 
@@ -163,8 +179,8 @@ export interface DatasetRecord extends BaseRecord {
   datasetUpdated?: Date
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
   distributions: Array<DatasetDistribution>
-  spatialExtents: Array<DatasetSpatialExtent> // not handled yet
-  temporalExtents: Array<DatasetTemporalExtent> // not handled yet
+  spatialExtents: Array<DatasetSpatialExtent>
+  temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
 }
 

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

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 import { FieldFilters } from './filter.model'
 
 export interface TermsAggregationParams {

package/src/libs/common/domain/src/lib/model/search/field.model.ts

@@ -0,0 +1 @@
+export type FieldName = string

package/src/libs/common/domain/src/lib/model/search/filter.model.ts

@@ -1,4 +1,4 @@
-import { FieldName } from './search.model'
+import { FieldName } from './field.model'
 
 export type FieldFilterByValues = Record<string, boolean>
 export type FieldFilterByExpression = string | number

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

@@ -2,3 +2,4 @@ export * from './aggregation.model'
 export * from './filter.model'
 export * from './search.model'
 export * from './sort-by.model'
+export * from './field.model'

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

@@ -1,10 +1,10 @@
 import { FieldFilters } from './filter.model'
 import { CatalogRecord } from '../record'
 import { Geometry } from 'geojson'
+import { FieldName } from './field.model'
 
-type FieldSort = ['desc' | 'asc', FieldName]
+export type FieldSort = ['desc' | 'asc', FieldName]
 export type SortByField = FieldSort | FieldSort[] // several sort criteria can be used!
-export type FieldName = string
 
 export interface SearchParams {
   filters?: FieldFilters

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

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

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

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

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

@@ -15,8 +15,5 @@ export abstract class PlatformServiceInterface {
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
-  abstract getThesaurusByLang(
-    thesaurusName: string,
-    lang: string
-  ): Observable<ThesaurusModel>
+  abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
 }

package/src/libs/common/fixtures/src/lib/elasticsearch/full-response.ts

@@ -131,7 +131,7 @@ export const ES_FIXTURE_FULL_RESPONSE = deepFreeze({
           creationDateForResource: ['2012-01-01T00:00:00.000Z'],
           creationYearForResource: '2012',
           creationMonthForResource: '2012-01',
-          publicationDateForResource: ['2021-04-01T00:00:00.000Z'],
+          publicationDateForResource: '2021-04-01T00:00:00.000Z',
           publicationYearForResource: '2021',
           publicationMonthForResource: '2021-04',
           resourceDate: [

package/src/libs/common/fixtures/src/lib/gn4/groups.fixtures.ts

@@ -64,7 +64,7 @@ export const GROUPS_FIXTURE = deepFreeze([
     defaultCategory: null,
     allowedCategories: [],
     enableAllowedCategories: false,
-    id: 348385324,
+    id: 2,
     email: 'ifremer.ifremer@ifremer.admin.fr',
     referrer: null,
     description: "Institut français de recherche pour l'exploitation de la mer",

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

@@ -69,8 +69,24 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
         url: new URL('http://my-org.net/two.png'),
       },
     ],
-    keywords: ['international', 'test', '_another_keyword_'],
-    themes: ['testData', 'exampleData'],
+    keywords: [
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'international',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'test',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: '_another_keyword_',
+      },
+    ],
+    topics: ['testData', 'exampleData'],
     spatialRepresentation: 'grid',
     distributions: [
       {
@@ -115,7 +131,7 @@ As such, **it is not very interesting at all.**`,
         url: new URL('https://data.rennesmetropole.fr/pages/licence/'),
       },
     ],
-    accessConstraints: [
+    legalConstraints: [
       {
         text: "Dataset access isn't possible since it does not really exist",
         type: 'other',
@@ -125,12 +141,15 @@ As such, **it is not very interesting at all.**`,
         type: 'security',
       },
     ],
+    securityConstraints: [],
+    otherConstraints: [],
     spatialExtents: [],
     temporalExtents: [],
     updateFrequency: {
       updatedTimes: 3,
       per: 'month',
     },
+    languages: ['en'],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',
@@ -168,13 +187,33 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
       },
     ],
     keywords: [
-      'planification',
-      'PLU',
-      "Plan local d'urbanisme",
-      'données ouvertes',
-      'Avrigny*60036',
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'planification',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'PLU',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: "Plan local d'urbanisme",
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'données ouvertes',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'Avrigny*60036',
+      },
     ],
-    themes: ['Usage des sols', "document d'urbanisme"],
+    topics: ['Usage des sols', "document d'urbanisme"],
     spatialRepresentation: 'vector',
     distributions: [
       {
@@ -189,7 +228,9 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
-    accessConstraints: [],
+    legalConstraints: [],
+    securityConstraints: [],
+    otherConstraints: [],
     useLimitations: ["Aucune condition ne s'applique", 'Licence Ouverte 2.0'],
     licenses: [
       {
@@ -200,5 +241,6 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     temporalExtents: [],
     status: 'completed',
     updateFrequency: 'unknown',
+    languages: ['fr', 'de'],
   },
 ])

package/src/libs/feature/catalog/src/lib/my-org/my-org.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
-import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs'
+import { combineLatest, map, Observable } from 'rxjs'
 import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { shareReplay } from 'rxjs/operators'
 
 @Injectable({
   providedIn: 'root',
@@ -16,20 +17,6 @@ export class MyOrgService {
     userList: UserModel[]
   }>
 
-  private myOrgDataSubject = new BehaviorSubject<{
-    orgName: string
-    logoUrl: string
-    recordCount: number
-    userCount: number
-    userList: UserModel[]
-  }>({
-    orgName: '',
-    logoUrl: '',
-    recordCount: 0,
-    userCount: 0,
-    userList: [],
-  })
-
   constructor(
     private platformService: PlatformServiceInterface,
     private orgService: OrganizationsServiceInterface
@@ -55,7 +42,8 @@ export class MyOrgService {
           userList,
           userCount,
         }
-      })
+      }),
+      shareReplay(1)
     )
   }
 }

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -9,8 +9,8 @@ import {
   SupportedTypes,
 } from '../../../../../../libs/util/data-fetcher/src'
 import {
-  extensionToFormat,
   getFileFormat,
+  getFileFormatFromServiceOutput,
   getMimeTypeForFormat,
   ProxyService,
 } from '../../../../../../libs/util/shared/src'
@@ -45,7 +45,7 @@ interface WfsDownloadUrls {
 export class DataService {
   constructor(private proxy: ProxyService) {}
 
-  private getDownloadUrlsFromWfs(
+  getDownloadUrlsFromWfs(
     wfsUrl: string,
     featureTypeName: string
   ): Observable<WfsDownloadUrls> {
@@ -120,7 +120,7 @@ export class DataService {
     )
   }
 
-  private getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
+  getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
     return this.proxy.getProxiedUrl(
       `${apiUrl}/query?f=${format}&where=1=1&outFields=*`
     )
@@ -138,8 +138,11 @@ export class DataService {
       map((urls) =>
         Object.keys(urls).map((format) => ({
           ...wfsLink,
+          type: 'download',
           url: new URL(urls[format]),
-          mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+          mimeType: getMimeTypeForFormat(
+            getFileFormatFromServiceOutput(format)
+          ),
         }))
       )
     )
@@ -153,7 +156,7 @@ export class DataService {
       url: new URL(
         this.getDownloadUrlFromEsriRest(esriRestLink.url.toString(), format)
       ),
-      mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+      mimeType: getMimeTypeForFormat(getFileFormatFromServiceOutput(format)),
     }))
   }
 

package/src/libs/feature/editor/src/index.ts

@@ -1,3 +1,8 @@
+export * from './lib/+state/editor.facade'
+export * from './lib/+state/editor.models'
+export * from './lib/+state/editor.selectors'
+export * from './lib/+state/editor.reducer'
+export * from './lib/+state/editor.actions'
 export * from './lib/feature-editor.module'
 export * from './lib/services/editor.service'
 export * from './lib/record-form/record-form.component'