decidim-admin 0.30.2 → 0.31.0.rc1

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

@@ -1,3 +1,31 @@
+@use "stylesheets/decidim/admin/forms";
+@use "stylesheets/decidim/admin/color_picker";
+@use "stylesheets/decidim/admin/main-nav";
+@use "stylesheets/decidim/admin/layout";
+@use "stylesheets/decidim/admin/secondary-nav";
+@use "stylesheets/decidim/admin/title-bar";
+@use "stylesheets/decidim/admin/user-login";
+@use "stylesheets/decidim/admin/cards";
+@use "stylesheets/decidim/admin/logs";
+@use "stylesheets/decidim/admin/filters";
+@use "stylesheets/decidim/admin/table-list";
+@use "stylesheets/decidim/admin/taxonomies";
+@use "stylesheets/decidim/admin/dropdown";
+@use "stylesheets/decidim/admin/item_show";
+@use "stylesheets/decidim/admin/item_edit";
+@use "stylesheets/decidim/admin/tabs";
+@use "stylesheets/decidim/admin/component-show";
+@use "stylesheets/decidim/admin/moderations";
+@use "stylesheets/decidim/admin/select_picker";
+@use "stylesheets/decidim/admin/show_email";
+@use "stylesheets/decidim/admin/data_picker";
+@use "stylesheets/decidim/admin/legacy_foundation";
+@use "stylesheets/decidim/admin/sidebar-menu";
+@use "stylesheets/decidim/admin/datepicker";
+@use "stylesheets/decidim/admin/minimap";
+@use "stylesheets/decidim/admin/proposal_status";
+@use "stylesheets/decidim/tribute";
+
 :root {
   --primary: #e02d2d;
   --primary-rgb: 224 45 45;
@@ -12,32 +40,3 @@
   --alert: #e7131a;
   --alert-rgb: 231 19 26;
 }
-
-@import "stylesheets/decidim/admin/_forms.scss";
-@import "stylesheets/decidim/admin/_color_picker.scss";
-@import "stylesheets/decidim/admin/_main-nav.scss";
-@import "stylesheets/decidim/admin/_layout.scss";
-@import "stylesheets/decidim/admin/_secondary-nav.scss";
-@import "stylesheets/decidim/admin/_title-bar.scss";
-@import "stylesheets/decidim/admin/_user-login.scss";
-@import "stylesheets/decidim/admin/_cards.scss";
-@import "stylesheets/decidim/admin/_logs.scss";
-@import "stylesheets/decidim/admin/_filters.scss";
-@import "stylesheets/decidim/admin/_table-list.scss";
-@import "stylesheets/decidim/admin/_taxonomies.scss";
-@import "stylesheets/decidim/admin/_dropdown.scss";
-@import "stylesheets/decidim/admin/_item_show.scss";
-@import "stylesheets/decidim/admin/_item_edit.scss";
-@import "stylesheets/decidim/admin/_tabs.scss";
-@import "stylesheets/decidim/admin/_component-show.scss";
-@import "stylesheets/decidim/admin/_moderations.scss";
-@import "stylesheets/decidim/admin/_select_picker.scss";
-@import "stylesheets/decidim/admin/_show_email.scss";
-@import "stylesheets/decidim/admin/_bulk_actions.scss";
-@import "stylesheets/decidim/admin/_data_picker.scss";
-@import "stylesheets/decidim/admin/_legacy_foundation.scss";
-@import "stylesheets/decidim/admin/_sidebar-menu.scss";
-@import "stylesheets/decidim/admin/_datepicker.scss";
-@import "stylesheets/decidim/admin/_minimap.scss";
-@import "stylesheets/decidim/admin/_proposal_status.scss";
-@import "stylesheets/decidim/_tribute.scss";

data/app/permissions/decidim/admin/permissions.rb

@@ -36,12 +36,13 @@ module Decidim
         if user.admin? && admin_terms_accepted?
           allow! if read_admin_log_action?
           allow! if read_user_statistics_action?
-          allow! if read_metrics_action?
+          allow! if read_statistics_action?
           allow! if static_page_action?
           allow! if templates_action?
           allow! if organization_action?
           allow! if user_action?
           allow! if admin_user_action?
+          allow! if moderate_user_action?
 
           allow! if permission_action.subject == :component
           allow! if permission_action.subject == :attachment
@@ -51,9 +52,7 @@ module Decidim
           allow! if permission_action.subject == :scope_type
           allow! if permission_action.subject == :area
           allow! if permission_action.subject == :area_type
-          allow! if permission_action.subject == :user_group
           allow! if permission_action.subject == :officialization
-          allow! if permission_action.subject == :moderate_users
           allow! if permission_action.subject == :authorization
           allow! if permission_action.subject == :authorization_workflow
           allow! if permission_action.subject == :static_page_topic
@@ -147,8 +146,8 @@ module Decidim
           permission_action.action == :read
       end
 
-      def read_metrics_action?
-        permission_action.subject == :metrics &&
+      def read_statistics_action?
+        permission_action.subject == :statistics &&
           permission_action.action == :read
       end
 
@@ -235,6 +234,19 @@ module Decidim
         end
       end
 
+      def moderate_user_action?
+        return unless permission_action.subject == :moderate_users
+
+        target_user = context.fetch(:user, nil)
+
+        case permission_action.action
+        when :destroy, :block
+          target_user != user
+        else
+          true
+        end
+      end
+
       def organization
         @organization ||= context.fetch(:organization, nil) || context.fetch(:current_organization, nil)
       end

data/app/presenters/decidim/admin/dashboard_statistic_charts_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class DashboardStatisticChartsPresenter < Decidim::StatsPresenter
+      def scope_entity
+        __getobj__.fetch(:organization)
+      end
+
+      def highlighted
+        high_priority = collection(priority: StatsRegistry::HIGH_PRIORITY)
+        medium_priority = collection(priority: StatsRegistry::MEDIUM_PRIORITY)
+
+        (high_priority + medium_priority).select { |stat| stat[:admin] }
+      end
+    end
+  end
+end

data/app/queries/decidim/admin/user_filter.rb

@@ -15,7 +15,7 @@ module Decidim
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # scope - the ActiveRecord::Relation of users to be filtered
-      # name_query - query to filter user group names
+      # name_query - query to filter user names
       # state - evaluation state to be used as a filter
       def self.for(scope, name_query = nil, state = nil)
         new(scope, name_query, state).query
@@ -24,7 +24,7 @@ module Decidim
       # Initializes the class.
       #
       # scope - the ActiveRecord::Relation of users to be filtered
-      # name_query - query to filter user group names
+      # name_query - query to filter user names
       # state - users state, must be defined as a scope in the user model
       def initialize(scope, name_query = nil, state = nil)
         @scope = scope
@@ -32,7 +32,7 @@ module Decidim
         @state = state
       end
 
-      # List the User groups by the different filters.
+      # List the Users by the different filters.
       def query
         users = scope
         users = filter_by_search(users)

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

@@ -8,36 +8,59 @@
       <% end %>
     </h1>
   </div>
-  <div class="table-scroll">
+
+  <div class="flash warning"><%= t("areas.deprecated", scope: "decidim.admin") %></div>
+
+  <div class="table-stacked">
       <table class="table-list">
       <thead>
         <tr>
           <th><%= t("models.area_type.fields.name", scope: "decidim.admin") %></th>
           <th><%= t("models.area_type.fields.plural", scope: "decidim.admin") %></th>
-          <th></th>
+          <th><%= t("decidim.admin.actions.actions") %></th>
         </tr>
       </thead>
       <tbody>
         <% area_types.each do |area_type| %>
           <tr>
-            <td>
+            <td data-label="<%= t("models.area_type.fields.name", scope: "decidim.admin") %>">
               <% if allowed_to? :update, :area_type, area_type: area_type %>
                 <%= link_to translated_attribute(area_type.name), [:edit, area_type] %>
               <% else %>
                 <%= translated_attribute(area_type.name) %>
               <% end %>
             </td>
-            <td>
+            <td data-label="<%= t("models.area_type.fields.plural", scope: "decidim.admin") %>">
               <%= translated_attribute(area_type.plural) %>
             </td>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :area_type, area_type: area_type %>
-                <%= icon_link_to "pencil-line", [:edit, area_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
-              <% end %>
+            <td class="table-list__actions" data-label="<%= t("decidim.admin.actions.actions") %>">
+              <button type="button" data-controller="dropdown" data-target="actions-area-type-<%= area_type.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: translated_attribute(area_type.name)) %>">
+                <%= icon "more-fill", class: "text-secondary" %>
+              </button>
 
-              <% if allowed_to? :destroy, :area_type, area_type: area_type %>
-                <%= icon_link_to "delete-bin-line", area_type, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-              <% end %>
+              <div class="inline-block relative">
+                <ul id="actions-area-type-<%= area_type.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                  <% if allowed_to? :update, :area_type, area_type: area_type %>
+                    <li class="dropdown__item">
+                      <%= link_to [:edit, area_type], method: :get, class: "dropdown__button" do %>
+                        <%= icon "pencil-line" %>
+                        <%= t("actions.edit", scope: "decidim.admin") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+
+                  <% if allowed_to? :destroy, :area_type, area_type: area_type %>
+                    <hr>
+
+                    <li class="dropdown__item">
+                      <%= link_to area_type, method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                        <%= icon "delete-bin-line" %>
+                        <%= t("actions.destroy", scope: "decidim.admin") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+                </ul>
+              </div>
             </td>
           </tr>
         <% end %>

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

@@ -9,39 +9,59 @@
     </h1>
   </div>
 
-  <div class="callout warning"><%= t("areas.deprecated", scope: "decidim.admin") %></div>
+  <div class="flash warning"><%= t("areas.deprecated", scope: "decidim.admin") %></div>
 
   <% if @areas.any? %>
-    <div class="table-scroll">
+    <div class="table-stacked">
       <table class="table-list">
       <thead>
         <tr>
           <th><%= t("models.area.fields.name", scope: "decidim.admin") %></th>
           <th><%= t("models.area.fields.area_type", scope: "decidim.admin") %></th>
-          <th></th>
+          <th><%= t("decidim.admin.actions.actions") %></th>
         </tr>
       </thead>
       <tbody>
         <% @areas.each do |area| %>
           <tr>
-            <td>
+            <td data-label="<%= t("models.area.fields.name", scope: "decidim.admin") %>">
               <% if allowed_to? :update, :area, area: area %>
                 <%= link_to translated_attribute(area.name), [:edit, area] %>
               <% else %>
                 <%= translated_attribute(area.name) %>
               <% end %>
             </td>
-            <td>
+            <td data-label="<%= t("models.area.fields.area_type", scope: "decidim.admin") %>">
               <%= area.area_type ? translated_attribute(area.area_type.name) : "-" %>
             </td>
-            <td class="table-list__actions">
-              <% if allowed_to? :update, :area, area: area %>
-                <%= icon_link_to "pencil-line", [:edit, area], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
-              <% end %>
+            <td class="table-list__actions" data-label="<%= t("decidim.admin.actions.actions") %>">
+              <button type="button" data-controller="dropdown" data-target="actions-area-<%= area.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: translated_attribute(area.name)) %>">
+                <%= icon "more-fill" , class: "text-secondary" %>
+              </button>
 
-              <% if allowed_to? :destroy, :area, area: area %>
-                <%= icon_link_to "delete-bin-line", area, t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-              <% end %>
+              <div class="inline-block relative">
+                <ul id="actions-area-<%= area.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                  <% if allowed_to? :update, :area, area: area %>
+                    <li class="dropdown__item">
+                      <%= link_to [:edit, area], method: :get, class: "dropdown__button" do %>
+                        <%= icon "pencil-line" %>
+                        <%= t("actions.edit", scope: "decidim.admin" ) %>
+                      <% end %>
+                    </li>
+                    <% end %>
+
+                    <% if allowed_to? :destroy, :area, area: area %>
+                      <hr>
+
+                      <li class="dropdown__item">
+                        <%= link_to area, method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin" ) }, class: "dropdown__button" do %>
+                          <%= icon "delete-bin-line" %>
+                          <%= t("actions.destroy", scope: "decidim.admin" ) %>
+                        <% end %>
+                      </li>
+                    <% end %>
+                </ul>
+              </div>
             </td>
           </tr>
         <% end %>

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

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+
 <div class="card" id="attachment_collections">
   <div class="item_show__header">
     <h1 class="item_show__header-title">
@@ -9,32 +10,59 @@
     </h1>
   </div>
   <% if collection_for.attachment_collections.any? %>
-    <div class="table-scroll">
+    <div class="table-stacked">
       <table class="table-list">
         <thead>
           <tr>
             <th><%= t("activemodel.attributes.attachment_collection.name") %></th>
-            <th></th>
+            <th><%= t("decidim.admin.actions.actions") %></th>
           </tr>
         </thead>
         <tbody>
           <% collection_for.attachment_collections.each do |attachment_collection| %>
             <tr data-id="<%= attachment_collection.id %>">
-              <td>
+              <td data-label="<%= t("activemodel.attributes.attachment_collection.name") %>">
                 <%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %><br>
               </td>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :attachment_collection, attachment_collection: attachment_collection %>
-                  <%= icon_link_to "pencil-line", edit_polymorphic_path([collection_for, attachment_collection]), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <% end %>
+              <td class="table-list__actions" data-label="<%= t("decidim.admin.actions.actions") %>">
+                <button type="button" data-controller="dropdown" data-target="actions-attachment-collection-<%= attachment_collection.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: translated_attribute(attachment_collection.name)) %>">
+                  <%= icon "more-fill", class: "text-secondary" %>
+                </button>
+
+                <div class="inline-block relative">
+                  <ul id="actions-attachment-collection-<%= attachment_collection.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                    <% if allowed_to? :update, :attachment_collection, attachment_collection: attachment_collection %>
+                      <li class="dropdown__item">
+                        <%= link_to edit_polymorphic_path([collection_for, attachment_collection]), class: "dropdown__button" do %>
+                          <%= icon "pencil-line" %>
+                          <%= t("actions.edit", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% end %>
+
+                    <% if allowed_to? :destroy, :attachment_collection, attachment_collection: attachment_collection %>
+                      <hr>
 
-                <% if allowed_to? :destroy, :attachment_collection, attachment_collection: attachment_collection %>
-                  <% if attachment_collection.unused? %>
-                    <%= icon_link_to "delete-bin-line", polymorphic_path([collection_for, attachment_collection]), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                  <% else %>
-                    <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
-                  <% end %>
-                <% end %>
+                      <li class="dropdown__item">
+                        <% if attachment_collection.unused? %>
+                          <%= link_to polymorphic_path([collection_for, attachment_collection]), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                            <%= icon "delete-bin-line" %>
+                            <%= t("actions.destroy", scope: "decidim.admin") %>
+                          <% end %>
+                        <% else %>
+                          <div class="dropdown__button-disabled">
+                            <%= with_tooltip t("tooltips.deleted_attachment_collections_info", scope: "decidim.admin") do %>
+                              <%= icon "delete-bin-line", class: "text-gray" %>
+                              <span>
+                                <%= t("actions.destroy", scope: "decidim.admin") %>
+                              </span>
+                            <% end %>
+                          </div>
+                        <% end %>
+                      </li>
+                    <% end %>
+                  </ul>
+                </div>
               </td>
             </tr>
           <% end %>

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

@@ -10,7 +10,7 @@
   </div>
   <%= cell("decidim/admin/attachments_privacy_warning", attached_to.attachments) %>
   <% if attached_to.attachments.any? %>
-    <div class="table-scroll">
+    <div class="table-stacked">
       <table class="table-list">
         <thead>
           <tr>
@@ -18,32 +18,51 @@
             <th><%= t("models.attachment.fields.collection", scope: "decidim.admin") %></th>
             <th><%= t("models.attachment.fields.content_type", scope: "decidim.admin") %></th>
             <th><%= t("models.attachment.fields.file_size", scope: "decidim.admin") %></th>
-            <th></th>
+            <th><%= t("decidim.admin.actions.actions") %></th>
           </tr>
         </thead>
         <tbody>
           <% attached_to.attachments.each do |attachment| %>
             <tr data-id="<%= attachment.id %>">
-              <td>
+              <td data-label="<%= t("models.attachment.fields.title", scope: "decidim.admin") %>">
                 <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br>
               </td>
-              <td>
+              <td data-label="<%= t("models.attachment.fields.collection", scope: "decidim.admin") %>">
                 <%= translated_attribute(attachment.attachment_collection&.name) %>
               </td>
-              <td>
+              <td data-label="<%= t("models.attachment.fields.content_type", scope: "decidim.admin") %>">
                 <%= attachment.file_type %>
               </td>
-              <td>
+              <td data-label="<%= t("models.attachment.fields.file_size", scope: "decidim.admin") %>">
                 <%= attachment.file? ? number_to_human_size(attachment.file_size) : "-" %>
               </td>
-              <td class="table-list__actions">
-                <% if allowed_to? :update, :attachment, attachment: attachment %>
-                  <%= icon_link_to "pencil-line", edit_polymorphic_path([attached_to, attachment]), t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit" %>
-                <% end %>
+              <td class="table-list__actions" data-label="<%= t("decidim.admin.actions.actions") %>">
+                <button type="button" data-controller="dropdown" data-target="actions-attachment-<%= attachment.id %>" aria-label="<%= t("decidim.admin.actions.actions_label", resource: translated_attribute(attachment.title)) %>">
+                  <%= icon "more-fill", class: "text-secondary" %>
+                </button>
 
-                <% if allowed_to? :destroy, :attachment, attachment: attachment %>
-                  <%= icon_link_to "delete-bin-line", polymorphic_path([attached_to, attachment]), t("actions.destroy", scope: "decidim.admin"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
-                <% end %>
+                <div class="inline-block relative">
+                  <ul id="actions-attachment-<%= attachment.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                    <% if allowed_to? :update, :attachment, attachment: attachment %>
+                      <li class="dropdown__item">
+                        <%= link_to edit_polymorphic_path([attached_to, attachment]), class: "dropdown__button" do %>
+                          <%= icon "pencil-line" %>
+                          <%= t("actions.edit", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% end %>
+
+                    <% if allowed_to? :destroy, :attachment, attachment: attachment %>
+                      <hr>
+                      <li class="dropdown__item">
+                        <%= link_to polymorphic_path([attached_to, attachment]), method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }, class: "dropdown__button" do %>
+                          <%= icon "delete-bin-line" %>
+                          <%= t("actions.destroy", scope: "decidim.admin") %>
+                        <% end %>
+                      </li>
+                    <% end %>
+                  </ul>
+                </div>
               </td>
             </tr>
           <% end %>

data/app/views/decidim/admin/block_user/bulk_new.html.erb

@@ -29,7 +29,7 @@
                 <%= hidden_field_tag "user_ids[]", id %>
               <% end %>
               <%= f.hidden_field :hide %>
-              <%= f.text_area :justification, required: true, label: t(".justification") %>
+              <%= f.text_area :justification, required: true, label: t(".justification"), data: { controller: "character-counter" } %>
             </div>
           </div>
         </div>

data/app/views/decidim/admin/block_user/new.html.erb

@@ -26,7 +26,7 @@
             <div class="row column">
               <%= f.hidden_field :user_id %>
               <%= f.hidden_field :hide %>
-              <%= f.text_area :justification, required: true, label: t(".justification") %>
+              <%= f.text_area :justification, required: true, label: t(".justification"), data: { controller: "character-counter" } %>
             </div>
           </div>
         </div>