From 27f3f9c7a1cae356597059a4ce6ff259b59c38e7 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 13:46:45 +0100
Subject: [PATCH] 58789: Force reload list after editing and deleting metadata
 as well

---
 .../metadata-registry.component.html          |  3 +--
 .../metadata-registry.component.ts            | 25 +++++++++++++------
 .../metadata-schema-form.component.ts         |  5 +---
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 4084a88c1a..b9590978ed 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -6,8 +6,7 @@
 
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
-            <ds-metadata-schema-form
-              (submitForm)="createdSchema($event)"></ds-metadata-schema-form>
+            <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
 
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 8405e05faa..ced3e019ff 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -9,6 +9,7 @@ import { map } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -23,7 +24,8 @@ export class MetadataRegistryComponent {
     pageSize: 2
   });
 
-  constructor(private registryService: RegistryService) {
+  constructor(private registryService: RegistryService,
+              private notificationsService: NotificationsService) {
     this.updateSchemas();
   }
 
@@ -36,6 +38,11 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
   }
 
+  private forceUpdateSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
+    this.updateSchemas();
+  }
+
   editSchema(schema: MetadataSchema) {
     this.registryService.editMetadataSchema(schema);
   }
@@ -62,11 +69,6 @@ export class MetadataRegistryComponent {
     );
   }
 
-  createdSchema(event) {
-    this.registryService.clearMetadataSchemaRequests().subscribe((value) => console.log('cleared for substring: ' + value));
-    this.updateSchemas();
-  }
-
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
       (schemas) => {
@@ -77,8 +79,15 @@ export class MetadataRegistryComponent {
           }
         }
         zip(...tasks$).subscribe((responses: RestResponse[]) => {
-          console.log('deleted ' + responses.length + ' schemas');
-          // TODO: Reload the list of schemas
+          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
+          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+          if (successResponses.length > 0) {
+            this.notificationsService.success('Success', `Successfully deleted ${successResponses.length} metadata schemas`);
+          }
+          if (failedResponses.length > 0) {
+            this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata schemas`);
+          }
+          this.forceUpdateSchemas();
         });
       }
     )
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 53a01af9da..e1f6ae859c 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
@@ -103,9 +103,7 @@ export class MetadataSchemaFormComponent implements OnInit {
         };
         if (schema == null) {
           this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            console.log(newSchema);
             this.submitForm.emit(newSchema);
-            // TODO: Reload the list of schemas
           });
         } else {
           this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
@@ -113,8 +111,7 @@ export class MetadataSchemaFormComponent implements OnInit {
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
           })).subscribe((updatedSchema) => {
-            console.log(updatedSchema);
-            // TODO: Reload the list of schemas
+            this.submitForm.emit(updatedSchema);
           });
         }
       }