decidim-admin 0.31.5 → 0.32.0.rc2

data/config/locales/zh-CN.yml

@@ -66,11 +66,6 @@ zh-CN:
         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: 名称
@@ -230,10 +225,6 @@ zh-CN:
           values:
             'false': 已授权
             'true': 未正式授权
-        participatory_space_private_users:
-          user_invitation_sent_at_not_null:
-            values:
-              'false': 未发送
         private_space_eq:
           label: 非公开的
           values:
@@ -281,7 +272,6 @@ zh-CN:
           impersonate: 仿冒的
           impersonate_existing_managed_user: 管理参与者 "%{name}"
           impersonate_existing_user: 管理参与者 "%{name}"
-          impersonate_new_managed_user: 管理新参与者
       managed_users:
         promotion:
           error: 在促进管理下的参与者方面存在问题。
@@ -290,6 +280,10 @@ zh-CN:
           new:
             explanation: 管理下的参与者可以提升到标准参与者。 这意味着他们将被邀请到应用程序中，您将无法再次管理他们。 邀请的参与者将收到一封电子邮件来接受您的邀请。
             promote: 升级
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: 上传您的 CSV 文件
       menu:
         admin_log: 管理员活动日志
         admins: 管理员
@@ -343,8 +337,6 @@ zh-CN:
             sent_to: 发送至
             subject: 议 题
           name: 通讯
-        participatory_space_private_user:
-          name: 参与性空间私人参与者
         scope:
           fields:
             name: 名称
@@ -423,7 +415,6 @@ zh-CN:
           title: 选择要交付的收件人
           warning: "<strong>注意:</strong> 这份通讯将只发送给已激活 <em>我想在其通知设置中接收新闻简讯</em>。"
         show:
-          preview: 预览
           select_recipients_to_deliver: 选择要交付的收件人
           subject: 议 题
         update:
@@ -465,24 +456,6 @@ zh-CN:
         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 文件
       resource_permissions:
         edit:
           submit: 提交
@@ -536,7 +509,6 @@ zh-CN:
           title: 新主题
         update:
           error: 更新这个主题时出现问题。
-          success: 主题更新成功
       static_pages:
         create:
           error: 创建新页面时出现问题。
@@ -557,13 +529,8 @@ zh-CN:
         update:
           error: 更新此页面时出现问题。
       titles:
-        area_types: 区域类型
         areas: 地区
         authorization_workflows: 核查方法
-        impersonations: 参与者管理
-        pages: 页 次
-        participants: 参加者
-        scope_types: 范围类型
         scopes: 范围
       users:
         create:

data/config/locales/zh-TW.yml

@@ -47,7 +47,6 @@ zh-TW:
         default_locale: 預設語言
         description: 說明
         enable_omnipresent_banner: 顯示全域廣告
-        enable_participatory_space_filters: 啟用參與空間過濾器
         facebook_handler: Facebook 處理器
         favicon: 圖示
         force_authentication: 強制認證
@@ -86,11 +85,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: 名稱
@@ -131,10 +125,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:
@@ -172,8 +162,6 @@ zh-TW:
         import: 匯入
         newsletter:
           new: 新電子報
-        participatory_space_private_user:
-          new: 新參與空間私有使用者
         per_page: 每頁
         share: 分享
         user:
@@ -292,7 +280,6 @@ zh-TW:
           title: '新增元件： %{name}'
         publish:
           success: 這個元件已經成功發佈
-        title: 组件
         unpublish:
           success: 這個元件已經成功取消發佈
         update:
@@ -352,10 +339,6 @@ zh-TW:
           values:
             'false': 官方化
             'true': 非官方化
-        participatory_space_private_users:
-          user_invitation_sent_at_not_null:
-            values:
-              'false': 未發送
         private_space_eq:
           label: 私人的
           values:
@@ -418,7 +401,6 @@ zh-TW:
           impersonate: 模擬
           impersonate_existing_managed_user: 管理參與者 "%{name}"
           impersonate_existing_user: 管理參與者 "%{name}"
-          impersonate_new_managed_user: 管理新參與者
       imports:
         and: 和
         data_errors:
@@ -468,6 +450,10 @@ zh-TW:
           new:
             explanation: 受管理的參與者可以晉升為標準參與者。這意味著他們將受邀加入應用程式，您將無法再對其進行管理。被邀請的參與者將收到一封電子郵件，以接受您的邀請。
             promote: 推廣
+      members_csv_imports:
+        new:
+          csv_upload:
+            title: 請上傳您的 CSV 檔案。
       menu:
         admin_log: 管理員活動日誌
         admins: 管理員
@@ -525,8 +511,6 @@ zh-TW:
             sent_to: 發送至
             subject: 主旨
           name: 電子報
-        participatory_space_private_user:
-          name: 參與空間私有參與者
         scope:
           fields:
             name: 名稱
@@ -649,7 +633,6 @@ zh-TW:
         send:
           no_recipients: 沒有選擇收件人.
         show:
-          preview: 預覽
           select_recipients_to_deliver: 選擇要傳送的收件人
           subject: 主旨
         update:
@@ -703,30 +686,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: 在創建提醒時遇到問題。
@@ -792,7 +751,6 @@ zh-TW:
           title: 新增主題
         update:
           error: 更新主題時發生問題。
-          success: 主題已成功更新。
       static_pages:
         create:
           error: 創建新頁面時出現問題。
@@ -816,14 +774,9 @@ zh-TW:
           error: 更新此頁面時出現問題。
           success: 頁面已更新成功.
       titles:
-        area_types: 區域類型
         areas: 區域
         authorization_workflows: 驗證方式
-        impersonations: 參與者管理
-        pages: 頁
         panel: 管理員
-        participants: 參與者
-        scope_types: 範圍類型
         scopes: 範圍
       users:
         create:

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.rc2"
+  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/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))