geonetwork-ui 2.2.0-dev.95b40cd8 → 2.2.0-dev.9d7dfa2e

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

@@ -29,7 +29,7 @@ import {
   writeSecurityConstraints,
   writeSpatialRepresentation,
   writeStatus,
-  writeThemes,
+  writeTopics,
   writeTitle,
   writeUniqueIdentifier,
   writeUpdateFrequency,
@@ -51,12 +51,12 @@ import {
   readOverviews,
   readOwnerOrganization,
   readRecordUpdated,
+  readRecordPublished,
   readSecurityConstraints,
   readSpatialExtents,
   readSpatialRepresentation,
   readStatus,
   readTemporalExtents,
-  readThemes,
   readTitle,
   readUniqueIdentifier,
   readUpdateFrequency,
@@ -75,17 +75,15 @@ export function toModel(xml: string): CatalogRecord {
   const contacts = readContacts(rootEl)
   const recordUpdated = readRecordUpdated(rootEl)
   const recordCreated = recordUpdated
+  const recordPublished = readRecordPublished(rootEl)
   const keywords = readKeywords(rootEl)
-  const themes = readThemes(rootEl)
+  const topics = readIsoTopics(rootEl)
   const legalConstraints = readLegalConstraints(rootEl)
   const otherConstraints = readOtherConstraints(rootEl)
   const securityConstraints = readSecurityConstraints(rootEl)
   const licenses = readLicenses(rootEl)
   const overviews = readOverviews(rootEl)
 
-  // not used yet
-  const isoTopics = readIsoTopics(rootEl)
-
   if (kind === 'dataset') {
     const status = readStatus(rootEl)
     const datasetCreated = readDatasetCreated(rootEl)
@@ -100,8 +98,10 @@ export function toModel(xml: string): CatalogRecord {
     return {
       uniqueIdentifier,
       kind,
+      languages: [],
       recordCreated,
       recordUpdated,
+      recordPublished,
       status,
       title,
       abstract,
@@ -109,7 +109,7 @@ export function toModel(xml: string): CatalogRecord {
       contacts,
       contactsForResource: [], // FIXME: is that really useful??
       keywords,
-      themes,
+      topics,
       licenses,
       legalConstraints,
       securityConstraints,
@@ -129,14 +129,16 @@ export function toModel(xml: string): CatalogRecord {
     return {
       uniqueIdentifier,
       kind,
+      languages: [],
       recordCreated,
       recordUpdated,
+      recordPublished,
       title,
       abstract,
       ownerOrganization,
       contacts,
       keywords,
-      themes,
+      topics,
       licenses,
       legalConstraints,
       securityConstraints,
@@ -168,7 +170,7 @@ export function toXml(record: CatalogRecord, originalXml?: string): string {
   writeAbstract(record, rootEl)
   fieldChanged('contacts') && writeContacts(record, rootEl)
   fieldChanged('keywords') && writeKeywords(record, rootEl)
-  fieldChanged('themes') && writeThemes(record, rootEl)
+  fieldChanged('topics') && writeTopics(record, rootEl)
   fieldChanged('legalConstraints') && writeLegalConstraints(record, rootEl)
   fieldChanged('securityConstraints') &&
     writeSecurityConstraints(record, rootEl)

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

@@ -5,6 +5,8 @@ import {
   DatasetTemporalExtent,
   GraphicOverview,
   Individual,
+  Keyword,
+  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -39,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(
@@ -447,7 +450,7 @@ function findIdentification() {
   }
 }
 
-function extractCitationDate(type: 'creation' | 'revision') {
+function extractCitationDate(type: 'creation' | 'revision' | 'publication') {
   return pipe(
     findIdentification(),
     findNestedElements('gmd:citation', 'gmd:CI_Citation', 'gmd:date'),
@@ -514,6 +517,10 @@ export function readRecordUpdated(rootEl: XmlElement): Date {
   return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
 }
 
+export function readRecordPublished(rootEl: XmlElement): Date {
+  return pipe(findChildElement('gmd:dateStamp'), extractDateTime())(rootEl)
+}
+
 export function readTitle(rootEl: XmlElement): string {
   return pipe(
     findIdentification(),
@@ -552,29 +559,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 {
@@ -627,7 +665,7 @@ export function readLicenses(rootEl: XmlElement): Constraint[] {
 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

@@ -5,6 +5,8 @@ import {
   DatasetRecord,
   DatasetServiceDistribution,
   Individual,
+  Keyword,
+  KeywordThesaurus,
   RecordStatus,
   Role,
   ServiceEndpoint,
@@ -25,6 +27,7 @@ import {
   findNestedElement,
   findNestedElements,
   readAttribute,
+  readText,
   removeAllChildren,
   removeChildren,
   removeChildrenByName,
@@ -288,7 +291,10 @@ function appendResponsibleParty(contact: Individual) {
   )
 }
 
-function updateCitationDate(date: Date, type: 'revision' | 'creation') {
+function updateCitationDate(
+  date: Date,
+  type: 'revision' | 'creation' | 'publication'
+) {
   return pipe(
     findNestedElements('gmd:date', 'gmd:CI_Date'),
     filterArray(
@@ -305,7 +311,10 @@ function updateCitationDate(date: Date, type: 'revision' | 'creation') {
   )
 }
 
-function appendCitationDate(date, type: 'revision' | 'creation') {
+function appendCitationDate(
+  date,
+  type: 'revision' | 'creation' | 'publication'
+) {
   return appendChildren(
     pipe(
       createElement('gmd:date'),
@@ -326,47 +335,78 @@ 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))
         )
       )
     )
@@ -740,16 +780,24 @@ 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)
 }
 

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

@@ -133,7 +133,7 @@ export class ElasticsearchService {
     title: string,
     uuid: string,
     size = 6,
-    _source = ES_SOURCE_SUMMARY
+    _source = [...ES_SOURCE_SUMMARY, 'allKeywords', 'createDate']
   ): EsSearchParams {
     return {
       query: {

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

@@ -60,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
@@ -68,9 +84,11 @@ 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
+  topics: Array<string> // TODO: handle codelists
+  keywords: Array<Keyword>
   licenses: Array<Constraint>
   legalConstraints: Array<Constraint>
   securityConstraints: Array<Constraint>
@@ -80,7 +98,6 @@ export interface BaseRecord {
   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/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/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: [
       {
@@ -133,6 +149,7 @@ As such, **it is not very interesting at all.**`,
       updatedTimes: 3,
       per: 'month',
     },
+    languages: ['en'],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',
@@ -170,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: [
       {
@@ -204,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/record/src/lib/data-view-permalink/data-view-permalink.component.ts

@@ -29,18 +29,18 @@ export class DataViewPermalinkComponent {
       if (config) {
         const { aggregation, xProperty, yProperty, chartType } = config
         const url = new URL(`${this.wcEmbedderBaseUrl}`, window.location.origin)
-        url.search = `?v=${this.version}
-&e=gn-dataset-view-chart
-&a=api-url=${this.config.basePath}
-&a=dataset-id=${metadata.uniqueIdentifier}
-&a=primary-color=%230f4395
-&a=secondary-color=%238bc832
-&a=main-color=%23555
-&a=background-color=%23fdfbff
-&a=aggregation=${aggregation}
-&a=x-property=${xProperty}
-&a=y-property=${yProperty}
-&a=chart-type=${chartType}`
+        url.searchParams.set('v', `${this.version}`)
+        url.searchParams.append('e', `gn-dataset-view-chart`)
+        url.searchParams.append('a', `api-url=${this.config.basePath}`)
+        url.searchParams.append('a', `dataset-id=${metadata.uniqueIdentifier}`)
+        url.searchParams.append('a', `primary-color=#0f4395`)
+        url.searchParams.append('a', `secondary-color=#8bc832`)
+        url.searchParams.append('a', `main-color=#555`)
+        url.searchParams.append('a', `background-color=#fdfbff`)
+        url.searchParams.append('a', `aggregation=${aggregation}`)
+        url.searchParams.append('a', `x-property=${xProperty}`)
+        url.searchParams.append('a', `y-property=${yProperty}`)
+        url.searchParams.append('a', `chart-type=${chartType}`)
         return url.toString()
       }
       return ''

package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.html

@@ -1,6 +1,6 @@
-<div class="flex flex-row content-center">
+<div class="flex flex-row items-center">
   <span
-    class="align-text-top mr-1.5 mt-1.5 favorite-count"
+    class="align-text-top mr-1.5 favorite-count"
     *ngIf="hasFavoriteCount && displayCount"
     >{{ favoriteCount }}</span
   >
@@ -8,10 +8,9 @@
     [toggled]="isFavorite$ | async"
     (newValue)="toggleFavorite($event)"
     [disabled]="loading || (isAnonymous$ | async)"
-    class="mt-1"
   ></gn-ui-star-toggle>
   <span
-    class="align-text-top ml-1.5 favorite-count mt-1.5"
+    class="align-text-top ml-1.5 favorite-count"
     *ngIf="!displayCount"
     translate="datahub.record.addToFavorites"
   ></span>

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html

@@ -5,6 +5,6 @@
   [selected]="currentLang"
   ariaName="languages"
   [showTitle]="false"
-  [extraBtnClass]="'flex justify-items-center text-white !pl-2 !py-1'"
+  extraBtnClass="bg-transparent flex justify-items-center !pl-2 !py-1"
 >
 </gn-ui-dropdown-selector>

package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.css

@@ -0,0 +1,5 @@
+.icon-small {
+  font-size: 16px;
+  height: 16px;
+  width: 16px;
+}

package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.html

@@ -0,0 +1,39 @@
+<div class="h-full flex flex-col">
+  <div class="flex-none w-full flex flex-row items-center">
+    <p class="flex-none font-bold">{{ label }}</p>
+    <div class="flex-1 flex justify-end items-center">
+      <gn-ui-button
+        [extraClass]="getButtonExtraClass()"
+        (buttonClick)="togglePreview()"
+      >
+        <span class="material-symbols-outlined mr-1 icon-small">{{
+          preview ? 'visibility' : 'visibility_off'
+        }}</span>
+        {{ preview ? 'WYSIWYG' : 'Markdown' }}
+      </gn-ui-button>
+      <span
+        class="material-symbols-outlined m-2 icon-small"
+        [matTooltip]="tooltip"
+        matTooltipPosition="above"
+      >
+        help
+      </span>
+    </div>
+  </div>
+  <p class="flex-none mb-2 font-medium text-sm text-gray-900">
+    {{ helperText }}
+  </p>
+  <div class="flex-1" [hidden]="preview">
+    <gn-ui-text-area
+      [placeholder]="placeholder"
+      [value]="textContent"
+      (valueChange)="textContentChangedHandler($event)"
+    ></gn-ui-text-area>
+  </div>
+  <div
+    class="flex-1 border border-gray-800 rounded overflow-y-scroll"
+    [hidden]="!preview"
+  >
+    <gn-ui-markdown-parser [textContent]="textContent"></gn-ui-markdown-parser>
+  </div>
+</div>