geonetwork-ui 2.4.0-dev.ac57b75b → 2.4.0-dev.c5f4c491

package/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.d.ts

@@ -12,7 +12,7 @@ export declare class OverviewUploadComponent implements OnInit, OnChanges {
     altTextChange: EventEmitter<string>;
     resourceAltText: string;
     resourceFileName: string;
-    resourceUrl: URL;
+    resourceUrl: string;
     constructor(recordsApiService: RecordsApiService, cd: ChangeDetectorRef);
     ngOnInit(): void;
     handleFileChange(file: File): void;

package/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"overview-upload.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,YAAY,EAEZ,SAAS,EACT,MAAM,EAEN,aAAa,EACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAA;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,8DAA8D,CAAA;;AAQ9F,qBAQa,uBAAwB,YAAW,MAAM,EAAE,SAAS;IAW7D,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,EAAE;IAXH,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAG,WAAW,CAAA;IACxB,cAAc,gCAA6C;IAC3D,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IAElE,eAAe,SAAK;IACpB,gBAAgB,SAAK;IACrB,WAAW,EAAE,GAAG,CAAA;gBAGN,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,iBAAiB;IAG/B,QAAQ,IAAI,IAAI;IAsBhB,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAmB3B,eAAe,CAAC,GAAG,EAAE,MAAM;IAmB3B,mBAAmB,CAAC,UAAU,EAAE,MAAM;IAUtC,YAAY;IAgBZ,OAAO,CAAC,WAAW,CAUlB;IAED,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;yCAjH9B,uBAAuB;2CAAvB,uBAAuB;CAsInC"}
+{"version":3,"file":"overview-upload.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAEjB,YAAY,EAEZ,SAAS,EACT,MAAM,EAEN,aAAa,EACd,MAAM,eAAe,CAAA;AAEtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAA;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,8DAA8D,CAAA;;AAE9F,qBAQa,uBAAwB,YAAW,MAAM,EAAE,SAAS;IAW7D,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,EAAE;IAXH,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAG,WAAW,CAAA;IACxB,cAAc,gCAA6C;IAC3D,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IAElE,eAAe,EAAE,MAAM,CAAA;IACvB,gBAAgB,EAAE,MAAM,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;gBAGT,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,iBAAiB;IAG/B,QAAQ,IAAI,IAAI;IAqBhB,gBAAgB,CAAC,IAAI,EAAE,IAAI;IAmB3B,eAAe,CAAC,GAAG,EAAE,MAAM;IAmB3B,mBAAmB,CAAC,UAAU,EAAE,MAAM;IAWtC,YAAY;IAiBZ,OAAO,CAAC,WAAW,CAUlB;IAED,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI;yCAlH9B,uBAAuB;2CAAvB,uBAAuB;CAuInC"}

package/libs/feature/editor/src/lib/components/record-form/record-form.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"record-form.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAG/C,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,4BAA4B,CAAA;;AAEnC,qBAQa,mBAAmB;IACX,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAEvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAQhE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,GAAG;IAI7D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,GAAG;yCAfzD,mBAAmB;2CAAnB,mBAAmB;CAkB/B"}
+{"version":3,"file":"record-form.component.d.ts","sourceRoot":"","sources":["../../../../../../../src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAG/C,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,4BAA4B,CAAA;;AAEnC,qBAQa,mBAAmB;IACX,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAEvC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAOhE,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,GAAG;IAI7D,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,GAAG,GAAG;yCAdzD,mBAAmB;2CAAnB,mBAAmB;CAiB/B"}

package/libs/ui/inputs/src/lib/image-input/image-input.component.d.ts

@@ -1,13 +1,11 @@
 import { HttpClient } from '@angular/common/http';
 import { ChangeDetectorRef, EventEmitter } from '@angular/core';
-import { FormControl } from '@angular/forms';
 import * as i0 from "@angular/core";
 export declare class ImageInputComponent {
     private http;
     private cd;
-    formControl: FormControl;
     maxSizeMB: number;
-    previewUrl?: URL;
+    previewUrl?: string;
     altText?: string;
     uploadProgress?: number;
     uploadError?: boolean;
@@ -41,6 +39,6 @@ export declare class ImageInputComponent {
     private filterTypeImage;
     private resizeAndEmit;
     static ɵfac: i0.ɵɵFactoryDeclaration<ImageInputComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<ImageInputComponent, "gn-ui-image-input", never, { "formControl": { "alias": "formControl"; "required": false; }; "maxSizeMB": { "alias": "maxSizeMB"; "required": false; }; "previewUrl": { "alias": "previewUrl"; "required": false; }; "altText": { "alias": "altText"; "required": false; }; "uploadProgress": { "alias": "uploadProgress"; "required": false; }; "uploadError": { "alias": "uploadError"; "required": false; }; }, { "fileChange": "fileChange"; "urlChange": "urlChange"; "uploadCancel": "uploadCancel"; "delete": "delete"; "altTextChange": "altTextChange"; }, never, never, true, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<ImageInputComponent, "gn-ui-image-input", never, { "maxSizeMB": { "alias": "maxSizeMB"; "required": false; }; "previewUrl": { "alias": "previewUrl"; "required": false; }; "altText": { "alias": "altText"; "required": false; }; "uploadProgress": { "alias": "uploadProgress"; "required": false; }; "uploadError": { "alias": "uploadError"; "required": false; }; }, { "fileChange": "fileChange"; "urlChange": "urlChange"; "uploadCancel": "uploadCancel"; "delete": "delete"; "altTextChange": "altTextChange"; }, never, never, true, never>;
 }
 //# sourceMappingURL=image-input.component.d.ts.map

package/libs/ui/inputs/src/lib/image-input/image-input.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-input.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/inputs/src/lib/image-input/image-input.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAEL,iBAAiB,EAEjB,YAAY,EAGb,MAAM,eAAe,CAAA;AAStB,OAAO,EAAE,WAAW,EAAuB,MAAM,gBAAgB,CAAA;;AAEjE,qBAgBa,mBAAmB;IAsBlB,OAAO,CAAC,IAAI;IAAc,OAAO,CAAC,EAAE;IArBvC,WAAW,EAAG,WAAW,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,GAAG,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IACnD,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IACpD,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IACrD,MAAM,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IAC/C,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IAElE,aAAa,UAAQ;IACrB,YAAY,UAAQ;IACpB,aAAa,UAAQ;IACrB,gBAAgB,UAAQ;IAExB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;gBAEb,IAAI,EAAE,UAAU,EAAU,EAAE,EAAE,iBAAiB;IAEnE,cAAc;IAUd,gBAAgB;IAUhB,mBAAmB,CAAC,aAAa,EAAE,OAAO;IAO1C,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE;IAS7B,eAAe,CAAC,KAAK,EAAE,KAAK;IAQ5B,eAAe;IAKf,eAAe,CAAC,KAAK,EAAE,KAAK;IAKtB,WAAW;IAiCjB,wBAAwB;IAQxB,YAAY;IAIZ,WAAW;IAWX,YAAY;IAKZ,kBAAkB;IAIlB,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAKhC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,aAAa;yCA1JV,mBAAmB;2CAAnB,mBAAmB;CAiK/B"}
+{"version":3,"file":"image-input.component.d.ts","sourceRoot":"","sources":["../../../../../../src/libs/ui/inputs/src/lib/image-input/image-input.component.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAEL,iBAAiB,EAEjB,YAAY,EAGb,MAAM,eAAe,CAAA;;AAUtB,qBAea,mBAAmB;IAqBlB,OAAO,CAAC,IAAI;IAAc,OAAO,CAAC,EAAE;IApBvC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,WAAW,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IACnD,SAAS,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IACpD,YAAY,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IACrD,MAAM,EAAE,YAAY,CAAC,IAAI,CAAC,CAAqB;IAC/C,aAAa,EAAE,YAAY,CAAC,MAAM,CAAC,CAAqB;IAElE,aAAa,UAAQ;IACrB,YAAY,UAAQ;IACpB,aAAa,UAAQ;IACrB,gBAAgB,UAAQ;IAExB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,cAAc,CAAC,EAAE,MAAM,GAAG,KAAK,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;gBAEb,IAAI,EAAE,UAAU,EAAU,EAAE,EAAE,iBAAiB;IAEnE,cAAc;IAUd,gBAAgB;IAUhB,mBAAmB,CAAC,aAAa,EAAE,OAAO;IAO1C,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE;IAS7B,eAAe,CAAC,KAAK,EAAE,KAAK;IAQ5B,eAAe;IAKf,eAAe,CAAC,KAAK,EAAE,KAAK;IAKtB,WAAW;IAgCjB,wBAAwB;IAQxB,YAAY;IAIZ,WAAW;IAWX,YAAY;IAIZ,kBAAkB;IAIlB,mBAAmB,CAAC,KAAK,EAAE,KAAK;IAKhC,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,aAAa;yCAvJV,mBAAmB;2CAAnB,mBAAmB;CA8J/B"}

package/package.json

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

package/src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.html

@@ -2,7 +2,6 @@
   [maxSizeMB]="5"
   [previewUrl]="resourceUrl"
   [altText]="resourceAltText"
-  [formControl]="formControl"
   (fileChange)="handleFileChange($event)"
   (urlChange)="handleUrlChange($event)"
   (altTextChange)="handleAltTextChange($event)"

package/src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.ts

@@ -15,12 +15,6 @@ import { UiInputsModule } from '../../../../../../../libs/ui/inputs/src'
 import { FormControl } from '@angular/forms'
 import { GraphicOverview } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
-const extractFileNameFromUrl = (url: string): string => {
-  const pattern = new RegExp(`attachments/([^/?#]+)(?:[/?#]|$)`, 'i')
-  const match = url.match(pattern)
-  return match ? match[1] : ''
-}
-
 @Component({
   selector: 'gn-ui-overview-upload',
   standalone: true,
@@ -35,9 +29,9 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
   @Output() overviewChange = new EventEmitter<GraphicOverview | null>()
   @Output() altTextChange: EventEmitter<string> = new EventEmitter()
 
-  resourceAltText = '' // = ressourceFileName by default
-  resourceFileName = ''
-  resourceUrl: URL
+  resourceAltText: string
+  resourceFileName: string
+  resourceUrl: string
 
   constructor(
     private recordsApiService: RecordsApiService,
@@ -48,14 +42,13 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
     this.recordsApiService.getAllResources(this.metadataUuid).subscribe({
       next: (resources) => {
         if (resources && resources.length > 0) {
-          this.resourceUrl = new URL(resources[0]?.url)
-          this.resourceAltText =
-            this.resourceAltText === ''
-              ? resources[0].filename
-              : this.resourceAltText
-          this.resourceFileName = extractFileNameFromUrl(resources[0]?.url)
+          this.resourceUrl = resources[0].url
+          this.resourceFileName = resources[0].filename
+          if (!this.resourceAltText) {
+            this.resourceAltText = this.resourceFileName
+          }
         } else {
-          this.resourceUrl = null
+          this.resourceUrl = ''
           this.resourceAltText = ''
           this.resourceFileName = ''
         }
@@ -71,7 +64,7 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
       .putResource(this.metadataUuid, file, 'public')
       .subscribe({
         next: (resource) => {
-          this.resourceUrl = new URL(resource.url)
+          this.resourceUrl = resource.url
           this.resourceAltText = resource.filename
 
           this.overviewChange.emit({
@@ -90,7 +83,7 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
       .putResourceFromURL(this.metadataUuid, url, 'public')
       .subscribe({
         next: (resource) => {
-          this.resourceUrl = new URL(resource.url)
+          this.resourceUrl = resource.url
           this.resourceAltText = resource.filename
 
           this.overviewChange.emit({
@@ -108,19 +101,21 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
     this.resourceAltText = newAltText
 
     this.overviewChange.emit({
-      url: this.resourceUrl,
+      url: new URL(this.resourceUrl),
       description: this.resourceAltText,
     })
+
     this.cd.markForCheck()
   }
 
   handleDelete() {
+    //this.formControl.markAsDirty()
     this.recordsApiService
       .delResource(this.metadataUuid, this.resourceFileName)
       .subscribe({
         next: () => {
-          this.resourceAltText = null
-          this.resourceUrl = null
+          this.resourceAltText = ''
+          this.resourceUrl = ''
 
           this.overviewChange.emit(null)
 
@@ -133,7 +128,7 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
   private errorHandle = (error: never) => {
     console.error(error)
 
-    this.resourceUrl = null
+    this.resourceUrl = ''
     this.resourceAltText = ''
     this.resourceFileName = ''
 
@@ -157,7 +152,7 @@ export class OverviewUploadComponent implements OnInit, OnChanges {
       } else {
         return
       }
-      if (overview.description && overview.description !== '') {
+      if (overview.description) {
         this.resourceAltText = overview.description
         this.cd.markForCheck()
       }

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts

@@ -24,7 +24,6 @@ export class RecordFormComponent {
     if (!model) {
       return
     }
-    console.log(newValue)
     this.facade.updateRecordField(model, newValue)
   }
 

package/src/libs/ui/inputs/src/lib/image-input/image-input.component.html

@@ -51,7 +51,7 @@
   <div class="w-full h-full flex flex-col gap-2">
     <label
       gnUiFilesDrop
-      class="block flex-1 border-2 border-dashed border-gray-300 rounded-lg p-6 flex flex-col items-center justify-center gap-4 hover:cursor-pointer"
+      class="block flex-1 border-2 border-dashed border-gray-300 rounded-lg p-6 flex flex-col items-center justify-center gap-4"
       (dragFilesOver)="handleDragFilesOver($event)"
       (dropFiles)="handleDropFiles($event)"
     >

package/src/libs/ui/inputs/src/lib/image-input/image-input.component.ts

@@ -16,7 +16,6 @@ import { ButtonComponent } from '../button/button.component'
 import { FilesDropDirective } from '../files-drop/files-drop.directive'
 import { TranslateModule } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { FormControl, ReactiveFormsModule } from '@angular/forms'
 
 @Component({
   selector: 'gn-ui-image-input',
@@ -31,13 +30,11 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms'
     FilesDropDirective,
     MatProgressSpinnerModule,
     TranslateModule,
-    ReactiveFormsModule,
   ],
 })
 export class ImageInputComponent {
-  @Input() formControl!: FormControl
   @Input() maxSizeMB: number
-  @Input() previewUrl?: URL
+  @Input() previewUrl?: string
   @Input() altText?: string
   @Input() uploadProgress?: number
   @Input() uploadError?: boolean
@@ -130,8 +127,7 @@ export class ImageInputComponent {
             const file = new File([blob], name)
             this.fileChange.emit(file)
           },
-          error: (error) => {
-            console.error(error)
+          error: () => {
             this.downloadError = true
             this.cd.markForCheck()
             this.urlChange.emit(this.urlInputValue)
@@ -169,7 +165,6 @@ export class ImageInputComponent {
   }
 
   handleDelete() {
-    this.formControl.markAsDirty()
     this.delete.emit()
   }