Merge branch 'develop' of github.com:decidim/decidim into chore/remov…

…e-admin-xlarge
decidim · Oct 4, 2023 · c062878 · c062878
2 parents 836785d + 7903db2
commit c062878
Show file tree

Hide file tree

Showing 83 changed files with 330 additions and 310 deletions.
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
@@ -368,9 +368,7 @@ ignore_unused:
   - versions.directions.*
   - layouts.decidim.conferences.conference.*
   - decidim.admin.conflicts.*
-  - decidim.profiles.show.badges
   - decidim.profiles.show.conversations
-  - decidim.profiles.show.groups
   - decidim.profiles.show.view_full_profile
   - layouts.decidim.assemblies.promoted_assembly.take_part
   - versions.dropdown.option_*

diff --git a/decidim-admin/app/controllers/concerns/decidim/moderations/admin/filterable.rb b/decidim-admin/app/controllers/concerns/decidim/moderations/admin/filterable.rb
@@ -47,6 +47,10 @@ def search_field_predicate
           def reportable_types
             collection.pluck(:decidim_reportable_type).uniq.sort
           end
+
+          def extra_allowed_params
+            [:hidden]
+          end
         end
       end
     end

diff --git a/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb b/decidim-admin/spec/system/admin_manages_global_moderations_spec.rb
@@ -17,12 +17,15 @@
   let(:participatory_space_path) do
     decidim_admin.moderations_path
   end
+  let(:resource_controller) { Decidim::Admin::GlobalModerationsController }
 
   before do
     switch_to_host(organization.host)
     login_as user, scope: :user
   end
 
+  include_context "with filterable context"
+
   context "when displaying the counter" do
     let!(:reportables) { create_list(:dummy_resource, 4, component: current_component) }
     let!(:moderations) do
@@ -97,4 +100,22 @@
     let(:moderations_link_text) { "Global moderations" }
     let(:moderations_link_in_admin_menu) { false }
   end
+
+  context "when on hidden moderations path" do
+    let!(:hidden_moderations) do
+      moderation = create(:moderation, reportable: reportables.last, report_count: 3, reported_content: reportables.last.reported_searchable_content_text, hidden_at: Time.current)
+      create_list(:report, 3, moderation:, reason: :spam)
+      [moderation]
+    end
+    let!(:hidden_moderation) { hidden_moderations.first }
+
+    before do
+      visit decidim_admin.moderations_path(hidden: true)
+    end
+
+    it "can be filtered by id" do
+      search_by_text(hidden_moderation.reportable.id)
+      expect(page).to have_selector("tbody tr", count: 1)
+    end
+  end
 end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -4,6 +4,8 @@ module Decidim
   module Assemblies
     module Admin
       class AssemblyImportsController < Decidim::Assemblies::Admin::ApplicationController
+        layout "decidim/admin/assemblies_settings"
+
         def new
           enforce_permission_to :import, :assembly
           @form = form(AssemblyImportForm).instance

diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_members_controller.rb
@@ -7,7 +7,6 @@ module Admin
       #
       class AssemblyMembersController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
-        layout "decidim/admin/assembly_members"
 
         def index
           enforce_permission_to :index, :assembly_member

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_settings/_form.html.erb
@@ -1,6 +1,5 @@
 <div class="form__wrapper">
-  <div class="card">
-    <div class="card-divider"></div>
+  <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
         <%= form.check_box :enable_organization_chart %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_types/_form.html.erb
@@ -1,9 +1,5 @@
 <div class="form__wrapper">
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t(".title") %></h2>
-    </div>
-
+  <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb
@@ -7,7 +7,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_type" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assemblies_types.new.title", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assemblies_types.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_copies/_form.html.erb
@@ -1,8 +1,6 @@
 <%= append_javascript_pack_tag "decidim_assemblies_admin" %>
 <div class="form__wrapper">
-  <div class="card" id="assemblies">
-    <div class="card-divider"></div>
-
+  <div class="card pt-4" id="assemblies">
     <div class="card-section">
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
@@ -12,7 +10,7 @@
       </div>
       <div class="card">
         <div class="card-divider">
-          <legend><%= select %></legend>
+          <legend><%= t("assembly_copies.new.select", scope: "decidim.admin") %></legend>
         </div>
         <div class="card-section">
           <div class="row column">

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb
@@ -7,7 +7,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, url: assembly_copies_path(current_assembly), method: :post, html: { class: "form form-defaults copy_assembly" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_copies.new.title", scope: "decidim.admin"), select: t("assembly_copies.new.select", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_copies.new.copy", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/_form.html.erb
@@ -1,8 +1,7 @@
 <%= append_javascript_pack_tag "decidim_assemblies_admin" %>
 
 <div class="form__wrapper">
-  <div class="card" id="assemblies">
-    <div class="card-divider"></div>
+  <div class="card pt-4" id="assemblies">
     <div class="card-section">
       <div class="row column">
         <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
@@ -16,7 +15,7 @@
       <div class="row column">
         <div class="card">
           <div class="card-divider">
-            <legend><%= select %></legend>
+            <legend><%= t("assembly_imports.new.select", scope: "decidim.admin") %></legend>
           </div>
           <div class="card-section">
             <div class="row column">

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -7,7 +7,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, url: imports_path, method: :post, html: { class: "form form-defaults import_assembly" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_imports.new.title", scope: "decidim.admin"), select: t("assembly_imports.new.select", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_imports.new.import", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/_form.html.erb
@@ -1,11 +1,5 @@
 <div class="form__wrapper">
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= title %>
-      </h2>
-    </div>
-
+  <div class="card pt-4">
     <div class="card-section">
       <div class="user-fields">
         <div class="row column">

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb
@@ -6,7 +6,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, url: assembly_member_path(@assembly_member.assembly, @assembly_member), html: { class: "form form-defaults edit_assembly_member" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_members.edit.title", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_members.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/index.html.erb
@@ -1,6 +1,9 @@
 <div class="item_show__header">
   <h2 class="item_show__header-title">
     <%= t("assembly_members_title", scope: "decidim.admin.assembly_members.index") %>
+    <% if allowed_to? :create, :assembly_member %>
+      <%= link_to t("actions.new_assembly_member", scope: "decidim.admin"), new_assembly_member_path(current_assembly), class: "button button__sm button__secondary new" %>
+    <% end %>
   </h2>
 </div>
 

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_members/new.html.erb
@@ -6,7 +6,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_member" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_members.new.title", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_members.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/_form.html.erb
@@ -1,11 +1,5 @@
 <div class="form__wrapper">
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title">
-        <%= title %>
-      </h2>
-    </div>
-
+  <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
         <%= form.text_field :name, readonly: @form.persisted? %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -6,7 +6,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, url: assembly_user_role_path(@user_role.assembly, @user_role), html: { class: "form-defaults form edit_assembly_user_roles" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_user_roles.edit.title", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_user_roles.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -6,7 +6,7 @@
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">
     <%= decidim_form_for(@form, html: { class: "form-defaults form new_assembly_user_role" }) do |f| %>
-      <%= render partial: "form", object: f, locals: { title: t("assembly_user_roles.new.title", scope: "decidim.admin") } %>
+      <%= render partial: "form", object: f %>
       <div class="item__edit-sticky">
         <div class="item__edit-sticky-container">
           <%= f.submit t("assembly_user_roles.new.create", scope: "decidim.admin"), class: "button button__sm button__secondary" %>

diff --git a/decidim-assemblies/app/views/layouts/decidim/admin/_manage_assemblies.html.erb b/decidim-assemblies/app/views/layouts/decidim/admin/_manage_assemblies.html.erb
@@ -0,0 +1,44 @@
+<div class="inline-block relative">
+  <%= button_tag id: "assemblies-menu-trigger", data: { component: "dropdown", target: "assemblies-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
+    <span>
+      <%= t("menu.manage", scope: "decidim.admin") %>
+    </span>
+    <%= icon "arrow-down-s-line" %>
+  <% end %>
+  <div id="assemblies-dropdown-menu-settings">
+    <ul class="dropdown dropdown__bottom">
+      <% if allowed_to? :import, :assembly %>
+        <li class="dropdown__item">
+          <%= icon "price-tag-3-line", class: "fill-gray-2" %>
+          <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
+                      new_import_path,
+                      class: "text-secondary" %>
+        </li>
+      <% end %>
+      <% if allowed_to?(:read, :assembly_list) %>
+        <li class="dropdown__item">
+          <%= icon "government-line" %>
+          <%= link_to t("menu.assemblies", scope: "decidim.admin"),
+                      decidim_admin_assemblies.assemblies_path,
+                      class: "text-secondary" %>
+        </li>
+      <% end %>
+      <% if  allowed_to?(:manage, :assemblies_type) %>
+        <li class="dropdown__item">
+          <%= icon "government-line" %>
+          <%= link_to t("menu.assemblies_types", scope: "decidim.admin"),
+                      decidim_admin_assemblies.assemblies_types_path,
+                      class: "text-secondary" %>
+        </li>
+      <% end %>
+      <% if allowed_to? :read, :assemblies_setting %>
+        <li class="dropdown__item">
+          <%= icon "tools-line" %>
+          <%= link_to t("menu.assemblies_settings", scope: "decidim.admin"),
+                      decidim_admin_assemblies.edit_assemblies_settings_path,
+                      class: "text-secondary" %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
diff --git a/decidim-assemblies/app/views/layouts/decidim/admin/assemblies.html.erb b/decidim-assemblies/app/views/layouts/decidim/admin/assemblies.html.erb
@@ -8,50 +8,7 @@
         </span>
       <% end %>
     <% end %>
-    <div class="inline-block relative">
-      <%= button_tag id: "assemblies-menu-trigger", data: { component: "dropdown", target: "assemblies-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
-        <span>
-          <%= t("menu.manage", scope: "decidim.admin") %>
-        </span>
-        <%= icon "arrow-down-s-line" %>
-      <% end %>
-      <div id="assemblies-dropdown-menu-settings">
-        <ul class="dropdown dropdown__bottom">
-          <% if allowed_to? :import, :assembly %>
-            <li class="dropdown__item">
-              <%= icon "price-tag-3-line", class: "fill-gray-2" %>
-              <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
-                new_import_path,
-                class: "text-secondary" %>
-            </li>
-          <% end %>
-          <% if allowed_to?(:read, :assembly_list) %>
-            <li class="dropdown__item">
-              <%= icon "government-line" %>
-              <%= link_to t("menu.assemblies", scope: "decidim.admin"),
-                decidim_admin_assemblies.assemblies_path,
-                class: "text-secondary" %>
-            </li>
-          <% end %>
-          <% if  allowed_to?(:manage, :assemblies_type) %>
-            <li class="dropdown__item">
-              <%= icon "government-line" %>
-              <%= link_to t("menu.assemblies_types", scope: "decidim.admin"),
-                decidim_admin_assemblies.assemblies_types_path,
-                class: "text-secondary" %>
-            </li>
-          <% end %>
-          <% if allowed_to? :read, :assemblies_setting %>
-            <li class="dropdown__item">
-              <%= icon "tools-line" %>
-              <%= link_to t("menu.assemblies_settings", scope: "decidim.admin"),
-                decidim_admin_assemblies.edit_assemblies_settings_path,
-                class: "text-secondary" %>
-            </li>
-          <% end %>
-        </ul>
-      </div>
-    </div>
+    <%= render partial: "layouts/decidim/admin/manage_assemblies" %>
   </div>
 <% end %>
 

diff --git a/decidim-assemblies/app/views/layouts/decidim/admin/assemblies_settings.html.erb b/decidim-assemblies/app/views/layouts/decidim/admin/assemblies_settings.html.erb
@@ -1,33 +1,6 @@
 <% content_for :breadcrumb_context_menu do %>
   <div class="process-title-content-breadcrumb-container-right">
-    <div class="inline-block relative">
-      <%= button_tag id: "assemblies-menu-trigger", data: { component: "dropdown", target: "assemblies-dropdown-menu-settings" }, class: "dropdown__trigger button button__transparent" do %>
-        <span>
-          <%= t("menu.manage", scope: "decidim.admin") %>
-        </span>
-        <%= icon "arrow-down-s-line" %>
-      <% end %>
-      <div id="assemblies-dropdown-menu-settings">
-        <ul class="dropdown dropdown__bottom">
-          <li class="dropdown__item">
-            <% if allowed_to? :import, :assembly %>
-              <%= icon "upload-line" %>
-               <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
-                           new_import_path,
-                           class: "text-secondary" %>
-             <% end %>
-          </li>
-          <li class="dropdown__item">
-            <% if allowed_to? :read, :assemblies_setting %>
-              <%= icon "tools-line" %>
-              <%= link_to t("menu.assemblies_settings", scope: "decidim.admin"),
-                         decidim_admin_assemblies.edit_assemblies_settings_path,
-                         class: "text-secondary" %>
-            <% end %>
-          </li>
-        </ul>
-      </div>
-    </div>
+    <%= render partial: "layouts/decidim/admin/manage_assemblies" %>
   </div>
 <% end %>