geonetwork-ui 2.4.1-dev.89bb09dfa → 2.4.1-dev.9ee0df3df

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

@@ -201,22 +201,6 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
-  getRecordPublicationStatus(uniqueIdentifier: string): Observable<boolean> {
-    return uniqueIdentifier
-      ? this.getRecord(uniqueIdentifier).pipe(
-          map((record) => record.extras['isPublishedToAll'] as boolean)
-        )
-      : of(true)
-  }
-
-  canEditRecord(uniqueIdentifier: string): Observable<boolean> {
-    return this.getRecord(uniqueIdentifier).pipe(
-      map((record) => {
-        return record.extras['edit'] as boolean
-      })
-    )
-  }
-
   openRecordForEdition(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null> {
@@ -239,45 +223,31 @@ export class Gn4Repository implements RecordsRepositoryInterface {
 
   openRecordForDuplication(
     uniqueIdentifier: string
-  ): Observable<[CatalogRecord, string, true] | null> {
-    return this.gn4RecordsApi
-      .create(
-        uniqueIdentifier,
-        '2',
-        'METADATA',
-        '',
-        false,
-        undefined,
-        true,
-        false,
-        undefined,
-        'body',
-        false,
-        {
-          httpHeaderAccept: 'application/json',
-          httpContentTypeSelected: 'application/json;charset=UTF-8',
-        }
-      )
-      .pipe(
-        switchMap((uniqueIdentifier) => {
-          return this.getRecordAsXml(uniqueIdentifier)
-        }),
-        switchMap((xml) => {
-          return from(
-            findConverterForDocument(xml)
-              .readRecord(xml)
-              .then((record) => {
-                return [record, xml, true] as [CatalogRecord, string, true]
-              })
-          )
-        })
-      )
+  ): Observable<[CatalogRecord, string, false] | null> {
+    return this.getRecordAsXml(uniqueIdentifier).pipe(
+      switchMap(async (fetchedRecordAsXml) => {
+        const converter = findConverterForDocument(fetchedRecordAsXml)
+        const record = await converter.readRecord(fetchedRecordAsXml)
+
+        record.uniqueIdentifier = `${TEMPORARY_ID_PREFIX}${Date.now()}`
+        record.title = `${record.title} (Copy)`
+
+        const recordAsXml = await converter.writeRecord(
+          record,
+          fetchedRecordAsXml
+        )
+
+        this.saveRecordToLocalStorage(recordAsXml, record.uniqueIdentifier)
+        this._draftsChanged.next()
+
+        return [record, recordAsXml, false] as [CatalogRecord, string, false]
+      })
+    )
   }
 
   saveRecord(
     record: CatalogRecord,
-    referenceRecordSource?: string,
-    publishToAll = true
+    referenceRecordSource?: string
   ): Observable<string> {
     return this.platformService.getApiVersion().pipe(
       map((version) => {
@@ -292,7 +262,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
           undefined,
           undefined,
           undefined,
-          publishToAll,
+          true,
           undefined,
           'OVERWRITE',
           undefined,
@@ -367,6 +337,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.getRecordFromLocalStorage(uniqueIdentifier) !== null
   }
 
+  isRecordNotYetSaved(uniqueIdentifier: string): boolean {
+    return uniqueIdentifier.startsWith(TEMPORARY_ID_PREFIX)
+  }
+
   // generated by copilot
   getAllDrafts(): Observable<CatalogRecord[]> {
     const items = { ...window.localStorage }
@@ -394,7 +368,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
 
   hasRecordChangedSinceDraft(localRecord: CatalogRecord) {
     return of({
-      isUnsaved: !localRecord.uniqueIdentifier,
+      isUnsaved: this.isRecordNotYetSaved(localRecord.uniqueIdentifier),
       hasDraft: this.recordHasDraft(localRecord.uniqueIdentifier),
     }).pipe(
       switchMap(({ isUnsaved, hasDraft }) => {

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

@@ -17,7 +17,7 @@ export abstract class RecordsRepositoryInterface {
     similarTo: CatalogRecord
   ): Observable<CatalogRecord[]>
   abstract fuzzySearch(query: string): Observable<SearchResults>
-  abstract canEditRecord(uniqueIdentifier: string): Observable<boolean>
+
   /**
    * This emits once:
    * - record object; if a draft exists, this will return it
@@ -40,7 +40,7 @@ export abstract class RecordsRepositoryInterface {
    */
   abstract openRecordForDuplication(
     uniqueIdentifier: string
-  ): Observable<[CatalogRecord, string, true] | null>
+  ): Observable<[CatalogRecord, string, false] | null>
 
   /**
    * @param record
@@ -49,8 +49,7 @@ export abstract class RecordsRepositoryInterface {
    */
   abstract saveRecord(
     record: CatalogRecord,
-    referenceRecordSource?: string,
-    publishToAll?: boolean
+    referenceRecordSource?: string
   ): Observable<string>
 
   /**
@@ -83,6 +82,7 @@ export abstract class RecordsRepositoryInterface {
 
   abstract clearRecordDraft(uniqueIdentifier: string): void
   abstract recordHasDraft(uniqueIdentifier: string): boolean
+  abstract isRecordNotYetSaved(uniqueIdentifier: string): boolean
 
   /** will return all pending drafts, both published and not published */
   abstract getAllDrafts(): Observable<CatalogRecord[]>
@@ -91,5 +91,4 @@ export abstract class RecordsRepositoryInterface {
   abstract hasRecordChangedSinceDraft(
     localRecord: CatalogRecord
   ): Observable<{ user: string; date: Date }>
-  abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
 }

package/src/libs/common/fixtures/src/lib/elasticsearch/full-response.fixtures.ts

@@ -1578,7 +1578,7 @@ export const elasticFullResponseFixture = () => ({
             'http://inspire.ec.europa.eu/metadatacodelist/LimitationsOnPublicAccess/noLimitations',
           ],
         },
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -3249,7 +3249,7 @@ export const elasticFullResponseFixture = () => ({
           userSavedCount: '0',
           sourceCatalogue: '7ea582d4-9ddf-422e-b28f-29760a4c0147',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,

package/src/libs/common/fixtures/src/lib/elasticsearch/search-responses.fixtures.ts

@@ -124,9 +124,9 @@ export const elasticHitsOnlyFixture = () => ({
           sourceCatalogue: '6731be1e-6533-44e0-9b8a-580b45e36e80',
           link: [],
         },
-        edit: true,
+        edit: false,
         owner: false,
-        isPublishedToAll: true,
+        isPublishedToAll: false,
         view: false,
         notify: false,
         download: false,
@@ -203,9 +203,9 @@ export const elasticHitsOnlyFixture = () => ({
           userSavedCount: '4',
           link: [],
         },
-        edit: true,
+        edit: false,
         owner: false,
-        isPublishedToAll: true,
+        isPublishedToAll: false,
         view: false,
         notify: false,
         download: false,
@@ -299,7 +299,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '5',
         },
         sort: [1660176316000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -370,7 +370,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '0',
         },
         sort: [1660089739000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -428,7 +428,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '0',
         },
         sort: [1660089729000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -1531,7 +1531,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
             },
           ],
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -1715,7 +1715,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
                 op3: ['1', '25', '14688'],
                 op6: ['1', '14688'],
                 op5: ['1', '14688'],
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -2369,7 +2369,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
           inspireAnnexForFirstTheme: 'iii',
           userSavedCount: '0',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -2796,7 +2796,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
                 uuid: 'ebef2115-bee5-40bb-b5cc-4593d82ba334',
                 op0: '1',
                 resourceType: ['dataset', 'map', 'map/static'],
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -4920,7 +4920,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
             },
           ],
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -5148,7 +5148,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
                 op3: '1',
                 op6: '1',
                 op5: '1',
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -12690,7 +12690,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           inspireAnnexForFirstTheme: 'iii',
           userSavedCount: '0',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -13022,7 +13022,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           userSavedCount: '0',
           sourceCatalogue: 'ce008f24-8e0d-45a8-97f8-9f10399f0190',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -13349,7 +13349,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           userSavedCount: '0',
           sourceCatalogue: 'ce008f24-8e0d-45a8-97f8-9f10399f0190',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -157,10 +157,6 @@ As such, **it is not very interesting at all.**`,
     },
     otherLanguages: ['de'],
     defaultLanguage: 'en',
-    extras: {
-      isPublishedToAll: true,
-      edit: true,
-    },
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',
@@ -471,165 +467,6 @@ export const simpleDatasetRecordAsXmlFixture =
     </mdb:resourceLineage>
 </mdb:MD_Metadata>`
 
-export const duplicateDatasetRecordAsXmlFixture =
-  (): string => `<?xml version="1.0" encoding="UTF-8"?>
-<mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0">
-    <mdb:metadataIdentifier>
-        <mcc:MD_Identifier>
-            <mcc:code>
-                <gco:CharacterString>my-dataset-001</gco:CharacterString>
-            </mcc:code>
-        </mcc:MD_Identifier>
-    </mdb:metadataIdentifier>
-    <mdb:metadataScope>
-        <mdb:MD_MetadataScope>
-            <mdb:resourceScope>
-                <mcc:MD_ScopeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ScopeCode" codeListValue="dataset">dataset</mcc:MD_ScopeCode>
-            </mdb:resourceScope>
-        </mdb:MD_MetadataScope>
-    </mdb:metadataScope>
-    <mdb:contact>
-        <cit:CI_Responsibility>
-            <cit:role>
-                <cit:CI_RoleCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_RoleCode" codeListValue="pointOfContact">pointOfContact</cit:CI_RoleCode>
-            </cit:role>
-            <cit:party>
-                <cit:CI_Organisation>
-                    <cit:name>
-                        <gco:CharacterString>MyOrganization</gco:CharacterString>
-                    </cit:name>
-                    <cit:contactInfo>
-                        <cit:CI_Contact>
-                            <cit:address>
-                                <cit:CI_Address>
-                                    <cit:electronicMailAddress>
-                                        <gco:CharacterString>bob@org.net</gco:CharacterString>
-                                    </cit:electronicMailAddress>
-                                </cit:CI_Address>
-                            </cit:address>
-                        </cit:CI_Contact>
-                    </cit:contactInfo>
-                    <cit:individual>
-                        <cit:CI_Individual>
-                            <cit:name>
-                                <gco:CharacterString>Bob TheGreat</gco:CharacterString>
-                            </cit:name>
-                            <cit:positionName>
-                                <gco:CharacterString>developer</gco:CharacterString>
-                            </cit:positionName>
-                        </cit:CI_Individual>
-                    </cit:individual>
-                </cit:CI_Organisation>
-            </cit:party>
-        </cit:CI_Responsibility>
-    </mdb:contact>
-    <mdb:dateInfo>
-        <cit:CI_Date>
-            <cit:date>
-                <gco:DateTime>2022-02-01T15:12:00</gco:DateTime>
-            </cit:date>
-            <cit:dateType>
-                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="revision">revision</cit:CI_DateTypeCode>
-            </cit:dateType>
-        </cit:CI_Date>
-    </mdb:dateInfo>
-    <mdb:identificationInfo>
-        <mri:MD_DataIdentification>
-            <mri:citation>
-                <cit:CI_Citation>
-                    <cit:title>
-                        <gco:CharacterString>Copy of record A very interesting dataset (un jeu de données très intéressant)</gco:CharacterString>
-                    </cit:title>
-                    <cit:date>
-                        <cit:CI_Date>
-                            <cit:date>
-                                <gco:DateTime>2022-09-01T14:18:19</gco:DateTime>
-                            </cit:date>
-                            <cit:dateType>
-                                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="creation">creation</cit:CI_DateTypeCode>
-                            </cit:dateType>
-                        </cit:CI_Date>
-                    </cit:date>
-                    <cit:date>
-                        <cit:CI_Date>
-                            <cit:date>
-                                <gco:DateTime>2022-12-04T15:12:00</gco:DateTime>
-                            </cit:date>
-                            <cit:dateType>
-                                <cit:CI_DateTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#CI_DateTypeCode" codeListValue="revision">revision</cit:CI_DateTypeCode>
-                            </cit:dateType>
-                        </cit:CI_Date>
-                    </cit:date>
-                </cit:CI_Citation>
-            </mri:citation>
-            <mri:abstract>
-                <gco:CharacterString>This dataset has been established for testing purposes.</gco:CharacterString>
-            </mri:abstract>
-            <mri:topicCategory>
-                <mri:MD_TopicCategoryCode>testData</mri:MD_TopicCategoryCode>
-            </mri:topicCategory>
-            <mri:status>
-                <mcc:MD_ProgressCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ProgressCode" codeListValue="onGoing">onGoing</mcc:MD_ProgressCode>
-            </mri:status>
-            <mri:resourceMaintenance>
-                <mmi:MD_MaintenanceInformation>
-                    <mmi:userDefinedMaintenanceFrequency>
-                        <gco:TM_PeriodDuration>P0Y0M10D</gco:TM_PeriodDuration>
-                    </mmi:userDefinedMaintenanceFrequency>
-                </mmi:MD_MaintenanceInformation>
-            </mri:resourceMaintenance>
-            <mri:spatialRepresentationType>
-                <mcc:MD_SpatialRepresentationTypeCode codeList="https://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_SpatialRepresentationTypeCode" codeListValue="grid">grid</mcc:MD_SpatialRepresentationTypeCode>
-            </mri:spatialRepresentationType>
-        </mri:MD_DataIdentification>
-    </mdb:identificationInfo>
-    <mdb:distributionInfo>
-        <mrd:MD_Distribution>
-            <mrd:distributionFormat>
-                <mrd:MD_Format>
-                    <mrd:formatSpecificationCitation>
-                        <cit:CI_Citation>
-                            <cit:title>
-                                <gco:CharacterString>x-gis/x-shapefile</gco:CharacterString>
-                            </cit:title>
-                        </cit:CI_Citation>
-                    </mrd:formatSpecificationCitation>
-                </mrd:MD_Format>
-            </mrd:distributionFormat>
-            <mrd:transferOptions>
-                <mrd:MD_DigitalTransferOptions>
-                    <mrd:onLine>
-                        <cit:CI_OnlineResource>
-                            <cit:linkage>
-                                <gco:CharacterString>http://my-org.net/download/1.zip</gco:CharacterString>
-                            </cit:linkage>
-                            <cit:description>
-                                <gco:CharacterString>Dataset downloaded as a shapefile</gco:CharacterString>
-                            </cit:description>
-                            <cit:name>
-                                <gco:CharacterString>Direct download</gco:CharacterString>
-                            </cit:name>
-                            <cit:protocol>
-                                <gco:CharacterString>WWW:DOWNLOAD</gco:CharacterString>
-                            </cit:protocol>
-                            <cit:function>
-                                <cit:CI_OnLineFunctionCode codeList="http://standards.iso.org/iso/19139/resources/gmxCodelists.xml#CI_OnLineFunctionCode" codeListValue="download"/>
-                            </cit:function>
-                        </cit:CI_OnlineResource>
-                    </mrd:onLine>
-                </mrd:MD_DigitalTransferOptions>
-            </mrd:transferOptions>
-        </mrd:MD_Distribution>
-    </mdb:distributionInfo>
-    <mdb:resourceLineage>
-        <mrl:LI_Lineage>
-            <mrl:statement>
-                <gco:CharacterString>This record was edited manually to test the conversion processes</gco:CharacterString>
-            </mrl:statement>
-        </mrl:LI_Lineage>
-    </mdb:resourceLineage>
-</mdb:MD_Metadata>`
-
 export const NATIONAL_KEYWORD = {
   key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/national',
   label: 'National',

package/src/libs/data-access/gn4/src/openapi/api/records.api.service.ts

@@ -1371,10 +1371,7 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'body',
     reportProgress?: boolean,
-    options?: {
-      httpHeaderAccept?: 'application/json'
-      httpContentTypeSelected?: 'application/json;charset=UTF-8'
-    }
+    options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<string>
   public create(
     sourceUuid: string,
@@ -1392,10 +1389,7 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'response',
     reportProgress?: boolean,
-    options?: {
-      httpHeaderAccept?: 'application/json'
-      httpContentTypeSelected?: 'application/json;charset=UTF-8'
-    }
+    options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpResponse<string>>
   public create(
     sourceUuid: string,
@@ -1413,10 +1407,7 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'events',
     reportProgress?: boolean,
-    options?: {
-      httpHeaderAccept?: 'application/json'
-      httpContentTypeSelected?: 'application/json;charset=UTF-8'
-    }
+    options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpEvent<string>>
   public create(
     sourceUuid: string,
@@ -1434,10 +1425,7 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe: any = 'body',
     reportProgress: boolean = false,
-    options?: {
-      httpHeaderAccept?: 'application/json'
-      httpContentTypeSelected?: 'application/json;charset=UTF-8'
-    }
+    options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<any> {
     if (sourceUuid === null || sourceUuid === undefined) {
       throw new Error(
@@ -1522,14 +1510,6 @@ export class RecordsApiService {
 
     let headers = this.defaultHeaders
 
-    // to determine the Content-Type header
-    const consumes: string[] = ['application/json;charset=UTF-8']
-    const httpContentTypeSelected: string | undefined =
-      this.configuration.selectHeaderContentType(consumes)
-    if (httpContentTypeSelected !== undefined) {
-      headers = headers.set('Content-Type', httpContentTypeSelected)
-    }
-
     let httpHeaderAcceptSelected: string | undefined =
       options && options.httpHeaderAccept
     if (httpHeaderAcceptSelected === undefined) {

package/src/libs/feature/editor/src/lib/+state/editor.actions.ts

@@ -7,6 +7,7 @@ export const openRecord = createAction(
   '[Editor] Open record',
   props<{
     record: CatalogRecord
+    alreadySavedOnce: boolean
     recordSource?: string | null
   }>()
 )
@@ -50,13 +51,3 @@ export const hasRecordChangedSinceDraftSuccess = createAction(
   '[Editor] Has Record Changed Since Draft Success',
   props<{ changes: { user: string; date: Date } }>()
 )
-
-export const isPublished = createAction(
-  '[Editor] Record Saved But Not Published',
-  props<{ isPublished: boolean }>()
-)
-
-export const canEditRecord = createAction(
-  '[Editor] User can edit record',
-  props<{ canEditRecord: boolean }>()
-)