decidim-admin 0.26.2 → 0.27.0.rc2

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -172,8 +173,6 @@ ro:
         permissions: Drepturi
         reject: Respinge
         share: Distribuie
-        user:
-          new: Utilizator nou
         verify: Verifică
       admin_terms_of_use:
         accept:
@@ -256,6 +255,8 @@ ro:
         update:
           error: A apărut o eroare la actualizarea acestui atașament.
           success: Atașamentul a fost actualizat cu succes.
+      attachments_privacy_warning:
+        message: Fiți precaut atunci când lucrați cu atașamente într-un spațiu privat. Orice participant poate distribui acest document altora.
       autocomplete:
         no_results: Nu a fost găsit niciun rezultat
         search_prompt: Tastați cel puțin trei caractere pentru a căuta
@@ -338,7 +339,7 @@ ro:
       dashboard:
         show:
           view_more_logs: Afișează mai multe înregistrări
-          welcome: Bine ați venit în Panoul de administrare Decidim.
+          welcome: Bine ați venit în Panoul de administrare.
       domain_whitelist:
         form:
           domain_too_short: Domeniul e prea scurt
@@ -838,6 +839,9 @@ ro:
           explanation: 'Încărcă fişierul tău CSV. Trebuie să aibă două coloane cu e-mail în prima coloană a fișierului și numele în ultima coloană (e-mail, numele) pentru utilizatorii pe care doriţi să îi adăugaţi în spaţiul participativ, fără antet. Evită folosirea caracterelor invalide, cum ar fi `<>?%&^*#@()[]=+:;"{}\<unk> ` în numele utilizatorului.'
           title: Încarcă fișierul tău CSV
           upload: Încarcă
+      reminders:
+        new:
+          submit: Trimite
       resource_permissions:
         edit:
           submit: Trimite
@@ -955,7 +959,6 @@ ro:
         static_pages: Pagini
         statistics: Activitate
         user_groups: Grupuri
-        users: Participanți
       user_group:
         csv_verify:
           invalid: A apărut o problemă la citirea fișierului CSV.
@@ -991,7 +994,6 @@ ro:
           role: Rol
         new:
           create: Invită
-          title: Invită participantul ca administrator
       users_statistics:
         users_count:
           admins: Administratori

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   activemodel:
     attributes:
@@ -249,7 +250,6 @@ ru:
       dashboard:
         show:
           view_more_logs: Просмотреть другие журналы
-          welcome: Добро пожаловать в админ-панель Десидим!
       exports:
         export_as: "%{name} как %{export_format}"
         notice: Идет сохранение в виде файла. Вы получите электронное письмо, когда оно будет завершено.
@@ -575,7 +575,6 @@ ru:
         scopes: Охваты
         static_pages: Страницы
         user_groups: Группы участников
-        users: Участники
       user_group:
         reject:
           invalid: При отказе от этой группы участников произошла ошибка.
@@ -606,7 +605,6 @@ ru:
           role: Роль
         new:
           create: Пригласить
-          title: Пригласить участника в качестве администратора
       users_statistics:
         users_count:
           admins: Администраторы

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -264,7 +265,6 @@ sk:
       dashboard:
         show:
           view_more_logs: Zobraziť viac logov
-          welcome: Vitajte v Administrátorskom Paneli Decidim.
       exports:
         export_as: "%{name} ako %{export_format}"
         notice: Váš export práve prebieha. Obdržíte e-mail po dokončení.
@@ -688,7 +688,6 @@ sk:
         static_pages: Stránky
         statistics: Aktivita
         user_groups: Skupiny
-        users: Účastníci
       user_group:
         csv_verify:
           invalid: Vyskytol sa problém s čítaním súboru CSV.
@@ -724,7 +723,6 @@ sk:
           role: Rola
         new:
           create: Pozvať
-          title: Pozvať účastníka ako administrátora
       users_statistics:
         users_count:
           admins: Administrátori

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/sr-CS.yml

@@ -1,3 +1,4 @@
+---
 sr:
   activemodel:
     attributes:
@@ -264,7 +265,6 @@ sr:
       dashboard:
         show:
           view_more_logs: Pogledaj još zapisa iz evidencije
-          welcome: Dobrošli u Decidim Admin Panel.
       exports:
         export_as: "%{name} kao %{export_format}"
         notice: Vaš prenos podataka je u toku. Dobićete e-mail poruku kada bude završen.
@@ -564,7 +564,6 @@ sr:
       titles:
         metrics: Metrika
         statistics: Aktivnost
-        users: Učesnici
       users_statistics:
         users_count:
           last_day: Poslednji dan

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -260,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
@@ -342,7 +345,7 @@ sv:
       dashboard:
         show:
           view_more_logs: Visa fler loggar
-          welcome: Välkommen till Decidims adminpanel.
+          welcome: Välkommen till Adminpanelen.
       domain_whitelist:
         form:
           domain_too_short: Domänen är för kort
@@ -835,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
@@ -895,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:
@@ -955,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.
@@ -991,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
@@ -1042,6 +1060,7 @@ sv:
             hidden_at: Dold
             participatory_space: Deltagarutrymme
             report_count: Antal
+            reportable_id: ID
             reportable_type: Typ
             reported_content_url: Rapporterad innehållsadress
             reports: Rapporter

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

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