decidim-admin 0.28.1 → 0.29.0.rc1

data/config/locales/zh-TW.yml

@@ -182,6 +182,7 @@ zh-TW:
         export: 全部匯出
         export-selection: 匯出選擇
         import: 匯入
+        manage: 管理
         newsletter:
           new: 新電子報
         participatory_space_private_user:
@@ -346,7 +347,6 @@ zh-TW:
         title: 驗證衝突
         transfer:
           email: 電子郵件
-          error: 轉移現在參與者到管理參與者時發生錯誤
           name: 名稱
           reason: 理由
           success: 目前的轉換完成
@@ -359,10 +359,6 @@ zh-TW:
           title: 等待的操作
         show:
           view_more_logs: 檢視更多記錄
-      domain_whitelist:
-        update:
-          error: 網址白名單更新失敗
-          success: 網址白名單更新成功.
       exports:
         export_as: "%{name} 成為 %{export_format}"
         formats:
@@ -429,7 +425,6 @@ zh-TW:
           report_count_eq: 報告數量等於
           reported_id_string_or_reported_content_cont: 按報告 Id 或內容搜索%{collection}。
           title_cont: 按標題搜索%{collection}。
-          user_name_or_user_email_cont: 按名稱或電子郵件搜索%{collection}。
           user_name_or_user_nickname_or_user_email_cont: 按電子郵件、姓名或暱稱搜索%{collection}。
         state_eq:
           label: 狀態
@@ -538,6 +533,7 @@ zh-TW:
         appearance: 外觀
         area_types: 區域類型
         areas: 區域
+        components: 组件
         configuration: 配置
         content: 被檢舉的內容
         help_sections: 幫助部分
@@ -807,12 +803,6 @@ zh-TW:
             layout_appearance_title: 編輯版面外觀
             preview: 預覽
           omnipresent_banner_appearance_title: 編輯無處不在的橫幅
-      organization_external_domain_whitelist:
-        edit:
-          update: 更新
-        form:
-          add: 新增到白名單
-          title: 外部域名白名單
       participatory_space_private_users:
         create:
           error: 在此參與空間中添加私人參與者時出現問題。

data/config/routes.rb

@@ -7,7 +7,7 @@ Decidim::Admin::Engine.routes.draw do
       resource :homepage, only: [:edit, :update], controller: "organization_homepage" do
         resources :content_blocks, only: [:edit, :update, :destroy, :create], controller: "organization_homepage_content_blocks"
       end
-      resource :external_domain_whitelist, only: [:edit, :update], controller: "organization_external_domain_whitelist"
+      resource :external_domain_allowlist, only: [:edit, :update], controller: "organization_external_domain_allowlist"
 
       member do
         get :users

data/decidim-admin.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-admin"
   s.summary = "Decidim organization administration"

data/lib/decidim/admin/import/creator.rb

@@ -12,7 +12,7 @@ module Decidim
       # own creator or this default will be used.
       class Creator
         class << self
-          # Retuns the resource class to be created with the provided data.
+          # Returns the resource class to be created with the provided data.
           def resource_klass
             raise NotImplementedError, "#{self.class.name} does not define resource class"
           end

data/lib/decidim/admin/import/importer_factory.rb

@@ -5,11 +5,11 @@ module Decidim
     module Import
       # A factory class providing easier way to create new importers.
       class ImporterFactory
-        def self.build(file, mime_type, **keyword_args)
+        def self.build(file, mime_type, **)
           reader = Readers.search_by_mime_type(mime_type)
           raise NotImplementedError, "No reader implemented for mime type: #{mime_type}" if reader.nil?
 
-          Importer.new(file:, reader:, **keyword_args)
+          Importer.new(file:, reader:, **)
         end
       end
     end

data/lib/decidim/admin/menu.rb

@@ -192,9 +192,9 @@ module Decidim
                         position: 1.6,
                         if: allowed_to?(:update, :help_sections)
 
-          menu.add_item :external_domain_whitelist,
-                        I18n.t("menu.external_domain_whitelist", scope: "decidim.admin"),
-                        decidim_admin.edit_organization_external_domain_whitelist_path,
+          menu.add_item :external_domain_allowlist,
+                        I18n.t("menu.external_domain_allowlist", scope: "decidim.admin"),
+                        decidim_admin.edit_organization_external_domain_allowlist_path,
                         icon_name: "computer-line",
                         position: 1.7,
                         if: allowed_to?(:update, :organization, organization: current_organization)
@@ -270,7 +270,7 @@ module Decidim
                             decidim/admin/scope_types
                             decidim/admin/areas decidim/admin/area_types
                             decidim/admin/help_sections
-                            decidim/admin/organization_external_domain_whitelist
+                            decidim/admin/organization_external_domain_allowlist
                           ),
                           []
                         ],

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

@@ -15,6 +15,23 @@ shared_examples "showing the unauthorized error message" do
   end
 end
 
+shared_examples "admin participatory space edit button" do
+  context "and visits the participatory space public page" do
+    before do
+      switch_to_host(organization.host)
+      login_as role, scope: :user
+    end
+
+    it "shows the admin bar with the Edit button" do
+      visit participatory_space_path
+
+      within "#admin-bar" do
+        expect(page).to have_link("Edit", href: target_path)
+      end
+    end
+  end
+end
+
 shared_examples "admin participatory space access" do
   before do
     switch_to_host(organization.host)
@@ -31,6 +48,16 @@ shared_examples "admin participatory space access" do
   context "when the user has the role" do
     let(:user) { role }
 
+    context "and visits the root path" do
+      it "shows the admin bar" do
+        visit decidim.root_path
+
+        within "#admin-bar" do
+          expect(page).to have_link("Admin dashboard", href: "/admin/")
+        end
+      end
+    end
+
     context "and has permission" do
       before do
         visit target_path

data/lib/decidim/admin/test/commands/create_attachment_collection_examples.rb

@@ -25,10 +25,11 @@ module Decidim
             form_params,
             collection_for:
           ).with_context(
-            current_organization: organization
+            current_organization: organization,
+            current_user: user
           )
         end
-        let(:command) { described_class.new(form, collection_for, user) }
+        let(:command) { described_class.new(form, collection_for) }
 
         describe "when the form is not valid" do
           before do

data/lib/decidim/admin/test/commands/create_category_examples.rb

@@ -22,10 +22,12 @@ module Decidim
             form_params,
             current_participatory_space: participatory_space
           ).with_context(
-            current_organization: organization
+            current_organization: organization,
+            current_participatory_space: participatory_space,
+            current_user: user
           )
         end
-        let(:command) { described_class.new(form, participatory_space, user) }
+        let(:command) { described_class.new(form) }
 
         describe "when the form is not valid" do
           before do

data/lib/decidim/admin/test/commands/update_attachment_collection_examples.rb

@@ -26,10 +26,11 @@ module Decidim
             form_params,
             collection_for:
           ).with_context(
-            current_organization: organization
+            current_organization: organization,
+            current_user: user
           )
         end
-        let(:command) { described_class.new(attachment_collection, form, user) }
+        let(:command) { described_class.new(attachment_collection, form) }
 
         describe "when the form is not valid" do
           before do

data/lib/decidim/admin/test/commands/update_category_examples.rb

@@ -23,10 +23,11 @@ module Decidim
             form_params,
             current_participatory_space: participatory_space
           ).with_context(
-            current_organization: organization
+            current_organization: organization,
+            current_user: user
           )
         end
-        let(:command) { described_class.new(category, form, user) }
+        let(:command) { described_class.new(form, category) }
 
         describe "when the form is not valid" do
           before do

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

@@ -11,13 +11,15 @@ shared_context "with filterable context" do
     within(".filters__section") do
       find_link("Filter").hover
       find_link(options).hover
-      click_link(filter, href: /q/)
+      within ".submenu > .is-active > .submenu" do
+        click_on(filter)
+      end
     end
   end
 
   def remove_applied_filter(filter)
     within("[data-applied-filters-tags] .label", text: /#{filter}/i) do
-      click_link("Cancel")
+      click_on("Cancel")
     end
   end
 
@@ -50,7 +52,7 @@ shared_context "with filterable context" do
     before { apply_filter(options, filter) }
 
     it { expect(page).to have_content(in_filter) }
-    it { expect(page).not_to have_content(not_in_filter) }
+    it { expect(page).to have_no_content(not_in_filter) }
 
     it_behaves_like "searching by text" do
       let(:text) { in_filter }

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

@@ -14,7 +14,7 @@ shared_examples "sortable participatory space user roles" do
       let(:sort_by) { "name asc" }
 
       it "displays the result" do
-        expect(page).not_to have_content(user.name)
+        expect(page).to have_no_content(user.name)
       end
     end
   end
@@ -32,7 +32,7 @@ shared_examples "sortable participatory space user roles" do
       let(:sort_by) { "email asc" }
 
       it "displays the result" do
-        expect(page).not_to have_content(user.name)
+        expect(page).to have_no_content(user.name)
       end
     end
   end
@@ -50,7 +50,7 @@ shared_examples "sortable participatory space user roles" do
       let(:sort_by) { "last_sign_in_at asc" }
 
       it "displays the result" do
-        expect(page).not_to have_content(user.name)
+        expect(page).to have_no_content(user.name)
       end
     end
   end
@@ -68,7 +68,7 @@ shared_examples "sortable participatory space user roles" do
       let(:sort_by) { "invitation_accepted_at asc" }
 
       it "displays the result" do
-        expect(page).not_to have_content(user.name)
+        expect(page).to have_no_content(user.name)
       end
     end
   end
@@ -86,7 +86,7 @@ shared_examples "sortable participatory space user roles" do
       let(:sort_by) { "role asc" }
 
       it "displays the result" do
-        expect(page).not_to have_content(user.name)
+        expect(page).to have_no_content(user.name)
       end
     end
   end

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

@@ -0,0 +1,180 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space admins" do |check_private_space: true, check_landing_page: true|
+  let(:role) { "Administrator" }
+
+  before do
+    switch_to_host organization.host
+  end
+
+  shared_examples "sees public space menu" do
+    it "can access all sections" do
+      within_admin_sidebar_menu do
+        expect(page).to have_content(about_this_space_label)
+        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_content("Moderations")
+      end
+    end
+  end
+
+  shared_examples "sees private space menu" do
+    it "can access all sections" do
+      within_admin_sidebar_menu do
+        expect(page).to have_content(about_this_space_label)
+        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("Moderations")
+      end
+    end
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on translated(participatory_space.title)
+        end
+      end
+    end
+
+    context "when the user does not exist" do
+      before do
+        perform_enqueued_jobs { invite_user }
+
+        visit last_email_link
+
+        within "form.new_user" do
+          fill_in :invitation_user_nickname, with: "caballo_loco"
+          fill_in :invitation_user_password, with: "decidim123456789"
+          check :invitation_user_tos_agreement
+          find("*[type=submit]").click
+        end
+
+        expect(page).to have_current_path "/admin/admin_terms/show"
+
+        visit decidim_admin.admin_terms_show_path
+
+        find_button("I agree with the terms").click
+
+        click_on space_sidebar_label
+
+        within "div.table-scroll" do
+          expect(page).to have_i18n_content(participatory_space.title)
+          within "tr", text: translated(participatory_space.title) do
+            click_on translated(participatory_space.title)
+          end
+        end
+      end
+
+      context "and is a public space" do
+        it_behaves_like "sees public space menu"
+      end
+
+      if check_private_space
+        context "and is a private space" do
+          let(:participatory_space) { private_participatory_space }
+
+          it_behaves_like "sees private space menu"
+        end
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "administrator@example.org" }
+
+    let!(:administrator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the administrator to the admin dashboard" do
+      login_as administrator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on translated(participatory_space.title)
+        end
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(administrator.name)
+
+      expect(page).to have_select("Role", selected: "Administrator")
+    end
+
+    context "when user exists in the organization" do
+      before do
+        perform_enqueued_jobs { invite_user }
+        login_as administrator, scope: :user
+
+        visit decidim_admin.root_path
+
+        click_on space_sidebar_label
+
+        within "div.table-scroll" do
+          expect(page).to have_i18n_content(participatory_space.title)
+          expect(page).to have_i18n_content(participatory_space.title)
+          within "tr", text: translated(participatory_space.title) do
+            click_on translated(participatory_space.title)
+          end
+        end
+      end
+
+      context "and is a public space" do
+        it_behaves_like "sees public space menu"
+      end
+
+      if check_private_space
+        context "and is a private space" do
+          let(:participatory_space) { private_participatory_space }
+
+          it_behaves_like "sees private space menu"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space collaborators" do
+  let(:role) { "Collaborator" }
+
+  before do
+    switch_to_host organization.host
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "collaborator@example.org" }
+
+    let!(:collaborator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the collaborator to the admin dashboard" do
+      login_as collaborator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(collaborator.name)
+
+      expect(page).to have_select("Role", selected: "Collaborator")
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+shared_examples "inviting participatory space moderators" do
+  before do
+    switch_to_host organization.host
+  end
+
+  context "when the user does not exist" do
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "asks for a password and nickname and redirects to the admin dashboard" do
+      visit last_email_link
+
+      within "form.new_user" do
+        fill_in :invitation_user_nickname, with: "caballo_loco"
+        fill_in :invitation_user_password, with: "decidim123456789"
+        check :invitation_user_tos_agreement
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_current_path "/admin/admin_terms/show"
+
+      visit decidim_admin.admin_terms_show_path
+      find_button("I agree with the terms").click
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        click_on "Moderate"
+      end
+
+      within "div.process-title-content-breadcrumb-container-left" do
+        expect(page).to have_css("span.process-title-content-breadcrumb", text: "Moderations")
+      end
+    end
+  end
+
+  context "when the user already exists" do
+    let(:email) { "moderator@example.org" }
+
+    let!(:moderator) do
+      create(:user, :confirmed, :admin_terms_accepted, email:, organization:)
+    end
+
+    before do
+      perform_enqueued_jobs { invite_user }
+    end
+
+    it "redirects the moderator to the admin dashboard" do
+      login_as moderator, scope: :user
+
+      visit decidim_admin.root_path
+
+      click_on space_sidebar_label
+
+      within "div.table-scroll" do
+        expect(page).to have_i18n_content(participatory_space.title)
+        within "tr", text: translated(participatory_space.title) do
+          click_on "Moderate"
+        end
+      end
+
+      within "div.process-title-content-breadcrumb-container-left" do
+        expect(page).to have_css("span.process-title-content-breadcrumb", text: "Moderations")
+      end
+    end
+
+    it "selects the user role in the form" do
+      edit_user(moderator.name)
+
+      expect(page).to have_select("Role", selected: "Moderator")
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+shared_context "when inviting participatory space users" do
+  let(:organization) { participatory_space.organization }
+  let(:user) { create(:user, :admin, :confirmed, organization: participatory_space.organization) }
+  let(:email) { "this_email_does_not_exist@example.org" }
+  let(:role) { "Moderator" }
+
+  def invite_user
+    login_as user, scope: :user
+
+    visit participatory_space_user_roles_path
+    within "[data-content]" do
+      click_on new_button_label
+    end
+
+    fill_in "Name", with: "Alice Liddel"
+    fill_in "Email", with: email
+    select role, from: "Role"
+    click_on "Create"
+    logout :user
+  end
+
+  def edit_user(username)
+    login_as user, scope: :user
+
+    visit participatory_space_user_roles_path
+
+    within "tr", text: username do
+      click_on "Edit"
+    end
+  end
+end