From 4afb873afce3d40d61dfc3b3fdd49f587e6ac725 Mon Sep 17 00:00:00 2001
From: Lisa Durand <lisa.c.durand@gmail.com>
Date: Thu, 5 Jan 2023 15:10:07 +0100
Subject: [PATCH] feedbacks from Martin

---
 app/assets/stylesheets/buttons.scss           |  1 -
 .../batch_operation_component.html.haml       | 71 +++++++++----------
 app/models/batch_operation.rb                 | 16 ++---
 3 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss
index 2852987d1..e94100721 100644
--- a/app/assets/stylesheets/buttons.scss
+++ b/app/assets/stylesheets/buttons.scss
@@ -273,7 +273,6 @@ ul.dropdown-items {
       margin: -$default-padding;
       padding: $default-padding;
       text-align: left;
-      font-size: 12px;
     }
 
     .icon {
diff --git a/app/components/dossiers/batch_operation_component/batch_operation_component.html.haml b/app/components/dossiers/batch_operation_component/batch_operation_component.html.haml
index 80ea8fd2c..271e52f65 100644
--- a/app/components/dossiers/batch_operation_component/batch_operation_component.html.haml
+++ b/app/components/dossiers/batch_operation_component/batch_operation_component.html.haml
@@ -1,42 +1,41 @@
-- if available_operations[:options].present?
-  - if available_operations[:options].count == 1
-    - opt = available_operations[:options].dig(0)
-    = form_for(BatchOperation.new, url: instructeur_batch_operations_path(procedure_id: procedure.id), method: :post, html: { class: 'flex justify-end', id: "#{dom_id(BatchOperation.new)}" }, data: { "batch-operation-target" => "form"}) do |form|
-      = form.button opt[:label], class: ['fr-btn fr-btn--icon-left', icons[opt[:operation].to_sym]], disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation] }
+- if available_operations[:options].count == 1
+  - opt = available_operations[:options].dig(0)
+  = form_for(BatchOperation.new, url: instructeur_batch_operations_path(procedure_id: procedure.id), method: :post, html: { class: 'flex justify-end', id: "#{dom_id(BatchOperation.new)}" }, data: { "batch-operation-target" => "form"}) do |form|
+    = form.button opt[:label], class: ['fr-btn fr-btn--icon-left', icons[opt[:operation].to_sym]], disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation] }
 
-  - else
-    .flex.justify-end
-      .dropdown{ data: { controller: 'menu-button', popover: 'true' } }
-        -# Dropdown button title
-        %button.fr-btn.dropdown-button{ id: 'batch_operation_dropdown', disabled: :disabled, data: { menu_button_target: 'button'} }
-          Actions multiples
+- else
+  .flex.justify-end
+    .dropdown{ data: { controller: 'menu-button', popover: 'true' } }
+      -# Dropdown button title
+      %button.fr-btn.dropdown-button{ id: 'batch_operation_dropdown', disabled: :disabled, data: { menu_button_target: 'button'} }
+        Actions multiples
 
-        #state-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
-          = form_for(BatchOperation.new, url: instructeur_batch_operations_path(procedure_id: procedure.id), method: :post, html: { class: 'flex justify-end form', id: "#{dom_id(BatchOperation.new)}" }, data: { "batch-operation-target" => "form"}) do |form|
-            %ul.dropdown-items
-              - available_operations[:options].each do |opt|
-                %li{ 'data-turbo': 'true' }
-                  - if opt[:operation] == 'accepter'
-                    .wrapper
+      #state-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
+        = form_for(BatchOperation.new, url: instructeur_batch_operations_path(procedure_id: procedure.id), method: :post, html: { class: 'flex justify-end form', id: "#{dom_id(BatchOperation.new)}" }, data: { "batch-operation-target" => "form"}) do |form|
+          %ul.dropdown-items
+            - available_operations[:options].each do |opt|
+              %li{ 'data-turbo': 'true' }
+                - if opt[:operation] == 'accepter'
+                  .wrapper
 
-                      %a.dropdown-items-link{ href: '#', onclick: "DS.showMotivation(event, 'accept');" }
-                        %span{ class: icons[opt[:operation].to_sym] }
-                        .dropdown-description
-                          %h4= opt[:label]
-
-                      .motivation.hidden.accept
-                        = form.text_area :motivation, class: 'motivation-text-area'
-                        .optional-justificatif{ id: "justificatif_motivation_suggest_accept", onclick: "DS.showImportJustificatif('accept');" }
-                          .button Ajouter un justificatif (optionnel)
-                        .hidden{ id: "justificatif_motivation_import_accept" }
-                          = form.file_field :justificatif_motivation, direct_upload: true
-
-                        .text-right
-                          %span{ onclick: 'DS.motivationCancel();', class: 'fr-btn fr-btn--secondary' } Annuler
-
-                          = form.button "Valider la décision", class: ['fr-btn'], disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation]}
-                  - else
-                    = form.button opt[:label], class: 'dropdown-items-link', disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation]} do
+                    %a.dropdown-items-link{ href: '#', onclick: "DS.showMotivation(event, 'accept');" }
                       %span{ class: icons[opt[:operation].to_sym] }
                       .dropdown-description
                         %h4= opt[:label]
+
+                    .motivation.hidden.accept
+                      = form.text_area :motivation, class: 'motivation-text-area'
+                      .optional-justificatif{ id: "justificatif_motivation_suggest_accept", onclick: "DS.showImportJustificatif('accept');" }
+                        .button Ajouter un justificatif (optionnel)
+                      .hidden{ id: "justificatif_motivation_import_accept" }
+                        = form.file_field :justificatif_motivation, direct_upload: true
+
+                      .text-right
+                        %span{ onclick: 'DS.motivationCancel();', class: 'fr-btn fr-btn--secondary' } Annuler
+
+                        = form.button "Valider la décision", class: ['fr-btn'], disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation]}
+                - else
+                  = form.button opt[:label], class: 'dropdown-items-link', disabled: :disabled, name: "#{form.object_name}[operation]", data: { "batch-operation-target" => "submit", "submitter-operation" => opt[:operation]} do
+                    %span{ class: icons[opt[:operation].to_sym] }
+                    .dropdown-description
+                      %h4= opt[:label]
diff --git a/app/models/batch_operation.rb b/app/models/batch_operation.rb
index c89a70ca9..d223a2afe 100644
--- a/app/models/batch_operation.rb
+++ b/app/models/batch_operation.rb
@@ -78,16 +78,14 @@ class BatchOperation < ApplicationRecord
   end
 
   def track_processed_dossier(success, dossier)
-    transaction do
-      dossiers.delete(dossier)
-      touch(:run_at) if called_for_first_time?
-      touch(:finished_at) if called_for_last_time?(dossier)
+    dossiers.delete(dossier)
+    touch(:run_at) if called_for_first_time?
+    touch(:finished_at) if called_for_last_time?(dossier)
 
-      if success
-        dossier_operation(dossier).done!
-      else
-        dossier_operation(dossier).fail!
-      end
+    if success
+      dossier_operation(dossier).done!
+    else
+      dossier_operation(dossier).fail!
     end
   end