decidim-admin 0.26.5 → 0.27.0.rc1

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
@@ -756,10 +754,10 @@ sk:
       models:
         moderation:
           fields:
-            created_at: Dátum vytvorenia
             hidden_at: Skryté
             report_count: Počet
             reported_content_url: Nahlásiť URL obsahu
+            reports: Nahlásenia
             visit_url: Navštíviť URL
   errors:
     messages:

data/config/locales/sl.yml

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

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

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.
@@ -556,9 +556,6 @@ sr:
           images:
             preview: Pregled
           omnipresent_banner_appearance_title: Izmeni sveprisutni baner
-      organization_homepage_content_blocks:
-        edit:
-          update: Ažuriraj
       shared:
         gallery:
           add_images: Dodaj slike
@@ -567,15 +564,9 @@ sr:
       titles:
         metrics: Metrika
         statistics: Aktivnost
-        users: Učesnici
       users_statistics:
         users_count:
           last_day: Poslednji dan
           last_month: Poslednji mesec
           last_week: Poslednje nedelje
           no_users_count_statistics_yet: Još nema statistike o broju korisnika
-    moderations:
-      models:
-        moderation:
-          fields:
-            created_at: Datum kreiranja

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -14,24 +15,17 @@ sv:
         description: Beskrivning
         file: Fil
         title: Bilaga eller bildnamn
-        weight: Ordning
       attachment_collection:
         description: Beskrivning
         name: Namn
-        weight: Ordning
       category:
         description: Beskrivning
         name: Namn
         parent_id: Överordnad
-        weight: Ordning
       component:
         name: Namn
         published_at: Publicerad
-        weight: Ordning
-      external_domain:
-        value: Värde
-      help_section:
-        content: Innehåll
+        weight: Vikt
       id: ID
       import:
         user_group_id: Skapa import som
@@ -99,9 +93,6 @@ sv:
         welcome_notification_body: Välkomstmeddelandets brödtext
         welcome_notification_subject: Välkomstmeddelandets ämnesrad
         youtube_handler: YouTube-hanterare
-      participatory_space_private_user:
-        email: E-post
-        name: Namn
       scope:
         code: Kod
         name: Namn
@@ -123,13 +114,12 @@ sv:
         show_in_footer: Visa i sidfoten
         slug: URL slug
         title: Titel
-        topic_id: Ämne
-        weight: Ordning
+        weight: Vikt
       static_page_topic:
         description: Beskrivning
         show_in_footer: Visa i sidfoten
         title: Titel
-        weight: Ordning
+        weight: Vikt
       user_group_csv_verification:
         file: Fil
     errors:
@@ -271,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
@@ -353,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
@@ -846,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
@@ -906,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:
@@ -966,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.
@@ -1002,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
@@ -1050,7 +1057,6 @@ sv:
         moderation:
           fields:
             created_at: Skapandedatum
-            deleted_resource: Borttagen resurs
             hidden_at: Dold
             participatory_space: Deltagarutrymme
             report_count: Antal

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:
@@ -77,8 +78,6 @@ tr:
         welcome_notification_body: Karşılama bildirimi gövdesi
         welcome_notification_subject: Karşılama bildirimi konusu
         youtube_handler: YouTube işleyici
-      participatory_space_private_user:
-        name: Adı
       scope:
         code: kod
         name: isim
@@ -145,6 +144,7 @@ tr:
           error: Yönetici kullanım şartlarını kabul ederken bir hata oluştu.
           success: Harika! Yönetici kullanım şartlarını kabul ettiniz.
         actions:
+          accept: Aşağıdaki şartları kabul ediyorum
           refuse: Yönetici şartlarını reddedin
           title: Kullanım şartlarını ve koşullarını kabul edin
         required_review:
@@ -297,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:
@@ -802,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.
@@ -838,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: Зараз відбувається збереження у вигляді файлу. Ви отримаєте електронного листа після його завершення.
@@ -457,9 +457,6 @@ uk:
         edit:
           active_content_blocks: Блоки діючого вмісту
           inactive_content_blocks: Блоки недіючого вмісту
-      organization_homepage_content_blocks:
-        edit:
-          update: Оновити
       participatory_space_private_users:
         create:
           error: При спробі додати приватного учасника до цього простору співучасті сталася помилка.
@@ -560,7 +557,6 @@ uk:
           role: Роль
         new:
           create: Запросити
-          title: Запросити учасника в якості адміністратора
       users_statistics:
         users_count:
           admins: Адміністратори
@@ -582,10 +578,10 @@ uk:
       models:
         moderation:
           fields:
-            created_at: Дата створення
             hidden_at: 'Приховано:'
             report_count: Кількість
             reported_content_url: Веб-адреса оскарженого вмісту
+            reports: Скарги
             visit_url: Відвідайте веб-адресу
   errors:
     messages:

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: 管理员
@@ -799,10 +797,10 @@ zh-CN:
       models:
         moderation:
           fields:
-            created_at: 创建日期
             hidden_at: 隐藏于
             report_count: 计数
             reported_content_url: 报告的内容 URL
+            reports: 报告
             visit_url: 访问 URL
   errors:
     messages:

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"
@@ -174,10 +173,7 @@ module Decidim
                         decidim_admin.root_path,
                         icon_name: "dashboard",
                         position: 1,
-                        active: [%w(
-                          decidim/admin/dashboard
-                          decidim/admin/metrics
-                        ), []]
+                        active: ["decidim/admin/dashboard" => :show]
 
           menu.add_item :moderations,
                         I18n.t("menu.moderation", scope: "decidim.admin"),
@@ -212,15 +208,10 @@ module Decidim
                           decidim/admin/user_groups_csv_verifications
                           decidim/admin/officializations
                           decidim/admin/impersonatable_users
-                          decidim/admin/conflicts
                           decidim/admin/moderated_users
                           decidim/admin/managed_users/impersonation_logs
                           decidim/admin/managed_users/promotions
                           decidim/admin/authorization_workflows
-                          decidim/verifications/id_documents/admin/pending_authorizations
-                          decidim/verifications/id_documents/admin/config
-                          decidim/verifications/postal_letter/admin/pending_authorizations
-                          decidim/verifications/csv_census/admin/census
                         ), []],
                         if: allowed_to?(:read, :admin_user) || allowed_to?(:read, :managed_user)
 
@@ -247,8 +238,6 @@ module Decidim
                             decidim/admin/scopes
                             decidim/admin/scope_types
                             decidim/admin/areas decidim/admin/area_types
-                            decidim/admin/help_sections
-                            decidim/admin/organization_external_domain_whitelist
                           ),
                           []
                         ],

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