Feature ouidou/batch action on dossiers desarchiver

app/components/dossiers/batch_alert_component/batch_alert_component.en.yml

@@ -8,6 +8,15 @@ en:
       text_success:
         one: "1 is being archived"
         other: "%{success_count}/%{count} files have been archived"
+  desarchiver:
+    finish:
+      text_success:
+        one: "%{success_count}/1 file has been unarchived"
+        other: "%{success_count}/%{count} files have been unarchived"
+    in_progress:
+      text_success:
+        one: "1 is being unarchived"
+        other: "%{success_count}/%{count} files have been unarchived"
   passer_en_instruction:
     finish:
       text_success:
@@ -35,6 +44,24 @@ en:
       text_success:
         one: "1 is being refused"
         other: "%{success_count}/%{count} files have been refused"
+  supprimer:
+    finish:
+      text_success:
+        one: "%{success_count}/1 file has been deleted"
+        other: "%{success_count}/%{count} files have been deleted"
+    in_progress:
+      text_success:
+        one: "1 is being deleted"
+        other: "%{success_count}/%{count} files have been deleted"
+  restaurer:
+    finish:
+      text_success:
+        one: "%{success_count}/1 file has been restored"
+        other: "%{success_count}/%{count} files have been restored"
+    in_progress:
+      text_success:
+        one: "1 is being restored"
+        other: "%{success_count}/%{count} files have been restored"
   classer_sans_suite:
     finish:
       text_success:

app/components/dossiers/batch_alert_component/batch_alert_component.fr.yml

@@ -8,6 +8,15 @@ fr:
       text_success:
         one: "1 dossier est en cours d'archivage"
         other: "%{success_count}/%{count} dossiers ont été archivés"
+  desarchiver:
+    finish:
+      text_success:
+        one: "%{success_count}/1 dossier a été désarchivé"
+        other: "%{success_count}/%{count} dossiers ont été désarchivés"
+    in_progress:
+      text_success:
+        one: "1 dossier est en cours d'désarchivage"
+        other: "%{success_count}/%{count} dossiers ont été désarchivés"
   passer_en_instruction:
     finish:
       text_success:
@@ -35,6 +44,24 @@ fr:
       text_success:
         one: "1 dossier est en cours de refus"
         other: "%{success_count}/%{count} dossiers ont été refusés"
+  supprimer:
+    finish:
+      text_success:
+        one: "%{success_count}/1 dossier a été supprimé"
+        other: "%{success_count}/%{count} dossiers ont été supprimés"
+    in_progress:
+      text_success:
+        one: "1 dossier est en cours de suppression"
+        other: "%{success_count}/%{count} dossiers ont été supprimés"
+  restaurer:
+    finish:
+      text_success:
+        one: "%{success_count}/1 dossier a été restauré"
+        other: "%{success_count}/%{count} dossiers ont été restaurés"
+    in_progress:
+      text_success:
+        one: "1 dossier est en cours de restauration"
+        other: "%{success_count}/%{count} dossiers ont été restaurés"
   classer_sans_suite:
     finish:
       text_success:

app/components/dossiers/batch_operation_component.rb

@@ -7,7 +7,7 @@ def initialize(statut:, procedure:)
   end
 
   def render?
-    ['a-suivre', 'traites', 'suivis'].include?(@statut)
+    ['a-suivre', 'traites', 'suivis', 'archives', 'supprimes_recemment'].include?(@statut)
   end
 
   def operations_for_dossier(dossier)
@@ -17,7 +17,7 @@ def operations_for_dossier(dossier)
     when Dossier.states.fetch(:en_instruction)
       [BatchOperation.operations.fetch(:accepter), BatchOperation.operations.fetch(:refuser), BatchOperation.operations.fetch(:classer_sans_suite), BatchOperation.operations.fetch(:repasser_en_construction)]
     when Dossier.states.fetch(:accepte), Dossier.states.fetch(:refuse), Dossier.states.fetch(:sans_suite)
-      [BatchOperation.operations.fetch(:archiver)]
+      [BatchOperation.operations.fetch(:archiver), BatchOperation.operations.fetch(:desarchiver), BatchOperation.operations.fetch(:supprimer), BatchOperation.operations.fetch(:restaurer)]
     else
       []
     end.append(BatchOperation.operations.fetch(:follow), BatchOperation.operations.fetch(:unfollow))
@@ -37,13 +37,37 @@ def available_operations
             }
           ]
       }
+    when 'archives' then
+      {
+        options:
+          [
+            {
+              label: t(".operations.desarchiver"),
+              operation: BatchOperation.operations.fetch(:desarchiver)
+            }
+          ]
+      }
     when 'traites' then
       {
         options:
           [
             {
               label: t(".operations.archiver"),
               operation: BatchOperation.operations.fetch(:archiver)
+            },
+            {
+              label: t(".operations.supprimer"),
+              operation: BatchOperation.operations.fetch(:supprimer)
+            }
+          ]
+      }
+    when 'supprimes_recemment' then
+      {
+        options:
+          [
+            {
+              label: t(".operations.restaurer"),
+              operation: BatchOperation.operations.fetch(:restaurer)
             }
           ]
       }
@@ -107,9 +131,12 @@ def icons
     {
       accepter: 'fr-icon-success-line',
       archiver: 'fr-icon-folder-2-line',
+      desarchiver: 'fr-icon-upload-2-line',
       follow: 'fr-icon-star-line',
       passer_en_instruction: 'fr-icon-edit-line',
       repasser_en_construction: 'fr-icon-draft-line',
+      supprimer: 'fr-icon-delete-line',
+      restaurer: 'fr-icon-refresh-line',
       unfollow: 'fr-icon-star-fill'
     }
   end

app/components/dossiers/batch_operation_component/batch_operation_component.en.yml

@@ -1,9 +1,12 @@
 fr:
   operations:
     archiver: 'Archive selected files'
+    desarchiver: 'Unarchive selected files'
     passer_en_instruction: 'Change selected files to instructing'
     instruction: Instructing files
     accepter: 'Accept seleted files'
+    supprimer: Delete seleted files
+    restaurer: Restore seleted files
     accepter_description: Users will be notified that their file has been accepted
     refuser: 'Refuse seleted files'
     refuser_description: Users will be notified that their file has been refused

app/components/dossiers/batch_operation_component/batch_operation_component.fr.yml

@@ -1,9 +1,12 @@
 fr:
   operations:
     archiver: 'Archiver les dossiers'
+    desarchiver: 'Désarchiver les dossiers'
     passer_en_instruction: 'Passer les dossiers en instruction'
     instruction: Instruire les dossiers
     accepter: 'Accepter les dossiers'
+    supprimer: 'Supprimer les dossiers'
+    restaurer: 'Restaurer les dossiers'
     accepter_description: Les usagers seront informés que leur dossier a été accepté
     refuser: 'Refuser les dossiers'
     refuser_description: Les usagers seront informés que leur dossier a été refusé

app/models/batch_operation.rb

@@ -4,10 +4,13 @@ class BatchOperation < ApplicationRecord
     refuser: 'refuser',
     classer_sans_suite: 'classer_sans_suite',
     archiver: 'archiver',
+    desarchiver: 'desarchiver',
     follow: 'follow',
     passer_en_instruction: 'passer_en_instruction',
     repasser_en_construction: 'repasser_en_construction',
-    unfollow: 'unfollow'
+    restaurer: 'restaurer',
+    unfollow: 'unfollow',
+    supprimer: 'supprimer'
   }
 
   has_many :dossiers, dependent: :nullify
@@ -37,25 +40,30 @@ class BatchOperation < ApplicationRecord
   def dossiers_safe_scope(dossier_ids = self.dossier_ids)
     query = instructeur
       .dossiers
-      .visible_by_administration
       .where(id: dossier_ids)
     case operation
     when BatchOperation.operations.fetch(:archiver) then
-      query.not_archived.state_termine
+      query.visible_by_administration.not_archived.state_termine
+    when BatchOperation.operations.fetch(:desarchiver) then
+      query.visible_by_administration.archived.state_termine
     when BatchOperation.operations.fetch(:passer_en_instruction) then
-      query.state_en_construction
+      query.visible_by_administration.state_en_construction
     when BatchOperation.operations.fetch(:accepter) then
-      query.state_en_instruction
+      query.visible_by_administration.state_en_instruction
     when BatchOperation.operations.fetch(:refuser) then
-      query.state_en_instruction
+      query.visible_by_administration.state_en_instruction
     when BatchOperation.operations.fetch(:classer_sans_suite) then
-      query.state_en_instruction
+      query.visible_by_administration.state_en_instruction
     when BatchOperation.operations.fetch(:follow) then
-      query.without_followers.en_cours
+      query.visible_by_administration.without_followers.en_cours
     when BatchOperation.operations.fetch(:repasser_en_construction) then
-      query.state_en_instruction
+      query.visible_by_administration.state_en_instruction
     when BatchOperation.operations.fetch(:unfollow) then
-      query.with_followers.en_cours
+      query.visible_by_administration.with_followers.en_cours
+    when BatchOperation.operations.fetch(:supprimer) then
+      query.visible_by_administration.state_termine
+    when BatchOperation.operations.fetch(:restaurer) then
+      query.hidden_by_administration
     end
   end
 
@@ -68,6 +76,8 @@ def process_one(dossier)
     case operation
     when BatchOperation.operations.fetch(:archiver)
       dossier.archiver!(instructeur)
+    when BatchOperation.operations.fetch(:desarchiver)
+      dossier.desarchiver!
     when BatchOperation.operations.fetch(:passer_en_instruction)
       dossier.passer_en_instruction(instructeur: instructeur)
     when BatchOperation.operations.fetch(:accepter)
@@ -82,6 +92,10 @@ def process_one(dossier)
       dossier.repasser_en_construction!(instructeur: instructeur)
     when BatchOperation.operations.fetch(:unfollow)
       instructeur.unfollow(dossier)
+    when BatchOperation.operations.fetch(:supprimer)
+      dossier.hide_and_keep_track!(instructeur, :instructeur_request)
+    when BatchOperation.operations.fetch(:restaurer)
+      dossier.restore(instructeur)
     end
   end