geonetwork-ui 2.2.0-dev.8cce3b0e → 2.2.0-dev.91cd6a97

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/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: [
       {
@@ -170,13 +186,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: [
       {

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/metadata-contact/metadata-contact.component.html

@@ -1,5 +1,5 @@
 <div class="py-5 px-5 rounded bg-gray-100 text-black mb-6">
-  <div class="grid gap-3">
+  <div class="grid gap-3 overflow-hidden">
     <div>
       <p class="text-sm font-medium" translate>record.metadata.contact</p>
     </div>

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -55,29 +55,85 @@
   </div>
 </gn-ui-expandable-panel>
 <gn-ui-expandable-panel
-  class="metadata-origin"
   *ngIf="
     metadata.lineage ||
     metadata.recordUpdated ||
     metadata.updateFrequency ||
     metadata.status
   "
-  [title]="'record.metadata.origin' | translate"
+  [title]="'record.metadata.details' | translate"
 >
-  <p
+  <div
     *ngIf="metadata.lineage"
-    class="mb-5 pt-4 whitespace-pre-line break-words text-gray-900"
-    gnUiLinkify
+    class="text-gray-900 flex flex-col mb-5 pt-4 gap-2"
   >
-    {{ metadata.lineage }}
-  </p>
+    <p class="whitespace-pre-line break-words text-gray-900" gnUiLinkify>
+      {{ metadata.lineage }}
+    </p>
+  </div>
+  <div class="flex flex-row gap-6 mb-8" *ngIf="resourceContact">
+    <div
+      *ngIf="resourceContact.organization?.logoUrl?.href"
+      class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
+    >
+      <gn-ui-thumbnail
+        class="relative h-full w-full"
+        [thumbnailUrl]="resourceContact.organization.logoUrl.href"
+        fit="contain"
+      ></gn-ui-thumbnail>
+    </div>
+    <div class="flex flex-col gap-1">
+      <p class="text-sm font-medium" translate>record.metadata.producer</p>
+      <div
+        class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+        data-cy="organization-name"
+      >
+        {{ resourceContact.organization?.name }}
+      </div>
+      <div *ngIf="resourceContact.organization?.website">
+        <a
+          [href]="resourceContact.organization.website"
+          target="_blank"
+          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          >{{ resourceContact.organization.website }}
+          <mat-icon
+            class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
+            >open_in_new</mat-icon
+          >
+        </a>
+      </div>
+      <div class="mt-4" *ngIf="resourceContact.email">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+          >
+            mail_outline</mat-icon
+          >
+          <a
+            *ngIf="resourceContact.email"
+            [href]="'mailto:' + resourceContact.email"
+            class="text-sm hover:underline ml-2"
+            target="_blank"
+            data-cy="contact-email"
+            >{{ resourceContact?.email }}</a
+          >
+        </div>
+      </div>
+    </div>
+  </div>
   <div
-    class="py-4 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-[10px] gap-x-[20px] text-gray-700 info-grid"
+    class="py-6 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-6 gap-x-[20px] text-gray-700"
   >
-    <div *ngIf="metadata.recordUpdated">
-      <p class="text-sm" translate>record.metadata.updatedOn</p>
+    <div *ngIf="metadata.recordCreated">
+      <p class="text-sm" translate>record.metadata.creation</p>
       <p class="text-primary font-medium mt-1">
-        {{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}
+        {{ metadata.recordCreated.toLocaleDateString() }}
+      </p>
+    </div>
+    <div *ngIf="metadata.recordPublished">
+      <p class="text-sm" translate>record.metadata.publication</p>
+      <p class="text-primary font-medium mt-1">
+        {{ metadata.recordPublished.toLocaleDateString() }}
       </p>
     </div>
     <div *ngIf="updateFrequency">
@@ -90,17 +146,52 @@
         {{ updateFrequency }}
       </p>
     </div>
-    <div *ngIf="metadata.status">
-      <p class="text-sm" translate>record.metadata.updateStatus</p>
-      <p class="text-primary font-medium mt-1" translate>
-        domain.record.status.{{ metadata.status }}
-      </p>
+    <div *ngIf="metadata.languages">
+      <p class="text-sm mb-1" translate>record.metadata.languages</p>
+      <div class="flex flex-row gap-1 flex-wrap">
+        <p
+          class="text-primary font-medium"
+          translate
+          *ngFor="let language of metadata.languages"
+        >
+          language.{{ language }}
+        </p>
+      </div>
+    </div>
+    <div *ngIf="temporalExtent">
+      <p class="text-sm" translate>record.metadata.temporalExtent</p>
+      <div class="flex flex-row gap-1 mb-1 text-primary font-medium">
+        <p
+          *ngIf="temporalExtent.start && temporalExtent.end"
+          translate
+          [translateParams]="{
+            start: temporalExtent.start,
+            end: temporalExtent.end
+          }"
+        >
+          record.metadata.temporalExtent.fromDateToDate
+        </p>
+        <p
+          *ngIf="temporalExtent.start && !temporalExtent.end"
+          translate
+          [translateParams]="{ start: temporalExtent.start }"
+        >
+          record.metadata.temporalExtent.sinceDate
+        </p>
+        <p
+          *ngIf="!temporalExtent.start && temporalExtent.end"
+          translate
+          [translateParams]="{ end: temporalExtent.end }"
+        >
+          record.metadata.temporalExtent.untilDate
+        </p>
+      </div>
     </div>
   </div>
 </gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
-  [title]="'record.metadata.details' | translate"
+  [title]="'record.metadata.technical' | translate"
 >
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">
@@ -136,13 +227,13 @@
         </p>
       </div>
     </div>
-    <div *ngIf="metadata.themes?.length">
-      <p class="text-sm mb-1" translate>record.metadata.themes</p>
+    <div *ngIf="metadata.topics?.length">
+      <p class="text-sm mb-1" translate>record.metadata.topics</p>
       <div class="sm:pb-4 sm:pr-16">
         <gn-ui-badge
-          class="inline-block mr-2 lowercase"
-          *ngFor="let theme of metadata.themes"
-          >{{ theme }}</gn-ui-badge
+          class="inline-block mr-2 mb-2 lowercase"
+          *ngFor="let topic of metadata.topics"
+          >{{ topic }}</gn-ui-badge
         >
       </div>
     </div>
@@ -154,7 +245,7 @@
           (click)="onKeywordClick(keyword)"
           [clickable]="true"
           *ngFor="let keyword of metadata.keywords"
-          >{{ keyword }}</gn-ui-badge
+          >{{ keyword.label }}</gn-ui-badge
         >
       </div>
     </div>

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -5,7 +5,11 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetRecord,
+  Keyword,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+import { getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-metadata-info',
@@ -16,7 +20,7 @@ import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/mode
 export class MetadataInfoComponent {
   @Input() metadata: Partial<DatasetRecord>
   @Input() incomplete: boolean
-  @Output() keyword = new EventEmitter<string>()
+  @Output() keyword = new EventEmitter<Keyword>()
   updatedTimes: number
 
   get hasUsage() {
@@ -73,11 +77,24 @@ export class MetadataInfoComponent {
     }
   }
 
+  get temporalExtent(): { start: string; end: string } {
+    const temporalExtents = this.metadata.temporalExtents
+    return getTemporalRangeUnion(temporalExtents)
+  }
+
+  get shownOrganization() {
+    return this.metadata.ownerOrganization
+  }
+
+  get resourceContact() {
+    return this.metadata.contactsForResource?.[0]
+  }
+
   fieldReady(propName: string) {
     return !this.incomplete || propName in this.metadata
   }
 
-  onKeywordClick(keyword: string) {
+  onKeywordClick(keyword: Keyword) {
     this.keyword.emit(keyword)
   }
 }

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts

@@ -55,7 +55,7 @@ export class MetadataQualityComponent implements OnChanges {
     this.items = []
     this.add('title', !!this.metadata?.title)
     this.add('description', !!this.metadata?.abstract)
-    this.add('topic', this.metadata?.themes?.length > 0)
+    this.add('topic', this.metadata?.topics?.length > 0)
     this.add('keywords', this.metadata?.keywords?.length > 0)
     this.add('legalConstraints', this.metadata?.legalConstraints?.length > 0)
     this.add('organisation', !!contact?.organization)

package/src/libs/ui/elements/src/lib/thumbnail/thumbnail.component.html

@@ -1,13 +1,13 @@
 <div
   #containerElement
-  class="h-full w-full relative shrink-0 overflow-hidden flex items-center"
+  class="h-full w-full relative shrink-0 overflow-hidden flex items-center justify-center"
   [ngClass]="isPlaceholder ? 'bg-gray-100' : 'bg-white'"
   [attr.data-cy-is-placeholder]="isPlaceholder.toString()"
 >
   <img
     #imageElement
     class="relative w-full object-center"
-    [ngClass]="imgFit === 'contain' ? 'h-4/5' : 'h-full'"
+    [ngClass]="imgFit === 'contain' ? 'h-4/5 w-4/5' : 'h-full'"
     [ngStyle]="{ objectFit: imgFit }"
     alt="thumbnail"
     loading="lazy"

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html

@@ -1,6 +1,6 @@
 <gn-ui-button
   type="outline"
-  extraClass="w-full !p-[8px] !pl-[16px]"
+  extraClass="bg-background w-full !p-[8px] !pl-[16px]"
   [title]="title"
   [attr.aria-owns]="id"
   (buttonClick)="openOverlay()"

package/src/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.html

@@ -9,7 +9,9 @@
   <gn-ui-button
     type="outline"
     class="grow min-w-0"
-    extraClass="!p-[8px] !pl-[16px] flex flex-row w-full {{ extraBtnClass }}"
+    extraClass="bg-background !p-[8px] !pl-[16px] flex flex-row w-full {{
+      extraBtnClass
+    }}"
     [title]="title"
     [attr.aria-owns]="id"
     (buttonClick)="openOverlay()"

package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.css

@@ -0,0 +1,3 @@
+button {
+  color: var(--navigation-button-color, --color-background);
+}

package/src/libs/ui/inputs/src/lib/navigation-button/navigation-button.component.html

@@ -1,5 +1,5 @@
 <button
-  class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 text-white rounded content-center"
+  class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 rounded content-center"
 >
   <mat-icon class="material-symbols-outlined align-middle w-[18px]">{{
     icon

package/src/libs/util/i18n/src/lib/i18n.constants.ts

@@ -40,6 +40,24 @@ export const LANG_3_TO_2_MAPPER = {
   slo: 'sk',
 }
 
+export const LANGUAGE_NAMES = {
+  en: 'English',
+  nl: 'Nederlands',
+  fr: 'Français',
+  de: 'Deutsch',
+  ko: '한국어',
+  es: 'Español',
+  cs: 'Čeština',
+  ca: 'Català',
+  fi: 'Suomi',
+  is: 'Íslenska',
+  it: 'Italiano',
+  pt: 'Português',
+  ru: 'Русский',
+  zh: '中文',
+  sk: 'Slovenčina',
+}
+
 // Caution: changing this can break language selection from third parties!
 export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -6,3 +6,4 @@ export * from './sort-by'
 export * from './url'
 export * from './event'
 export * from './fuzzy-filter'
+export * from './temporal-extent-union'