geonetwork-ui 2.2.0-dev.9ae0a68b → 2.2.0-dev.9f0a89f5

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

@@ -1,12 +1,12 @@
 import {
-  AccessConstraint,
-  AccessConstraintType,
+  Constraint,
   DatasetDistribution,
   DatasetSpatialExtent,
   DatasetTemporalExtent,
   GraphicOverview,
   Individual,
-  License,
+  Keyword,
+  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -41,6 +41,7 @@ import {
 } from '../function-utils'
 import { getRoleFromRoleCode } from './codelists/role.mapper'
 import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
+import { getKeywordTypeFromKeywordTypeCode } from './codelists/keyword.mapper'
 
 function extractCharacterString(): ChainableFunction<XmlElement, string> {
   return pipe(
@@ -183,59 +184,69 @@ function extractStatus(): ChainableFunction<XmlElement, RecordStatus> {
 }
 
 // from gmd:resourceConstraints
-function extractAccessConstraints(): ChainableFunction<
+function extractLegalConstraints(): ChainableFunction<
   XmlElement,
-  Array<AccessConstraint>
+  Array<Constraint>
 > {
-  const getOtherConstraints = pipe(
+  return pipe(
     findChildrenElement('gmd:MD_LegalConstraints', false),
     filterArray(
       pipe(
         findChildrenElement('gmd:MD_RestrictionCode'),
         mapArray(readAttribute('codeListValue')),
-        map(
-          (values) =>
-            values.indexOf('license') === -1 &&
-            values.indexOf('otherRestrictions') > -1
-        )
+        map((values) => values.indexOf('license') === -1)
+      )
+    ),
+    mapArray(
+      combine(
+        findChildrenElement('gmd:otherConstraints'),
+        findChildrenElement('gmd:useLimitation')
       )
     ),
-    mapArray(findChildrenElement('gmd:otherConstraints')),
     flattenArray(),
-    mapArray(extractCharacterString()),
-    mapArray((text) => ({
+    flattenArray(),
+    mapArray(combine(extractCharacterString(), extractUrl())),
+    mapArray(([text, url]) => ({
+      ...(url && { url }),
       text,
-      type: 'other' as AccessConstraintType,
     }))
   )
-  const getSecurityConstraints = pipe(
+}
+
+// from gmd:resourceConstraints
+function extractSecurityConstraints(): ChainableFunction<
+  XmlElement,
+  Array<Constraint>
+> {
+  return pipe(
     findNestedElements('gmd:MD_SecurityConstraints', 'gmd:useLimitation'),
-    mapArray(extractCharacterString()),
-    mapArray((text) => ({
+    flattenArray(),
+    mapArray(combine(extractCharacterString(), extractUrl())),
+    mapArray(([text, url]) => ({
+      ...(url && { url }),
       text,
-      type: 'security' as AccessConstraintType,
     }))
   )
-  return pipe(
-    combine(getOtherConstraints, getSecurityConstraints),
-    flattenArray()
-  )
 }
 
 // from gmd:resourceConstraints
-function extractUseLimitations(): ChainableFunction<XmlElement, Array<string>> {
+function extractOtherConstraints(): ChainableFunction<
+  XmlElement,
+  Array<Constraint>
+> {
   return pipe(
-    combine(
-      findNestedElements('gmd:MD_Constraints', 'gmd:useLimitation'),
-      findNestedElements('gmd:MD_LegalConstraints', 'gmd:useLimitation')
-    ),
+    findNestedElements('gmd:MD_Constraints', 'gmd:useLimitation'),
     flattenArray(),
-    mapArray(extractCharacterString())
+    mapArray(combine(extractCharacterString(), extractUrl())),
+    mapArray(([text, url]) => ({
+      ...(url && { url }),
+      text,
+    }))
   )
 }
 
 // from gmd:resourceConstraints
-function extractLicenses(): ChainableFunction<XmlElement, Array<License>> {
+function extractLicenses(): ChainableFunction<XmlElement, Array<Constraint>> {
   return pipe(
     findChildrenElement('gmd:MD_LegalConstraints', false),
     filterArray(
@@ -246,15 +257,18 @@ function extractLicenses(): ChainableFunction<XmlElement, Array<License>> {
       )
     ),
     mapArray(
-      pipe(
-        findChildElement('gmd:otherConstraints'),
-        combine(extractCharacterString(), extractUrl()),
-        map(([text, url]) => ({
-          ...(url && { url }),
-          text,
-        }))
+      combine(
+        findChildrenElement('gmd:otherConstraints'),
+        findChildrenElement('gmd:useLimitation')
       )
-    )
+    ),
+    flattenArray(),
+    flattenArray(),
+    mapArray(combine(extractCharacterString(), extractUrl())),
+    mapArray(([text, url]) => ({
+      ...(url && { url }),
+      text,
+    }))
   )
 }
 
@@ -541,29 +555,60 @@ export function readContacts(rootEl: XmlElement): Individual[] {
   )(rootEl)
 }
 
-function readKeywordsOfType(isTheme: boolean) {
-  return pipe(
-    findIdentification(),
-    findNestedElements('gmd:descriptiveKeywords', 'gmd:MD_Keywords'),
-    filterArray(
-      pipe(
-        findChildrenElement('gmd:MD_KeywordTypeCode'),
-        mapArray(readAttribute('codeListValue')),
-        map((values) => isTheme === values.indexOf('theme') > -1)
-      )
-    ),
-    mapArray(findChildrenElement('gmd:keyword')),
-    flattenArray(),
-    mapArray(extractCharacterString())
+// from gmd:thesaurusName
+function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+  if (!rootEl) return null
+
+  const findIdentifier = findNestedElement(
+    'gmd:CI_Citation',
+    'gmd:identifier',
+    'gmd:MD_Identifier',
+    'gmd:code'
   )
+  const id = pipe(findIdentifier, extractCharacterString())(rootEl)
+  const url = pipe(findIdentifier, extractUrl())(rootEl)
+  const name = pipe(
+    findNestedElement('gmd:CI_Citation', 'gmd:title'),
+    extractCharacterString()
+  )(rootEl)
+  return {
+    id,
+    ...(name && { name }),
+    ...(url && { url }),
+  }
 }
 
-export function readKeywords(rootEl: XmlElement): string[] {
-  return readKeywordsOfType(false)(rootEl)
+// from gmd:MD_Keywords
+function readKeywordGroup(rootEl: XmlElement): Keyword[] {
+  const type = pipe(
+    findChildrenElement('gmd:MD_KeywordTypeCode'),
+    mapArray(readAttribute('codeListValue')),
+    map((values) => getKeywordTypeFromKeywordTypeCode(values[0]))
+  )(rootEl)
+  const thesaurus = pipe(
+    findNestedElement('gmd:thesaurusName'),
+    readThesaurus
+  )(rootEl)
+  return pipe(
+    findChildrenElement('gmd:keyword'),
+    mapArray((el) => {
+      const label = extractCharacterString()(el)
+      return {
+        ...(thesaurus ? { thesaurus } : {}),
+        label,
+        type,
+      } as Keyword
+    })
+  )(rootEl)
 }
 
-export function readThemes(rootEl: XmlElement): string[] {
-  return readKeywordsOfType(true)(rootEl)
+export function readKeywords(rootEl: XmlElement): Keyword[] {
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:descriptiveKeywords', 'gmd:MD_Keywords'),
+    mapArray(readKeywordGroup),
+    flattenArray()
+  )(rootEl)
 }
 
 export function readStatus(rootEl: XmlElement): RecordStatus {
@@ -579,24 +624,32 @@ const getConstraints = pipe(
   findChildrenElement('gmd:resourceConstraints', false)
 )
 
-export function readAccessConstraints(rootEl: XmlElement): AccessConstraint[] {
+export function readLegalConstraints(rootEl: XmlElement): Constraint[] {
   return pipe(
     getConstraints,
-    mapArray(extractAccessConstraints()),
+    mapArray(extractLegalConstraints()),
     flattenArray(),
     flattenArray()
   )(rootEl)
 }
 
-export function readUseLimitations(rootEl: XmlElement): string[] {
+export function readSecurityConstraints(rootEl: XmlElement): Constraint[] {
+  return pipe(
+    getConstraints,
+    mapArray(extractSecurityConstraints()),
+    flattenArray()
+  )(rootEl)
+}
+
+export function readOtherConstraints(rootEl: XmlElement): Constraint[] {
   return pipe(
     getConstraints,
-    mapArray(extractUseLimitations()),
+    mapArray(extractOtherConstraints()),
     flattenArray()
   )(rootEl)
 }
 
-export function readLicenses(rootEl: XmlElement): License[] {
+export function readLicenses(rootEl: XmlElement): Constraint[] {
   return pipe(
     getConstraints,
     mapArray(extractLicenses()),
@@ -608,7 +661,7 @@ export function readLicenses(rootEl: XmlElement): License[] {
 export function readIsoTopics(rootEl: XmlElement): string[] {
   return pipe(
     findIdentification(),
-    findChildrenElement('gmd:MD_TopicCategoryCode', false),
+    findChildrenElement('gmd:MD_TopicCategoryCode', true),
     mapArray(readText())
   )(rootEl)
 }

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/index.ts

@@ -6,3 +6,5 @@ export * from './auth'
 export * from './favorites/favorites.service'
 export * from './selection/selection.service'
 export * from './gn4.provider'
+export * from './platform/gn4-platform.service'
+export * from './platform/gn4-platform.mapper'

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,
           },