Merge pull request #111 from DDMAL/validation-fix

Make validation status global
DDMAL · Jul 11, 2024 · 2d2001a · 2d2001a
2 parents 204cfbe + 7734680
commit 2d2001a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/Editor/CressTable.ts b/src/Editor/CressTable.ts
@@ -166,7 +166,7 @@ export class CressTable {
           .then(([isValid, errorMsg]) => {
             this.meiTools.updateMeiData(mei.row, mei.mei, isValid, errorMsg);
             this.table.render();
-            this.meiTools.setResultStatus(isValid);
+            this.meiTools.setResultStatus();
           });
       });
     } else {
@@ -181,7 +181,7 @@ export class CressTable {
             .then(([isValid, errorMsg]) => {
               this.meiTools.updateMeiData(row, undefined, isValid, errorMsg);
               this.table.render();
-              this.meiTools.setResultStatus(isValid);
+              this.meiTools.setResultStatus();
             });
         }
       });

diff --git a/src/Editor/MeiTools.ts b/src/Editor/MeiTools.ts
@@ -7,7 +7,6 @@ export class MeiTools {
   private meiData: MeiData;
   public validationInProgress = false;
   public pendingValidations = 0;
-  public hasInvalid = false;
 
   constructor() {
     this.meiData = [];
@@ -70,13 +69,14 @@ export class MeiTools {
     if (value) this.pendingValidations++;
   }
 
-  public setResultStatus(isValid: boolean) {
-    if (!isValid) this.hasInvalid = true;
+  public setResultStatus() {
     this.pendingValidations--;
     if (this.pendingValidations === 0) {
       this.validationInProgress = false;
-      updateStatus('done', this.hasInvalid);
-      this.hasInvalid = false;
+      const hasInvalid = this.meiData.some(
+        (element) => element.isValid === false,
+      );
+      updateStatus('done', hasInvalid);
     }
   }