From e3ea2cb2b001ccf08c28b1dd863bfaa0b82da146 Mon Sep 17 00:00:00 2001
From: Hugo Dominguez <hugo@escire.lat>
Date: Sat, 19 Aug 2023 15:59:33 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20bug=20of=20caching=20when?=
 =?UTF-8?q?=20add=20new=20schema?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9fb9e5848c70274b7917bead52643e3611308174)
---
 .../metadata-schema-form.component.ts         | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git 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
index f5fcdef78d..61766a4a10 100644
--- 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
@@ -14,7 +14,7 @@ import {
 import { UntypedFormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { switchMap, take } from 'rxjs/operators';
+import { switchMap, take, tap } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, combineLatest } from 'rxjs';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
@@ -156,42 +156,48 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit(): void {
-    const clearMetadataSchemaRequests$ =
-      this.registryService.clearMetadataSchemaRequests();
+        this.registryService
+          .getActiveMetadataSchema()
+          .pipe(
+            take(1),
+            switchMap((schema: MetadataSchema) => {
+              const metadataValues = {
+                prefix: this.name.value,
+                namespace: this.namespace.value,
+              };
 
-    clearMetadataSchemaRequests$
-      .pipe(
-        switchMap(() =>
-          this.registryService.getActiveMetadataSchema().pipe(take(1))
-        ),
-        switchMap((schema: MetadataSchema) => {
-          const metadataValues = {
-            prefix: this.name.value,
-            namespace: this.namespace.value,
-          };
+              let createOrUpdate$: Observable<MetadataSchema>;
 
-          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
+                  );
+              }
 
-          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$;
-        })
-      )
-      .subscribe((updatedOrCreatedSchema: MetadataSchema) => {
-        this.submitForm.emit(updatedOrCreatedSchema);
-        this.clearFields();
-        this.registryService.cancelEditMetadataSchema();
-      });
+              return createOrUpdate$;
+            }),
+            tap(() => {
+              this.registryService.clearMetadataSchemaRequests().subscribe();
+            })
+          )
+          .subscribe((updatedOrCreatedSchema: MetadataSchema) => {
+            this.submitForm.emit(updatedOrCreatedSchema);
+            this.clearFields();
+            this.registryService.cancelEditMetadataSchema();
+          });
   }
 
   /**