decidim-admin 0.26.0 → 0.27.0.rc1

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -123,6 +124,10 @@ sv:
         file: Fil
     errors:
       models:
+        newsletter:
+          attributes:
+            base:
+              at_least_one_space: Välj minst ett deltagarutrymme
         organization:
           attributes:
             official_img_footer:
@@ -256,6 +261,8 @@ sv:
         update:
           error: Det gick inte att uppdatera bilagan.
           success: Bilagan har uppdaterats.
+      attachments_privacy_warning:
+        message: Var försiktig när du arbetar med bilagor i ett privat utrymme. En deltagare skulle kunna dela detta dokument utanför plattformen.
       autocomplete:
         no_results: Hittade inga resultat
         search_prompt: Sök genom att skriva minst tre tecken
@@ -338,7 +345,7 @@ sv:
       dashboard:
         show:
           view_more_logs: Visa fler loggar
-          welcome: Välkommen till Decidims administratörspanel.
+          welcome: Välkommen till Adminpanelen.
       domain_whitelist:
         form:
           domain_too_short: Domänen är för kort
@@ -521,7 +528,7 @@ sv:
         area_types: Typer av område
         areas: Områden
         configuration: Konfiguration
-        dashboard: Kontrollpanel
+        dashboard: Adminpanel
         external_domain_whitelist: Tillåtna externa domäner
         help_sections: Hjälpavsnitt
         homepage: Hemsida
@@ -532,7 +539,7 @@ sv:
         reported_users: Rapporterade användare
         scope_types: Omfattningstyper
         scopes: Omfattningar
-        settings: inställningar
+        settings: Inställningar
         static_pages: Sidor
         user_groups: Grupper
         users: Deltagare
@@ -831,9 +838,23 @@ sv:
           invalid: Det gick inte att läsa CSV-filen.
           success: CSV-filen har skickats in och vi skickar inbjudningar via e-brev till deltagarna. Det kan ta en stund.
         new:
+          destroy:
+            button: Radera alla privata deltagare
+            confirm: Är du säker på att du vill radera alla privata deltagare? Den här åtgärden kan inte ångras.
+            empty: Det finns inga privata deltagare.
+            explanation: Det finns %{count} privata deltagare.
+            title: Radera privata deltagare
           explanation: 'Skicka in din CSV-fil. Den måste ha två kolumner över de användare som du vill lägga till deltagarutrymmet, utan rubriker, med e-postadressen i den första kolumnen i filen och namnet i den sista kolumnen i filen (e-post, namn). Undvik olämpliga karaktärer som `<>?%&^*#@()[]=+:;"{}\|` i användarnamn.'
           title: Skicka CSV-fil
           upload: Skicka
+      reminders:
+        create:
+          error: Det gick inte att skapa påminnelser.
+          success:
+            one: "%{count} användare kommer påminnas."
+            other: "%{count} användare kommer påminnas."
+        new:
+          submit: Skicka
       resource_permissions:
         edit:
           submit: Skicka in
@@ -891,6 +912,7 @@ sv:
         gallery:
           add_images: Lägg till bilder
           delete_image: Ta bort bild
+          edit_images: Redigera bilder
           gallery_legend: Lägg till ett bildgalleri (Frivilligt)
       static_page_topics:
         create:
@@ -940,7 +962,7 @@ sv:
         area_types: Områdestyper
         areas: Områden
         authorization_workflows: Verifieringsmetoder
-        dashboard: Kontrollpanel
+        dashboard: Adminpanel
         impersonatable_users: Hanterbara deltagare
         impersonations: Deltagarhantering
         metrics: Metrik
@@ -951,7 +973,7 @@ sv:
         static_pages: Sidor
         statistics: Aktivitet
         user_groups: Grupper
-        users: Deltagare
+        users: Administratörer
       user_group:
         csv_verify:
           invalid: Det gick inte att läsa CSV-filen.
@@ -987,7 +1009,7 @@ sv:
           role: Roll
         new:
           create: Bjud in
-          title: Bjud in användaren som administratör
+          title: Bjud in ny administratör
       users_statistics:
         users_count:
           admins: Administratörer
@@ -1038,7 +1060,7 @@ sv:
             hidden_at: Dold
             participatory_space: Deltagarutrymme
             report_count: Antal
-            reportable_id: Id
+            reportable_id: ID
             reportable_type: Typ
             reported_content_url: Rapporterad innehållsadress
             reports: Rapporter
@@ -1059,6 +1081,6 @@ sv:
         newsletters:
           title: Nyhetsbrev
         settings:
-          title: inställningar
+          title: Inställningar
         users:
           title: Deltagare

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -296,7 +297,6 @@ tr:
       dashboard:
         show:
           view_more_logs: Daha fazla günlükleri görüntüle
-          welcome: Decidim Yönetici Paneline hoş geldiniz.
       exports:
         export_as: "%{name} olarak %{export_format}"
         formats:
@@ -801,7 +801,6 @@ tr:
         static_pages: Sayfalar
         statistics: Aktivite
         user_groups: Kullanıcı Grupları
-        users: Katılımcılar
       user_group:
         csv_verify:
           invalid: CSV dosyasını okurken bir hata oluştu.
@@ -837,7 +836,6 @@ tr:
           role: Rol
         new:
           create: Davet et
-          title: Kullanıcıyı yönetici olarak davet et
       users_statistics:
         users_count:
           admins: Yöneticiler
@@ -874,7 +872,6 @@ tr:
             hidden_at: Gizli
             participatory_space: Katılımcı alanı
             report_count: saymak
-            reportable_id: Id
             reportable_type: Türü
             reported_content_url: Raporlanan içerik URL'si
             reports: Raporlar

data/config/locales/uk.yml

@@ -1,3 +1,4 @@
+---
 uk:
   activemodel:
     attributes:
@@ -223,7 +224,6 @@ uk:
       dashboard:
         show:
           view_more_logs: Переглянути інші журнали
-          welcome: Ласкаво просимо до адмін-панелі Десідім!
       exports:
         export_as: "%{name} як %{export_format}"
         notice: Зараз відбувається збереження у вигляді файлу. Ви отримаєте електронного листа після його завершення.
@@ -557,7 +557,6 @@ uk:
           role: Роль
         new:
           create: Запросити
-          title: Запросити учасника в якості адміністратора
       users_statistics:
         users_count:
           admins: Адміністратори

data/config/locales/val-ES.yml

@@ -1,3 +1,4 @@
+---
 val:
   decidim:
     admin:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -273,7 +274,6 @@ zh-CN:
       dashboard:
         show:
           view_more_logs: 查看更多日志
-          welcome: 欢迎来到Decidim管理面板
       exports:
         export_as: "%{name} 为 %{export_format}"
         formats:
@@ -731,7 +731,6 @@ zh-CN:
         static_pages: 页 次
         statistics: 活动
         user_groups: 群組
-        users: 参加者
       user_group:
         csv_verify:
           invalid: 读取CSV文件时出现问题。
@@ -767,7 +766,6 @@ zh-CN:
           role: 作用
         new:
           create: 邀请
-          title: 邀请参与者作为管理员
       users_statistics:
         users_count:
           admins: 管理员

data/config/locales/zh-TW.yml

@@ -1 +1,2 @@
+---
 zh-TW:

data/lib/decidim/admin/engine.rb

@@ -7,7 +7,6 @@ require "devise"
 require "devise-i18n"
 require "decidim/core"
 require "foundation_rails_helper"
-require "rectify"
 require "doorkeeper"
 require "doorkeeper-i18n"
 require "hashdiff"

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

@@ -10,6 +10,8 @@ module Decidim
       # You can also use the ImporterFactory class to create an Importer
       # instance.
       class Importer
+        include Decidim::ProcessesFileLocally
+
         delegate :errors, to: :verifier
 
         # Public: Initializes an Importer.
@@ -72,15 +74,15 @@ module Decidim
           return @collection_data if @collection_data
 
           @collection_data = []
-          reader.new(file).read_rows do |rowdata, index|
-            if index.zero?
-              @data_headers = rowdata.map { |d| d.to_s.to_sym }
-            else
-              @collection_data << Hash[
-                rowdata.each_with_index.map do |val, ind|
+          process_file_locally(file) do |file_path|
+            reader.new(file_path).read_rows do |rowdata, index|
+              if index.zero?
+                @data_headers = rowdata.map { |d| d.to_s.to_sym }
+              else
+                @collection_data << rowdata.each_with_index.to_h do |val, ind|
                   [@data_headers[ind], val]
                 end
-              ]
+              end
             end
           end
 

data/lib/decidim/admin/import/readers/json.rb

@@ -39,7 +39,7 @@ module Decidim
             columns = data.shift
             json_data = data.map do |row|
               deep_hash(
-                columns.each_with_index.map { |col, ind| [col, row[ind]] }.to_h
+                columns.each_with_index.to_h { |col, ind| [col, row[ind]] }
               )
             end
 

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

@@ -7,6 +7,7 @@ module Decidim
     shared_examples_for "CreateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "attachment_collection" => {
@@ -27,11 +28,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, collection_for) }
+        let(:command) { described_class.new(form, collection_for, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +56,18 @@ module Decidim
               command.call
             end.to change(collection_for.attachment_collections, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -7,15 +7,13 @@ module Decidim
     shared_examples_for "CreateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
               "name_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_en" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_es" => Decidim::Faker::Localized.paragraph(sentence_count: 3),
-              "description_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
+              "name_ca" => Decidim::Faker::Localized.paragraph(sentence_count: 3)
             }
           }
         end
@@ -27,11 +25,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(form, participatory_space) }
+        let(:command) { described_class.new(form, participatory_space, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -55,6 +53,18 @@ module Decidim
               command.call
             end.to change(participatory_space.categories, :count).by(1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:create, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("create")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -7,8 +7,9 @@ module Decidim
     shared_examples_for "DestroyCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
-        let(:command) { described_class.new(category) }
+        let(:command) { described_class.new(category, user) }
 
         describe "when the category is not present" do
           let(:category) { nil }
@@ -28,6 +29,21 @@ module Decidim
           end
         end
 
+        context "when the category is a subcategory" do
+          let!(:parent_category) { create :category, participatory_space: participatory_space }
+
+          before do
+            category.parent = parent_category
+          end
+
+          it "destroy the category" do
+            category
+            expect do
+              command.call
+            end.to change(Category, :count).by(-1)
+          end
+        end
+
         describe "when the data is valid" do
           it "broadcasts ok" do
             expect { command.call }.to broadcast(:ok)
@@ -39,6 +55,18 @@ module Decidim
               command.call
             end.to change(Category, :count).by(-1)
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:delete, category, user)
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("delete")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -7,6 +7,7 @@ module Decidim
     shared_examples_for "UpdateAttachmentCollection command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:attachment_collection) { create(:attachment_collection, collection_for: collection_for) }
         let(:form_params) do
           {
@@ -28,11 +29,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(attachment_collection, form) }
+        let(:command) { described_class.new(attachment_collection, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +59,18 @@ module Decidim
 
             expect(translated(attachment_collection.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::AttachmentCollection, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -7,16 +7,14 @@ module Decidim
     shared_examples_for "UpdateCategory command" do
       describe "call" do
         let(:organization) { create(:organization) }
+        let(:user) { create(:user, organization: organization) }
         let(:category) { create(:category, participatory_space: participatory_space) }
         let(:form_params) do
           {
             "category" => {
               "name_en" => "New title",
               "name_es" => "Title",
-              "name_ca" => "Title",
-              "description_en" => "Description",
-              "description_es" => "Description",
-              "description_ca" => "Description"
+              "name_ca" => "Title"
             }
           }
         end
@@ -28,11 +26,11 @@ module Decidim
             current_organization: organization
           )
         end
-        let(:command) { described_class.new(category, form) }
+        let(:command) { described_class.new(category, form, user) }
 
         describe "when the form is not valid" do
           before do
-            expect(form).to receive(:invalid?).and_return(true)
+            allow(form).to receive(:invalid?).and_return(true)
           end
 
           it "broadcasts invalid" do
@@ -58,6 +56,18 @@ module Decidim
 
             expect(translated(category.name)).to eq("New title")
           end
+
+          it "traces the action", versioning: true do
+            expect(Decidim.traceability)
+              .to receive(:perform_action!)
+              .with(:update, Decidim::Category, user, {})
+              .and_call_original
+
+            expect { command.call }.to change(Decidim::ActionLog, :count)
+            action_log = Decidim::ActionLog.last
+            expect(action_log.action).to eq("update")
+            expect(action_log.version).to be_present
+          end
         end
       end
     end

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

@@ -99,7 +99,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Invite accepted", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -110,7 +110,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Invite accepted", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -123,7 +123,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Ever logged in", "Yes")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -134,7 +134,7 @@ shared_examples "filterable participatory space user roles" do
         apply_filter("Ever logged in", "No")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end

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

@@ -7,7 +7,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation sent", "Not sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -18,7 +18,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation sent", "Sent")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -31,7 +31,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation accepted", "Not accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_2.name)
+          expect(page).to have_content(invited_user2.name)
           expect(page).to have_css("tr", count: 1)
         end
       end
@@ -42,7 +42,7 @@ shared_examples "filterable participatory space users" do
         apply_filter("Invitation accepted", "Accepted")
 
         within ".stack tbody" do
-          expect(page).to have_content(invited_user_1.name)
+          expect(page).to have_content(invited_user1.name)
           expect(page).to have_css("tr", count: 1)
         end
       end

data/lib/decidim/admin/test/forms/category_form_examples.rb

@@ -21,13 +21,6 @@ module Decidim
           ca: "Nom"
         }
       end
-      let(:description) do
-        {
-          en: "Description",
-          es: "Descripción",
-          ca: "Descripció"
-        }
-      end
       let(:parent_id) { nil }
       let(:attributes) do
         {
@@ -35,10 +28,7 @@ module Decidim
             "name_en" => name[:en],
             "name_es" => name[:es],
             "name_ca" => name[:ca],
-            "parent_id" => parent_id,
-            "description_en" => description[:en],
-            "description_es" => description[:es],
-            "description_ca" => description[:ca]
+            "parent_id" => parent_id
           }
         }
       end
@@ -59,16 +49,6 @@ module Decidim
         it { is_expected.to be_invalid }
       end
 
-      context "when some language in description is missing" do
-        let(:description) do
-          {
-            ca: "Descripció"
-          }
-        end
-
-        it { is_expected.to be_invalid }
-      end
-
       context "when the parent_id is set" do
         let!(:category) { create :category, participatory_space: participatory_space }
 

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

@@ -48,8 +48,11 @@ shared_examples "manage attachments examples" do
           es: "Este documento contiene información importante",
           ca: "Aquest document conté informació important"
         )
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
 
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      within ".new_attachment" do
         find("*[type=submit]").click
       end
 
@@ -81,7 +84,11 @@ shared_examples "manage attachments examples" do
         )
 
         select translated(attachment_collection.name, locale: :en), from: "attachment_attachment_collection_id"
-        attach_file :attachment_file, Decidim::Dev.asset("Exampledocument.pdf")
+      end
+
+      dynamically_attach_file(:attachment_file, Decidim::Dev.asset("Exampledocument.pdf"))
+
+      within ".new_attachment" do
         find("*[type=submit]").click
       end