decidim-admin 0.28.0 → 0.28.2

data/config/locales/tr-TR.yml

@@ -131,6 +131,7 @@ tr:
       actions:
         add: Eklemek
         browse: Araştır
+        manage: yönetme
         per_page: Sayfa başına
         permissions: İzinler
         reject: reddetmek
@@ -200,6 +201,7 @@ tr:
       block_user:
         new:
           action: Hesabı engelle ve uyarı mesjı gönder
+          already_reported_html: Bu işleme devam ederek katılımcıların tüm içeriklerini de gizleyebilirsiniz.
           justification: Gerekçe
           title: '%{name} Kullanıcısını Engelle'
       categories:
@@ -365,6 +367,7 @@ tr:
         help_sections: Yardım bölümleri
         homepage: Anasayfa
         impersonations: impersonations
+        manage: yönetme
         moderation: Küresel denetimler
         newsletters: Haber bültenleri
         participants: Katılımcılar
@@ -601,6 +604,9 @@ tr:
             layout_appearance_title: Düzen görünümünü düzenle
             preview: Önizleme
           omnipresent_banner_appearance_title: Her yerde bulunan banner'ı düzenle
+      organization_external_domain_whitelist:
+        edit:
+          update: Güncelleştirme
       participatory_space_private_users:
         create:
           error: Bu katılımcı alan için özel bir kullanıcı eklenirken bir hata oluştu.
@@ -800,3 +806,8 @@ tr:
   errors:
     messages:
       invalid_json: Geçersiz JSON
+  layouts:
+    decidim:
+      admin:
+        global_moderations:
+          title: Küresel denetimler

data/config/locales/uk.yml

@@ -92,6 +92,7 @@ uk:
       actions:
         add: Додати
         browse: Переглянути
+        manage: Керувати
         permissions: Права
         reject: Відхилити
         verify: Підтвердити
@@ -272,6 +273,7 @@ uk:
         configuration: Конфігурація
         homepage: Домашня сторінка
         impersonations: Виступи в ролі учасника
+        manage: Керувати
         newsletters: Розсилання новин
         scope_types: Різновиди обсягу
         scopes: Обсяги
@@ -423,6 +425,9 @@ uk:
           images:
             layout_appearance_title: Редагувати зовнішній вигляд шаблону
           omnipresent_banner_appearance_title: Редагувати всюдисущий банер
+      organization_external_domain_whitelist:
+        edit:
+          update: Оновити
       participatory_space_private_users:
         create:
           error: При спробі додати приватного учасника до цього простору співучасті сталася помилка.

data/config/locales/zh-CN.yml

@@ -125,6 +125,7 @@ zh-CN:
       actions:
         add: 添加
         browse: 浏览
+        manage: 管理
         per_page: 每页
         permissions: 权限
         reject: 拒绝
@@ -336,6 +337,7 @@ zh-CN:
         help_sections: 帮助部分
         homepage: 主页
         impersonations: 影像
+        manage: 管理
         newsletters: 新闻通讯
         participants: 参加者
         scope_types: 范围类型
@@ -538,6 +540,9 @@ zh-CN:
             layout_appearance_title: 编辑布局外观
             preview: 预览
           omnipresent_banner_appearance_title: Edit omnipresent banner
+      organization_external_domain_whitelist:
+        edit:
+          update: 更新
       participatory_space_private_users:
         create:
           error: 在这种参与空间中添加私人参与者时出现了问题。

data/config/locales/zh-TW.yml

@@ -182,6 +182,7 @@ zh-TW:
         export: 全部匯出
         export-selection: 匯出選擇
         import: 匯入
+        manage: 管理
         newsletter:
           new: 新電子報
         participatory_space_private_user:
@@ -281,7 +282,6 @@ zh-TW:
       block_user:
         new:
           action: 封鎖帳號並且發送理由
-          already_reported_html: 繼續操作也會隱藏所有參與者內容， <a href="%{link}">封鎖這個帳號</a>。
           description: 封鎖一個使用者會讓他的帳號無法使用，可以在此提供建議說明如何取消封鎖
           justification: 理由
           title: 封鎖使用者 %{name}
@@ -356,15 +356,11 @@ zh-TW:
         user_name: 使用者
       dashboard:
         pending_moderations:
-          anouncement:
-            other: 有 %{count} 個操作等待中
           goto_moderation: 前往全域管理
           title: 等待的操作
         show:
           view_more_logs: 檢視更多記錄
       domain_whitelist:
-        form:
-          domain_too_short: 網址太短
         update:
           error: 網址白名單更新失敗
           success: 網址白名單更新成功.
@@ -543,12 +539,13 @@ zh-TW:
         appearance: 外觀
         area_types: 區域類型
         areas: 區域
+        components: 组件
         configuration: 配置
         content: 被檢舉的內容
-        external_domain_whitelist: 允許的外部域名
         help_sections: 幫助部分
         homepage: 首頁
         impersonations: 模擬登錄
+        manage: 管理
         moderation: 全局審查
         newsletters: 電子報
         participants: 參與者
@@ -815,11 +812,6 @@ zh-TW:
       organization_external_domain_whitelist:
         edit:
           update: 更新
-        external_domain:
-          down: 向下
-          external_domain: 外部網域
-          remove: 移除
-          up: 往上
         form:
           add: 新增到白名單
           title: 外部域名白名單

data/decidim-admin.gemspec

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+$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
+  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"
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim-admin"
+  s.summary = "Decidim organization administration"
+  s.description = "Organization administration to manage a single organization."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  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 "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
+end

data/lib/decidim/admin/engine.rb

@@ -57,39 +57,15 @@ module Decidim
         Mime::Type.register Decidim::Admin::Import::Readers::XLSX::MIME_TYPE, :xlsx
       end
 
-      initializer "decidim_admin.global_moderation_menu" do
+      initializer "decidim_admin.menu" do
         Decidim::Admin::Menu.register_admin_global_moderation_menu!
-      end
-
-      initializer "decidim_admin.workflows_menu" do
         Decidim::Admin::Menu.register_workflows_menu!
-      end
-
-      initializer "decidim_admin.impersonate_menu" do
         Decidim::Admin::Menu.register_impersonate_menu!
-      end
-
-      initializer "decidim_admin.static_pages_menu" do
         Decidim::Admin::Menu.register_admin_static_pages_menu!
-      end
-
-      initializer "decidim_admin.user_menu" do
         Decidim::Admin::Menu.register_admin_user_menu!
-      end
-
-      initializer "decidim_admin.scopes_menu" do
         Decidim::Admin::Menu.register_admin_scopes_menu!
-      end
-
-      initializer "decidim_admin.areas_menu" do
         Decidim::Admin::Menu.register_admin_areas_menu!
-      end
-
-      initializer "decidim_admin.settings_menu" do
         Decidim::Admin::Menu.register_admin_settings_menu!
-      end
-
-      initializer "decidim_admin.menu" do
         Decidim::Admin::Menu.register_admin_menu!
       end
 

data/lib/decidim/admin/menu.rb

@@ -8,7 +8,7 @@ module Decidim
           moderations_count = Decidim::Admin::ModerationStats.new(current_user).count_content_moderations
 
           caption = I18n.t("menu.content", scope: "decidim.admin")
-          caption += content_tag(:span, moderations_count, class: moderations_count.zero? ? "component-counter component-counter--off" : "component-counter")
+          caption += content_tag(:span, moderations_count, class: "component-counter")
 
           menu.add_item :moderations,
                         caption.html_safe,
@@ -20,7 +20,7 @@ module Decidim
           user_reports = Decidim::Admin::ModerationStats.new(current_user).count_user_pending_reports
 
           caption = I18n.t("menu.reported_users", scope: "decidim.admin")
-          caption += content_tag(:span, user_reports, class: user_reports.zero? ? "component-counter component-counter--off" : "component-counter")
+          caption += content_tag(:span, user_reports, class: "component-counter")
 
           menu.add_item :moderated_users,
                         caption.html_safe,
@@ -168,13 +168,22 @@ module Decidim
                         decidim_admin.scopes_path,
                         icon_name: "price-tag-3-line",
                         position: 1.3,
-                        if: allowed_to?(:read, :scope)
+                        if: allowed_to?(:read, :scope),
+                        active: [%w(
+                          decidim/admin/scopes
+                          decidim/admin/scope_types
+                        ), []]
+
           menu.add_item :areas,
                         I18n.t("menu.areas", scope: "decidim.admin"),
                         decidim_admin.areas_path,
                         icon_name: "layout-masonry-line",
                         position: 1.5,
-                        if: allowed_to?(:read, :area)
+                        if: allowed_to?(:read, :area),
+                        active: [%w(
+                          decidim/admin/areas
+                          decidim/admin/area_types
+                        ), []]
 
           menu.add_item :help_sections,
                         I18n.t("menu.help_sections", scope: "decidim.admin"),

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/destroy_category_examples.rb

@@ -19,6 +19,15 @@ module Decidim
           end
         end
 
+        context "when the category is being used by a resource" do
+          let(:component) { create(:dummy_component, participatory_space:) }
+          let!(:resource) { create(:dummy_resource, component:, category:) }
+
+          it "broadcasts invalid" do
+            expect { command.call }.to broadcast(:invalid)
+          end
+        end
+
         context "when the category is not empty" do
           let!(:subcategory) { create :subcategory, parent: category }
 

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).not_to have_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