decidim-admin 0.31.6 → 0.32.0.rc1

data/lib/decidim/admin/engine.rb

@@ -20,7 +20,11 @@ module Decidim
 
       initializer "decidim_admin.mount_routes" do |_app|
         Decidim::Core::Engine.routes do
-          mount Decidim::Admin::Engine => "/admin"
+          extend Decidim::Routes::LocaleRedirects
+
+          scope "/:locale", **locale_scope_options do
+            mount Decidim::Admin::Engine => "/admin"
+          end
         end
       end
 
@@ -44,7 +48,6 @@ module Decidim
         Decidim.icons.register(name: "earth-line", icon: "earth-line", category: "system", description: "Earth line", engine: :admin)
 
         Decidim.icons.register(name: "attachment-2", icon: "attachment-2", category: "system", description: "", engine: :admin)
-        Decidim.icons.register(name: "spy-line", icon: "spy-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "refresh-line", icon: "refresh-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "zoom-in-line", icon: "zoom-in-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "add-line", icon: "add-line", category: "system", description: "", engine: :admin)

data/lib/decidim/admin/form_builder.rb

@@ -19,6 +19,7 @@ module Decidim
       #   - :class (string) You can provide custom class name for the container (ex. autocomplete-field--results-inline)
       # @param [Hash] prompt_options
       #   Prompt configuration. A hash with options:
+      #   - :url (String) The url where the ajax endpoint to fill the select
       #   - :placeholder (String) Text to use as placeholder
       #   - :no_results (String) (optional) Text to use when there are no matching results (default: No results found)
       #   - :search_prompt (String) (optional) Text to prompt for search input (default: Type at least three characters to search)
@@ -29,7 +30,7 @@ module Decidim
       #   - label: This will be the label of the option select.
       #
       # @example How to use it
-      #   <% prompt_options = { placeholder: t(".select_user") }
+      #   <% prompt_options = { url: users_url, text: t(".select_user") }
       #      options = { label: t(".user") } %>
       #   <%= form.autocomplete_select(:user_id, form.object.user.presence, options, prompt_options) do |user|
       #      { value: user.id, label: "#{user.name} (#{user.nickname})" }
@@ -47,6 +48,7 @@ module Decidim
                                     name: options[:name] || "#{@object_name}[#{attribute}]",
                                     options: (options[:default_options].to_a + [selected]).compact,
                                     placeholder: prompt_options[:placeholder],
+                                    searchURL: prompt_options[:url],
                                     changeURL: prompt_options[:change_url],
                                     selected: selected ? selected[:value] : "",
                                     searchPromptText: options[:search_prompt] || I18n.t("autocomplete.search_prompt", scope: "decidim.admin"),

data/lib/decidim/admin/menu.rb

@@ -48,7 +48,7 @@ module Decidim
       def self.register_impersonate_menu!
         Decidim.menu :impersonate_menu do |menu|
           menu.add_item :conflicts,
-                        I18n.t("title", scope: "decidim.admin.conflicts"),
+                        I18n.t("title", scope: "decidim.admin.conflicts.index"),
                         decidim_admin.conflicts_path,
                         active: is_active_link?(decidim_admin.conflicts_path),
                         if: allowed_to?(:index, :impersonatable_user)

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

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+shared_examples "manage admin members examples" do
+  let(:other_user) { create(:user, organization:, email: "my_email@example.org") }
+
+  let!(:member) { create(:member, user:, participatory_space:) }
+
+  before do
+    switch_to_host(organization.host)
+    login_as user, scope: :user
+    visit participatory_space_edit_path
+    within_admin_sidebar_menu do
+      click_on "Members"
+    end
+  end
+
+  it "shows the member list" do
+    within "#members table" do
+      expect(page).to have_content(member.user.email)
+    end
+  end
+
+  it "creates a new member" do
+    click_on "New member"
+
+    within ".new_member" do
+      fill_in :member_name, with: "John Doe"
+      fill_in :member_email, with: other_user.email
+
+      find("*[type=submit]").click
+    end
+
+    expect(page).to have_callout("Member access successfully created.")
+
+    within "#members table" do
+      expect(page).to have_content(other_user.email)
+    end
+
+    visit decidim_admin.root_path
+    expect(page).to have_content("invited #{other_user.name} to be a member")
+  end
+
+  describe "when import a batch of members from csv" do
+    it "import a batch of members" do
+      click_on "Import via CSV"
+
+      # The CSV has no headers
+      expect(Decidim::Admin::ParticipatorySpace::ImportMemberCsvJob).to receive(:perform_later).once.ordered.with("john.doe@example.org", "John Doe", participatory_space, user)
+      expect(Decidim::Admin::ParticipatorySpace::ImportMemberCsvJob).to receive(:perform_later).once.ordered.with("jane.doe@example.org", "Jane Doe", participatory_space, user)
+      dynamically_attach_file(:member_csv_import_file, Decidim::Dev.asset("import_members.csv"))
+      perform_enqueued_jobs { click_on "Upload" }
+
+      expect(page).to have_content("CSV file uploaded successfully")
+    end
+  end
+
+  describe "when publishing all members" do
+    let!(:member) { create(:member, :unpublished, user:, participatory_space:) }
+
+    it "publishes all members" do
+      click_on "Publish all"
+
+      sleep(1)
+      expect(member.reload).to be_published
+    end
+
+    it "displays the correct log message" do
+      click_on "Publish all"
+      sleep(1)
+      visit decidim_admin.root_path
+      expect(page).to have_content("published all members of the #{translated(participatory_space.title)}")
+    end
+  end
+
+  describe "when managing different users" do
+    before do
+      create(:member, user: other_user, participatory_space:)
+      visit current_path
+    end
+
+    it "deletes a member" do
+      within "#members tr", text: other_user.email do
+        find("button[data-controller='dropdown']").click
+        accept_confirm { click_on "Delete" }
+      end
+
+      expect(page).to have_callout("Member access successfully destroyed.")
+
+      within "#members table" do
+        expect(page).to have_no_content(other_user.email)
+      end
+    end
+
+    context "when the user has not accepted the invitation" do
+      before do
+        form = Decidim::Admin::ParticipatorySpace::MemberForm.from_params(
+          name: "test",
+          email: "test@example.org"
+        )
+
+        Decidim::Admin::ParticipatorySpace::CreateMember.call(
+          form,
+          participatory_space
+        )
+
+        visit current_path
+      end
+
+      it "resends the invitation to the user" do
+        within "#members tr", text: "test@example.org" do
+          find("button[data-controller='dropdown']").click
+          click_on "Resend invitation"
+        end
+
+        expect(page).to have_callout("Invitation successfully resent.")
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ end
 shared_examples "showing the unauthorized error message" do
   it "redirects to the relevant unauthorized page" do
     expect(page).to have_content("You are not authorized to perform this action")
-    expect(page).to have_current_path("/admin/")
+    expect(page).to have_current_path(decidim_admin.root_path)
   end
 end
 
@@ -40,7 +40,7 @@ shared_examples "admin participatory space access" do
 
   context "when the user is a normal user" do
     let(:user) { create(:user, :confirmed, organization:) }
-    let(:unauthorized_path) { "/" }
+    let(:unauthorized_path) { decidim.root_path }
 
     it_behaves_like "a 404 page"
   end
@@ -53,7 +53,7 @@ shared_examples "admin participatory space access" do
         visit decidim.root_path
 
         within "#admin-bar" do
-          expect(page).to have_link("Admin dashboard", href: "/admin/")
+          expect(page).to have_link("Admin dashboard", href: decidim_admin.root_path)
         end
       end
     end

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

@@ -148,27 +148,36 @@ shared_examples "filtering collection by published/unpublished" do
   it_behaves_like "paginating a collection"
 end
 
-shared_examples "filtering collection by private/public" do
+shared_examples "filtering collection by open/restricted/transparent" do
   include_context "with filterable context"
 
   unless block_given?
-    let!(:public_space) do
-      create(factory_name, private_space: false, organization:)
+    let!(:open_space) do
+      create(factory_name, :open, organization:)
     end
 
-    let!(:private_space) do
-      create(factory_name, private_space: true, organization:)
+    let!(:restricted_space) do
+      create(factory_name, :restricted, organization:)
     end
+
+    let!(:transparent_space) do
+      create(factory_name, :transparent, organization:)
+    end
+  end
+
+  it_behaves_like "a filtered collection", options: "Access mode", filter: "Open" do
+    let(:in_filter) { translated(open_space.title) }
+    let(:not_in_filter) { [translated(restricted_space.title), translated(transparent_space.title)] }
   end
 
-  it_behaves_like "a filtered collection", options: "Private", filter: "Public" do
-    let(:in_filter) { translated(public_space.title) }
-    let(:not_in_filter) { translated(private_space.title) }
+  it_behaves_like "a filtered collection", options: "Access mode", filter: "Restricted" do
+    let(:in_filter) { translated(restricted_space.title) }
+    let(:not_in_filter) { [translated(open_space.title), translated(transparent_space.title)] }
   end
 
-  it_behaves_like "a filtered collection", options: "Private", filter: "Private" do
-    let(:in_filter) { translated(private_space.title) }
-    let(:not_in_filter) { translated(public_space.title) }
+  it_behaves_like "a filtered collection", options: "Access mode", filter: "Transparent" do
+    let(:in_filter) { translated(transparent_space.title) }
+    let(:not_in_filter) { [translated(open_space.title), translated(restricted_space.title)] }
   end
 
   it_behaves_like "paginating a collection"

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-shared_examples "inviting participatory space admins" do |check_private_space: true, check_landing_page: true|
+shared_examples "inviting participatory space admins" do |check_members_page: true, check_landing_page: true|
   let(:role) { "Administrator" }
 
   before do
     switch_to_host organization.host
   end
 
-  shared_examples "sees public space menu" do
+  shared_examples "sees space without members menu" do
     it "can access all sections" do
       within_admin_sidebar_menu do
         expect(page).to have_content(about_this_space_label)
@@ -16,13 +16,13 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         expect(page).to have_content("Components")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_no_content("Members") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_no_content("Members") if participatory_space.respond_to?(:has_members)
         expect(page).to have_content("Moderations")
       end
     end
   end
 
-  shared_examples "sees private space menu" do
+  shared_examples "sees space with members menu" do
     it "can access all sections" do
       within_admin_sidebar_menu do
         expect(page).to have_content(about_this_space_label)
@@ -31,7 +31,7 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         expect(page).to have_content("Components")
         expect(page).to have_content("Attachments")
         expect(page).to have_content(space_admins_label)
-        expect(page).to have_content("Members") if participatory_space.respond_to?(:private_space)
+        expect(page).to have_content("Members") if participatory_space.respond_to?(:has_members)
         expect(page).to have_content("Moderations")
       end
     end
@@ -52,7 +52,7 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         find("*[type=submit]").click
       end
 
-      expect(page).to have_current_path "/admin/admin_terms/show"
+      expect(page).to have_current_path decidim_admin.admin_terms_show_path
 
       visit decidim_admin.admin_terms_show_path
 
@@ -81,7 +81,7 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
           find("*[type=submit]").click
         end
 
-        expect(page).to have_current_path "/admin/admin_terms/show"
+        expect(page).to have_current_path decidim_admin.admin_terms_show_path
 
         visit decidim_admin.admin_terms_show_path
 
@@ -98,14 +98,14 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
       end
 
       context "and is a public space" do
-        it_behaves_like "sees public space menu"
+        it_behaves_like "sees space without members menu"
       end
 
-      if check_private_space
-        context "and is a private space" do
-          let(:participatory_space) { private_participatory_space }
+      if check_members_page
+        context "and is a space with members" do
+          let(:participatory_space) { members_participatory_space }
 
-          it_behaves_like "sees private space menu"
+          it_behaves_like "sees space with members menu"
         end
       end
     end
@@ -163,14 +163,14 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
       end
 
       context "and is a public space" do
-        it_behaves_like "sees public space menu"
+        it_behaves_like "sees space without members menu"
       end
 
-      if check_private_space
-        context "and is a private space" do
-          let(:participatory_space) { private_participatory_space }
+      if check_members_page
+        context "and is a space with members" do
+          let(:participatory_space) { members_participatory_space }
 
-          it_behaves_like "sees private space menu"
+          it_behaves_like "sees space with members menu"
         end
       end
     end

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

@@ -22,7 +22,7 @@ shared_examples "inviting participatory space collaborators" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_current_path "/admin/admin_terms/show"
+      expect(page).to have_current_path decidim_admin.admin_terms_show_path
 
       visit decidim_admin.admin_terms_show_path
       find_button("I agree with the terms").click

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

@@ -20,7 +20,7 @@ shared_examples "inviting participatory space moderators" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_current_path "/admin/admin_terms/show"
+      expect(page).to have_current_path decidim_admin.admin_terms_show_path
 
       visit decidim_admin.admin_terms_show_path
       find_button("I agree with the terms").click

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

@@ -18,7 +18,7 @@ shared_context "when inviting participatory space users" do
     fill_in "Email", with: email
     select role, from: "Role"
     click_on "Create"
-    expect(page).to have_content("successfully added")
+    expect(page).to have_callout(added_callout_message)
     logout :user
   end
 

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

@@ -44,7 +44,7 @@ shared_examples "manage attachment collections examples" do
       find("*[type=submit]").click
     end
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout("Folder created successfully.")
 
     within "#attachment_collections table" do
       expect(page).to have_content(translated(attributes[:name]))
@@ -72,7 +72,7 @@ shared_examples "manage attachment collections examples" do
       find("*[type=submit]").click
     end
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout("Folder updated successfully.")
 
     within "#attachment_collections table" do
       expect(page).to have_content(translated(attributes[:name]))
@@ -96,7 +96,7 @@ shared_examples "manage attachment collections examples" do
           accept_confirm { click_on "Delete" }
         end
 
-        expect(page).to have_admin_callout("successfully")
+        expect(page).to have_callout("Folder destroyed successfully.")
 
         within "#attachment_collections table" do
           expect(page).to have_no_content(translated(attachment_collection2.name))

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

@@ -70,7 +70,7 @@ shared_examples "manage attachments examples" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("Attachment created successfully.")
 
       within "#attachments table" do
         expect(page).to have_text("Very Important Document")
@@ -106,7 +106,7 @@ shared_examples "manage attachments examples" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("Attachment created successfully.")
 
       within "#attachments table" do
         expect(page).to have_text("Very Important Document")
@@ -142,7 +142,7 @@ shared_examples "manage attachments examples" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("Attachment created successfully.")
 
       within "#attachments table" do
         expect(page).to have_text("Document inside a collection")
@@ -178,7 +178,7 @@ shared_examples "manage attachments examples" do
         accept_confirm { click_on "Delete" }
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("Attachment destroyed successfully.")
 
       expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
@@ -189,7 +189,7 @@ shared_examples "manage attachments examples" do
         accept_confirm { click_on "Delete" }
       end
 
-      expect(page).to have_admin_callout("Attachment destroyed successfully")
+      expect(page).to have_callout("Attachment destroyed successfully")
 
       expect(page).to have_no_content(translated(attachment_with_link.title, locale: :en))
     end
@@ -214,7 +214,7 @@ shared_examples "manage attachments examples" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("Attachment updated successfully.")
 
       within "#attachments table" do
         expect(page).to have_text("This is a nice photo")

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

@@ -60,7 +60,7 @@ shared_examples "Managing component permissions" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout("Permissions updated successfully.")
 
       expect(component.reload.permissions["foo"]).to(
         include(
@@ -91,7 +91,7 @@ shared_examples "Managing component permissions" do
     end
 
     it "renders the form again" do
-      expect(page).to have_content("problem")
+      expect(page).to have_content("There was a problem updating the permissions of this component.")
     end
   end
 
@@ -125,7 +125,7 @@ shared_examples "Managing component permissions" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout("Permissions updated successfully.")
 
       expect(component.reload.permissions["foo"]).to be_nil
     end
@@ -162,7 +162,7 @@ shared_examples "Managing component permissions" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout("Permissions updated successfully.")
 
       expect(component.reload.permissions["foo"]).to(
         include(
@@ -185,7 +185,7 @@ shared_examples "Managing component permissions" do
         find("*[type=submit]").click
       end
 
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout("Permissions updated successfully.")
 
       expect(component.reload.permissions["foo"]).to(
         include(

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:nth-child(2)")).to have_content(reportables.first.id)
+      expect(row.find("td:nth-child(2)")).to have_content(reportables.first.class.model_name.human)
     end
   end
 end
@@ -86,7 +86,7 @@ shared_examples "manage moderations" do
         click_on "Undo the report"
       end
 
-      expect(page).to have_admin_callout("Resource successfully unreported")
+      expect(page).to have_callout("Resource successfully unreported")
     end
 
     it "user can hide a resource" do
@@ -95,7 +95,7 @@ shared_examples "manage moderations" do
         click_on "Hide"
       end
 
-      expect(page).to have_admin_callout("Resource successfully hidden")
+      expect(page).to have_callout("Resource successfully hidden")
       expect(page).to have_no_content(moderation.reportable.reported_content_url)
     end
 
@@ -107,8 +107,8 @@ shared_examples "manage moderations" do
         click_on "Reports count"
 
         all("tbody tr").each_with_index do |row, index|
-          reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id
-          expect(row.find("td:nth-child(2)")).to have_content(reportable_id)
+          reportable_type = moderations_ordered_by_report_count_asc[index].reportable.class.model_name.human
+          expect(row.find("td:nth-child(2)")).to have_content(reportable_type)
         end
       end
     end
@@ -241,7 +241,7 @@ shared_examples "manage moderations" do
         click_on "Hide"
       end
 
-      expect(page).to have_admin_callout("Resource successfully hidden")
+      expect(page).to have_callout("Resource successfully hidden")
       expect(page).to have_no_css("tr[data-id=\"#{moderation_id}\"]")
     end
   end

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

@@ -20,7 +20,7 @@ shared_examples "manage participatory space publications" do
     end
 
     it "publishes it" do
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout(publish_callout_message)
 
       visit public_collection_path
 
@@ -50,7 +50,7 @@ shared_examples "manage participatory space publications" do
         click_on "Unpublish"
       end
 
-      expect(page).to have_content("successfully")
+      expect(page).to have_callout(unpublish_callout_message)
 
       visit public_collection_path
 

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

@@ -26,7 +26,7 @@ shared_examples "manage soft deletable component or space" do |resource_name|
         end
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("#{resource_name.capitalize} successfully deleted.")
 
       within "table" do
         expect(page).to have_no_content(title[:en])
@@ -81,7 +81,7 @@ shared_examples "manage soft deletable resource" do |resource_name|
       accept_confirm { click_on "Move to trash" }
     end
 
-    expect(page).to have_admin_callout("successfully")
+    expect(page).to have_callout("#{resource_name.capitalize} successfully deleted.")
 
     within "table" do
       expect(page).to have_no_content(title[:en])
@@ -118,7 +118,7 @@ shared_examples "manage trashed resource" do |resource_name|
         click_on "Restore"
       end
 
-      expect(page).to have_admin_callout("successfully")
+      expect(page).to have_callout("#{resource_name.capitalize} successfully restored.")
       visit trash_path
       within "table" do
         expect(page).to have_no_content(title[:en])

data/lib/decidim/admin/version.rb

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

data/lib/decidim/admin.rb

@@ -15,8 +15,6 @@ module Decidim
     autoload :Import, "decidim/admin/import"
     autoload :CustomImport, "decidim/admin/custom_import"
 
-    include ActiveSupport::Configurable
-
     # Public: Stores an instance of ViewHooks
     def self.view_hooks
       @view_hooks ||= ViewHooks.new