decidim-admin 0.27.10 → 0.28.0.rc4

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

@@ -11,7 +11,7 @@ shared_examples "Managing component permissions" do
   end
 
   let!(:component) do
-    create(:component, participatory_space: participatory_space)
+    create(:component, participatory_space:)
   end
 
   before do
@@ -28,7 +28,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "saves permission settings in the component" do
-      within "form.new_component_permissions" do
+      within "#components form" do
         within ".foo-permission" do
           check "Example authorization (Direct)"
           fill_in "Allowed postal codes", with: "08002"
@@ -42,7 +42,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "allowed_postal_codes" => "08002" }
+              "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
             }
           }
         )
@@ -56,7 +56,7 @@ shared_examples "Managing component permissions" do
       within ".component-#{component.id}" do
         click_link "Permissions"
       end
-      within "form.new_component_permissions" do
+      within "#components form" do
         within ".foo-permission" do
           check "Example authorization (Direct)"
           fill_in "Allowed postal codes", with: "08002"
@@ -90,7 +90,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "removes the action from the permissions hash" do
-      within "form.new_component_permissions" do
+      within "#components form" do
         within ".foo-permission" do
           uncheck "Example authorization (Direct)"
           uncheck "Another example authorization (Direct)"
@@ -125,7 +125,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "changes the configured action in the permissions hash" do
-      within "form.new_component_permissions" do
+      within "#components form" do
         within ".foo-permission" do
           uncheck "Example authorization (Direct)"
           check "Another example authorization (Direct)"
@@ -149,7 +149,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "adds an authorization to the configured action in the component permissions hash" do
-      within "form.new_component_permissions" do
+      within "#components form" do
         within ".foo-permission" do
           check "Another example authorization (Direct)"
           fill_in "Passport number", with: "AXXXXXXXX"
@@ -164,7 +164,7 @@ shared_examples "Managing component permissions" do
         include(
           "authorization_handlers" => {
             "dummy_authorization_handler" => {
-              "options" => { "allowed_postal_codes" => "08002" }
+              "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
             },
             "another_dummy_authorization_handler" => {
               "options" => { "passport_number" => "AXXXXXXXX" }
@@ -177,13 +177,13 @@ shared_examples "Managing component permissions" do
 
   context "when managing resource permissions" do
     let!(:resource) do
-      create(:dummy_resource, component: component)
+      create(:dummy_resource, component:)
     end
 
     let(:edit_resource_permissions_path) do
-      ::Decidim::EngineRouter.admin_proxy(participatory_space).edit_component_permissions_path(component.id,
-                                                                                               resource_name: resource.resource_manifest.name,
-                                                                                               resource_id: resource.id)
+      Decidim::EngineRouter.admin_proxy(participatory_space).edit_component_permissions_path(component.id,
+                                                                                             resource_name: resource.resource_manifest.name,
+                                                                                             resource_id: resource.id)
     end
 
     let(:component_settings) { nil }
@@ -199,20 +199,20 @@ shared_examples "Managing component permissions" do
     end
 
     it "shows the resource permissions settings" do
-      expect(page).to have_content(translated(resource.title))
+      expect(page).to have_content("Edit permissions")
     end
 
     context "when resources permissions are disabled" do
       let(:component_settings) { { resources_permissions_enabled: false } }
 
-      it "doesn't show the resource permissions settings" do
+      it "does not show the resource permissions settings" do
         expect(page).not_to have_content(resource.title)
       end
     end
 
     context "when setting permissions" do
       it "saves permission settings for the resource" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             check "Example authorization (Direct)"
             fill_in "Allowed postal codes", with: "08002"
@@ -226,7 +226,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
               }
             }
           )
@@ -253,7 +253,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "removes the action from the permissions hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             uncheck "Example authorization (Direct)"
             uncheck "Another example authorization (Direct)"
@@ -286,7 +286,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "changes the configured action in the resource permissions hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             uncheck "Example authorization (Direct)"
             check "Another example authorization (Direct)"
@@ -310,7 +310,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "adds an authorization to the configured action in the resource permissions hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             check "Another example authorization (Direct)"
             fill_in "Passport number", with: "AXXXXXXXX"
@@ -325,7 +325,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }
@@ -354,7 +354,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "changes the configured action in the resource permissions hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             uncheck "Example authorization (Direct)"
             check "Another example authorization (Direct)"
@@ -378,7 +378,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "adds an authorization to the configured action in the resource permissions hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             check "Another example authorization (Direct)"
             fill_in "Passport number", with: "AXXXXXXXX"
@@ -393,7 +393,7 @@ shared_examples "Managing component permissions" do
           include(
             "authorization_handlers" => {
               "dummy_authorization_handler" => {
-                "options" => { "allowed_postal_codes" => "08002" }
+                "options" => { "allowed_postal_codes" => "08002", "allowed_scope_id" => "" }
               },
               "another_dummy_authorization_handler" => {
                 "options" => { "passport_number" => "AXXXXXXXX" }
@@ -421,7 +421,7 @@ shared_examples "Managing component permissions" do
       end
 
       it "saves the action from the permissions hash as an empty hash" do
-        within "form.new_component_permissions" do
+        within "#components form" do
           within ".foo-permission" do
             uncheck "Example authorization (Direct)"
             uncheck "Another example authorization (Direct)"

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

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+shared_examples "hideable resource during block" do
+  include ActiveJob::TestHelper
+
+  let(:organization) { create(:organization) }
+
+  let!(:admin) { create(:user, :confirmed, :admin, organization:) }
+  let(:reportable) { create(:user, :confirmed, organization:) }
+  let(:reportable_path) { decidim.profile_path(reportable.nickname) }
+
+  let(:participatory_process) { create(:participatory_process, organization:) }
+  let(:component) { create(:dummy_component, participatory_space: participatory_process) }
+  let(:content) { create(:dummy_resource, component:, author: reportable, published_at: Time.current) }
+
+  before do
+    switch_to_host(admin.organization.host)
+    login_as admin, scope: :user
+    visit reportable_path
+
+    within ".profile__actions-secondary", match: :first do
+      click_button(I18n.t("decidim.shared.flag_modal.report"))
+    end
+    within ".flag-modal" do
+      find(:css, "input[name='report[block]']").set(true)
+    end
+    content.reload
+  end
+
+  it "chooses to hide content" do
+    within ".flag-modal" do
+      find(:css, "input[name='report[hide]']").set(true)
+    end
+    click_button I18n.t("decidim.shared.flag_user_modal.block")
+    expect(page).to have_current_path(decidim_admin.new_user_block_path(user_id: reportable.id, hide: true))
+  end
+
+  context "when finalizing hide" do
+    around do |example|
+      perform_enqueued_jobs do
+        example.run
+      end
+    end
+
+    it "chooses to hide content" do
+      within ".flag-modal" do
+        find(:css, "input[name='report[hide]']").set(true)
+      end
+      click_button I18n.t("decidim.shared.flag_user_modal.block")
+      expect(page).to have_current_path(decidim_admin.new_user_block_path(user_id: reportable.id, hide: true))
+
+      fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
+
+      click_button I18n.t("decidim.admin.block_user.new.action")
+
+      expect(content.reload).to be_hidden
+    end
+  end
+end

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

@@ -3,22 +3,28 @@
 shared_examples "sorted moderations" do
   let!(:moderations) do
     reportables.first(reportables.length - 1).map do |reportable|
-      moderation = create(:moderation, reportable: reportable, report_count: 1, reported_content: reportable.reported_searchable_content_text)
-      create(:report, moderation: moderation)
+      moderation = create(:moderation, reportable:, report_count: 1, reported_content: reportable.reported_searchable_content_text)
+      create(:report, moderation:)
       moderation
     end
   end
   let!(:moderation) { moderations.first }
   let(:moderations_link_text) { "Moderations" }
+  let(:moderations_link_in_admin_menu) { true }
 
   before do
     visit participatory_space_path
-    click_link moderations_link_text
+    if moderations_link_in_admin_menu
+      within_admin_sidebar_menu { click_link(moderations_link_text) }
+    else
+      within("div.layout-nav") { click_link(moderations_link_text) }
+    end
   end
 
   it "sorts the most recent first" do
-    within ".pagination" do
-      click_link "Last"
+    link_text = find("ul[data-pages]").text.split("\n")[-2]
+    within "ul[data-pages]" do
+      click_link link_text
     end
     all("tbody tr").each_with_index do |row, _index|
       expect(row.find("td:first-child")).to have_content(reportables.first.id)
@@ -29,24 +35,29 @@ end
 shared_examples "manage moderations" do
   let!(:moderations) do
     reportables.first(reportables.length - 1).map do |reportable|
-      moderation = create(:moderation, reportable: reportable, report_count: 1, reported_content: reportable.reported_searchable_content_text)
-      create(:report, moderation: moderation)
+      moderation = create(:moderation, reportable:, report_count: 1, reported_content: reportable.reported_searchable_content_text)
+      create(:report, moderation:)
       moderation
     end
   end
   let!(:moderation) { moderations.first }
   let!(:hidden_moderations) do
     reportables.last(1).map do |reportable|
-      moderation = create(:moderation, reportable: reportable, report_count: 3, reported_content: reportable.reported_searchable_content_text, hidden_at: Time.current)
-      create_list(:report, 3, moderation: moderation, reason: :spam)
+      moderation = create(:moderation, reportable:, report_count: 3, reported_content: reportable.reported_searchable_content_text, hidden_at: Time.current)
+      create_list(:report, 3, moderation:, reason: :spam)
       moderation
     end
   end
   let(:moderations_link_text) { "Moderations" }
+  let(:moderations_link_in_admin_menu) { true }
 
   before do
     visit participatory_space_path
-    click_link moderations_link_text
+    if moderations_link_in_admin_menu
+      within_admin_sidebar_menu { click_link(moderations_link_text) }
+    else
+      within("div.layout-nav") { click_link(moderations_link_text) }
+    end
   end
 
   context "when listing moderations" do
@@ -57,7 +68,7 @@ shared_examples "manage moderations" do
 
       visit current_path
 
-      expect(page).to have_no_selector("tr[data-id=\"#{external_moderation.id}\"]")
+      expect(page).not_to have_selector("tr[data-id=\"#{external_moderation.id}\"]")
     end
 
     it "user can review them" do
@@ -77,12 +88,21 @@ shared_examples "manage moderations" do
       expect(page).to have_admin_callout("Resource successfully unreported")
     end
 
+    it "user can hide a resource" do
+      within "tr[data-id=\"#{moderation.id}\"]" do
+        click_link "Hide"
+      end
+
+      expect(page).to have_admin_callout("Resource successfully hidden")
+      expect(page).not_to have_content(moderation.reportable.reported_content_url)
+    end
+
     it "user can sort by report count" do
       moderations.each_with_index { |moderation, index| moderation.update(report_count: index + 1) }
       moderations_ordered_by_report_count_asc = moderations.sort_by(&:report_count)
 
       within "table" do
-        click_link "Count"
+        click_link "Reports count"
 
         all("tbody tr").each_with_index do |row, index|
           reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id
@@ -105,7 +125,7 @@ shared_examples "manage moderations" do
       search = moderation.reportable.id
       within ".filters__section" do
         fill_in("Search Moderation by reportable id or content.", with: search)
-        find(:xpath, "//button[@type='submit']").click
+        click_button(type: "submit")
       end
       expect(page).to have_selector("tbody tr", count: 1)
     end
@@ -124,7 +144,7 @@ shared_examples "manage moderations" do
         moderation.reportable.destroy
         visit current_path
 
-        expect(page).to have_no_selector("tr[data-id=\"#{moderation.id}\"]")
+        expect(page).not_to have_selector("tr[data-id=\"#{moderation.id}\"]")
       end
     end
 
@@ -149,7 +169,7 @@ shared_examples "manage moderations" do
           }
         )
 
-        within_language_menu do
+        within_language_menu(admin: true) do
           click_link "Català"
         end
       end
@@ -164,12 +184,10 @@ shared_examples "manage moderations" do
 
   context "when listing hidden resources" do
     before do
-      within ".card-title" do
-        click_link "Hidden"
-      end
+      click_link "Hidden"
     end
 
-    it "user can't unreport them" do
+    it "user cannot unreport them" do
       expect(page).not_to have_css(".action-icon--unreport")
     end
 
@@ -191,8 +209,8 @@ shared_examples "manage moderations" do
     let!(:moderations) do
       comments.map do |reportable|
         space = reportable.is_a?(Decidim::Participable) ? reportable : reportable.participatory_space
-        moderation = create(:moderation, reportable: reportable, report_count: 1, participatory_space: space, reported_content: reportable.reported_searchable_content_text)
-        create(:report, moderation: moderation)
+        moderation = create(:moderation, reportable:, report_count: 1, participatory_space: space, reported_content: reportable.reported_searchable_content_text)
+        create(:report, moderation:)
 
         reportable.root_commentable.destroy!
         reportable.reload

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

@@ -17,8 +17,8 @@ shared_examples "a paginated collection" do |options|
     end
 
     it "changes the number of results per page" do
-      within ".results-per-page__dropdown" do
-        page.find("a", text: "15").click
+      within "[data-pagination]" do
+        page.find("details", text: "15").click
         click_link "50"
       end
 

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+shared_examples "manage participatory space publications" do |_options|
+  before do
+    participatory_space.update(title: { en: title })
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+  end
+
+  context "when the participatory space is unpublished" do
+    before do
+      participatory_space.unpublish!
+      participatory_space.reload
+      visit admin_page_path
+    end
+
+    it "publishes it" do
+      click_link "Publish"
+
+      expect(page).to have_content("successfully")
+
+      visit public_collection_path
+
+      expect(page).to have_content title
+    end
+  end
+
+  context "when the participatory space is published" do
+    before do
+      allow(Rails.application).to \
+        receive(:env_config).with(no_args).and_wrap_original do |m, *|
+          m.call.merge(
+            "action_dispatch.show_exceptions" => true,
+            "action_dispatch.show_detailed_exceptions" => false
+          )
+        end
+      participatory_space.publish!
+      participatory_space.reload
+      visit admin_page_path
+    end
+
+    it "unpublishes it" do
+      # we cannot use "a 404 page" shared example as we want to check it
+      # inside an example
+      click_link "Unpublish"
+
+      expect(page).to have_content("successfully")
+
+      visit public_collection_path
+
+      expect(page).to have_content("The page you are looking for cannot be found")
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 shared_examples_for "needs admin TOS accepted" do
   context "when the user has not accepted the admin TOS" do
     it "shows a message to accept the admin TOS" do
-      expect(page).to have_content("Please take a moment to review Admin Terms of Use")
+      expect(page).to have_content("Please take a moment to review the admin terms of service")
     end
   end
 end

data/lib/decidim/admin/test.rb

@@ -6,7 +6,11 @@ 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_paginated_collection_examples"
+require "decidim/admin/test/manage_participatory_space_publications_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"
+require "decidim/admin/test/manage_hide_content_examples"
 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"

data/lib/decidim/admin/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-admin version.
   module Admin
     def self.version
-      "0.27.10"
+      "0.28.0.rc4"
     end
   end
 end

data/lib/decidim/admin.rb

@@ -11,7 +11,9 @@ module Decidim
   module Admin
     autoload :Components, "decidim/admin/components"
     autoload :FormBuilder, "decidim/admin/form_builder"
+    autoload :SearchFormBuilder, "decidim/admin/search_form_builder"
     autoload :Import, "decidim/admin/import"
+    autoload :CustomImport, "decidim/admin/custom_import"
 
     include ActiveSupport::Configurable