Merge pull request #8408 from tchak/fix-batch-operations-buttons

fix(dossier): disable buttons when selection is canceled
demarches-simplifiees · Jan 11, 2023 · 061a3e5 · 061a3e5
2 parents cc3053e + f17ae44
commit 061a3e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/components/dossiers/batch_operation_component.rb b/app/components/dossiers/batch_operation_component.rb
@@ -13,7 +13,7 @@ def render?
   def operations_for_dossier(dossier)
     case dossier.state
     when Dossier.states.fetch(:en_construction)
-      [BatchOperation.operations.fetch(:passer_en_instruction)]
+      [BatchOperation.operations.fetch(:passer_en_instruction), BatchOperation.operations.fetch(:follow)]
     when Dossier.states.fetch(:en_instruction)
       [BatchOperation.operations.fetch(:accepter)]
     when Dossier.states.fetch(:accepte), Dossier.states.fetch(:refuse), Dossier.states.fetch(:sans_suite)

diff --git a/app/javascript/controllers/batch_operation_controller.ts b/app/javascript/controllers/batch_operation_controller.ts
@@ -40,8 +40,11 @@ export class BatchOperationController extends ApplicationController {
           disable(this.menuTarget);
         }
       }
-    } else if (this.hasMenuTarget) {
-      disable(this.menuTarget);
+    } else {
+      if (this.hasMenuTarget) {
+        disable(this.menuTarget);
+      }
+      buttons.forEach((button) => switchButton(button, false));
     }
   }
 }