From fbcd9fa568af0592520ccda847a08986f4101c9d Mon Sep 17 00:00:00 2001
From: Yubing325 <35515298+Yubing325@users.noreply.github.com>
Date: Mon, 2 Nov 2020 09:56:19 -0600
Subject: [PATCH] fixed error message on command modal shows everytime

---
 .../command-modal.component.html              |  2 +-
 .../command-modal/command-modal.component.ts  |  6 +--
 .../grid-filter-demo.component.html           | 44 +++++++------------
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.html b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.html
index 875fd6d..b8ecc7e 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.html
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.html
@@ -7,7 +7,7 @@
 <div class="modal-body">
     <ng-container [ngTemplateOutlet]="template"
         [ngTemplateOutletContext]="{ $implicit: commandModel, loading: loading }"></ng-container>
-    <div *ngIf="validationMessage" class="alert alert-danger mt-2" style="white-space: pre-wrap">{{validationMessage}}</div>
+    <div *ngIf="hasError" class="alert alert-danger mt-2" style="white-space: pre-wrap">{{validationMessage}}</div>
 </div>
 <div class="modal-footer">
     <button type="button" class="btn btn-light" (click)="modalRef.hide()"
diff --git a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
index 1119e17..1efc378 100644
--- a/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
+++ b/projects/poweredsoft/ngx-bootstrap/src/lib/command-modal/command-modal/command-modal.component.ts
@@ -25,6 +25,7 @@ export class CommandModalComponent implements OnInit, OnDestroy {
   validationMessage:string ;
   btnClass:string;
   successEmitter: EventEmitter<any>; 
+  hasError: boolean;
 
   private _notifyMessage: Subscription;
   private _validationError: Subscription;
@@ -53,8 +54,6 @@ export class CommandModalComponent implements OnInit, OnDestroy {
   }
 
   onSubmit(){
-    
-
     this.loading = true;
     this.validationMessage = null;
 
@@ -67,10 +66,11 @@ export class CommandModalComponent implements OnInit, OnDestroy {
       .subscribe(commandResult => {
         if (this.refreshOnSuccess)
           this.dataSource.refresh();
-
+        this.hasError = false;
         this.modalRef.hide();
         this.successEmitter.emit(commandResult);
       }, fail => {
+        this.hasError = true;
         // you do not want to close on failure.. so just ignore..
       });
   }
diff --git a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
index 34ca93a..a2ad6a4 100644
--- a/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
+++ b/src/app/grid-filter&sorting-demo/grid-filter-demo/grid-filter-demo.component.html
@@ -14,7 +14,7 @@
         <ng-container *psDataGridColHeader>ID</ng-container>
         <psbx-ds-text-filter *psDataGridCellFilter [dataSource]="merchantDataSource" path="id"></psbx-ds-text-filter>
         <psbx-ds-sorting *psDataGridColSort [dataSource]="merchantDataSource" path="id"></psbx-ds-sorting>
-        <ng-container *psDataGridCell="let model">{{model.id}}</ng-container>      
+        <ng-container *psDataGridCell="let model">{{model.id}}</ng-container>
     </ng-container>
 
     <ng-container psDataGridCol="name">
@@ -53,21 +53,13 @@
         <ng-container *psDataGridCell="let model">
             <div class="btn-group">
                 <button class="btn-info btn" psbxCommandModal [commandTitle]="'Change ' + model.name + ' name'"
-                commandText="Update" [dataSource]="merchantDataSource" command="changeMerchant" [model]="model"
-                [template]="theModal">Change</button>
-                <button class="btn-danger btn" 
-                psbxCommand 
-                [dataSource]="merchantDataSource" 
-                command="removeMerchant" 
-                [model]="model" 
-                [confirm]="true"
-                yesClass="warning"
-                noClass = "secondary"
-                noText = "Cancel Delete"
-                yesText = "Delete It"
-                confirmMessage="Are you sure you want to delete this merchant?"
-                >RemoveIt</button></div>
-            
+                    commandText="Update" [dataSource]="merchantDataSource" command="changeMerchant" [model]="model"
+                    [template]="theModal">Change</button>
+                <button class="btn-danger btn" psbxCommand [dataSource]="merchantDataSource" command="removeMerchant"
+                    [model]="model" [confirm]="true" yesClass="warning" noClass="secondary" noText="Cancel Delete"
+                    yesText="Delete It"
+                    confirmMessage="Are you sure you want to delete this merchant?">RemoveIt</button></div>
+
         </ng-container>
     </ng-container>
     <ng-container *psDataGridFooter>
@@ -78,17 +70,16 @@
 
 <ng-template #theModal let-command let-loading="loading">
     <label for="name">Name</label>
-    <input type="text" required  [(ngModel)]="command.name" placeholder="Enter a merchant name"
-        class="form-control">
+    <input type="text" required [(ngModel)]="command.name" placeholder="Enter a merchant name" class="form-control">
     <label for="address">Address</label>
-    <input type="text" required  [(ngModel)]="command.address"
-        placeholder="Enter the merchant's address" class="form-control">
+    <input type="text" required [(ngModel)]="command.address" placeholder="Enter the merchant's address"
+        class="form-control">
     <label for="address">Priority</label>
-    <input type="number" required  [(ngModel)]="command.ordering"
-        placeholder="Enter the merchant's Priority" class="form-control">
+    <input type="number" required [(ngModel)]="command.ordering" placeholder="Enter the merchant's Priority"
+        class="form-control">
     <label for="address">Priority</label>
-    <input type="date" required  [(ngModel)]="command.openDate"
-        placeholder="Enter the merchant's Priority" class="form-control">
+    <input type="date" required [(ngModel)]="command.openDate" placeholder="Enter the merchant's Priority"
+        class="form-control">
 
 </ng-template>
 
@@ -99,7 +90,4 @@
         <button type="button" class="btn btn-default">Yes</button>
         <button type="button" class="btn btn-primary">No</button>
     </div>
-</ng-template>
-
-
-
+</ng-template>
\ No newline at end of file