DigitaleBibliothek / Frontend / e9b94f8e028

Commits

Alan Orth authored and GitHub committed e9b94f8e028 Merge 08 Sep 2023

Merge pull request #2445 from hugo-escire/issue/1081

Fix to Metadata Registry create new metadata schema doesn't appear without reload #1081

src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts

Modified

-1
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
-2
+import {
-3
+  DynamicFormControlModel,
-4
+  DynamicFormGroupModel,
-5
+  DynamicFormLayout,
-6
+  DynamicInputModel
-7
+} from '@ng-dynamic-forms/core';
-8
+import { UntypedFormGroup } from '@angular/forms';
-9
+import { RegistryService } from '../../../../core/registry/registry.service';
-10
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
--
+import { take } from 'rxjs/operators';
-+
+import { switchMap, take, tap } from 'rxjs/operators';
-12
+import { TranslateService } from '@ngx-translate/core';
--
+import { combineLatest } from 'rxjs';
-+
+import { Observable, combineLatest } from 'rxjs';
-14
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
-15
-16
+@Component({
-17
+  selector: 'ds-metadata-schema-form',
-18
+  templateUrl: './metadata-schema-form.component.html'
-19
+})
-20
+/**
-21
+ * A form used for creating and editing metadata schemas
-22
+ */
-23
+export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
-140
+    this.registryService.cancelEditMetadataSchema();
-141
+  }
-142
-143
+  /**
-144
+   * Submit the form
-145
+   * When the schema has an id attached -> Edit the schema
-146
+   * When the schema has no id attached -> Create new schema
-147
+   * Emit the updated/created schema using the EventEmitter submitForm
-148
+   */
-149
+  onSubmit(): void {
--
+    this.registryService.clearMetadataSchemaRequests().subscribe();
--
+    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
--
+      (schema: MetadataSchema) => {
--
+        const values = {
--
+          prefix: this.name.value,
--
+          namespace: this.namespace.value
--
+        };
--
+        if (schema == null) {
--
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
--
+            this.submitForm.emit(newSchema);
--
+          });
--
+        } else {
--
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
--
+            id: schema.id,
--
+            prefix: schema.prefix,
--
+            namespace: values.namespace,
--
+          })).subscribe((updatedSchema: MetadataSchema) => {
--
+            this.submitForm.emit(updatedSchema);
-+
+        this.registryService
-+
+          .getActiveMetadataSchema()
-+
+          .pipe(
-+
+            take(1),
-+
+            switchMap((schema: MetadataSchema) => {
-+
+              const metadataValues = {
-+
+                prefix: this.name.value,
-+
+                namespace: this.namespace.value,
-+
+              };
-+
-+
+              let createOrUpdate$: Observable<MetadataSchema>;
-+
-+
+              if (schema == null) {
-+
+                createOrUpdate$ =
-+
+                  this.registryService.createOrUpdateMetadataSchema(
-+
+                    Object.assign(new MetadataSchema(), metadataValues)
-+
+                  );
-+
+              } else {
-+
+                const updatedSchema = Object.assign(
-+
+                  new MetadataSchema(),
-+
+                  schema,
-+
+                  {
-+
+                    namespace: metadataValues.namespace,
-+
+                  }
-+
+                );
-+
+                createOrUpdate$ =
-+
+                  this.registryService.createOrUpdateMetadataSchema(
-+
+                    updatedSchema
-+
+                  );
-+
+              }
-+
-+
+              return createOrUpdate$;
-+
+            }),
-+
+            tap(() => {
-+
+              this.registryService.clearMetadataSchemaRequests().subscribe();
-+
+            })
-+
+          )
-+
+          .subscribe((updatedOrCreatedSchema: MetadataSchema) => {
-+
+            this.submitForm.emit(updatedOrCreatedSchema);
-+
+            this.clearFields();
-+
+            this.registryService.cancelEditMetadataSchema();
-191
+          });
--
+        }
--
+        this.clearFields();
--
+        this.registryService.cancelEditMetadataSchema();
--
+      }
--
+    );
-192
+  }
-193
-194
+  /**
-195
+   * Reset all input-fields to be empty
-196
+   */
-197
+  clearFields(): void {
-198
+    this.formGroup.reset('metadatadataschemagroup');
-199
+    this.name.disabled = false;
-200
+  }
-201

Frontend

Commits

Jira Issues

Add shortcut