Merge branch 'fix-metadata-fields-containing-dots_contribute-7.4' into fix-metadata-fields-containing-dots_contribute-main

2025-10-17 15:03:07 +00:00 · 2023-04-03 14:46:23 +02:00
parent 9cc158230f 24e6cdd3ec
commit 751ce12f97
4 changed files with 75 additions and 81 deletions
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -1,5 +1,4 @@
 import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -30,7 +29,7 @@ describe('MetadataSchemaFormComponent', () => {
      return {
        patchValue: () => {
        },
-        markAsUntouched(opts?: any) {
+        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
        },
      };
    }
@@ -38,7 +37,7 @@ describe('MetadataSchemaFormComponent', () => {
  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */

  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
      declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
      providers: [
@@ -66,7 +65,7 @@ describe('MetadataSchemaFormComponent', () => {
    const expected = Object.assign(new MetadataSchema(), {
      namespace: namespace,
      prefix: prefix
-    });
+    } as MetadataSchema);

    beforeEach(() => {
      spyOn(component.submitForm, 'emit');
@@ -81,11 +80,10 @@ describe('MetadataSchemaFormComponent', () => {
        fixture.detectChanges();
      });

-      it('should emit a new schema using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new schema using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
    });

    describe('with an active schema', () => {
@@ -93,7 +91,7 @@ describe('MetadataSchemaFormComponent', () => {
        id: 1,
        namespace: namespace,
        prefix: prefix
-      });
+      } as MetadataSchema);

      beforeEach(() => {
        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(expectedWithId));
@@ -101,11 +99,10 @@ describe('MetadataSchemaFormComponent', () => {
        fixture.detectChanges();
      });

-      it('should edit the existing schema using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should edit the existing schema using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
    });
  });
 });
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -87,9 +87,12 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
          name: 'name',
          validators: {
            required: null,
-            pattern: '^[^ ,_]{1,32}$'
+            pattern: '^[^. ,_]{1,32}$',
          },
          required: true,
+          errorMessages: {
+            pattern: 'error.validation.metadata.namespace.invalid-pattern',
+          },
        });
      this.namespace = new DynamicInputModel({
          id: 'namespace',
@@ -97,12 +100,8 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
          name: 'namespace',
          validators: {
            required: null,
-            pattern: '^[^.]*$',
          },
          required: true,
-          errorMessages: {
-            pattern: 'error.validation.metadata.namespace.invalid-pattern',
-          },
        });
      this.formModel = [
        new DynamicFormGroupModel(
@@ -112,13 +111,18 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
          })
      ];
      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataSchema().subscribe((schema) => {
-        this.formGroup.patchValue({
-          metadatadataschemagroup:{
-            name: schema != null ? schema.prefix : '',
-            namespace: schema != null ? schema.namespace : ''
-          }
-        });
+      this.registryService.getActiveMetadataSchema().subscribe((schema: MetadataSchema) => {
+        if (schema == null) {
+          this.clearFields();
+        } else {
+          this.formGroup.patchValue({
+            metadatadataschemagroup: {
+              name: schema.prefix,
+              namespace: schema.namespace,
+            },
+          });
+          this.name.disabled = true;
+        }
      });
    });
  }
@@ -136,10 +140,10 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
   * When the schema has no id attached -> Create new schema
   * Emit the updated/created schema using the EventEmitter submitForm
   */
-  onSubmit() {
+  onSubmit(): void {
    this.registryService.clearMetadataSchemaRequests().subscribe();
    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
-      (schema) => {
+      (schema: MetadataSchema) => {
        const values = {
          prefix: this.name.value,
          namespace: this.namespace.value
@@ -151,9 +155,9 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
        } else {
          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
            id: schema.id,
-            prefix: (values.prefix ? values.prefix : schema.prefix),
-            namespace: (values.namespace ? values.namespace : schema.namespace)
-          })).subscribe((updatedSchema) => {
+            prefix: schema.prefix,
+            namespace: values.namespace,
+          })).subscribe((updatedSchema: MetadataSchema) => {
            this.submitForm.emit(updatedSchema);
          });
        }
@@ -166,14 +170,9 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
  /**
   * Reset all input-fields to be empty
   */
-  clearFields() {
-    this.formGroup.markAsUntouched();
-    this.formGroup.patchValue({
-      metadatadataschemagroup:{
-        name: '',
-        namespace: ''
-      }
-    });
+  clearFields(): void {
+    this.formGroup.reset('metadatadataschemagroup');
+    this.name.disabled = false;
  }

  /**
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -40,7 +40,7 @@ describe('MetadataFieldFormComponent', () => {
      return {
        patchValue: () => {
        },
-        markAsUntouched(opts?: any) {
+        reset(_value?: any, _options?: { onlySelf?: boolean; emitEvent?: boolean; }): void {
        },
      };
    }
@@ -48,7 +48,7 @@ describe('MetadataFieldFormComponent', () => {
  /* eslint-enable no-empty, @typescript-eslint/no-empty-function */

  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
      declarations: [MetadataFieldFormComponent, EnumKeysPipe],
      providers: [
@@ -100,11 +100,10 @@ describe('MetadataFieldFormComponent', () => {
        fixture.detectChanges();
      });

-      it('should emit a new field using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new field using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
    });

    describe('with an active field', () => {
@@ -122,11 +121,10 @@ describe('MetadataFieldFormComponent', () => {
        fixture.detectChanges();
      });

-      it('should edit the existing field using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should edit the existing field using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
    });
  });
 });
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -142,14 +142,20 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
        })
      ];
      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataField().subscribe((field) => {
-        this.formGroup.patchValue({
-          metadatadatafieldgroup: {
-            element: field != null ? field.element : '',
-            qualifier: field != null ? field.qualifier : '',
-            scopeNote: field != null ? field.scopeNote : ''
-          }
-        });
+      this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => {
+        if (field == null) {
+          this.clearFields();
+        } else {
+          this.formGroup.patchValue({
+            metadatadatafieldgroup: {
+              element: field.element,
+              qualifier: field.qualifier,
+              scopeNote: field.scopeNote,
+            },
+          });
+          this.element.disabled = true;
+          this.qualifier.disabled = true;
+        }
      });
    });
  }
@@ -167,25 +173,24 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
   * When the field has no id attached -> Create new field
   * Emit the updated/created field using the EventEmitter submitForm
   */
-  onSubmit() {
+  onSubmit(): void {
    this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
-      (field) => {
-        const values = {
-          element: this.element.value,
-          qualifier: this.qualifier.value,
-          scopeNote: this.scopeNote.value
-        };
+      (field: MetadataField) => {
        if (field == null) {
-          this.registryService.createMetadataField(Object.assign(new MetadataField(), values), this.metadataSchema).subscribe((newField) => {
+          this.registryService.createMetadataField(Object.assign(new MetadataField(), {
+            element: this.element.value,
+            qualifier: this.qualifier.value,
+            scopeNote: this.scopeNote.value,
+          }), this.metadataSchema).subscribe((newField: MetadataField) => {
            this.submitForm.emit(newField);
          });
        } else {
          this.registryService.updateMetadataField(Object.assign(new MetadataField(), field, {
            id: field.id,
-            element: (values.element ? values.element : field.element),
-            qualifier: (values.qualifier ? values.qualifier : field.qualifier),
-            scopeNote: (values.scopeNote ? values.scopeNote : field.scopeNote)
-          })).subscribe((updatedField) => {
+            element: field.element,
+            qualifier: field.qualifier,
+            scopeNote: this.scopeNote.value,
+          })).subscribe((updatedField: MetadataField) => {
            this.submitForm.emit(updatedField);
          });
        }
@@ -198,15 +203,10 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
  /**
   * Reset all input-fields to be empty
   */
-  clearFields() {
-    this.formGroup.markAsUntouched();
-    this.formGroup.patchValue({
-      metadatadatafieldgroup: {
-        element: '',
-        qualifier: '',
-        scopeNote: ''
-      }
-    });
+  clearFields(): void {
+    this.formGroup.reset('metadatadatafieldgroup');
+    this.element.disabled = false;
+    this.qualifier.disabled = false;
  }

  /**