decidim-admin 0.27.8 → 0.28.0.rc4

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

@@ -3,8 +3,8 @@
 module Decidim
   module Admin
     class SimpleMenuPresenter < Decidim::MenuPresenter
-      def render(&block)
-        render_menu(&block)
+      def render(&)
+        render_menu(&)
       end
     end
   end

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

@@ -23,7 +23,7 @@ module Decidim
 
         query = Decidim::User.left_outer_joins(:organization).where(decidim_organizations: { id: organization.id })
         query = query.where("#{Decidim::User.table_name}.current_sign_in_at >= ?", date)
-        query.where(admin: admin)
+        query.where(admin:)
       end
 
       private

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

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A class used to find the Invites by their status status.
+    class Invites < Decidim::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # invites - the initial Invites relation that needs to be filtered.
+      # query - query to filter invites
+      # status - invite status to be used as a filter
+      def self.for(invites, query = nil, status = nil)
+        new(invites, query, status).query
+      end
+
+      # Initializes the class.
+      #
+      # invites - the initial Invites relation that need to be filtered
+      # query - query to filter invites
+      # status - invite status to be used as a filter
+      def initialize(invites, query = nil, status = nil)
+        @invites = invites
+        @query = query
+        @status = status
+      end
+
+      # List the invites by the different filters.
+      def query
+        @invites = filter_by_search(@invites)
+        @invites = filter_by_status(@invites)
+        @invites
+      end
+
+      private
+
+      def filter_by_search(invites)
+        return invites if @query.blank?
+
+        invites.joins(:user).where(
+          User.arel_table[:name].lower.matches("%#{@query}%").or(User.arel_table[:email].lower.matches("%#{@query}%"))
+        )
+      end
+
+      def filter_by_status(invites)
+        case @status
+        when "accepted"
+          invites.where.not(accepted_at: nil)
+        when "rejected"
+          invites.where.not(rejected_at: nil)
+        when "sent"
+          invites.where.not(sent_at: nil).where(accepted_at: nil, rejected_at: nil)
+        else
+          invites
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    class ModerationStats
+      def initialize(user)
+        @user = user
+      end
+
+      def content_moderations
+        @content_moderations ||= Decidim::Moderation.where(participatory_space: spaces_user_is_admin_to)
+      end
+
+      def user_reports
+        @user_reports ||= UserModeration.joins(:user).where(decidim_users: { decidim_organization_id: user.decidim_organization_id })
+      end
+
+      def count_content_moderations
+        content_moderations.not_hidden.count
+      end
+
+      def count_user_pending_reports
+        user_reports.unblocked.count
+      end
+
+      def count_pending_moderations
+        count_content_moderations + count_user_pending_reports
+      end
+
+      private
+
+      attr_reader :user
+
+      # Private: Finds the participatory spaces the current user is admin to.
+      # This method will later be used to find out what moderations the
+      # current user can manage.
+      #
+      # Returns an Array.
+      def spaces_user_is_admin_to
+        @spaces_user_is_admin_to ||=
+          Decidim.participatory_space_manifests.flat_map do |manifest|
+            Decidim
+              .find_participatory_space_manifest(manifest.name)
+              .participatory_spaces
+              .call(user.organization)&.select do |space|
+              space.moderators.exists?(id: user.id) ||
+                space.admins.exists?(id: user.id)
+            end
+          end
+      end
+    end
+  end
+end

data/app/views/decidim/admin/admin_terms/show.html.erb

@@ -1,24 +1,29 @@
 <%= cell("decidim/announcement", announcement_body, callout_class: current_user.admin_terms_accepted? ? "success" : "warning" ) %>
 
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("title", scope: "decidim.admin.admin_terms_of_service") %>
+  </h2>
+</div>
+
 <article class="card">
-  <div class="card-section grid-x grid-margin-x">
+  <div class="card-section p-4">
     <div class="cell medium-12">
 
-      <div class="content">
-        <%= admin_terms_of_use_body %>
+      <div class="admin-terms-of-service">
+        <%= admin_terms_of_service_body %>
       </div>
     </div>
 
     <% unless current_user.admin_terms_accepted? %>
-      <h4 class="cell medium-12 text-center">
-        <%= t("decidim.admin.admin_terms_of_use.actions.title") %>
-      </h4>
-
-      <div class="cell medium-6 small-order-2 medium-order-1 text-center">
-        <%= button_to_refuse_admin_terms %>
+      <div class="admin-terms-of-service">
+        <h2 class="mb-2">
+          <%= t("decidim.admin.admin_terms_of_service.actions.title") %>
+        </h2>
       </div>
 
-      <div class="cell medium-6 small-order-1 medium-order-2 text-center">
+      <div class="flex align-items gap-x-4">
+        <%= button_to_refuse_admin_terms %>
         <%= button_to_accept_admin_terms %>
       </div>
     <% end %>

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

@@ -1,7 +1,12 @@
-
-<div class="row column">
-  <%= form.translated :text_field, :name %>
-</div>
-<div class="row column">
-  <%= form.translated :text_field, :plural %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :name, aria: { label: :name } %>
+      </div>
+      <div class="row column">
+        <%= form.translated :text_field, :plural, aria: { label: :plural } %>
+      </div>
+    </div>
+  </div>
 </div>

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

@@ -1,14 +1,16 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit-form">
+  <%= decidim_form_for(@form, html: { class: "form-defaults form edit_area_type" }) do |f| %>
+    <%= render partial: "form", object: f %>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+      </div>
     </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,45 +1,47 @@
 <% add_decidim_page_title(t("decidim.admin.titles.area_types")) %>
 <div class="card" id="area-types">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t "decidim.admin.titles.area_types" %>
       <% if allowed_to? :create, :area_type %>
-        <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button tiny button--title new" %>
+        <%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
       <% end %>
     </h2>
   </div>
-  <div class="card-section">
-    <div class="table-scroll">
-        <table class="table-list">
-        <thead>
+  <div class="table-scroll">
+      <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>
+        </tr>
+      </thead>
+      <tbody>
+        <% area_types.each do |area_type| %>
           <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>
-          </tr>
-        </thead>
-        <tbody>
-          <% area_types.each do |area_type| %>
-            <tr>
-              <td>
+            <td>
+              <% 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) %>
-              </td>
-              <td>
-                <%= 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", [:edit, area_type], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
-                <% end %>
+              <% end %>
+            </td>
+            <td>
+              <%= 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 %>
 
-                <% if allowed_to? :destroy, :area_type, area_type: area_type %>
-                  <%= icon_link_to "circle-x", area_type, 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 %>
-        </tbody>
-      </table>
-    </div>
+              <% 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 %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>

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

@@ -1,14 +1,16 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit-form">
+  <%= decidim_form_for(@form, html: { class: "form-defaults form new_area_type" }) do |f| %>
+    <%= render partial: "form", object: f %>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+      </div>
     </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,10 +1,14 @@
-
-<div class="row column">
-  <%= form.translated :text_field, :name %>
-</div>
-
-<div class="row">
-  <div class="columns xlarge-6">
-    <%= form.collection_select :area_type_id, organization_area_types, :id, :name %>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :name, aria: { label: :name } %>
+      </div>
+      <div class="row">
+        <div class="columns">
+          <%= form.collection_select :area_type_id, organization_area_types, :id, :name %>
+        </div>
+      </div>
+    </div>
   </div>
 </div>

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

@@ -1,14 +1,16 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit-form">
+  <%= decidim_form_for(@form, html: { class: "form-defaults form edit_area_" }) do |f| %>
+    <%= render partial: "form", object: f %>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+      </div>
     </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update") %>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,49 +1,51 @@
 <% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
 <div class="card" id="areas">
-  <div class="card-divider">
-    <h2 class="card-title">
+  <div class="item_show__header">
+    <h2 class="item_show__header-title">
       <%= t "decidim.admin.titles.areas" %>
       <% if allowed_to? :create, :area %>
-        <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button tiny button--title new" %>
+        <%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
       <% end %>
     </h2>
   </div>
-  <div class="card-section">
-    <% if @areas.any? %>
-      <div class="table-scroll">
-        <table class="table-list">
-        <thead>
+  <% if @areas.any? %>
+    <div class="table-scroll">
+      <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>
+        </tr>
+      </thead>
+      <tbody>
+        <% @areas.each do |area| %>
           <tr>
-            <th><%= t("models.area.fields.name", scope: "decidim.admin") %></th>
-            <th><%= t("models.area.fields.area_type", scope: "decidim.admin") %></th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody>
-          <% @areas.each do |area| %>
-            <tr>
-              <td>
+            <td>
+              <% if allowed_to? :update, :area, area: area %>
+                <%= link_to translated_attribute(area.name), [:edit, area] %>
+              <% else %>
                 <%= translated_attribute(area.name) %>
-              </td>
-              <td>
-                <%= 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", [:edit, area], t("actions.edit", scope: "decidim.admin"), class: "action-icon--edit", method: :get, data: {} %>
-                <% end %>
+              <% end %>
+            </td>
+            <td>
+              <%= 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 %>
 
-                <% if allowed_to? :destroy, :area, area: area %>
-                  <%= icon_link_to "circle-x", area, 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 %>
-        </tbody>
-        </table>
-      </div>
-    <% else %>
-      <p><%= t("decidim.admin.areas.no_areas") %></p>
-    <% end %>
-  </div>
+              <% 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 %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+      </table>
+    </div>
+  <% else %>
+    <p><%= t("decidim.admin.areas.no_areas") %></p>
+  <% end %>
 </div>

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

@@ -1,14 +1,16 @@
 <% add_decidim_page_title(t(".title")) %>
-<%= decidim_form_for(@form, url: areas_path) do |f| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t ".title" %></h2>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t ".title" %>
+  </h2>
+</div>
+<div class="item__edit-form">
+  <%= decidim_form_for(@form, url: areas_path, html: { class: "form-defaults form new_area_" }) do |f| %>
+    <%= render partial: "form", object: f %>
+    <div class="item__edit-sticky">
+      <div class="item__edit-sticky-container">
+        <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+      </div>
     </div>
-    <div class="card-section">
-      <%= render partial: "form", object: f %>
-    </div>
-  </div>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,19 +1,17 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :name, autofocus: true %>
-    </div>
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :name, autofocus: true, aria: { label: :name } %>
+      </div>
 
-    <div class="row column">
-      <%= form.number_field :weight %>
-    </div>
+      <div class="row column">
+        <%= form.number_field :weight %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :description %>
+      <div class="row column">
+        <%= form.translated :text_field, :description, aria: { label: :description } %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1,8 +1,20 @@
 <% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
-<%= decidim_form_for(@form, url: url_for([@attachment_collection.collection_for, @attachment_collection]), html: { class: "form edit_attachment_collection" }) do |f| %>
-  <%= render partial: "decidim/admin/attachment_collections/form", object: f, locals: { title: t("attachment_collections.edit.title", scope: "decidim.admin") } %>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t("attachment_collections.edit.update", scope: "decidim.admin") %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+  </h2>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: url_for([@attachment_collection.collection_for, @attachment_collection]), html: { class: "form form-defaults edit_attachment_collection" }) do |f| %>
+      <%= render partial: "decidim/admin/attachment_collections/form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("attachment_collections.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>