feat(upload): save selected user row info

app/controllers/user_list_uploads/invitation_attempts_controller.rb

@@ -7,11 +7,11 @@ def select_rows
       @user_collection.sort_by!(**sort_params) if sort_params_valid?
       @user_collection.search!(params[:search_query]) if params[:search_query].present?
       @user_rows = @user_collection.user_rows_with_user_save_success
+      @all_user_rows_selected = @user_rows.all?(&:marked_for_invitation)
     end
 
     def create_many
       @user_collection = @user_list_upload.user_collection
-      @user_collection.mark_selected_rows_for_invitation!(selected_ids)
       UserListUpload::InviteUsersJob.perform_later(@user_list_upload.id, invitation_formats)
       redirect_to user_list_upload_invitation_attempts_path(user_list_upload_id: @user_list_upload.id)
     end
@@ -33,10 +33,6 @@ def set_user_list_upload
       authorize @user_list_upload, :edit?
     end
 
-    def selected_ids
-      params.permit(selected_ids: []).fetch(:selected_ids, [])
-    end
-
     def invitation_formats
       [params[:email], params[:sms]].compact.map(&:downcase)
     end

app/controllers/user_list_uploads/user_list_uploads_controller.rb

@@ -10,6 +10,7 @@ def show
       @user_rows = @user_collection.user_rows
       @user_rows_with_errors = @user_collection.user_rows_with_errors
       @category_configuration = @user_list_upload.category_configuration
+      @all_user_rows_selected = @user_rows.all?(&:marked_for_user_save)
     end
 
     def new; end

app/controllers/user_list_uploads/user_rows_controller.rb

@@ -1,6 +1,7 @@
 module UserListUploads
   class UserRowsController < BaseController
-    before_action :set_user_list_upload, :set_user_row
+    before_action :set_user_list_upload
+    before_action :set_user_row, except: :update_all
     before_action :set_user_row_partial, only: [:show, :update]
 
     def show
@@ -10,13 +11,27 @@ def show
     end
 
     def update
-      if @user_row.update(row_params.to_h.symbolize_keys)
-        redirect_to request.referer
-      else
-        render :update_error
+      success = @user_row.update(row_params.to_h.symbolize_keys)
+
+      respond_to do |format|
+        format.turbo_stream do
+          if success
+            redirect_to request.referer
+          else
+            render :update_error
+          end
+        end
+
+        format.json { render json: { success: } }
       end
     end
 
+    def update_all
+      success = @user_list_upload.user_rows.update_all(rows_params.to_h)
+
+      render json: { success: }
+    end
+
     def show_details
       respond_to :turbo_stream
     end
@@ -44,9 +59,13 @@ def set_user_row_partial
                           end
     end
 
+    def rows_params
+      params.permit(:marked_for_invitation, :marked_for_user_save)
+    end
+
     def row_params
       params.expect(
-        user_row: [:title, :first_name, :last_name, :affiliation_number, :phone_number, :email,
+        user_row: [:marked_for_user_save, :marked_for_invitation, :title, :first_name, :last_name, :affiliation_number, :phone_number, :email,
                    :assigned_organisation_id]
       )
     end

app/controllers/user_list_uploads/user_save_attempts_controller.rb

@@ -3,7 +3,6 @@ class UserSaveAttemptsController < BaseController
     before_action :set_user_list_upload, only: [:create_many, :index]
 
     def create_many
-      @user_list_upload.user_collection.mark_selected_rows_for_user_save!(selected_ids)
       UserListUpload::SaveUsersJob.perform_later(@user_list_upload.id)
       redirect_to user_list_upload_user_save_attempts_path(user_list_upload_id: @user_list_upload)
     end
@@ -16,6 +15,7 @@ def index
       @user_rows_with_user_save_errors = @user_collection.user_rows_with_user_save_errors
       @user_rows_with_user_save_attempted = @user_collection.user_rows_with_user_save_attempted
       @all_saves_attempted = @user_rows_with_user_save_attempted.count == @user_rows.count
+      @all_user_rows_selected = @user_rows.all?(&:marked_for_invitation)
     end
 
     private
@@ -24,9 +24,5 @@ def set_user_list_upload
       @user_list_upload = UserListUpload.find(params[:user_list_upload_id])
       authorize @user_list_upload, :edit?
     end
-
-    def selected_ids
-      params.permit(selected_ids: []).fetch(:selected_ids, [])
-    end
   end
 end

app/helpers/user_list_upload/user_list_upload_helper.rb

@@ -13,6 +13,10 @@ def user_row_status_badge_class(user_row)
     }[user_row.before_user_save_status]
   end
 
+  def user_row_checked_value(selected)
+    selected ? "checked" : ""
+  end
+
   def user_row_icon_for_status(errors)
     return if errors.empty?
 

app/javascript/controllers/submit_selected_ids_controller.js → app/javascript/controllers/user_row_selection_controller.js

@@ -1,4 +1,5 @@
 import { Controller } from "@hotwired/stimulus";
+import appFetch from "../lib/appFetch";
 
 export default class extends Controller {
   static targets = ["checkbox", "submit", "formatOption", "selectedUsersCounter"]
@@ -10,31 +11,13 @@ export default class extends Controller {
     this.#updateSelectedCountText()
   }
 
-  submit(event) {
-    const selectedIds = this.checkboxTargets
-      .filter(checkbox => checkbox.checked)
-      .map(checkbox => checkbox.value)
-
-    const form = event.currentTarget
-
-    // Remove any existing hidden fields first
-    form.querySelectorAll("input[name='selected_ids[]']").forEach(el => el.remove())
-
-    // Create a new hidden field for each UID
-    selectedIds.forEach(id => {
-      const hiddenField = document.createElement("input")
-      hiddenField.type = "hidden"
-      hiddenField.name = "selected_ids[]"
-      hiddenField.value = id
-      form.appendChild(hiddenField)
-    })
-  }
-
-  toggleAll(event) {
-    this.checkboxTargets.forEach(checkbox => {
-      checkbox.checked = checkbox.disabled ? false : event.target.checked
-    })
-    this.toggleSubmit()
+  async toggleAll(event) {
+    if (await this.#saveAllSelectedState(event)) {
+      this.checkboxTargets.forEach(checkbox => {
+        checkbox.checked = checkbox.disabled ? false : event.target.checked
+      })
+      this.toggleSubmit()
+    }
   }
 
   toggleSubmit() {
@@ -46,6 +29,24 @@ export default class extends Controller {
     this.#updateSelectedCountText()
   }
 
+  async saveSelectedState(event) {
+    const response = await appFetch(event.target.dataset.updateUserRowUrl, "PATCH", {
+      user_row: { [this.element.dataset.userRowSelectionType]: event.target.checked }
+    })
+
+    if (!response.success) {
+      event.target.checked = !event.target.checked;
+    }
+  }
+
+  async #saveAllSelectedState(event) {
+    const response = await appFetch(event.target.dataset.updateAllUserRowsUrl, "PATCH", {
+      [this.element.dataset.userRowSelectionType]: event.target.checked
+    })
+
+    return response.success
+  }
+
   disableUninvitableUsers() {
     const supportedFormats = this.formatOptionTargets.filter(option => option.checked).map(option => option.dataset.format)
 
@@ -61,6 +62,7 @@ export default class extends Controller {
         checkbox.checked = false
         checkbox.disabled = true
       }
+      checkbox.dispatchEvent(new Event("change", { bubbles: true }))
     })
 
     this.toggleSubmit()

app/models/user_list_upload/collection.rb

@@ -45,7 +45,10 @@ def user_rows_enriched_with_cnaf_data
   end
 
   def user_rows_marked_for_user_save
-    user_rows.select(&:marked_for_user_save?)
+    # .reject do |user_row|
+    #   user_row.last_user_save_attempt.success?
+    # end
+    user_rows.select(&:user_valid?).select(&:marked_for_user_save?)
   end
 
   def user_rows_with_user_save_attempted
@@ -57,17 +60,18 @@ def user_rows_with_user_save_success
   end
 
   def user_rows_with_user_save_errors
-    user_rows_with_user_save_attempted.reject do |user_row|
-      user_row.last_user_save_attempt.success?
-    end
+    user_rows_with_user_save_attempted.reject(&:user_save_succeded?)
   end
 
   def all_saves_attempted?
     user_rows_marked_for_user_save.all?(&:attempted_user_save?)
   end
 
   def user_rows_marked_for_invitation
-    user_rows.select(&:marked_for_invitation?)
+    # .reject do |user_row|
+    #   user_row.invitation_succeeded?
+    # end
+    user_rows.select(&:marked_for_invitation?).select(&:user_save_succeded?)
   end
 
   def all_invitations_attempted?
@@ -82,22 +86,6 @@ def user_rows_with_invitation_errors
     user_rows_with_invitation_attempted.select(&:all_invitations_failed?)
   end
 
-  def mark_selected_rows_for_invitation!(selected_ids)
-    user_rows.each do |user_row|
-      user_row.mark_for_invitation! if selected_ids.include?(user_row.id)
-    end
-
-    save!(user_rows.select(&:marked_for_invitation?))
-  end
-
-  def mark_selected_rows_for_user_save!(selected_ids)
-    user_rows.each do |user_row|
-      user_row.mark_for_user_save! if selected_ids.include?(user_row.id)
-    end
-
-    save!(user_rows.select(&:marked_for_user_save?))
-  end
-
   def sort_by!(sort_by:, sort_direction:)
     user_rows.sort_by! do |user_row|
       # we place nil values at the end

app/models/user_list_upload/user_row.rb

@@ -197,6 +197,10 @@ def invitation_attempted?
     invitation_attempts.any?
   end
 
+  def invitation_succeeded?
+    invitation_attempts.any?(&:success?)
+  end
+
   def last_invitation_attempt
     invitation_attempts.max_by(&:created_at)
   end

app/views/user_list_uploads/invitation_attempts/_user_row_before_invitation.html.erb

@@ -2,13 +2,14 @@
   <td class="border-light">
     <input type="checkbox"
             class="form-check-input user-checkbox"
-            data-submit-selected-ids-target="checkbox"
-            data-action="click->submit-selected-ids#toggleSubmit"
+            data-user-row-selection-target="checkbox"
+            data-action="click->user-row-selection#toggleSubmit change->user-row-selection#saveSelectedState"
+            data-update-user-row-url="<%= user_list_upload_user_row_path(id: user_row.id, user_list_upload_id: @user_list_upload.id) %>"
             data-user-email="<%= user_row.user.email %>"
             data-user-phone="<%= user_row.user.phone_number %>"
             data-user-invitable="<%= user_row.invitable? %>"
             value="<%= user_row.id %>"
-            <%= user_row.invitable? ? "checked" : "disabled" %>>
+            <%= user_row.invitable? ? user_row_checked_value(user_row.marked_for_invitation) : "disabled" %>>
   </td>
 
   <% [:title, :first_name, :last_name, :affiliation_number, :phone_number, :email].each do |attribute| %>
@@ -38,4 +39,4 @@
         <i class="ri-download-line"></i>
       </button>
   </td>
-</tr>
+</tr>

app/views/user_list_uploads/invitation_attempts/_user_rows_before_invitation.html.erb

@@ -3,7 +3,13 @@
     <thead class="bg-white text-dark-blue sticky-header" data-controller="sort-list">
       <tr>
         <th scope="col" class="border-light">
-          <input type="checkbox" class="form-check-input" data-action="click->submit-selected-ids#toggleAll" checked>
+          <input 
+            type="checkbox" 
+            class="form-check-input" 
+            data-action="click->user-row-selection#toggleAll" 
+            data-update-all-user-rows-url="<%= update_all_user_list_upload_user_rows_path(user_list_upload_id: @user_list_upload.id) %>" 
+            <%= @all_user_rows_selected ? "checked" : "" %>
+          >
         </th>
         <th scope="col" class="border-light">Civilité</th>
         <th scope="col" data-action="click->sort-list#changeUrlParams" data-sort-by="first_name">

app/views/user_list_uploads/invitation_attempts/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title, "Envoyer des invitations - #{structure_name_with_context(@user_list_upload.structure)} - rdv-insertion" %>
 
-<div class="container px-5 py-3" data-controller="submit-selected-ids">
+<div class="container px-5 py-3" data-controller="user-row-selection" data-user-row-selection-type="marked_for_invitation">
   <div class="row text-dark-blue ">
     <div class="col text-center align-items-center my-1">
       <div>

app/views/user_list_uploads/invitation_attempts/select_rows.html.erb

@@ -1,6 +1,6 @@
 <% content_for :title, "Envoyer des invitations - #{structure_name_with_context(@user_list_upload.structure)} - rdv-insertion" %>
 
-<div class="container px-5 py-3" data-controller="submit-selected-ids">
+<div class="container px-5 py-3" data-controller="user-row-selection" data-user-row-selection-type="marked_for_invitation">
   <div class="row text-dark-blue ">
     <div class="col text-center align-items-center my-1">
       <div>
@@ -33,19 +33,19 @@
           <div>
             <%= form_tag create_many_user_list_upload_invitation_attempts_path(user_list_upload_id: @user_list_upload.id),
                   method: :post,
-                  data: { action: "submit->submit-selected-ids#submit", turbo: false } do %>
+                  data: { action: "submit->user-row-selection#submit", turbo: false } do %>
               <div class="d-flex justify-content-around align-items-center">
                 <div class="align-middle">Inviter la sélection par:</div>
                 <div class="form-check mx-3">
-                  <%= check_box_tag "email", "Email", checked: true, class: "form-check-input text-dark-blue", data: { submit_selected_ids_target: "formatOption", action: "change->submit-selected-ids#disableUninvitableUsers", format: "email" } %>
+                  <%= check_box_tag "email", "Email", checked: true, class: "form-check-input text-dark-blue", data: { user_row_selection_target: "formatOption", action: "change->user-row-selection#disableUninvitableUsers", format: "email" } %>
                   <%= label_tag "email", "Email", class: "form-check-label" %>
                 </div>
                 <div class="form-check mx-3">
-                  <%= check_box_tag "sms", "SMS", checked: true, class: "form-check-input text-dark-blue", data: { submit_selected_ids_target: "formatOption", action: "change->submit-selected-ids#disableUninvitableUsers", format: "sms" } %>
+                  <%= check_box_tag "sms", "SMS", checked: true, class: "form-check-input text-dark-blue", data: { user_row_selection_target: "formatOption", action: "change->user-row-selection#disableUninvitableUsers", format: "sms" } %>
                   <%= label_tag "sms", "SMS", class: "form-check-label" %>
                 </div>
                 <%= hidden_field_tag "selected_ids[]" %>
-                <%= submit_tag "Envoyer les invitations", class: "btn btn-primary d-block mx-auto", data: { submit_selected_ids_target: "submit" } %>
+                <%= submit_tag "Envoyer les invitations", class: "btn btn-primary d-block mx-auto", data: { user_row_selection_target: "submit" } %>
               </div>
             <% end %>
           </div>

app/views/user_list_uploads/user_list_uploads/_user_row.html.erb

@@ -2,10 +2,11 @@
   <td>
     <input type="checkbox"
             class="form-check-input user-checkbox"
-            data-submit-selected-ids-target="checkbox"
-            data-action="click->submit-selected-ids#toggleSubmit"
+            data-user-row-selection-target="checkbox"
+            data-action="click->user-row-selection#toggleSubmit change->user-row-selection#saveSelectedState"
+            data-update-user-row-url="<%= user_list_upload_user_row_path(id: user_row.id, user_list_upload_id: @user_list_upload.id) %>"
             value="<%= user_row.id %>"
-            <%= user_row.user_valid? ? "checked" : "disabled" %>>
+            <%= user_row.user_valid? ? user_row_checked_value(user_row.marked_for_user_save) : "disabled" %>>
   </td>
 
   <% %i[title first_name last_name affiliation_number phone_number email].each do |attribute| %>

app/views/user_list_uploads/user_list_uploads/_user_rows.html.erb

@@ -3,7 +3,13 @@
     <thead class="bg-white text-dark-blue sticky-header" data-controller="sort-list">
       <tr>
         <th scope="col">
-          <input type="checkbox" class="form-check-input" data-action="click->submit-selected-ids#toggleAll" checked>
+          <input 
+            type="checkbox" 
+            class="form-check-input" 
+            data-action="click->user-row-selection#toggleAll"  
+            data-update-all-user-rows-url="<%= update_all_user_list_upload_user_rows_path(user_list_upload_id: @user_list_upload.id) %>"
+            <%= @all_user_rows_selected ? "checked" : "" %>
+          >
         </th>
         <th scope="col">Civilité</th>
         <th scope="col" data-action="click->sort-list#changeUrlParams" data-sort-by="first_name">