geonetwork-ui 2.4.0-dev.6c8dcba0 → 2.4.0-dev.78565730

package/libs/ui/widgets/src/lib/ui-widgets.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-widgets.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/ui/widgets/src/lib/ui-widgets.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAgBA,qBA4Ba,eAAe;yCAAf,eAAe;0CAAf,eAAe;0CAAf,eAAe;CAAG"}
+{"version":3,"file":"ui-widgets.module.d.ts","sourceRoot":"","sources":["../../../../../src/libs/ui/widgets/src/lib/ui-widgets.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAeA,qBA0Ba,eAAe;yCAAf,eAAe;0CAAf,eAAe;0CAAf,eAAe;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.4.0-dev.6c8dcba0",
+  "version": "2.4.0-dev.78565730",
   "engines": {
     "node": ">=14.17.0"
   },

package/src/libs/api/metadata-converter/src/index.ts

@@ -1,3 +1,4 @@
+export * from './lib/base.converter'
 export * from './lib/iso19139'
 export * from './lib/iso19115-3'
 export * from './lib/find-converter'

package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts

@@ -120,6 +120,7 @@ export const mapKeywords = (thesauri: Thesaurus[], language: string) => {
       keywords.push({
         label: selectTranslatedValue<string>(keyword, language),
         type: getKeywordTypeFromKeywordTypeCode(rawThesaurus.theme),
+        ...(keyword.link && { key: keyword.link }),
         ...(thesaurus && { thesaurus }),
       })
     }

package/src/libs/api/metadata-converter/src/lib/gn4/types/index.ts

@@ -1,3 +1,4 @@
 export * from './elasticsearch.model'
 export * from './search.model'
 export * from './metadata.model'
+export * from './keywords.model'

package/src/libs/api/metadata-converter/src/lib/gn4/types/keywords.model.ts

@@ -0,0 +1,31 @@
+export interface KeywordApiResponse {
+  values?: {
+    eng: string
+  }
+  definitions?: {
+    eng: string
+  }
+  coordEast?: string
+  coordWest?: string
+  coordSouth?: string
+  coordNorth?: string
+  thesaurusKey?: string
+  definition?: string
+  value?: string
+  uri?: string
+}
+
+export interface ThesaurusApiResponse {
+  key?: string
+  dname?: string
+  description?: string[] | string
+  filename?: string
+  title?: string
+  multilingualTitles?: string[]
+  dublinCoreMultilinguals?: string[]
+  date?: string
+  url?: string
+  defaultNamespace?: string
+  type?: string
+  activated?: string
+}

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -5,6 +5,7 @@ type MultilingualField = {
   [K in `lang${LangCode}`]: string
 } & {
   default: string
+  link?: string
 }
 
 type BooleanString = 'true' | 'false'

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

@@ -4,7 +4,6 @@ import {
   GraphicOverview,
   Individual,
   Keyword,
-  KeywordThesaurus,
   Organization,
   RecordKind,
   RecordStatus,
@@ -41,6 +40,7 @@ import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
 import { getRoleFromRoleCode } from './utils/role.mapper'
 import { getStatusFromStatusCode } from './utils/status.mapper'
 import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 export function extractCharacterString(): ChainableFunction<
   XmlElement,
@@ -609,7 +609,7 @@ export function readContactsForResource(rootEl: XmlElement): Individual[] {
 }
 
 // from gmd:thesaurusName
-export function readThesaurus(rootEl: XmlElement): KeywordThesaurus {
+export function readThesaurus(rootEl: XmlElement): ThesaurusModel {
   if (!rootEl) return null
 
   const findIdentifier = findNestedElement(

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

@@ -1,4 +1,4 @@
-import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 export function getKeywordTypeFromKeywordTypeCode(
   typeCode: string

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

@@ -6,7 +6,6 @@ import {
   DatasetServiceDistribution,
   Individual,
   Keyword,
-  KeywordThesaurus,
   RecordStatus,
   Role,
   ServiceEndpoint,
@@ -46,6 +45,7 @@ import {
 } from '../xml-utils'
 import { readKind } from './read-parts'
 import { namePartsToFull } from './utils/individual-name'
+import { ThesaurusModel } from '../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 export function writeCharacterString(
   text: string
@@ -367,7 +367,7 @@ export function removeKeywords() {
 }
 
 // returns a <gmd:thesaurusName> element
-export function createThesaurus(thesaurus: KeywordThesaurus) {
+export function createThesaurus(thesaurus: ThesaurusModel) {
   return pipe(
     createElement('gmd:thesaurusName'),
     createChild('gmd:CI_Citation'),

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

@@ -24,6 +24,7 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { catchError, map, tap } from 'rxjs/operators'
 import {
+  BaseConverter,
   findConverterForDocument,
   Gn4Converter,
   Gn4SearchResults,
@@ -230,6 +231,25 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  openRecordForDuplication(
+    uniqueIdentifier: string
+  ): Observable<[CatalogRecord, string, false] | null> {
+    return this.loadRecordAsXml(uniqueIdentifier).pipe(
+      switchMap(async (recordAsXml) => {
+        const converter = findConverterForDocument(recordAsXml)
+        const record = await converter.readRecord(recordAsXml)
+        record.uniqueIdentifier = `TEMP-ID-${Date.now()}`
+        record.title = `${record.title} (Copy)`
+        const xml = await converter.writeRecord(record, recordAsXml)
+        window.localStorage.setItem(
+          this.getLocalStorageKeyForRecord(record.uniqueIdentifier),
+          xml
+        )
+        return [record, xml, false] as [CatalogRecord, string, false]
+      })
+    )
+  }
+
   private serializeRecordToXml(
     record: CatalogRecord,
     referenceRecordSource?: string
@@ -265,14 +285,13 @@ export class Gn4Repository implements RecordsRepositoryInterface {
             undefined,
             recordXml
           )
-          .pipe(map(() => recordXml))
-      ),
-      tap(() => {
-        // if saving was successful, the associated draft can be discarded
-        window.localStorage.removeItem(
-          this.getLocalStorageKeyForRecord(record.uniqueIdentifier)
-        )
-      })
+          .pipe(
+            map((response) => {
+              const metadataId = Object.keys(response.metadataInfos)[0]
+              return response.metadataInfos[metadataId][0].uuid
+            })
+          )
+      )
     )
   }
 
@@ -303,4 +322,18 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       ) !== null
     )
   }
+
+  // generated by copilot
+  getAllDrafts(): Observable<CatalogRecord[]> {
+    const items = { ...window.localStorage }
+    const drafts = Object.keys(items)
+      .filter((key) => key.startsWith('geonetwork-ui-draft-'))
+      .map((key) => window.localStorage.getItem(key))
+      .filter((draft) => draft !== null)
+    return from(
+      Promise.all(
+        drafts.map((draft) => findConverterForDocument(draft).readRecord(draft))
+      )
+    )
+  }
 }

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

@@ -76,6 +76,7 @@ export class OrganizationsFromGroupsService
     return {
       name: group.label[lang3],
       ...(group.description && { description: group.description }),
+      ...(group.email && { email: group.email }),
       ...(group.logo && {
         logoUrl: getAsUrl(`${IMAGE_URL}${group.logo}`),
       }),

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

@@ -230,10 +230,12 @@ export class OrganizationsFromMetadataService
       if (!group) return fullOrg
       return {
         ...fullOrg,
+        email: emails[0],
         ...(group.description && { description: group.description }),
         ...(group.logo && { logoUrl: getAsUrl(`${IMAGE_URL}${group.logo}`) }),
         ...(group.website && { website: getAsUrl(group.website) }),
-      }
+        ...(group.email && { email: group.email }),
+      } as Organization
     })
   }
 

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

@@ -8,11 +8,16 @@ import { Injectable } from '@angular/core'
 import { AvatarServiceInterface } from '../auth'
 import { map } from 'rxjs/operators'
 import { Observable, of } from 'rxjs'
-import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
 import {
+  Keyword,
   UserFeedback,
   UserFeedbackViewModel,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 @Injectable()
 export class Gn4PlatformMapper {
@@ -40,7 +45,7 @@ export class Gn4PlatformMapper {
     const {
       enabled,
       emailAddresses,
-      organisation,
+      organization,
       kind,
       lastLoginDate,
       accountNonExpired,
@@ -52,8 +57,12 @@ export class Gn4PlatformMapper {
     return { ...apiUser, id: id.toString() } as UserModel
   }
 
-  thesaurusFromApi(thesaurus: any[], lang3?: string): ThesaurusModel {
-    return thesaurus.map((keyword) => {
+  keywordsFromApi(
+    keywords: KeywordApiResponse[],
+    thesaurus: ThesaurusApiResponse[],
+    lang3?: string
+  ): Keyword[] {
+    return keywords.map((keyword): 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) {
@@ -65,10 +74,22 @@ export class Gn4PlatformMapper {
         lang3 && lang3 in keyword.definitions
           ? keyword.definitions[lang3]
           : keyword.definition
+
+      const matchedThesaurus = thesaurus.find(
+        (thes) => keyword.thesaurusKey === thes.key
+      )
+
       return {
         key,
         label,
         description,
+        type: matchedThesaurus?.dname as KeywordType,
+        thesaurus: {
+          id: matchedThesaurus?.key,
+          name: matchedThesaurus?.title,
+          url: new URL(matchedThesaurus?.url),
+          type: matchedThesaurus?.dname as KeywordType,
+        },
       }
     })
   }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Observable, of, switchMap } from 'rxjs'
+import { Observable, combineLatest, of, switchMap } from 'rxjs'
 import { catchError, map, shareReplay, tap } from 'rxjs/operators'
 import {
   MeApiService,
@@ -12,13 +12,19 @@ import {
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import {
+  Keyword,
   Organization,
   UserFeedback,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 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'
+import { HttpClient } from '@angular/common/http'
+import {
+  KeywordApiResponse,
+  ThesaurusApiResponse,
+} from '../../../../../../../libs/api/metadata-converter/src'
+import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
 
 const minApiVersion = '4.2.2'
 
@@ -60,7 +66,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
    */
-  private thesauri: Record<string, Observable<ThesaurusModel>> = {}
+  private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
   constructor(
     private siteApiService: SiteApiService,
@@ -70,7 +76,8 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
     private langService: LangService,
-    private userfeedbackApiService: UserfeedbackApiService
+    private userfeedbackApiService: UserfeedbackApiService,
+    private httpClient: HttpClient
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -121,7 +128,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       // 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(
+      return this.getKeywordsByUri(thesaurusUri).pipe(
         map((thesaurus) => {
           for (const item of thesaurus) {
             if (item.key === key) return item.label
@@ -133,12 +140,60 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.keyTranslations$.pipe(map((translations) => translations[key]))
   }
 
-  getThesaurusByUri(uri: string): Observable<ThesaurusModel> {
-    if (this.thesauri[uri]) {
-      return this.thesauri[uri]
+  private allThesaurus$ = this.httpClient
+    .get(
+      `${this.registriesApiService.configuration.basePath}/thesaurus?_content_type=json`
+    )
+    .pipe(
+      map((thesaurus) => {
+        return thesaurus[0] as ThesaurusApiResponse[]
+      }),
+      shareReplay(1)
+    )
+
+  searchKeywords(
+    query: string,
+    keywordTypes: KeywordType[]
+  ): Observable<Keyword[]> {
+    const keywords$: Observable<KeywordApiResponse[]> = this.allThesaurus$.pipe(
+      switchMap((thesaurus) => {
+        const selectedThesauri = []
+        keywordTypes.map((keywordType) => {
+          selectedThesauri.push(
+            ...thesaurus.filter((thes) => thes.dname === keywordType)
+          )
+        })
+
+        return this.registriesApiService.searchKeywords(
+          query,
+          this.langService.iso3,
+          10,
+          0,
+          null,
+          selectedThesauri.map((thes) => thes.key),
+          null,
+          `*${query}*`
+        ) as Observable<KeywordApiResponse[]>
+      })
+    )
+
+    return combineLatest([keywords$, this.allThesaurus$]).pipe(
+      map(([keywords, thesaurus]) => {
+        return this.mapper.keywordsFromApi(
+          keywords,
+          thesaurus,
+          this.langService.iso3
+        )
+      })
+    )
+  }
+
+  getKeywordsByUri(uri: string): Observable<Keyword[]> {
+    if (this.keywordsByThesauri[uri]) {
+      return this.keywordsByThesauri[uri]
     }
-    this.thesauri[uri] = this.registriesApiService
-      .searchKeywords(
+    const keywords$: Observable<KeywordApiResponse[]> =
+      this.registriesApiService.searchKeywords(
         null,
         this.langService.iso3,
         1000,
@@ -147,18 +202,23 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         null,
         null,
         `${uri}*`
-      )
-      .pipe(
-        map((thesaurus) =>
-          this.mapper.thesaurusFromApi(
-            thesaurus as any[],
-            this.langService.iso3
-          )
-        ),
-        shareReplay(1)
-      )
+      ) as Observable<KeywordApiResponse[]>
+
+    this.keywordsByThesauri[uri] = combineLatest([
+      keywords$,
+      this.allThesaurus$,
+    ]).pipe(
+      map(([keywords, thesaurus]) => {
+        return this.mapper.keywordsFromApi(
+          keywords,
+          thesaurus,
+          this.langService.iso3
+        )
+      }),
+      shareReplay(1)
+    )
 
-    return this.thesauri[uri]
+    return this.keywordsByThesauri[uri]
   }
 
   getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {

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

@@ -2,6 +2,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import type { Individual } from './contact.model'
 import type { Organization } from './organization.model'
 import type { Geometry } from 'geojson'
+import { KeywordType, ThesaurusModel } from '../thesaurus'
 
 type Uuid = string
 
@@ -60,18 +61,12 @@ export type SpatialRepresentationType =
   | 'table'
   | 'point'
 
-export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
-
-export type KeywordThesaurus = {
-  id: string
-  name?: string
-  url?: URL
-}
-
 export interface Keyword {
+  key?: string
   label: string
+  description?: string
   type: KeywordType
-  thesaurus?: KeywordThesaurus
+  thesaurus?: ThesaurusModel
 }
 // languages should be expressed using two-letters ISO 639-1 codes
 export type LanguageCode = string

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

@@ -1,5 +1,6 @@
 export interface Organization {
   name: string
+  email?: string
   description?: string
   website?: URL
   logoUrl?: URL

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

@@ -1,7 +1,14 @@
-export interface ThesaurusItemModel {
-  key: string
-  label: string
-  description?: string
-}
+export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
 
-export type ThesaurusModel = ThesaurusItemModel[]
+export interface ThesaurusModel {
+  id: string
+  name?: string
+  url?: URL
+  thesaurusKey?: string
+  definition?: string
+  definitions?: object
+  uri?: string
+  value?: string
+  values?: object
+  type?: KeywordType
+}

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

@@ -1,8 +1,8 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
-import type { ThesaurusModel } from './model/thesaurus/'
-import { UserFeedback } from './model/record'
+import { Keyword, UserFeedback } from './model/record'
+import { KeywordType } from './model/thesaurus'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -16,7 +16,11 @@ export abstract class PlatformServiceInterface {
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
-  abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
+  abstract searchKeywords(
+    query: string,
+    keywordTypes: KeywordType[]
+  ): Observable<Keyword[]>
+  abstract getKeywordsByUri(uri: string): Observable<Keyword[]>
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 }

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -30,10 +30,22 @@ export abstract class RecordsRepositoryInterface {
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null>
 
+  /**
+   * This emits once:
+   * - record object with a new unique identifier and suffixed title
+   * - serialized representation of the record as text
+   * - false, as the duplicated record is always a draft
+   * @param uniqueIdentifier
+   * @returns Observable<[CatalogRecord, string, false] | null>
+   */
+  abstract openRecordForDuplication(
+    uniqueIdentifier: string
+  ): Observable<[CatalogRecord, string, false] | null>
+
   /**
    * @param record
    * @param referenceRecordSource
-   * @returns Observable<string> Returns the source of the record as it was serialized when saved
+   * @returns Observable<string> Returns the unique identifier of the record as it was when saved
    */
   abstract saveRecord(
     record: CatalogRecord,
@@ -52,4 +64,7 @@ export abstract class RecordsRepositoryInterface {
 
   abstract clearRecordDraft(uniqueIdentifier: string): void
   abstract recordHasDraft(uniqueIdentifier: string): boolean
+
+  /** will return all pending drafts, both published and not published */
+  abstract getAllDrafts(): Observable<CatalogRecord[]>
 }

package/src/libs/common/fixtures/src/index.ts

@@ -11,3 +11,5 @@ export * from './lib/records.fixtures'
 export * from './lib/repository.fixtures'
 export * from './lib/user.fixtures'
 export * from './lib/user-feedbacks.fixtures'
+
+export * from './lib/editor'