wip(stock): fix validation on removeItem()

Ensures validation happens when we remove the items form the grid.
IMA-WorldHealth · Mar 4, 2022 · 8f9e00f · 8f9e00f
1 parent 5f2be85
commit 8f9e00f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/client/src/js/components/bhStockExitType.js b/client/src/js/components/bhStockExitType.js
@@ -31,6 +31,7 @@ angular.module('bhima.components')
     bindings : {
       onSelectCallback : '&',
       depot : '<?',
+      exitType : '<?',
     },
   });
 
@@ -52,6 +53,11 @@ function StockExitTypeController(TypeService, Notify) {
     if (changes.depot) {
       reloadExitTypes();
     }
+
+    // when the exit type is cleared, reload exit types
+    if (changes.exitType?.currentValue === undefined) {
+      reloadExitTypes();
+    }
   };
 
   /**

diff --git a/client/src/modules/stock/StockExitForm.service.js b/client/src/modules/stock/StockExitForm.service.js
@@ -464,11 +464,6 @@ function StockExitFormService(
 
       // reset the depot and load stock
       this.setDepot(depot);
-
-      // validate() is only set up to test on submission as it checks the validity
-      // of individual items which will not have been configured, manually
-      // reset error state
-      delete this._errors;
     });
   };
 
@@ -551,6 +546,7 @@ function StockExitFormService(
     const showNeedsLotsInfoMessage = this.details.exit_type
       && !hasDestinationError
       && this.store.data.length === 0;
+
     this._toggleInfoMessage(showNeedsLotsInfoMessage, 'info', INFO_NEEDS_LOTS, this.details);
 
     return hasRequiredDetails

diff --git a/client/src/modules/stock/exit/exit.html b/client/src/modules/stock/exit/exit.html
@@ -36,6 +36,7 @@
       <div class="row">
         <bh-stock-exit-type
           depot="StockCtrl.stockForm.depot"
+          exit-type="StockCtrl.stockForm.details.exit_type"
           on-select-callback="StockCtrl.onSelectExitType(type, entity)">
         </bh-stock-exit-type>
       </div>

diff --git a/client/src/modules/stock/exit/exit.js b/client/src/modules/stock/exit/exit.js
@@ -126,7 +126,7 @@ function StockExitController(
     vm.validate();
   };
 
-  vm.onRemoveItem = function onRemoveItem(uuid) {
+  vm.removeItem = function removeItem(uuid) {
     vm.stockForm.removeItem(uuid);
     vm.validate();
   };

diff --git a/client/src/modules/stock/exit/templates/actions.tmpl.html b/client/src/modules/stock/exit/templates/actions.tmpl.html
@@ -1,3 +1,3 @@
 <div class="ui-grid-cell-contents text-center">
-  <a class="text-action" ng-click="grid.appScope.stockForm.removeItem(row.entity.uuid)" tabindex="-1"><i class="fa fa-trash-o text-danger"></i></a>
+  <a class="text-action" ng-click="grid.appScope.removeItem(row.entity.uuid)" tabindex="-1"><i class="fa fa-trash-o text-danger"></i></a>
 </div>