decidim-admin 0.31.7 → 0.32.0.rc1

data/config/locales/zh-TW.yml

@@ -1,4 +1,3 @@
----
 zh-TW:
   activemodel:
     attributes:
@@ -42,11 +41,11 @@ zh-TW:
         alert_color: 警告
         available_authorizations: 可用認證方式
         badges_enabled: 啟用勳章
+        comments_max_length: 留言字數上限 (0 表示使用預設)
         customize_welcome_notification: 自訂歡迎通知
         default_locale: 預設語言
         description: 說明
         enable_omnipresent_banner: 顯示全域廣告
-        enable_participatory_space_filters: 啟用參與空間過濾器
         facebook_handler: Facebook 處理器
         favicon: 圖示
         force_authentication: 強制認證
@@ -85,11 +84,6 @@ zh-TW:
         welcome_notification_body: 歡迎通知內容
         welcome_notification_subject: 歡迎通知主旨
         youtube_handler: YouTube 處理器
-      participatory_space_private_user:
-        email: 電子郵件
-        name: 名稱
-      participatory_space_private_user_csv_import:
-        file: 檔案
       scope:
         code: 代碼
         name: 名稱
@@ -130,10 +124,6 @@ zh-TW:
           attributes:
             official_img_footer:
               allowed_file_content_types: 圖片有誤
-        participatory_space_private_user_csv_import:
-          attributes:
-            file:
-              malformed: 匯入檔案格式有誤，請小心閱讀教學並且確認檔案是使用 UTF-8 編碼
         user_group_csv_verification:
           attributes:
             file:
@@ -171,8 +161,6 @@ zh-TW:
         import: 匯入
         newsletter:
           new: 新電子報
-        participatory_space_private_user:
-          new: 新參與空間私有使用者
         per_page: 每頁
         share: 分享
         user:
@@ -291,7 +279,6 @@ zh-TW:
           title: '新增元件： %{name}'
         publish:
           success: 這個元件已經成功發佈
-        title: 组件
         unpublish:
           success: 這個元件已經成功取消發佈
         update:
@@ -351,10 +338,6 @@ zh-TW:
           values:
             'false': 官方化
             'true': 非官方化
-        participatory_space_private_users:
-          user_invitation_sent_at_not_null:
-            values:
-              'false': 未發送
         private_space_eq:
           label: 私人的
           values:
@@ -417,7 +400,6 @@ zh-TW:
           impersonate: 模擬
           impersonate_existing_managed_user: 管理參與者 "%{name}"
           impersonate_existing_user: 管理參與者 "%{name}"
-          impersonate_new_managed_user: 管理新參與者
       imports:
         and: 和
         data_errors:
@@ -467,6 +449,10 @@ zh-TW:
           new:
             explanation: 受管理的參與者可以晉升為標準參與者。這意味著他們將受邀加入應用程式，您將無法再對其進行管理。被邀請的參與者將收到一封電子郵件，以接受您的邀請。
             promote: 推廣
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: 請上傳您的 CSV 檔案。
       menu:
         admin_log: 管理員活動日誌
         admins: 管理員
@@ -524,8 +510,6 @@ zh-TW:
             sent_to: 發送至
             subject: 主旨
           name: 電子報
-        participatory_space_private_user:
-          name: 參與空間私有參與者
         scope:
           fields:
             name: 名稱
@@ -648,7 +632,6 @@ zh-TW:
         send:
           no_recipients: 沒有選擇收件人.
         show:
-          preview: 預覽
           select_recipients_to_deliver: 選擇要傳送的收件人
           subject: 主旨
         update:
@@ -702,30 +685,6 @@ zh-TW:
         update:
           error: 更新此組織時發生問題。
           success: 組織更新成功
-      participatory_space_private_users:
-        create:
-          error: 在此參與空間中添加私人參與者時出現問題。
-          success: 成功建立參與空間的私人參與者訪問權限。
-        destroy:
-          error: 刪除參與空間的私人參與者時發生問題。
-          success: 成功刪除參與空間的私人參與者訪問權限。
-        edit:
-          update: 更新
-        index:
-          title: 參與空間私有參與者
-        new:
-          create: 建立
-          title: 新的參與空間私人參與者。
-      participatory_space_private_users_csv_imports:
-        new:
-          csv_upload:
-            title: 請上傳您的 CSV 檔案。
-          destroy:
-            button: 刪除所有私人參與者
-            confirm: 您確定要刪除所有私人參與者嗎？此操作無法撤銷，您將無法恢復它們。
-            empty: 您沒有私人參與者。
-            explanation: 您有 %{count} 位私人參與者。
-            title: 刪除私人參與者
       reminders:
         create:
           error: 在創建提醒時遇到問題。
@@ -773,6 +732,11 @@ zh-TW:
       share_tokens:
         actions:
           destroy: 刪除
+      shared:
+        gallery:
+          add_images: 添加圖案
+          edit_images: 編輯圖片
+          gallery_legend: 新增圖片庫(可選)
       static_page_topics:
         create:
           error: 建立新主題時發生問題。
@@ -786,7 +750,6 @@ zh-TW:
           title: 新增主題
         update:
           error: 更新主題時發生問題。
-          success: 主題已成功更新。
       static_pages:
         create:
           error: 創建新頁面時出現問題。
@@ -810,14 +773,9 @@ zh-TW:
           error: 更新此頁面時出現問題。
           success: 頁面已更新成功.
       titles:
-        area_types: 區域類型
         areas: 區域
         authorization_workflows: 驗證方式
-        impersonations: 參與者管理
-        pages: 頁
         panel: 管理員
-        participants: 參與者
-        scope_types: 範圍類型
         scopes: 範圍
       users:
         create:

data/config/routes.rb

@@ -8,6 +8,10 @@ Decidim::Admin::Engine.routes.draw do
         resources :content_blocks, only: [:edit, :update, :destroy, :create], controller: "organization_homepage_content_blocks"
       end
       resource :external_domain_allowlist, only: [:edit, :update], controller: "organization_external_domain_allowlist"
+
+      member do
+        get :users
+      end
     end
 
     resources :static_pages do

data/decidim-admin.gemspec

@@ -2,12 +2,9 @@
 
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
-# Maintain your gem's version:
-require "decidim/admin/version"
-
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.version = Decidim::Admin.version
+  version = "0.32.0.rc1"
+  s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
   s.license = "AGPL-3.0-or-later"
@@ -19,7 +16,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.3.0"
+  s.required_ruby_version = "~> 3.4.0"
 
   s.name = "decidim-admin"
   s.summary = "Decidim organization administration"
@@ -33,11 +30,11 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "active_link_to", "~> 1.0"
-  s.add_dependency "decidim-core", Decidim::Admin.version
-  s.add_dependency "devise", "~> 4.7"
+  s.add_dependency "decidim-core", version
+  s.add_dependency "devise", ">= 4.7", "< 6.0"
   s.add_dependency "devise-i18n", "~> 1.2"
   s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
 
-  s.add_development_dependency "decidim-dev", Decidim::Admin.version
-  s.add_development_dependency "decidim-participatory_processes", Decidim::Admin.version
+  s.add_development_dependency "decidim-dev", version
+  s.add_development_dependency "decidim-participatory_processes", version
 end

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))