decidim-department_admin 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff55c5dcb3bdfad666c4e4882d6d7e7d951b370c815195bd3be067f4ebb723b
-  data.tar.gz: 73d81c52a8ac93904767301a8467f8b1aa827158e53325325f4601252dd7e608
+  metadata.gz: 7ecc31ae9e41149508bba0d66faec60a5f49874502d1a60440094a792acffcf1
+  data.tar.gz: 66805a1eb552135f18a6e60eb801755b2712ac769e9d4209bcbd20bb390456c7
 SHA512:
-  metadata.gz: 3ec0cd830056b1ed8202b385bc9a20b2e63c740770fe0237aa72533419224631aff054bd5012b0a126d1824a61b17b9ffdf5e14df5a90138a962c07a7f104d86
-  data.tar.gz: 68e4deef3e876c240f852e1c254da34c4c41f4a071bef3206667abcc6e0486d1fb010ffdff09efb928d58c586008d7e6cc42d2d90648456efd2c9ce45bd760b4
+  metadata.gz: 8ac8a0f7d0d1d43f7a2e61044a676dc8c0ef005bb7749742d0e577e4895da8de449ca4d167174bf9ffc9ac26a44d05a36f5f16f3129b030b1d4ebd4a9a3d735e
+  data.tar.gz: 2d40480e18d898b50445dd540d2c90fa36a440413b7c6a772a8048af3149153d94acd555d5124d59caf7b3932159869cef54b2ea2b34ba92cdcce818e5aa0b56

data/app/decorators/decidim/admin/newsletters_controller_decorator.rb

@@ -27,4 +27,4 @@ module Decidim::Admin::NewslettersControllerDecorator
   end
 end
 
-::Decidim::Admin::NewslettersControllerDecorator.decorate
+Decidim::Admin::NewslettersControllerDecorator.decorate

data/app/decorators/decidim/admin/users_controller_decorator.rb

@@ -125,4 +125,4 @@ module Decidim::Admin::UsersControllerDecorator
   # rubocop: enable Metrics/PerceivedComplexity
 end
 
-::Decidim::Admin::UsersControllerDecorator.decorate
+Decidim::Admin::UsersControllerDecorator.decorate

data/app/decorators/decidim/area_decorator.rb

@@ -29,7 +29,7 @@ module Decidim::AreaDecorator
       end
 
       def has_department_admins?
-        Decidim::User.where(organization: organization).any? do |u|
+        Decidim::User.where(organization:).any? do |u|
           u.areas.exists?(id)
         end
       end
@@ -41,4 +41,4 @@ module Decidim::AreaDecorator
   end
 end
 
-::Decidim::AreaDecorator.decorate
+Decidim::AreaDecorator.decorate

data/app/decorators/decidim/assemblies/admin/assemblies_controller_decorator.rb

@@ -22,4 +22,4 @@ module Decidim::Assemblies::Admin::AssembliesControllerDecorator
   end
 end
 
-::Decidim::Assemblies::Admin::AssembliesControllerDecorator.decorate
+Decidim::Assemblies::Admin::AssembliesControllerDecorator.decorate

data/app/decorators/decidim/assemblies/admin/assemblies_helper_decorator.rb

@@ -21,4 +21,4 @@ module Decidim::Assemblies::Admin::AssembliesHelperDecorator
   end
 end
 
-::Decidim::Assemblies::Admin::AssembliesHelperDecorator.decorate
+Decidim::Assemblies::Admin::AssembliesHelperDecorator.decorate

data/app/decorators/decidim/assemblies/create_assembly_decorator.rb

@@ -16,4 +16,4 @@ module Decidim::Assemblies::CreateAssemblyDecorator
   end
 end
 
-::Decidim::Assemblies::CreateAssemblyDecorator.decorate
+Decidim::Assemblies::CreateAssemblyDecorator.decorate

data/app/decorators/decidim/assemblies/parent_assemblies_for_select_decorator.rb

@@ -35,4 +35,4 @@ module Decidim::Assemblies::ParentAssembliesForSelectDecorator
   end
 end
 
-::Decidim::Assemblies::ParentAssembliesForSelectDecorator.decorate
+Decidim::Assemblies::ParentAssembliesForSelectDecorator.decorate

data/app/decorators/decidim/assemblies/permissions_decorator.rb

@@ -19,4 +19,4 @@ module Decidim::Assemblies::PermissionsDecorator
   end
 end
 
-::Decidim::Assemblies::PermissionsDecorator.decorate
+Decidim::Assemblies::PermissionsDecorator.decorate

data/app/decorators/decidim/assemblies/update_assembly_decorator.rb

@@ -16,4 +16,4 @@ module Decidim::Assemblies::UpdateAssemblyDecorator
   end
 end
 
-::Decidim::Assemblies::UpdateAssemblyDecorator.decorate
+Decidim::Assemblies::UpdateAssemblyDecorator.decorate

data/app/decorators/decidim/assemblies_decorator.rb

@@ -18,4 +18,4 @@ module Decidim::AssembliesDecorator
   end
 end
 
-::Decidim::AssembliesDecorator.decorate
+Decidim::AssembliesDecorator.decorate

data/app/decorators/decidim/assemblies_with_user_role_decorator.rb

@@ -24,4 +24,4 @@ module Decidim::AssembliesWithUserRoleDecorator
   end
 end
 
-::Decidim::AssembliesWithUserRoleDecorator.decorate
+Decidim::AssembliesWithUserRoleDecorator.decorate

data/app/decorators/decidim/conference_form_decorator.rb

@@ -20,4 +20,4 @@ module Decidim::ConferenceFormDecorator
   end
 end
 
-::Decidim::ConferenceFormDecorator.decorate
+Decidim::ConferenceFormDecorator.decorate

data/app/decorators/decidim/conferences/admin/conferences_controller_decorator.rb

@@ -24,4 +24,4 @@ module Decidim::Conferences::Admin::ConferencesControllerDecorator
   end
 end
 
-::Decidim::Conferences::Admin::ConferencesControllerDecorator.decorate
+Decidim::Conferences::Admin::ConferencesControllerDecorator.decorate

data/app/decorators/decidim/conferences/create_conference_decorator.rb

@@ -26,6 +26,7 @@ module Decidim::Conferences::CreateConferenceDecorator
           slogan: form.slogan,
           slug: form.slug,
           hashtag: form.hashtag,
+          weight: form.weight,
           description: form.description,
           short_description: form.short_description,
           objectives: form.objectives,
@@ -48,4 +49,4 @@ module Decidim::Conferences::CreateConferenceDecorator
   end
 end
 
-::Decidim::Conferences::CreateConferenceDecorator.decorate
+Decidim::Conferences::CreateConferenceDecorator.decorate

data/app/decorators/decidim/conferences/permissions_decorator.rb

@@ -21,4 +21,4 @@ module Decidim::Conferences::PermissionsDecorator
   end
 end
 
-::Decidim::Conferences::PermissionsDecorator.decorate
+Decidim::Conferences::PermissionsDecorator.decorate

data/app/decorators/decidim/conferences/update_conference_decorator.rb

@@ -18,4 +18,4 @@ module Decidim::Conferences::UpdateConferenceDecorator
   end
 end
 
-::Decidim::Conferences::UpdateConferenceDecorator.decorate
+Decidim::Conferences::UpdateConferenceDecorator.decorate

data/app/decorators/decidim/conferences_decorator.rb

@@ -24,4 +24,4 @@ module Decidim::ConferencesDecorator
   end
 end
 
-::Decidim::ConferencesDecorator.decorate
+Decidim::ConferencesDecorator.decorate

data/app/decorators/decidim/conferences_with_user_role_decorator.rb

@@ -26,4 +26,4 @@ module Decidim::ConferencesWithUserRoleDecorator
   end
 end
 
-::Decidim::ConferencesWithUserRoleDecorator.decorate
+Decidim::ConferencesWithUserRoleDecorator.decorate

data/app/decorators/decidim/decidim_form_helper_decorator.rb

@@ -20,4 +20,4 @@ module Decidim::DecidimFormHelperDecorator
   end
 end
 
-::Decidim::DecidimFormHelperDecorator.decorate
+Decidim::DecidimFormHelperDecorator.decorate

data/app/decorators/decidim/invite_user_decorator.rb

@@ -53,4 +53,4 @@ module Decidim::InviteUserDecorator
   end
 end
 
-::Decidim::InviteUserDecorator.decorate
+Decidim::InviteUserDecorator.decorate

data/app/decorators/decidim/invite_user_form_decorator.rb

@@ -42,4 +42,4 @@ module Decidim::InviteUserFormDecorator
   end
 end
 
-::Decidim::InviteUserFormDecorator.decorate
+Decidim::InviteUserFormDecorator.decorate

data/app/decorators/decidim/newsletter_decorator.rb

@@ -17,4 +17,4 @@ module Decidim::NewsletterDecorator
   end
 end
 
-::Decidim::NewsletterDecorator.decorate
+Decidim::NewsletterDecorator.decorate

data/app/decorators/decidim/newsletters_helper_decorator.rb

@@ -41,4 +41,4 @@ module Decidim::NewslettersHelperDecorator
   # rubocop: enable Metrics/PerceivedComplexity
 end
 
-::Decidim::NewslettersHelperDecorator.decorate
+Decidim::NewslettersHelperDecorator.decorate

data/app/decorators/decidim/participatory_process_decorator.rb

@@ -18,4 +18,4 @@ module Decidim::ParticipatoryProcessDecorator
   end
 end
 
-::Decidim::ParticipatoryProcessDecorator.decorate
+Decidim::ParticipatoryProcessDecorator.decorate

data/app/decorators/decidim/participatory_process_group_decorator.rb

@@ -14,4 +14,4 @@ module Decidim::ParticipatoryProcessGroupDecorator
   end
 end
 
-::Decidim::ParticipatoryProcessGroupDecorator.decorate
+Decidim::ParticipatoryProcessGroupDecorator.decorate

data/app/decorators/decidim/participatory_processes/admin/participatory_processes_controller_decorator.rb

@@ -22,4 +22,4 @@ module Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessesControllerD
   end
 end
 
-::Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessesControllerDecorator.decorate
+Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessesControllerDecorator.decorate

data/app/decorators/decidim/participatory_processes/create_participatory_process_decorator.rb

@@ -16,4 +16,4 @@ module Decidim::ParticipatoryProcesses::CreateParticipatoryProcessDecorator
   end
 end
 
-::Decidim::ParticipatoryProcesses::CreateParticipatoryProcessDecorator.decorate
+Decidim::ParticipatoryProcesses::CreateParticipatoryProcessDecorator.decorate

data/app/decorators/decidim/participatory_processes/permissions_decorator.rb

@@ -19,4 +19,4 @@ module Decidim::ParticipatoryProcesses::PermissionsDecorator
   end
 end
 
-::Decidim::ParticipatoryProcesses::PermissionsDecorator.decorate
+Decidim::ParticipatoryProcesses::PermissionsDecorator.decorate

data/app/decorators/decidim/participatory_processes/update_participatory_process_decorator.rb

@@ -16,4 +16,4 @@ module Decidim::ParticipatoryProcesses::UpdateParticipatoryProcessDecorator
   end
 end
 
-::Decidim::ParticipatoryProcesses::UpdateParticipatoryProcessDecorator.decorate
+Decidim::ParticipatoryProcesses::UpdateParticipatoryProcessDecorator.decorate

data/app/decorators/decidim/participatory_processes_with_user_role_decorator.rb

@@ -24,4 +24,4 @@ module Decidim::ParticipatoryProcessesWithUserRoleDecorator
   end
 end
 
-::Decidim::ParticipatoryProcessesWithUserRoleDecorator.decorate
+Decidim::ParticipatoryProcessesWithUserRoleDecorator.decorate

data/app/decorators/decidim/user_decorator.rb

@@ -42,18 +42,18 @@ module Decidim::UserDecorator
 
       def self.space_admins(organization)
         if Decidim::DepartmentAdmin.conferences_defined?
-          Decidim::User.where(organization: organization)
-                       .where('"decidim_users"."id" in (select "decidim_participatory_process_user_roles"."decidim_user_id" from "decidim_participatory_process_user_roles")' \
-                              ' or "decidim_users"."id" in (select "decidim_assembly_user_roles"."decidim_user_id" from "decidim_assembly_user_roles")' \
-                              ' or "decidim_users"."id" in (select "decidim_conference_user_roles"."decidim_user_id" from "decidim_conference_user_roles")')
+          Decidim::User.where(organization:)
+                       .where('"decidim_users"."id" in (select "decidim_participatory_process_user_roles"."decidim_user_id" from "decidim_participatory_process_user_roles") ' \
+                              'or "decidim_users"."id" in (select "decidim_assembly_user_roles"."decidim_user_id" from "decidim_assembly_user_roles") ' \
+                              'or "decidim_users"."id" in (select "decidim_conference_user_roles"."decidim_user_id" from "decidim_conference_user_roles")')
         else
-          Decidim::User.where(organization: organization)
-                       .where('"decidim_users"."id" in (select "decidim_participatory_process_user_roles"."decidim_user_id" from "decidim_participatory_process_user_roles")' \
-                              ' or "decidim_users"."id" in (select "decidim_assembly_user_roles"."decidim_user_id" from "decidim_assembly_user_roles")')
+          Decidim::User.where(organization:)
+                       .where('"decidim_users"."id" in (select "decidim_participatory_process_user_roles"."decidim_user_id" from "decidim_participatory_process_user_roles") ' \
+                              'or "decidim_users"."id" in (select "decidim_assembly_user_roles"."decidim_user_id" from "decidim_assembly_user_roles")')
         end
       end
     end
   end
 end
 
-::Decidim::UserDecorator.decorate
+Decidim::UserDecorator.decorate

data/app/decorators/lib/decidim/participatory_space_resourceable_decorator.rb

@@ -27,10 +27,10 @@ module Lib::Decidim::ParticipatorySpaceResourceableDecorator
 end
 
 require "decidim/assembly"
-Decidim::Assembly.prepend(::Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+Decidim::Assembly.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
 require "decidim/participatory_process"
-Decidim::ParticipatoryProcess.prepend(::Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+Decidim::ParticipatoryProcess.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
 if Decidim::DepartmentAdmin.conferences_defined?
   require "decidim/conference"
-  Decidim::Conference.prepend(::Lib::Decidim::ParticipatorySpaceResourceableDecorator)
+  Decidim::Conference.prepend(Lib::Decidim::ParticipatorySpaceResourceableDecorator)
 end

data/app/helpers/decidim/department_admin/application_helper.rb

@@ -10,7 +10,7 @@ module Decidim
       # rubocop: disable Rails/HelperInstanceVariable
       def roles_with_title(user)
         roles_with_title = user.roles.collect { |role| [role, ""] }
-        # if user had particiatory processes then add role of process admin
+        # if user had participatory processes then add role of process admin
         user_participatory_processes_filtered(user, current_locale, @search_text).each do |participatory_process|
           roles_with_title << ["process_admin", translated_attribute(participatory_process.title)]
         end

data/app/packs/stylesheets/decidim/admin/department_admin.scss

@@ -1,4 +1,6 @@
 .department-admin-filter {
+  margin-left: 20px;
+
   .dropdown {
     z-index: 0 !important;
   }

data/app/views/decidim/admin/users/_filters.html.erb

@@ -1,28 +1,32 @@
-<div class='department-admin-filter filter row'>
-  <div class='column medium-3'>
-  <span class='dropdown-menu-inverted_label'><%= t('.filter_by') %> :</span>
-    <ul class='dropdown menu dropdown-inverted' data-dropdown-menu data-close-on-click-inside='false'>
-      <li class='is-dropdown-submenu-parent'>
-        <a href='#'>
-        <% if @role.present? %>
-          <%= t("models.user.fields.roles.#{@role}", scope: 'decidim.admin') %>
-        <% else %>
-          <%= t('.filter.all') %>
-        <% end %>
-        </a>
-        <ul class='menu is-dropdown-submenu'>
-          <% Decidim::User::Roles.all.map do |role| %>
-            <li><%= link_to t("models.user.fields.roles.#{role}", scope: 'decidim.admin'), url_for(role: role, q: ransack_params) %></li>
+<% if controller_name == "users" %>
+  <div class='department-admin-filter filter row'>
+    <div>
+      <span class='dropdown-menu-inverted_label'><%= t('.filter_by') %> :</span>
+      <ul class="dropdown menu" data-dropdown-menu data-close-on-click-inside="false">
+        <li class='is-dropdown-submenu-parent'>
+          <a href='#'>
+          <% if @role.present? %>
+            <%= t("models.user.fields.roles.#{@role}", scope: 'decidim.admin') %>
+          <% else %>
+            <%= t('.filter.all') %>
           <% end %>
-          <li><%= link_to t('models.user.fields.roles.space_admin', scope: 'decidim.admin'), url_for(role: 'space_admin', q: ransack_params) %></li>
-          <li><%= link_to t('.filter.all'), url_for(q: ransack_params) %></li>
-        </ul>
-      </li>
-    </ul>
-    <%= t('models.user.fields.search_question', scope: 'decidim.admin') %>
-    <input type='radio' id='processes_filter' name='filter_search' value='by_process_name' <%= @by_process_name ? "checked" : "" %> style='margin-left: 20px'>
-    <label for='processes_filter'><%= t('models.user.fields.search_field_processes', scope: 'decidim.admin') %></label>
-    <input type='radio' id='query_filter' name='filter_search' value='query' <%= params[:filter_search].blank? || params[:filter_search] == "query" ? "checked" : "" %> >
-    <label for='query_filter'><%= t('models.user.fields.search_field_admins', scope: 'decidim.admin') %></label>
+          </a>
+          <ul class='menu is-dropdown-submenu'>
+            <% Decidim::User::Roles.all.map do |role| %>
+              <li><%= link_to t("models.user.fields.roles.#{role}", scope: 'decidim.admin'), url_for(role: role, q: ransack_params) %></li>
+            <% end %>
+            <li><%= link_to t('models.user.fields.roles.space_admin', scope: 'decidim.admin'), url_for(role: 'space_admin', q: ransack_params) %></li>
+            <li><%= link_to t('.filter.all'), url_for(q: ransack_params) %></li>
+          </ul>
+        </li>
+      </ul>
+      <div class="process-or-admins">
+        <%= t('models.user.fields.search_question', scope: 'decidim.admin') %>
+        <input type='radio' id='processes_filter' name='filter_search' value='by_process_name' <%= @by_process_name ? "checked" : "" %> style='margin-left: 20px'>
+        <label for='processes_filter'><%= t('models.user.fields.search_field_processes', scope: 'decidim.admin') %></label>
+        <input type='radio' id='query_filter' name='filter_search' value='query' <%= params[:filter_search].blank? || params[:filter_search] == "query" ? "checked" : "" %> >
+        <label for='query_filter'><%= t('models.user.fields.search_field_admins', scope: 'decidim.admin') %></label>
+      </div>
+    </div>
   </div>
-</div>
+<% end %>

data/app/views/decidim/admin/users/_form.html.erb

@@ -1,21 +1,27 @@
-<div class="row column">
-  <%= form.text_field :name, label: t(".name") %>
-</div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.text_field :name, label: t(".name") %>
+      </div>
 
-<div class="row column">
-  <%= form.email_field :email, label: t(".email") %>
-</div>
+      <div class="row column">
+        <%= form.email_field :email, label: t(".email") %>
+      </div>
 
-<div class="row column">
-  <%= form.select :role, @form.available_roles_for_select, label: t(".role") %>
-</div>
+      <div class="row column">
+        <%= form.select :role, @form.available_roles_for_select, label: t(".role") %>
+      </div>
 
-<div id="area-block" class="row column">
-  <%= form.select :area_id,
-                  @form.available_areas_for_select,
-                  { label: t(".area") },
-                  { disabled: current_user.roles.include?('department_admin') }
-  %>
+      <div id="area-block" class="row column">
+        <%= form.select :area_id,
+                        @form.available_areas_for_select,
+                        { label: t(".area") },
+                        { disabled: current_user.roles.include?('department_admin') }
+        %>
+      </div>
+    </div>
+  </div>
 </div>
 
 <%= javascript_tag do %>

data/app/views/decidim/admin/users/index.html.erb

@@ -1,93 +1,91 @@
 <% add_decidim_page_title(t("decidim.admin.titles.users")) %>
 <div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.users" %>
       <% if allowed_to? :create, :admin_user %>
-        <%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button tiny button--title" %>
+        <%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
       <% end %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector %>
-  <div class="card-section">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-          <tr>
-            <th><%= sort_link(query, :role, t("models.user.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :name, t("models.user.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :department, t("models.user.fields.department", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :spaces, t("models.user.fields.spaces", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :created_at, t("models.user.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% filtered_collection.each do |user| %>
-            <% roles_with_title(user).each do |role_and_title| %>
-              <% if @role.blank? || (@role == role_and_title[0] || @role == 'space_admin' && (role_and_title[0] == 'process_admin' || role_and_title[0] == 'assembly_admin' || role_and_title[0] == 'conference_admin')) %>              
-              <tr data-user-id="<%= user.id %>">
-                <td>
-                  <% if role_and_title.nil? || role_and_title[0].empty? %>
-                    <%= t("models.user.fields.roles.#{user.active_role}", scope: "decidim.admin") %>
-                  <% else %>
-                    <%= t("models.user.fields.roles.#{role_and_title[0] }", scope: "decidim.admin") %>
-                  <% end %>
-                </td>
-                <td><%= user.name %></td>
-                <td><%= user.email %></td>
-                <td>
-                  <% if user.department_admin? %>
-                    <%= translated_attribute(user.areas.first&.name) %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if !role_and_title.nil? && !role_and_title[1].empty? %>
-                    <%= role_and_title[1] %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if user.invitation_sent_at %>
-                    <%= l user.invitation_sent_at, format: :short %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if user.invitation_accepted_at %>
-                    <%= l user.invitation_accepted_at, format: :short %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if user.last_sign_in_at %>
-                    <%= l user.last_sign_in_at, format: :short %>
-                  <% end %>
-                </td>
-                <td><%= l user.created_at, format: :short %></td>
-                <td class="table-list__actions">
-                  <% if user.participatory_processes.size > 0 || user.assemblies.size > 0 || (Decidim::DepartmentAdmin.conferences_defined? && user.conferences.size > 0) %>
-                    <% if allowed_to? :preview, :user, user: user %>
-                      <%= icon_link_to "eye", user_path(user.id), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
-                    <% end %>
+  <div class="table-scroll">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th><%= sort_link(query, :role, t("models.user.fields.role", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :name, t("models.user.fields.name", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :email, t("models.user.fields.email", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :department, t("models.user.fields.department", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :spaces, t("models.user.fields.spaces", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :invitation_sent_at, t("models.user.fields.invitation_sent_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :invitation_accepted_at, t("models.user.fields.invitation_accepted_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :last_sign_in_at, t("models.user.fields.last_sign_in_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :created_at, t("models.user.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @users.each do |user| %>
+          <% roles_with_title(user).each do |role_and_title| %>
+            <% if @role.blank? || (@role == role_and_title[0] || @role == 'space_admin' && (role_and_title[0] == 'process_admin' || role_and_title[0] == 'assembly_admin' || role_and_title[0] == 'conference_admin')) %>              
+            <tr data-user-id="<%= user.id %>">
+              <td>
+                <% if role_and_title.nil? || role_and_title[0].empty? %>
+                  <%= t("models.user.fields.roles.#{user.active_role}", scope: "decidim.admin") %>
+                <% else %>
+                  <%= t("models.user.fields.roles.#{role_and_title[0] }", scope: "decidim.admin") %>
+                <% end %>
+              </td>
+              <td><%= user.name %></td>
+              <td><%= user.email %></td>
+              <td>
+                <% if user.department_admin? %>
+                  <%= translated_attribute(user.areas.first&.name) %>
+                <% end %>
+              </td>
+              <td>
+                <% if !role_and_title.nil? && !role_and_title[1].empty? %>
+                  <%= role_and_title[1] %>
+                <% end %>
+              </td>
+              <td>
+                <% if user.invitation_sent_at %>
+                  <%= l user.invitation_sent_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if user.invitation_accepted_at %>
+                  <%= l user.invitation_accepted_at, format: :short %>
+                <% end %>
+              </td>
+              <td>
+                <% if user.last_sign_in_at %>
+                  <%= l user.last_sign_in_at, format: :short %>
+                <% end %>
+              </td>
+              <td><%= l user.created_at, format: :short %></td>
+              <td class="table-list__actions">
+                <% if user.participatory_processes.size > 0 || user.assemblies.size > 0 || (Decidim::DepartmentAdmin.conferences_defined? && user.conferences.size > 0) %>
+                  <% if allowed_to?(:preview, :user, user: user) %>
+                    <%= icon_link_to "eye-line", user_path(user.id), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
                   <% end %>
+                <% end %>
 
-                  <% if allowed_to?(:invite, :admin_user, user: user) && user.invited_to_sign_up? %>
-                    <%= icon_link_to "reload", [:resend_invitation, user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
-                  <% end %>
+                <% if allowed_to?(:invite, :admin_user, user: user) && user.invited_to_sign_up? %>
+                  <%= icon_link_to "refresh-line", [:resend_invitation, user], t("actions.resend_invitation", scope: "decidim.admin"), class: "resend-invitation", method: :post %>
+                <% end %>
 
-                  <% if allowed_to? :destroy, :admin_user, user: user %>
-                    <%= icon_link_to "circle-x", user, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                  <% end %>
-                </td>
-              </tr>
-              <% end %>
+                <% if allowed_to? :destroy, :admin_user, user: user %>
+                  <%= icon_link_to "delete-bin-line", user, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+                <% end %>
+              </td>
+            </tr>
             <% end %>
           <% end %>
-        </tbody>
-      </table>
-      <%= paginate @users, theme: "decidim" %>
-    </div>
+        <% end %>
+      </tbody>
+    </table>
+    <%= paginate @users, theme: "decidim" %>
   </div>
 </div>