decidim-admin 0.28.5 → 0.29.0.rc1

data/config/locales/th-TH.yml

@@ -97,16 +97,3 @@ th:
           success: ทำลายพื้นที่สำเร็จ
         edit:
           title: แก้ไขพื้นที่
-      categories:
-        edit:
-          update: อัปเดต
-      filters:
-        scope_id_eq:
-          label: ขอบเขต
-      organization_external_domain_whitelist:
-        edit:
-          update: อัปเดต
-      resources:
-        index:
-          headers:
-            scope: ขอบเขต

data/config/locales/tr-TR.yml

@@ -427,7 +427,7 @@ tr:
             plural: Çoğul
         share_token:
           fields:
-            created_at: Düzenlendi
+            created_at: Oluşturulma tarihi
             expires_at: Süre sonu
             last_used_at: Son kullanıldığı zaman
             times_used: Kullanım Sayısı
@@ -532,7 +532,7 @@ tr:
           confirm_deliver: Bu bülteni sunmak istediğinizden emin misiniz? Bu işlem geri alınamaz.
           deliver: Bülten sunun
           followers_help: Listede seçili herhangi bir katılımcı süreci takip eden bütün onaylanmış kullanıcılara haber bülteni gönderir.
-          none: Yok
+          none: Hiçbiri
           participants_help: Listede seçili herhangi bir katılımcı sürece katılmış olan bütün onaylanmış kullanıcılara haber bülteni gönderir.
           recipients_count: Bu haber bülteni <strong id='recipients_count'>%{count}</strong> kullanıcıya gönderilecektir.
           scopes_help: Hesaplarındaki 'İlgi Alanlarım' ayarlarında etkinleştirilmiş herhangi bir seçili kapsam bulunan kullanıcılara haber bülteni gönderir.
@@ -603,9 +603,6 @@ 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.
@@ -717,7 +714,6 @@ tr:
         areas: alanlar
         authorization_workflows: Doğrulama yöntemleri
         dashboard: Pano
-        edit_external_domains: Harici Güvenli Alan
         edit_landing_page: Sayfa İçeriği
         edit_organization_appearance: Ana Sayfayı Düzenleme
         impersonatable_users: Yönetilebilir kullanıcılar

data/config/locales/uk.yml

@@ -326,9 +326,6 @@ uk:
           fields:
             name: Ім'я
             plural: Множина
-        share_token:
-          fields:
-            created_at: 'Створено:'
         static_page:
           fields:
             created_at: 'Створено:'
@@ -428,9 +425,6 @@ 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

@@ -275,6 +275,8 @@ zh-CN:
           values:
             'false': 已发布
             'true': 未发布
+        scope_id_eq:
+          label: 范围
         search_label: 搜索
         search_placeholder:
           name_or_nickname_or_email_cont: 通过电子邮件、名称或昵称搜索 %{collection}。
@@ -538,9 +540,6 @@ 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: 在这种参与空间中添加私人参与者时出现了问题。
@@ -562,6 +561,10 @@ zh-CN:
           title: 编辑权限
         update:
           success: 权限更新成功。
+      resources:
+        index:
+          headers:
+            scope: 范围
       scope_types:
         create:
           error: 创建新的范围类型时出现问题。

data/config/locales/zh-TW.yml

@@ -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: 狀態
@@ -808,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
@@ -84,7 +84,7 @@ Decidim::Admin::Engine.routes.draw do
 
     resources :newsletters, except: [:new, :create] do
       member do
-        post :recipients_count
+        get :recipients_count
         post :send_to_user
         get :preview
         get :select_recipients_to_deliver

data/decidim-admin.gemspec

@@ -10,7 +10,7 @@ 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-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -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/engine.rb

@@ -26,7 +26,6 @@ module Decidim
       end
 
       initializer "decidim_admin.register_icons" do |_app|
-        Decidim.icons.register(name: "lock-2-line", icon: "lock-2-line", category: "system", description: "Block user icon", engine: :admin)
         Decidim.icons.register(name: "layout-masonry-line", icon: "layout-masonry-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "service-line", icon: "service-line", category: "system", description: "", engine: :admin)
         Decidim.icons.register(name: "fullscreen-line", icon: "fullscreen-line", category: "system", description: "", engine: :admin)

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

@@ -17,7 +17,7 @@ shared_examples "inviting participatory space admins" do |check_private_space: t
         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_no_content("Private participants") if participatory_space.respond_to?(:private_space)
         expect(page).to have_content("Moderations")
       end
     end

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

@@ -18,7 +18,6 @@ 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")
     logout :user
   end
 

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

@@ -16,16 +16,16 @@ shared_examples "manage attachment collections examples" do
 
   it "can view an attachment collection details" do
     within "#attachment_collections table" do
-      click_link "Edit"
+      click_on "Edit"
     end
 
-    expect(page).to have_selector("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
-    expect(page).to have_selector("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
-    expect(page).to have_selector("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
+    expect(page).to have_css("input#attachment_collection_name_en[value='#{translated(attachment_collection.name, locale: :en)}']")
+    expect(page).to have_css("input#attachment_collection_weight[value='#{attachment_collection.weight}']")
+    expect(page).to have_css("input#attachment_collection_description_en[value='#{translated(attachment_collection.description, locale: :en)}']")
   end
 
   it "can add attachment collections to a process" do
-    click_link "New attachment folder"
+    click_on "New attachment folder"
 
     within ".new_attachment_collection" do
       fill_in_i18n(
@@ -55,8 +55,8 @@ shared_examples "manage attachment collections examples" do
 
   it "can update an attachment collection" do
     within "#attachment_collections" do
-      within find("tr", text: translated(attachment_collection.name)) do
-        click_link "Edit"
+      within "tr", text: translated(attachment_collection.name) do
+        click_on "Edit"
       end
     end
 
@@ -89,14 +89,14 @@ shared_examples "manage attachment collections examples" do
       end
 
       it "can delete the attachment collection" do
-        within find("tr", text: translated(attachment_collection2.name)) do
-          accept_confirm { click_link "Delete" }
+        within "tr", text: translated(attachment_collection2.name) do
+          accept_confirm { click_on "Delete" }
         end
 
         expect(page).to have_admin_callout("successfully")
 
         within "#attachment_collections table" do
-          expect(page).not_to have_content(translated(attachment_collection2.name))
+          expect(page).to have_no_content(translated(attachment_collection2.name))
         end
       end
     end
@@ -109,8 +109,8 @@ shared_examples "manage attachment collections examples" do
       end
 
       it "cannot delete it" do
-        within find("tr", text: translated(attachment_collection.name)) do
-          expect(page).not_to have_selector("a.action-icon--remove")
+        within "tr", text: translated(attachment_collection.name) do
+          expect(page).to have_no_css("a.action-icon--remove")
         end
       end
     end

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

@@ -19,30 +19,18 @@ shared_examples "manage attachments examples" do
 
     it "can view an attachment details" do
       within "#attachments table" do
-        click_link "Edit"
+        click_on "Edit"
       end
 
-      expect(page).to have_selector("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
-      expect(page).to have_selector("input#attachment_weight[value='#{attachment.weight}']")
+      expect(page).to have_css("input#attachment_title_en[value='#{translated(attachment.title, locale: :en)}']")
+      expect(page).to have_css("input#attachment_description_en[value='#{translated(attachment.description, locale: :en)}']")
+      expect(page).to have_css("input#attachment_weight[value='#{attachment.weight}']")
       expect(page).to have_select("attachment_attachment_collection_id", selected: translated(attachment_collection.name, locale: :en))
-
-      # The image's URL changes every time it is requested because the disk
-      # service generates a unique URL based on the expiry time of the link.
-      # This expiry time is calculated at the time when the URL is requested
-      # which is why it changes every time to different URL. This changes the
-      # JSON encoded file identifier which includes the expiry time as well as
-      # the digest of the URL because the digest is calculated based on the
-      # passed data.
-      filename = attachment.file.blob.filename
-      within %([data-active-uploads] [data-filename="#{filename}"]) do
-        src = page.find("img")["src"]
-        expect(src).to be_blob_url(attachment.file.blob)
-      end
+      expect(page).to have_css("img[src~='#{attachment.url}']")
     end
 
     it "can add attachments without a collection to a process" do
-      click_link "New attachment"
+      click_on "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -75,8 +63,44 @@ shared_examples "manage attachments examples" do
       end
     end
 
+    it "can add attachments with a link to a process" do
+      click_on "New attachment"
+
+      within ".new_attachment" do
+        fill_in_i18n(
+          :attachment_title,
+          "#attachment-title-tabs",
+          en: "Very Important Document",
+          es: "Documento Muy Importante",
+          ca: "Document Molt Important"
+        )
+
+        fill_in_i18n(
+          :attachment_description,
+          "#attachment-description-tabs",
+          en: "This document contains important information",
+          es: "Este documento contiene información importante",
+          ca: "Aquest document conté informació important"
+        )
+      end
+
+      within ".new_attachment" do
+        find_by_id("trigger-link").click
+
+        fill_in "attachment[link]", with: "https://example.com/docs.pdf"
+
+        find("*[type=submit]").click
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      within "#attachments table" do
+        expect(page).to have_text("Very Important Document")
+      end
+    end
+
     it "can add attachments within a collection to a process" do
-      click_link "New attachment"
+      click_on "New attachment"
 
       within ".new_attachment" do
         fill_in_i18n(
@@ -114,9 +138,9 @@ shared_examples "manage attachments examples" do
 
     it "can remove an attachment from a collection" do
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
+        within "tr", text: translated(attachment.title) do
           expect(page).to have_text(translated(attachment_collection.name, locale: :en))
-          click_link "Edit"
+          click_on "Edit"
         end
       end
 
@@ -127,26 +151,26 @@ shared_examples "manage attachments examples" do
       end
 
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
-          expect(page).not_to have_text(translated(attachment_collection.name, locale: :en))
+        within "tr", text: translated(attachment.title) do
+          expect(page).to have_no_text(translated(attachment_collection.name, locale: :en))
         end
       end
     end
 
     it "can delete an attachment from a process" do
-      within find("tr", text: translated(attachment.title)) do
-        accept_confirm { click_link "Delete" }
+      within "tr", text: translated(attachment.title) do
+        accept_confirm { click_on "Delete" }
       end
 
       expect(page).to have_admin_callout("successfully")
 
-      expect(page).not_to have_content(translated(attachment.title, locale: :en))
+      expect(page).to have_no_content(translated(attachment.title, locale: :en))
     end
 
     it "can update an attachment" do
       within "#attachments" do
-        within find("tr", text: translated(attachment.title)) do
-          click_link "Edit"
+        within "tr", text: translated(attachment.title) do
+          click_on "Edit"
         end
       end
 

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

@@ -10,17 +10,17 @@ shared_examples "manage categories examples" do
 
   it "can view a category detail" do
     within "#categories table" do
-      click_link translated(category.name, locale: :en)
+      click_on translated(category.name, locale: :en)
     end
 
-    expect(page).to have_selector("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
-    expect(page).to have_selector("input#category_weight[value='#{category.weight}']")
+    expect(page).to have_css("input#category_name_en[value='#{translated(category.name, locale: :en)}']")
+    expect(page).to have_css("input#category_weight[value='#{category.weight}']")
 
     expect(page).to have_select(id: "category_parent_id")
   end
 
   it "creates a new category" do
-    click_link "New category"
+    click_on "New category"
 
     within ".new_category" do
       fill_in_i18n(
@@ -44,8 +44,8 @@ shared_examples "manage categories examples" do
 
   it "updates a category" do
     within "#categories" do
-      within find("tr", text: translated(category.name)) do
-        click_link "Edit"
+      within "tr", text: translated(category.name) do
+        click_on "Edit"
       end
     end
 
@@ -79,14 +79,14 @@ shared_examples "manage categories examples" do
         end
 
         it "deletes a category" do
-          within find("tr", text: translated(category2.name)) do
-            accept_confirm { click_link "Delete" }
+          within "tr", text: translated(category2.name) do
+            accept_confirm { click_on "Delete" }
           end
 
           expect(page).to have_admin_callout("successfully")
 
           within "#categories table" do
-            expect(page).not_to have_content(translated(category2.name))
+            expect(page).to have_no_content(translated(category2.name))
           end
         end
       end
@@ -99,8 +99,8 @@ shared_examples "manage categories examples" do
         end
 
         it "deletes a category" do
-          within find("tr", text: translated(category2.name)) do
-            accept_confirm { click_link "Delete" }
+          within "tr", text: translated(category2.name) do
+            accept_confirm { click_on "Delete" }
           end
 
           expect(page).to have_admin_callout("problem deleting")
@@ -119,8 +119,8 @@ shared_examples "manage categories examples" do
       it "cannot delete it" do
         visit current_path
 
-        within find("tr", text: translated(category.name)) do
-          expect(page).not_to have_selector("a.action-icon--remove")
+        within "tr", text: translated(category.name) do
+          expect(page).to have_no_css("a.action-icon--remove")
         end
       end
     end