geonetwork-ui 2.2.0-dev.4db0b597 → 2.2.0-dev.5042be2c

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

@@ -1,11 +1,12 @@
 import {
-  AccessConstraint,
   CatalogRecord,
+  Constraint,
   DatasetDistribution,
   DatasetRecord,
   DatasetServiceDistribution,
   Individual,
-  License,
+  Keyword,
+  KeywordThesaurus,
   RecordStatus,
   Role,
   ServiceEndpoint,
@@ -26,6 +27,7 @@ import {
   findNestedElement,
   findNestedElements,
   readAttribute,
+  readText,
   removeAllChildren,
   removeChildren,
   removeChildrenByName,
@@ -327,82 +329,89 @@ function appendCitationDate(date, type: 'revision' | 'creation') {
   )
 }
 
-function removeKeywords(type: string | null) {
-  return removeChildren(
-    pipe(
-      findNestedElements('gmd:descriptiveKeywords'),
-      filterArray(
-        pipe(
-          findNestedElement(
-            'gmd:MD_Keywords',
-            'gmd:type',
-            'gmd:MD_KeywordTypeCode'
-          ),
-          readAttribute('codeListValue'),
-          // if a specific type is targeted, compare with it; otherwise remove keywords if they have no type defined
-          map((typeValue) => (type !== null ? type === typeValue : true))
+function removeKeywords() {
+  return removeChildren(pipe(findNestedElements('gmd:descriptiveKeywords')))
+}
+
+// returns a <gmd:thesaurusName> element
+function createThesaurus(thesaurus: KeywordThesaurus) {
+  return pipe(
+    createElement('gmd:thesaurusName'),
+    createChild('gmd:CI_Citation'),
+    appendChildren(
+      pipe(
+        createElement('gmd:title'),
+        writeCharacterString(thesaurus.name || thesaurus.id)
+      ),
+      pipe(
+        createElement('gmd:identifier'),
+        createChild('gmd:MD_Identifier'),
+        appendChildren(
+          pipe(
+            createElement('gmd:code'),
+            thesaurus.url
+              ? writeAnchor(thesaurus.url, thesaurus.id)
+              : writeCharacterString(thesaurus.id)
+          )
         )
       )
     )
   )
 }
 
-function appendKeywords(keywords: string[], type: string | null) {
+function appendKeywords(keywords: Keyword[]) {
+  const keywordsByThesaurus: Keyword[][] = keywords.reduce((acc, keyword) => {
+    const thesaurusId = keyword.thesaurus?.id
+    const type = keyword.type
+    let existingGroup = acc.find((group) =>
+      group[0].thesaurus
+        ? group[0].thesaurus.id === thesaurusId
+        : group[0].type === type
+    )
+    if (!existingGroup) {
+      existingGroup = []
+      acc.push(existingGroup)
+    }
+    existingGroup.push(keyword)
+    return acc
+  }, [])
   return appendChildren(
-    pipe(
-      createElement('gmd:descriptiveKeywords'),
-      createChild('gmd:MD_Keywords'),
-      type !== null
-        ? appendChildren(
+    ...keywordsByThesaurus.map((keywords) =>
+      pipe(
+        createElement('gmd:descriptiveKeywords'),
+        createChild('gmd:MD_Keywords'),
+        appendChildren(
+          pipe(
+            createElement('gmd:type'),
+            createChild('gmd:MD_KeywordTypeCode'),
+            addAttribute(
+              'codeList',
+              'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#MD_KeywordTypeCode'
+            ),
+            addAttribute('codeListValue', keywords[0].type)
+          )
+        ),
+        keywords[0].thesaurus
+          ? appendChildren(createThesaurus(keywords[0].thesaurus))
+          : noop,
+        appendChildren(
+          ...keywords.map((keyword) =>
             pipe(
-              createElement('gmd:type'),
-              createChild('gmd:MD_KeywordTypeCode'),
-              addAttribute(
-                'codeList',
-                'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#MD_KeywordTypeCode'
-              ),
-              addAttribute('codeListValue', type)
+              createElement('gmd:keyword'),
+              writeCharacterString(keyword.label)
             )
           )
-        : noop,
-      appendChildren(
-        ...keywords.map((keyword) =>
-          pipe(createElement('gmd:keyword'), writeCharacterString(keyword))
         )
       )
     )
   )
 }
 
-function removeAccessConstraints() {
-  const securityConstraintsFilter = pipe(
-    findChildrenElement('gmd:MD_SecurityConstraints'),
-    (array) => array.length > 0
-  )
-
-  // remove legal constraints that *only* have 'otherRestrictions'
-  const otherConstraintsFilter = pipe(
-    findNestedElements(
-      'gmd:MD_LegalConstraints',
-      'gmd:accessConstraints',
-      'gmd:MD_RestrictionCode'
-    ),
-    mapArray(readAttribute('codeListValue')),
-    (restrictionCodes) =>
-      restrictionCodes.every((code) => code === 'otherRestrictions')
-  )
-  return removeChildren(
-    pipe(
-      findChildrenElement('gmd:resourceConstraints'),
-      filterArray(
-        (el) => securityConstraintsFilter(el) || otherConstraintsFilter(el)
-      )
-    )
-  )
-}
-
-function createAccessConstraint(constraint: AccessConstraint) {
-  if (constraint.type === 'security') {
+function createConstraint(
+  constraint: Constraint,
+  type: 'legal' | 'security' | 'other'
+) {
+  if (type === 'security') {
     return pipe(
       createElement('gmd:resourceConstraints'),
       createChild('gmd:MD_SecurityConstraints'),
@@ -422,29 +431,41 @@ function createAccessConstraint(constraint: AccessConstraint) {
         )
       )
     )
+  } else if (type === 'legal') {
+    return pipe(
+      createElement('gmd:resourceConstraints'),
+      createChild('gmd:MD_LegalConstraints'),
+      appendChildren(
+        pipe(
+          createElement('gmd:accessConstraints'),
+          createChild('gmd:MD_RestrictionCode'),
+          addAttribute(
+            'codeList',
+            'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#MD_RestrictionCode'
+          ),
+          addAttribute('codeListValue', 'otherRestrictions')
+        ),
+        pipe(
+          createElement('gmd:otherConstraints'),
+          writeCharacterString(constraint.text)
+        )
+      )
+    )
   }
+
   return pipe(
     createElement('gmd:resourceConstraints'),
-    createChild('gmd:MD_LegalConstraints'),
+    createChild('gmd:MD_Constraints'),
     appendChildren(
       pipe(
-        createElement('gmd:accessConstraints'),
-        createChild('gmd:MD_RestrictionCode'),
-        addAttribute(
-          'codeList',
-          'http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#MD_RestrictionCode'
-        ),
-        addAttribute('codeListValue', 'otherRestrictions')
-      ),
-      pipe(
-        createElement('gmd:otherConstraints'),
+        createElement('gmd:useLimitation'),
         writeCharacterString(constraint.text)
       )
     )
   )
 }
 
-function removeUseLimitations() {
+function removeOtherConstraints() {
   return removeChildren(
     pipe(
       findChildrenElement('gmd:resourceConstraints'),
@@ -458,12 +479,37 @@ function removeUseLimitations() {
   )
 }
 
-function createUseLimitation(useLimitation: string) {
-  return pipe(
-    createElement('gmd:resourceConstraints'),
-    createChild('gmd:MD_Constraints'),
-    createChild('gmd:useLimitation'),
-    writeCharacterString(useLimitation)
+function removeSecurityConstraints() {
+  return removeChildren(
+    pipe(
+      findChildrenElement('gmd:resourceConstraints'),
+      filterArray(
+        pipe(
+          findNestedElements('gmd:MD_SecurityConstraints', 'gmd:useLimitation'),
+          (array) => array.length > 0
+        )
+      )
+    )
+  )
+}
+
+function removeLegalConstraints() {
+  return removeChildren(
+    pipe(
+      findChildrenElement('gmd:resourceConstraints'),
+      filterArray(
+        pipe(
+          findNestedElements(
+            'gmd:MD_LegalConstraints',
+            'gmd:accessConstraints',
+            'gmd:MD_RestrictionCode'
+          ),
+          mapArray(readAttribute('codeListValue')),
+          (restrictionCodes) =>
+            restrictionCodes.every((code) => code !== 'license')
+        )
+      )
+    )
   )
 }
 
@@ -487,7 +533,7 @@ function removeLicenses() {
   )
 }
 
-function createLicense(license: License) {
+function createLicense(license: Constraint) {
   return pipe(
     createElement('gmd:resourceConstraints'),
     createChild('gmd:MD_LegalConstraints'),
@@ -728,43 +774,71 @@ export function writeContacts(record: CatalogRecord, rootEl: XmlElement) {
 export function writeKeywords(record: CatalogRecord, rootEl: XmlElement) {
   pipe(
     findOrCreateIdentification(),
-    removeKeywords(null),
-    appendKeywords(record.keywords, null)
+    removeKeywords(),
+    appendKeywords(record.keywords)
   )(rootEl)
 }
 
-export function writeThemes(record: CatalogRecord, rootEl: XmlElement) {
+export function writeTopics(record: CatalogRecord, rootEl: XmlElement) {
   pipe(
     findOrCreateIdentification(),
-    removeKeywords('theme'),
-    appendKeywords(record.themes, 'theme')
+    removeChildrenByName('gmd:topicCategory'),
+    appendChildren(
+      ...record.topics.map((topic) =>
+        pipe(
+          createElement('gmd:topicCategory'),
+          createChild('gmd:MD_TopicCategoryCode'),
+          setTextContent(topic)
+        )
+      )
+    )
+  )(rootEl)
+}
+
+export function writeLicenses(record: CatalogRecord, rootEl: XmlElement) {
+  pipe(
+    findOrCreateIdentification(),
+    removeLicenses(),
+    appendChildren(...record.licenses.map(createLicense))
   )(rootEl)
 }
 
-export function writeAccessConstraints(
+export function writeLegalConstraints(
   record: CatalogRecord,
   rootEl: XmlElement
 ) {
   pipe(
     findOrCreateIdentification(),
-    removeAccessConstraints(),
-    appendChildren(...record.accessConstraints.map(createAccessConstraint))
+    removeLegalConstraints(),
+    appendChildren(
+      ...record.legalConstraints.map((c) => createConstraint(c, 'legal'))
+    )
   )(rootEl)
 }
 
-export function writeLicenses(record: CatalogRecord, rootEl: XmlElement) {
+export function writeSecurityConstraints(
+  record: CatalogRecord,
+  rootEl: XmlElement
+) {
   pipe(
     findOrCreateIdentification(),
-    removeLicenses(),
-    appendChildren(...record.licenses.map(createLicense))
+    removeSecurityConstraints(),
+    appendChildren(
+      ...record.securityConstraints.map((c) => createConstraint(c, 'security'))
+    )
   )(rootEl)
 }
 
-export function writeUseLimitations(record: CatalogRecord, rootEl: XmlElement) {
+export function writeOtherConstraints(
+  record: CatalogRecord,
+  rootEl: XmlElement
+) {
   pipe(
     findOrCreateIdentification(),
-    removeUseLimitations(),
-    appendChildren(...record.useLimitations.map(createUseLimitation))
+    removeOtherConstraints(),
+    appendChildren(
+      ...record.otherConstraints.map((c) => createConstraint(c, 'other'))
+    )
   )(rootEl)
 }
 

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/common/domain/src/lib/model/record/metadata.model.ts

@@ -48,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
 }
@@ -66,6 +60,20 @@ 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
+}
+
 export interface BaseRecord {
   uniqueIdentifier: Uuid
   ownerOrganization: Organization
@@ -75,18 +83,17 @@ export interface BaseRecord {
   recordCreated?: Date
   recordUpdated: Date
   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 ?

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/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/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",