[DURACOM-413] update error handling/validation + resync translations

Author: FrancescoMolinaro

src/app/submission/edit/submission-edit.component.spec.ts

@@ -51,7 +51,13 @@ describe('SubmissionEditComponent Component', () => {
 
   const submissionId = '826';
   const route: ActivatedRouteStub = new ActivatedRouteStub();
-  const submissionObject: any = mockSubmissionObject;
+  const submissionObject: any = Object.assign({}, mockSubmissionObject, {
+    collection: {
+      ...mockSubmissionObject.collection,
+      hasMetadata: (_: string) => true,
+      firstMetadataValue: (_: string) => true,
+    },
+  });
 
   beforeEach(waitForAsync(() => {
     itemDataService = jasmine.createSpyObj('itemDataService', {

src/app/submission/edit/submission-edit.component.ts

@@ -160,10 +160,8 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
             this.router.navigate(['/mydspace']);
           } else {
             const collection = submissionObjectRD.payload.collection as Collection;
-            const entityType = collection.hasMetadata('dspace.entity.type') ? collection.firstMetadataValue('dspace.entity.type') : null;
-            if (hasValue(entityType)) {
-              this.entityType = entityType;
-            }
+            this.entityType = (hasValue(collection) && collection.hasMetadata('dspace.entity.type'))
+              ? collection.firstMetadataValue('dspace.entity.type') : null;
             const { errors } = submissionObjectRD.payload;
             this.submissionErrors = parseSectionErrors(errors);
             this.submissionId = submissionObjectRD.payload.id.toString();

src/app/submission/sections/custom-url/submission-section-custom-url.component.html

@@ -33,6 +33,5 @@ <h4 >{{'submission.sections.custom-url.label.previous-urls' | translate}}</h4>
         }
       </ul>
     </div>
-
   }
 </div>

src/app/submission/sections/custom-url/submission-section-custom-url.component.ts

@@ -1,7 +1,13 @@
 import {
+  AfterViewInit,
   Component,
   Inject,
+  ViewChild,
 } from '@angular/core';
+import {
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { JsonPatchOperationPathCombiner } from '@dspace/core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '@dspace/core/json-patch/builder/json-patch-operations-builder';
 import { SubmissionSectionError } from '@dspace/core/submission/models/submission-section-error.model';
@@ -40,6 +46,8 @@ import { SectionFormOperationsService } from '../form/section-form-operations.se
 import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
+
+
 /**
  * This component represents the submission section to select the Creative Commons license.
  */
@@ -53,7 +61,7 @@ import { SectionsService } from '../sections.service';
   ],
   standalone: true,
 })
-export class SubmissionSectionCustomUrlComponent extends SectionModelComponent {
+export class SubmissionSectionCustomUrlComponent extends SectionModelComponent implements AfterViewInit {
 
   /**
    * The form id
@@ -103,6 +111,13 @@ export class SubmissionSectionCustomUrlComponent extends SectionModelComponent {
    */
   redirectedUrls: string[] = [];
 
+  private readonly errorMessagePrefix = 'error.validation.custom-url.';
+
+  /**
+   * The FormComponent reference
+   */
+  @ViewChild('formRef') public formRef: FormComponent;
+
   constructor(
     protected sectionService: SectionsService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
@@ -181,7 +196,6 @@ export class SubmissionSectionCustomUrlComponent extends SectionModelComponent {
    *    the section data retrieved from the server
    */
   initForm(sectionData: WorkspaceitemSectionCustomUrlObject): void {
-    const model =
     this.formModel = [
       new DynamicInputModel({
         id: 'url',
@@ -198,6 +212,42 @@ export class SubmissionSectionCustomUrlComponent extends SectionModelComponent {
     this.updateSectionData(sectionData);
   }
 
+  customUrlValidator = (_: AbstractControl): ValidationErrors | null => {
+    if (this.sectionData.errorsToShow?.length) {
+      const urlErrors = this.sectionData.errorsToShow.map((error) =>
+        error.message.replace(this.errorMessagePrefix, ''));
+      const validationErrors: ValidationErrors = {};
+
+      urlErrors.forEach((error) => {
+        validationErrors[error] = true;
+      });
+      return validationErrors;
+    }
+    return null;
+  };
+
+  /**
+   * Update control status
+   * @param addValidator
+   */
+  updateControlStatus(addValidator = false): void {
+    const control = this.formRef?.formGroup?.get('url');
+    if (control) {
+      if (addValidator) {
+        control.addValidators(this.customUrlValidator);
+        // reset errors on user input
+        this.subs.push(control.valueChanges.subscribe(() => {
+          control.setErrors(null);
+        }));
+      }
+      control.updateValueAndValidity({ onlySelf: true, emitEvent: false });
+    }
+  }
+
+  ngAfterViewInit(): void {
+    this.updateControlStatus(true);
+  }
+
   /**
    * When an information is changed build the formOperations
    * If the submission scope is in EditItem also manage redirected-urls formOperations
@@ -250,6 +300,7 @@ export class SubmissionSectionCustomUrlComponent extends SectionModelComponent {
         if (isNotEmpty(errors) || isNotEmpty(this.sectionData.errorsToShow)) {
           this.sectionService.checkSectionErrors(this.submissionId, this.sectionData.id, this.formId, errors, this.sectionData.errorsToShow);
           this.sectionData.errorsToShow = errors;
+          this.updateControlStatus(true);
         }
       }),
     );

src/app/submission/utils/submission.mock.ts

@@ -404,6 +404,11 @@ export const mockSubmissionObject = {
         language: null,
         value: 'Collection of Sample Items',
       },
+      {
+        key: 'dspace.entity.type',
+        language: null,
+        value: 'Entity type of Sample Collection',
+      },
     ],
     _links: {
       license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },

src/assets/i18n/gu.json5

@@ -4765,6 +4765,7 @@
   "item.preview.dc.identifier.openalex": "ઓપનએલેક્સ પરિચયકર્તા",
 
   // "item.preview.dc.description": "Description",
+  // TODO Source message changed - Revise the translation
   "item.preview.dc.description": "વર્ણન:",
 
   // "item.select.confirm": "Confirm selected",

src/assets/i18n/mr.json5

@@ -4760,6 +4760,7 @@
   "item.preview.dc.identifier.openalex": "OpenAlex ओळखकर्ता",
 
   // "item.preview.dc.description": "Description",
+  // TODO Source message changed - Revise the translation
   "item.preview.dc.description": "वर्णन:",
 
   // "item.select.confirm": "Confirm selected",

src/config/default-app-config.ts

@@ -137,9 +137,6 @@ export class DefaultAppConfig implements AppConfig {
     validatorMap: {
       required: 'required',
       regex: 'pattern',
-      conflict: 'conflict',
-      empty: 'empty',
-      'invalid-characters': 'invalid-characters',
     },
   };