decidim-admin 0.29.1 → 0.30.0.rc1

data/lib/decidim/admin/test/filterable_examples.rb

@@ -17,6 +17,19 @@ shared_context "with filterable context" do
     end
   end
 
+  def apply_sub_filter(option1, option2, filter)
+    within(".filters__section") do
+      find_link("Filter").hover
+      find_link(option1).hover
+      within ".submenu > .is-active > .submenu" do
+        find_link(option2).hover
+        within ".submenu > .is-active > .submenu" do
+          click_on(filter)
+        end
+      end
+    end
+  end
+
   def remove_applied_filter(filter)
     within("[data-applied-filters-tags] .label", text: /#{filter}/i) do
       click_on("Cancel")
@@ -30,6 +43,20 @@ shared_context "with filterable context" do
     end
   end
 
+  def page_has_content(text)
+    text = [text] unless text.is_a?(Array)
+    text.each do |t|
+      expect(page).to have_content(t)
+    end
+  end
+
+  def page_has_no_content(text)
+    text = [text] unless text.is_a?(Array)
+    text.each do |t|
+      expect(page).to have_no_content(t)
+    end
+  end
+
   shared_examples "paginating a collection" do
     unless block_given?
       let!(:collection) do
@@ -41,18 +68,42 @@ shared_context "with filterable context" do
   end
 
   shared_examples "searching by text" do
-    before { search_by_text(ActionView::Base.full_sanitizer.sanitize(text)) }
-
-    it { expect(page).to have_content(ActionView::Base.full_sanitizer.sanitize(text)) }
-
-    after { search_by_text("") }
+    it "finds content" do
+      txt = text.is_a?(Array) ? text : [text]
+      txt.each do |t|
+        search_by_text(ActionView::Base.full_sanitizer.sanitize(t))
+        page_has_content(ActionView::Base.full_sanitizer.sanitize(t))
+      end
+    end
   end
 
   shared_examples "a filtered collection" do |options:, filter:|
     before { apply_filter(options, filter) }
 
-    it { expect(page).to have_content(in_filter) }
-    it { expect(page).to have_no_content(not_in_filter) }
+    it { page_has_content(in_filter) }
+    it { page_has_no_content(not_in_filter) }
+
+    it_behaves_like "searching by text" do
+      let(:text) { in_filter }
+    end
+
+    context "when removing applied filter" do
+      before { remove_applied_filter(filter) }
+
+      it { page_has_content(in_filter) }
+      it { page_has_content(not_in_filter) }
+
+      it_behaves_like "searching by text" do
+        let(:text) { not_in_filter }
+      end
+    end
+  end
+
+  shared_examples "a sub-filtered collection" do |option1:, option2:, filter:|
+    before { apply_sub_filter(option1, option2, filter) }
+
+    it { page_has_content(in_filter) }
+    it { page_has_no_content(not_in_filter) }
 
     it_behaves_like "searching by text" do
       let(:text) { in_filter }
@@ -61,8 +112,8 @@ shared_context "with filterable context" do
     context "when removing applied filter" do
       before { remove_applied_filter(filter) }
 
-      it { expect(page).to have_content(in_filter) }
-      it { expect(page).to have_content(not_in_filter) }
+      it { page_has_content(in_filter) }
+      it { page_has_content(not_in_filter) }
 
       it_behaves_like "searching by text" do
         let(:text) { not_in_filter }
@@ -122,3 +173,43 @@ shared_examples "filtering collection by private/public" do
 
   it_behaves_like "paginating a collection"
 end
+
+shared_examples "a collection filtered by taxonomies" do
+  let(:root_taxonomy1) { create(:taxonomy, organization:, name: { "en" => "Root1" }) }
+  let(:root_taxonomy2) { create(:taxonomy, organization:, name: { "en" => "Root2" }) }
+  let!(:taxonomy11) { create(:taxonomy, parent: root_taxonomy1, organization:, name: { "en" => "Taxonomy11" }) }
+  let!(:taxonomy12) { create(:taxonomy, parent: root_taxonomy1, organization:, name: { "en" => "Taxonomy12" }) }
+  let!(:taxonomy21) { create(:taxonomy, parent: root_taxonomy2, organization:, name: { "en" => "Taxonomy21" }) }
+  let!(:taxonomy22) { create(:taxonomy, parent: root_taxonomy2, organization:, name: { "en" => "Taxonomy22" }) }
+  let(:taxonomy1_filter1) { create(:taxonomy_filter, root_taxonomy: root_taxonomy1, participatory_space_manifests: [participatory_space.manifest.name]) }
+  let(:taxonomy2_filter1) { create(:taxonomy_filter, root_taxonomy: root_taxonomy2, participatory_space_manifests: [participatory_space.manifest.name]) }
+  let!(:taxonomy_filter_item11) { create(:taxonomy_filter_item, taxonomy_filter: taxonomy1_filter1, taxonomy_item: taxonomy11) }
+  let!(:taxonomy_filter_item12) { create(:taxonomy_filter_item, taxonomy_filter: taxonomy1_filter1, taxonomy_item: taxonomy12) }
+  let!(:taxonomy_filter_item21) { create(:taxonomy_filter_item, taxonomy_filter: taxonomy2_filter1, taxonomy_item: taxonomy21) }
+  let!(:taxonomy_filter_item22) { create(:taxonomy_filter_item, taxonomy_filter: taxonomy2_filter1, taxonomy_item: taxonomy22) }
+
+  before do
+    component.update!(settings: { taxonomy_filters: [taxonomy1_filter1.id, taxonomy2_filter1.id] })
+    visit current_path
+  end
+
+  it_behaves_like "a sub-filtered collection", option1: "Taxonomy", option2: "Root1", filter: "Taxonomy11" do
+    let(:in_filter) { resource_with_taxonomy11_title }
+    let(:not_in_filter) { [resource_with_taxonomy12_title, resource_with_taxonomy21_title, resource_with_taxonomy22_title] }
+  end
+
+  it_behaves_like "a sub-filtered collection", option1: "Taxonomy", option2: "Root2", filter: "Taxonomy21" do
+    let(:in_filter) { resource_with_taxonomy21_title }
+    let(:not_in_filter) { [resource_with_taxonomy11_title, resource_with_taxonomy12_title, resource_with_taxonomy22_title] }
+  end
+
+  it_behaves_like "a filtered collection", options: "Taxonomy", filter: "Root1" do
+    let(:in_filter) { [resource_with_taxonomy11_title, resource_with_taxonomy12_title] }
+    let(:not_in_filter) { [resource_with_taxonomy21_title, resource_with_taxonomy22_title] }
+  end
+
+  it_behaves_like "a filtered collection", options: "Taxonomy", filter: "Root2" do
+    let(:in_filter) { [resource_with_taxonomy21_title, resource_with_taxonomy22_title] }
+    let(:not_in_filter) { [resource_with_taxonomy11_title, resource_with_taxonomy12_title] }
+  end
+end

data/lib/decidim/admin/test/forms/attachment_collection_form_examples.rb

@@ -41,7 +41,7 @@ module Decidim
           }
         }
       end
-      let(:organization) { create :organization }
+      let(:organization) { create(:organization) }
 
       context "with correct data" do
         it "is valid" do

data/lib/decidim/admin/test/forms/attachment_form_examples.rb

@@ -32,7 +32,7 @@ module Decidim
       let(:file) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
       let(:attachment_collection) { create(:attachment_collection, collection_for: attached_to) }
       let(:attachment_collection_id) { attachment_collection.id }
-      let(:organization) { create :organization }
+      let(:organization) { create(:organization) }
 
       let(:attributes) do
         {

data/lib/decidim/admin/test/invite_participatory_space_admins_shared_examples.rb

@@ -14,10 +14,9 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         expect(page).to have_content("Landing page") if check_landing_page
         expect(page).to have_content("Phases") if participatory_space.is_a?(Decidim::ParticipatoryProcess)
         expect(page).to have_content("Components")
-        expect(page).to have_content("Categories")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_no_content("Private participants") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_no_content("Members") if participatory_space.respond_to?(:private_space)
         expect(page).to have_content("Moderations")
       end
     end
@@ -30,10 +29,9 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         expect(page).to have_content("Landing page") if check_landing_page
         expect(page).to have_content("Phases") if participatory_space.is_a?(Decidim::ParticipatoryProcess)
         expect(page).to have_content("Components")
-        expect(page).to have_content("Categories")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_content("Private participants") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_content("Members") if participatory_space.respond_to?(:private_space)
         expect(page).to have_content("Moderations")
       end
     end

data/lib/decidim/admin/test/manage_component_permissions_examples.rb

@@ -42,7 +42,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
+              "options" => { "allowed_postal_codes" => "08002" }
             }
           }
         )
@@ -164,7 +164,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
+              "options" => { "allowed_postal_codes" => "08002" }
             },
             "another_dummy_authorization_handler" => {
               "options" => { "passport_number" => "AXXXXXXXX" }
@@ -226,7 +226,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
+                "options" => { "allowed_postal_codes" => "08002" }
               }
             }
           )
@@ -325,7 +325,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
+                "options" => { "allowed_postal_codes" => "08002" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }
@@ -393,7 +393,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
+                "options" => { "allowed_postal_codes" => "08002" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }

data/lib/decidim/admin/test/manage_hide_content_examples.rb

@@ -57,7 +57,6 @@ shared_examples "hideable resource during block" do
 
       visit decidim_admin.root_path
       expect(page).to have_content("blocked user")
-      expect(page).to have_content("hid a resource of type")
     end
   end
 end

data/lib/decidim/admin/test/manage_moderations_examples.rb

@@ -27,7 +27,7 @@ shared_examples "sorted moderations" do
       click_on link_text
     end
     all("tbody tr").each_with_index do |row, _index|
-      expect(row.find("td:first-child")).to have_content(reportables.first.id)
+      expect(row.find("td:nth-child(2)")).to have_content(reportables.first.id)
     end
   end
 end
@@ -62,7 +62,7 @@ shared_examples "manage moderations" do
 
   context "when listing moderations" do
     it "only lists moderations for the current organization" do
-      external_reportable = create :dummy_resource
+      external_reportable = create(:dummy_resource)
       external_moderation = create(:moderation, reportable: external_reportable, report_count: 1, reported_content: external_reportable.reported_searchable_content_text)
       create(:report, moderation: external_moderation)
 
@@ -106,7 +106,7 @@ shared_examples "manage moderations" do
 
         all("tbody tr").each_with_index do |row, index|
           reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id
-          expect(row.find("td:first-child")).to have_content(reportable_id)
+          expect(row.find("td:nth-child(2)")).to have_content(reportable_id)
         end
       end
     end

data/lib/decidim/admin/test/manage_resource_soft_deletion_examples.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+shared_examples "manage soft deletable component or space" do |resource_name|
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+  end
+
+  context "when the participatory space is unpublished" do
+    before do
+      resource.unpublish!
+      resource.reload
+      visit admin_resource_path
+    end
+
+    it "moves the #{resource_name} to the trash and displays success message" do
+      within "table" do
+        expect(page).to have_content(title[:en])
+      end
+
+      accept_confirm { click_on "Soft delete" }
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "table" do
+        expect(page).to have_no_content(title[:en])
+      end
+    end
+  end
+
+  context "when the participatory space is published" do
+    before do
+      visit admin_resource_path
+    end
+
+    it "does not allow to move it to the trash" do
+      expect(page).to have_no_content("Soft delete")
+    end
+  end
+
+  context "when the participatory space is trashed" do
+    before do
+      resource.destroy!
+      resource.reload
+      visit trash_path
+      click_on title[:en]
+    end
+
+    it "shows warning message" do
+      expect(page).to have_content("You are currently viewing deleted items.")
+    end
+  end
+end
+
+shared_examples "manage soft deletable resource" do |resource_name|
+  let(:deleted_at) { nil }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit admin_resource_path
+  end
+
+  it "moves the #{resource_name} to the trash and displays success message" do
+    resource_row = "tr[data-id='#{resource.id}']"
+
+    expect(page).to have_content(title[:en])
+
+    within(resource_row) do
+      accept_confirm { click_on "Soft delete" }
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    within "table" do
+      expect(page).to have_no_content(title[:en])
+    end
+  end
+end
+
+shared_examples "manage trashed resource" do |resource_name|
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    resource.destroy!
+  end
+
+  context "when the #{resource_name} is trashed" do
+    before do
+      visit trash_path
+    end
+
+    it "shows page title" do
+      expect(page).to have_content("Deleted #{resource_name.pluralize}")
+    end
+
+    it "displays the #{resource_name} in the trash" do
+      within "table" do
+        expect(page).to have_content(title[:en])
+      end
+    end
+
+    it "restores the #{resource_name} from the trash" do
+      click_on "Restore"
+
+      expect(page).to have_admin_callout("successfully")
+      visit trash_path
+      within "table" do
+        expect(page).to have_no_content(title[:en])
+      end
+    end
+  end
+end

data/lib/decidim/admin/test/manage_taxonomy_filters_examples.rb

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+shared_examples "manage taxonomy filters in settings" do
+  let(:participatory_space_manifests) { [participatory_space.manifest.name] }
+  let!(:root_taxonomy) { create(:taxonomy, organization:, name: { en: "A root taxonomy" }) }
+  let!(:another_taxonomy) { create(:taxonomy, organization:, parent: root_taxonomy) }
+  let(:filters_path) { decidim_admin.taxonomies_path }
+
+  before do
+    within "#admin-sidebar-menu-settings" do
+      click_on "Components"
+    end
+  end
+
+  context "when taxonomy filter exist" do
+    let!(:another_taxonomy_filter) do
+      create(:taxonomy_filter, internal_name: { en: "Another filter" }, participatory_space_manifests: [participatory_space.manifest.name], root_taxonomy:)
+    end
+    before do
+      click_on "Configure"
+    end
+
+    it "can be added to settings" do
+      click_on "Add filter"
+      within "#taxonomy_filters-dialog-content" do
+        select "A root taxonomy", from: "taxonomy_id"
+        select "Internal taxonomy filter name", from: "taxonomy_filter_id"
+        within "#save-taxonomy-filter-form" do
+          expect(page).to have_content("Public taxonomy filter name")
+          expect(page).to have_content(decidim_sanitize_translated(taxonomy.name))
+        end
+        click_on "Save"
+      end
+
+      expect(page).to have_no_css("#taxonomy_filters-dialog-content")
+      within ".js-current-filters" do
+        expect(page).to have_css("td", text: "Internal taxonomy filter name")
+        expect(page).to have_css("td", text: "Public taxonomy filter name")
+        expect(page).to have_link("Edit")
+      end
+      expect(component.reload.settings.taxonomy_filters).to eq([taxonomy_filter.id.to_s])
+
+      click_on "Add filter"
+      within "#taxonomy_filters-dialog-content" do
+        select "A root taxonomy", from: "taxonomy_id"
+        select "Another filter", from: "taxonomy_filter_id"
+        click_on "Save"
+      end
+
+      expect(page).to have_no_css("#taxonomy_filters-dialog-content")
+      within ".js-current-filters" do
+        expect(page).to have_css("td", text: "Internal taxonomy filter name")
+        expect(page).to have_css("td", text: "Public taxonomy filter name")
+        expect(page).to have_css("td", text: "Another filter")
+        expect(page).to have_link("Edit", count: 2)
+      end
+      expect(component.reload.settings.taxonomy_filters).to contain_exactly(taxonomy_filter.id.to_s, another_taxonomy_filter.id.to_s)
+
+      click_on "Update"
+      click_on "Configure"
+      within ".js-current-filters" do
+        expect(page).to have_css("td", text: "Internal taxonomy filter name")
+        expect(page).to have_css("td", text: "Public taxonomy filter name")
+      end
+    end
+  end
+
+  context "when taxonomy filter does not exist" do
+    let(:taxonomy_filter_item) { nil }
+    let(:taxonomy_filter) { nil }
+    before do
+      click_on "Configure"
+    end
+
+    it "shows a configuration message" do
+      expect(page).to have_content("No taxonomy filters found.")
+      expect(page).to have_link("Please define some filters for this participatory space before using this setting", href: filters_path)
+    end
+  end
+
+  context "when a taxonomy filter is already in settings" do
+    let!(:another_taxonomy_filter) { create(:taxonomy_filter, root_taxonomy:, name: { en: "Another taxonomy filter name" }) }
+
+    before do
+      component.update!(settings: { taxonomy_filters: [another_taxonomy_filter.id.to_s, taxonomy_filter.id.to_s] })
+      click_on "Configure"
+    end
+
+    it "can be removed from settings" do
+      within ".js-current-filters" do
+        within "tr", text: "Internal taxonomy filter name" do
+          click_on "Edit"
+        end
+      end
+
+      within "#taxonomy_filters-dialog-content" do
+        click_on "Remove"
+      end
+      sleep 1
+      expect(component.reload.settings.taxonomy_filters).to eq([another_taxonomy_filter.id.to_s])
+      expect(page).to have_css("td", text: "Another taxonomy filter name")
+      expect(page).to have_no_css("#taxonomy_filters-dialog-content")
+      expect(page).to have_no_content("Internal taxonomy filter name")
+
+      click_on "Add filter"
+      within "#taxonomy_filters-dialog-content" do
+        select "A root taxonomy", from: "taxonomy_id"
+        select "Internal taxonomy filter name", from: "taxonomy_filter_id"
+        click_on "Save"
+      end
+
+      within ".js-current-filters" do
+        expect(page).to have_css("td", text: "Another taxonomy filter name")
+        expect(page).to have_css("td", text: "Internal taxonomy filter name")
+        expect(page).to have_css("td", text: "Public taxonomy filter name")
+        expect(page).to have_link("Edit", count: 2)
+      end
+
+      click_on "Update"
+      click_on "Configure"
+      within ".js-current-filters" do
+        expect(page).to have_css("td", text: "Internal taxonomy filter name")
+        expect(page).to have_css("td", text: "Public taxonomy filter name")
+      end
+    end
+  end
+end

data/lib/decidim/admin/test/taxonomy_filters_examples.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+shared_context "with taxonomy filters context" do
+  let(:organization) { create(:organization) }
+  let!(:user) { create(:user, :admin, :confirmed, organization:) }
+  let!(:root_taxonomy) { create(:taxonomy, organization:) }
+  let!(:another_root_taxonomy) { create(:taxonomy, organization:) }
+  let!(:taxonomy) { create(:taxonomy, skip_injection: true, organization:, parent: root_taxonomy) }
+  let!(:another_taxonomy) { create(:taxonomy, organization:, parent: root_taxonomy) }
+  let!(:taxonomy_with_child) { create(:taxonomy, organization:, parent: root_taxonomy) }
+  let!(:taxonomy_child) { create(:taxonomy, organization:, parent: taxonomy_with_child) }
+  let!(:taxonomy_filter) { create(:taxonomy_filter, name:, internal_name:, root_taxonomy:, participatory_space_manifests:) }
+  let(:name) { { "en" => "The name for regular users" } }
+  let(:internal_name) { { "en" => "The name for admins only" } }
+  let!(:another_taxonomy_filter) { create(:taxonomy_filter, root_taxonomy: another_root_taxonomy, participatory_space_manifests:) }
+  let!(:taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: taxonomy) }
+  let!(:another_taxonomy_filter_item) { create(:taxonomy_filter_item, taxonomy_filter:, taxonomy_item: another_taxonomy) }
+  let(:participatory_space_manifests) { %w(participatory_processes assemblies) }
+end
+
+shared_examples "having no taxonomy filters defined" do
+  let!(:taxonomy_filter) { create(:taxonomy_filter) }
+  let!(:taxonomy_filter_item) { nil }
+  let!(:another_taxonomy_filter) { create(:taxonomy_filter) }
+  let!(:another_taxonomy_filter_item) { nil }
+
+  it "shows no taxonomy filters" do
+    expect(page).to have_content("Taxonomies")
+    expect(page).to have_content("No taxonomy filters found.")
+    expect(page).to have_link("Please define some filters for this participatory space before using this setting")
+  end
+end

data/lib/decidim/admin/test.rb

@@ -2,11 +2,12 @@
 
 require "decidim/admin/test/manage_attachments_examples"
 require "decidim/admin/test/manage_attachment_collections_examples"
-require "decidim/admin/test/manage_categories_examples"
 require "decidim/admin/test/manage_component_permissions_examples"
 require "decidim/admin/test/manage_moderations_examples"
+require "decidim/admin/test/manage_taxonomy_filters_examples"
 require "decidim/admin/test/manage_paginated_collection_examples"
 require "decidim/admin/test/manage_participatory_space_publications_examples"
+require "decidim/admin/test/manage_resource_soft_deletion_examples"
 require "decidim/admin/test/filterable_examples"
 require "decidim/admin/test/filters_participatory_space_users_examples"
 require "decidim/admin/test/filters_participatory_space_user_roles_examples"
@@ -15,3 +16,4 @@ require "decidim/admin/test/needs_admin_tos_accepted_examples"
 require "decidim/admin/test/destroy_admin_examples"
 require "decidim/admin/test/commands/publish_participatory_space_examples"
 require "decidim/admin/test/invite_participatory_space_users_shared_context"
+require "decidim/admin/test/taxonomy_filters_examples"

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.29.1"
+      "0.30.0.rc1"
     end
   end
 end