From cfed50a0a922efcd977283d4c3b6769dc0789956 Mon Sep 17 00:00:00 2001
From: Shikha Vani <shikha.vani@rakuten.com>
Date: Wed, 2 Feb 2022 18:20:46 +0530
Subject: [PATCH 1/4] fix: Grey-out buttons after submission #443

---
 .../data-model-main/data-model-main.component.html          | 2 +-
 .../dataModel/data-model-main/data-model-main.component.ts  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
index d8f7925cb..aa7b4050c 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
@@ -31,7 +31,7 @@ <h4 class="marginless">New Data Model</h4>
                 </button>
             </div>
             <div fxFlex fxLayout="row-reverse" fxLayout.md="column" fxLayout.sm="column" fxLayout.xs="column" fxFlex="50" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
-                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid" (click)="save()">Submit Data Model</button>
+                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || disabledSave" (click)="save()">Submit Data Model</button>
                 <button mat-stroked-button type="button" color="primary" class="custom" *ngIf="(i+1) !== steps.length" [disabled]="step.invalid" matStepperNext>
                     Next step
                     <i class="fas fa-chevron-right"></i>
diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
index 9f945efdf..7edbbc67a 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
@@ -51,6 +51,7 @@ export class DataModelMainComponent implements OnInit {
     private folders: FolderService,
     private title: Title) { }
 
+  disabledSave = false;
   ngOnInit() {
     this.title.setTitle('New Data Model');
 
@@ -90,6 +91,7 @@ export class DataModelMainComponent implements OnInit {
   };
 
   save() {
+    this.disabledSave =  true;
     const details = this.steps[0].compRef.instance as DataModelStep1Component;
     const types = this.steps[1].compRef.instance as DataModelStep2Component;
 
@@ -114,12 +116,16 @@ export class DataModelMainComponent implements OnInit {
       .addToFolder(this.parentFolderId, resource, queryStringParams)
       .pipe(
         catchError(error => {
+          this.disabledSave =  false;
           this.messageHandler.showError('There was a problem saving the Data Model.', error);
           return EMPTY;
         }))
       .subscribe((response: DataModelDetailResponse) => {
         this.messageHandler.showSuccess('Data Model saved successfully.');
+        this.disabledSave =  false;
         this.stateHandler.Go('datamodel', { id: response.body.id }, { reload: true, location: true });
+      }, error => {
+        this.disabledSave =  false;
       });
   }
 }
\ No newline at end of file

From de64597e927797ff706037ddda132ae28a03c642 Mon Sep 17 00:00:00 2001
From: Shikha Vani <shikha.vani@rakuten.com>
Date: Wed, 2 Feb 2022 18:34:47 +0530
Subject: [PATCH 2/4] Revert "fix: Grey-out buttons after submission #443"

This reverts commit 579d73185b2e9f6e0359eb5e751447c53dc9c43f.
---
 .../data-model-main/data-model-main.component.html          | 2 +-
 .../dataModel/data-model-main/data-model-main.component.ts  | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
index aa7b4050c..d8f7925cb 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
@@ -31,7 +31,7 @@ <h4 class="marginless">New Data Model</h4>
                 </button>
             </div>
             <div fxFlex fxLayout="row-reverse" fxLayout.md="column" fxLayout.sm="column" fxLayout.xs="column" fxFlex="50" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
-                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || disabledSave" (click)="save()">Submit Data Model</button>
+                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid" (click)="save()">Submit Data Model</button>
                 <button mat-stroked-button type="button" color="primary" class="custom" *ngIf="(i+1) !== steps.length" [disabled]="step.invalid" matStepperNext>
                     Next step
                     <i class="fas fa-chevron-right"></i>
diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
index 7edbbc67a..9f945efdf 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
@@ -51,7 +51,6 @@ export class DataModelMainComponent implements OnInit {
     private folders: FolderService,
     private title: Title) { }
 
-  disabledSave = false;
   ngOnInit() {
     this.title.setTitle('New Data Model');
 
@@ -91,7 +90,6 @@ export class DataModelMainComponent implements OnInit {
   };
 
   save() {
-    this.disabledSave =  true;
     const details = this.steps[0].compRef.instance as DataModelStep1Component;
     const types = this.steps[1].compRef.instance as DataModelStep2Component;
 
@@ -116,16 +114,12 @@ export class DataModelMainComponent implements OnInit {
       .addToFolder(this.parentFolderId, resource, queryStringParams)
       .pipe(
         catchError(error => {
-          this.disabledSave =  false;
           this.messageHandler.showError('There was a problem saving the Data Model.', error);
           return EMPTY;
         }))
       .subscribe((response: DataModelDetailResponse) => {
         this.messageHandler.showSuccess('Data Model saved successfully.');
-        this.disabledSave =  false;
         this.stateHandler.Go('datamodel', { id: response.body.id }, { reload: true, location: true });
-      }, error => {
-        this.disabledSave =  false;
       });
   }
 }
\ No newline at end of file

From f59c4e1385d48bb952b589afdd77c35b48a6094f Mon Sep 17 00:00:00 2001
From: Shikha Vani <shikha.vani@rakuten.com>
Date: Wed, 2 Feb 2022 18:36:53 +0530
Subject: [PATCH 3/4] fix: grey out button on submit #443

---
 .../data-model-main/data-model-main.component.html          | 2 +-
 .../dataModel/data-model-main/data-model-main.component.ts  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
index d8f7925cb..aa7b4050c 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
@@ -31,7 +31,7 @@ <h4 class="marginless">New Data Model</h4>
                 </button>
             </div>
             <div fxFlex fxLayout="row-reverse" fxLayout.md="column" fxLayout.sm="column" fxLayout.xs="column" fxFlex="50" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
-                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid" (click)="save()">Submit Data Model</button>
+                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || disabledSave" (click)="save()">Submit Data Model</button>
                 <button mat-stroked-button type="button" color="primary" class="custom" *ngIf="(i+1) !== steps.length" [disabled]="step.invalid" matStepperNext>
                     Next step
                     <i class="fas fa-chevron-right"></i>
diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
index 9f945efdf..7edbbc67a 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
@@ -51,6 +51,7 @@ export class DataModelMainComponent implements OnInit {
     private folders: FolderService,
     private title: Title) { }
 
+  disabledSave = false;
   ngOnInit() {
     this.title.setTitle('New Data Model');
 
@@ -90,6 +91,7 @@ export class DataModelMainComponent implements OnInit {
   };
 
   save() {
+    this.disabledSave =  true;
     const details = this.steps[0].compRef.instance as DataModelStep1Component;
     const types = this.steps[1].compRef.instance as DataModelStep2Component;
 
@@ -114,12 +116,16 @@ export class DataModelMainComponent implements OnInit {
       .addToFolder(this.parentFolderId, resource, queryStringParams)
       .pipe(
         catchError(error => {
+          this.disabledSave =  false;
           this.messageHandler.showError('There was a problem saving the Data Model.', error);
           return EMPTY;
         }))
       .subscribe((response: DataModelDetailResponse) => {
         this.messageHandler.showSuccess('Data Model saved successfully.');
+        this.disabledSave =  false;
         this.stateHandler.Go('datamodel', { id: response.body.id }, { reload: true, location: true });
+      }, error => {
+        this.disabledSave =  false;
       });
   }
 }
\ No newline at end of file

From 457d52e001af5b43af520aaa338f38ca7a83aed4 Mon Sep 17 00:00:00 2001
From: Shikha Vani <shikha.vani@rakuten.com>
Date: Fri, 11 Feb 2022 14:59:17 +0530
Subject: [PATCH 4/4] fix: linting and code opt fixes

---
 .../data-model-main.component.html                |  2 +-
 .../data-model-main/data-model-main.component.ts  | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
index aa7b4050c..642c0eb86 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.html
@@ -31,7 +31,7 @@ <h4 class="marginless">New Data Model</h4>
                 </button>
             </div>
             <div fxFlex fxLayout="row-reverse" fxLayout.md="column" fxLayout.sm="column" fxLayout.xs="column" fxFlex="50" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
-                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || disabledSave" (click)="save()">Submit Data Model</button>
+                <button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || isSaving" (click)="save()">Submit Data Model</button>
                 <button mat-stroked-button type="button" color="primary" class="custom" *ngIf="(i+1) !== steps.length" [disabled]="step.invalid" matStepperNext>
                     Next step
                     <i class="fas fa-chevron-right"></i>
diff --git a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
index 7edbbc67a..9530a3128 100644
--- a/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
+++ b/src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
@@ -24,7 +24,7 @@ import { MdmResourcesService } from '@mdm/modules/resources';
 import { MessageHandlerService } from '@mdm/services/utility/message-handler.service';
 import { UIRouterGlobals } from '@uirouter/core';
 import { Title } from '@angular/platform-browser';
-import { catchError } from 'rxjs/operators';
+import { catchError, finalize } from 'rxjs/operators';
 import { EMPTY } from 'rxjs';
 import { CatalogueItemDomainType, Container, DataModelCreatePayload, DataModelDetailResponse, Uuid } from '@maurodatamapper/mdm-resources';
 import { FolderService } from '@mdm/folders-tree/folder.service';
@@ -42,7 +42,7 @@ export class DataModelMainComponent implements OnInit {
   parentFolderId: Uuid;
   parentDomainType: CatalogueItemDomainType;
   parentFolder: Container;
-
+  isSaving = false;
   constructor(
     private stateHandler: StateHandlerService,
     private uiRouterGlobals: UIRouterGlobals,
@@ -50,8 +50,6 @@ export class DataModelMainComponent implements OnInit {
     private messageHandler: MessageHandlerService,
     private folders: FolderService,
     private title: Title) { }
-
-  disabledSave = false;
   ngOnInit() {
     this.title.setTitle('New Data Model');
 
@@ -91,7 +89,7 @@ export class DataModelMainComponent implements OnInit {
   };
 
   save() {
-    this.disabledSave =  true;
+    this.isSaving =  true;
     const details = this.steps[0].compRef.instance as DataModelStep1Component;
     const types = this.steps[1].compRef.instance as DataModelStep2Component;
 
@@ -116,16 +114,15 @@ export class DataModelMainComponent implements OnInit {
       .addToFolder(this.parentFolderId, resource, queryStringParams)
       .pipe(
         catchError(error => {
-          this.disabledSave =  false;
           this.messageHandler.showError('There was a problem saving the Data Model.', error);
           return EMPTY;
+        }),
+        finalize(() => {
+          this.isSaving =  false;
         }))
       .subscribe((response: DataModelDetailResponse) => {
         this.messageHandler.showSuccess('Data Model saved successfully.');
-        this.disabledSave =  false;
         this.stateHandler.Go('datamodel', { id: response.body.id }, { reload: true, location: true });
-      }, error => {
-        this.disabledSave =  false;
       });
   }
 }
\ No newline at end of file