Admin: can add/remove editor for specific users

etalab · Dec 9, 2024 · 3602355 · 3602355
1 parent b1d0a9e
commit 3602355
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 9 deletions.
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -1,9 +1,26 @@
 class Admin::UsersController < AdminController
   def index
-    @q = User.ransack(params[:q])
+    @q = User.includes(:editor).ransack(params[:q])
     @users = @q.result(distinct: true).page(params[:page])
   end
 
+  def edit
+    @user = User.find(params[:id])
+    @editors = Editor.all
+  end
+
+  def update
+    @user = User.find(params[:id])
+
+    if @user.update(user_params)
+      success_message(title: "Utilisateur #{@user.email} a bien été modifié")
+
+      redirect_to admin_users_path
+    else
+      render :edit
+    end
+  end
+
   def impersonate
     user = User.find(params[:id])
 
@@ -17,4 +34,10 @@ def stop_impersonating
 
     redirect_to admin_users_path
   end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:editor_id)
+  end
 end
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
@@ -0,0 +1,13 @@
+<%= form_for(@user, url: [:admin, @user]) do |f| %>
+  <div class="fr-input-group">
+    <%= f.label :email, class: %w[fr-label] %>
+    <%= f.text_field :email, disabled: true, class: %w[fr-input] %>
+  </div>
+
+  <div class="fr-select-group">
+    <%= f.label :editor, class: %w[fr-label] %>
+    <%= f.collection_select :editor_id, @editors, :id, :name, { include_blank: true }, { class: %w[fr-select] } %>
+  </div>
+
+  <%= f.button :submit, class: %[fr-btn], id: 'submit' %>
+<% end %>
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb
@@ -17,11 +17,11 @@
       <tr>
         <%
           [
-            'ID',
             'Prénom',
             'Nom',
             'Email',
             'Organizations',
+            'Éditeur associé',
             'DataPass ID',
             'Actions',
           ].each do |attr|
@@ -36,9 +36,6 @@
     <tbody>
       <% @users.each do |user| %>
         <tr id="<%= dom_id(user) %>" class="user">
-          <td class="user-id">
-            <%= user.id %>
-          </td>
           <td class="user-first_name">
             <%= user.first_name %>
           </td>
@@ -62,7 +59,14 @@
             <% end %>
           </td>
 
-          <td class="user-organizations">
+          <td class="user-editor">
+            <% if user.editor %>
+              <%= user.editor.name %>
+            <% end %>
+
+            <%= link_to "Modifier l'éditeur associé", edit_admin_user_path(user), id: dom_id(user, :edit) %>
+          </td>
+          <td class="user-datapass">
             <% if user.authorization_requests.where(api: namespace).any? %>
               <ul>
                 <% user.authorization_requests.where(api: namespace).each do |authorization_request| %>
@@ -76,7 +80,7 @@
 
           <td class="user-actions">
             <% if current_user != user %>
-              <%= button_to 'Se connecter en tant que cet utilisateur', impersonate_admin_user_path(user), data: { turbo: false }, class: 'fr-btn', id: dom_id(user, :impersonate) %>
+              <%= button_to 'Se connecter en tant que cet utilisateur', impersonate_admin_user_path(user), data: { turbo: false }, class: 'fr-btn fr-btn--sm', id: dom_id(user, :impersonate) %>
             <% end %>
           </td>
         </tr>

diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
@@ -18,7 +18,7 @@
   <body>
     <%= render partial: 'shared/admin/header' %>
 
-    <div class="fr-container fr-mb-5w fr-mt-5w">
+    <div class="fr-container fr-mb-5w fr-my-5w">
       <turbo-frame id="alerts">
         <%= render partial: 'shared/alerts' %>
       </turbo-frame>

diff --git a/config/routes.rb b/config/routes.rb
@@ -8,7 +8,7 @@
   get '/admin', to: redirect('/admin/users')
 
   namespace :admin do
-    resources :users, only: %i[index] do
+    resources :users, only: %i[index edit update] do
       post :impersonate, on: :member
       post :stop_impersonating, on: :collection
     end

diff --git a/spec/features/admin/users_spec.rb b/spec/features/admin/users_spec.rb
@@ -42,4 +42,26 @@
       expect(page).to have_no_content(invalid_user.email)
     end
   end
+
+  describe 'adding an editor to a specific user' do
+    subject(:add_editor) do
+      visit admin_users_path
+
+      click_on dom_id(user, :edit)
+
+      select editor.name, from: 'user_editor_id'
+
+      click_on 'submit'
+    end
+
+    let!(:user) { create(:user, editor: nil) }
+    let!(:editor) { create(:editor) }
+
+    it 'adds the editor to the user' do
+      add_editor
+
+      expect(user.reload.editor).to eq(editor)
+      expect(page).to have_css('.fr-alert.fr-alert--success')
+    end
+  end
 end