decidim-participatory_processes 0.26.5 → 0.27.0.rc1

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       participatory_process:
@@ -60,12 +61,6 @@ pt-BR:
         email: O email
         name: Nome
         role: Cargo
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceitos são: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Passo ativado
       decidim/participatory_process_step_changed_event: Passo alterado

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ pt:
         email: E-mail
         name: Nome
         role: Função
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tipo de documento inválido. Formatos aceites: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Fase ativada
       decidim/participatory_process_step_changed_event: Fase modificada

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -60,12 +61,6 @@ ro:
         email: E-mail
         name: Nume
         role: Rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Tip de document invalid. Formatele acceptate sunt: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Etapă activată
       decidim/participatory_process_step_changed_event: Etapă modificată

data/config/locales/ru.yml

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

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ sk:
         email: E-mailom
         name: názov
         role: Úloha
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Neplatný typ dokumentu. Prijateľné formáty sú:%{valid_mime_types} '
     models:
       decidim/participatory_process_step_activated_event: Krok aktivovaný
       decidim/participatory_process_step_changed_event: Krok zmenený

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:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -11,16 +12,13 @@ sv:
         decidim_area_id: Område
         description: Beskrivning
         developer_group: Kampanjgrupp
-        document: Dokument
         domain: Domän
         end_date: Slutdatum
         hashtag: Hashtag
         hero_image: Hembild
-        import_steps: Importera steg
         local_area: Område
         meta_scope: Omfångets metadata
         participatory_process_group_id: Dialoggrupp
-        participatory_process_type_id: Dialogtyp
         participatory_scope: Vad som bestäms
         participatory_structure: Hur det bestäms
         promoted: Annonserad
@@ -59,16 +57,12 @@ sv:
         short_description: Kort beskrivning
         start_date: Startdatum
         title: Titel
+      participatory_process_type:
+        title: Titel
       participatory_process_user_role:
         email: E-post
         name: Namn
         role: Roll
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Ogiltig dokumenttyp. Godkända format är: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Steg aktiverat
       decidim/participatory_process_step_changed_event: Steget har ändrats
@@ -109,6 +103,7 @@ sv:
         participatory_process_groups_submenu:
           info: Info
           landing_page: Landningssida
+        participatory_process_types: Processtyper
         participatory_processes: Dialoger
         participatory_processes_submenu:
           attachment_collections: Mappar
@@ -140,6 +135,9 @@ sv:
             start_date: Startdatum
             title: Titel
           name: Steg i dialog
+        participatory_process_type:
+          fields:
+            title: Titel
         participatory_process_user_role:
           fields:
             email: E-post
@@ -222,6 +220,13 @@ sv:
         update:
           error: Det gick inte att uppdatera detta steg i dialogen.
           success: Steget i deltagarprocessen har uppdaterats.
+      participatory_process_types:
+        edit:
+          update: Uppdatera
+        form:
+          title: Titel
+        new:
+          create: Skapa
       participatory_process_user_roles:
         create:
           error: Det gick inte att lägga till en deltagare till dialogen.
@@ -430,6 +435,7 @@ sv:
             no_active: Inga pågående dialoger
             no_active_nor_upcoming: Inga pågående eller kommande dialoger
             no_active_nor_upcoming_callout: Det finns inga pågående eller kommande dialoger. Här är en lista över tidigare dialoger.
+          filter_by: Visa
           names:
             active: Pågående
             all: Alla

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:
@@ -59,12 +60,6 @@ tr:
         email: E-posta
         name: isim
         role: rol
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: 'Geçersiz belge türü. Kabul edilen biçimler şunlardır: %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: Adım aktif
       decidim/participatory_process_step_changed_event: Adım değişti

data/config/locales/uk.yml

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

data/config/locales/val-ES.yml

@@ -1 +1,2 @@
+---
 val:

data/config/locales/vi.yml

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

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -50,12 +51,6 @@ zh-CN:
         email: 电子邮件地址
         name: 名称
         role: 作用
-    errors:
-      models:
-        participatory_process:
-          attributes:
-            document:
-              invalid_document_type: '无效的文档类型。接受的格式为： %{valid_mime_types}'
     models:
       decidim/participatory_process_step_activated_event: 相位激活
       decidim/participatory_process_step_changed_event: 相位已更改

data/config/locales/zh-TW.yml

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

data/db/migrate/20211125202008_create_decidim_participatory_process_types.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreateDecidimParticipatoryProcessTypes < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_participatory_process_types do |t|
+      t.jsonb :title, null: false
+      t.references(
+        :decidim_organization,
+        foreign_key: true,
+        index: { name: "index_decidim_process_types_on_decidim_organization_id" }
+      )
+      t.timestamps
+    end
+
+    add_reference(
+      :decidim_participatory_processes,
+      :decidim_participatory_process_type,
+      foreign_key: true,
+      index: { name: "index_decidim_processes_on_decidim_process_type_id" }
+    )
+  end
+end

data/lib/decidim/api/participatory_process_type_type.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This type represents a ParticipatoryProcessType.
+    class ParticipatoryProcessTypeType < Decidim::Api::Types::BaseObject
+      description "A participatory process type"
+
+      field :id, GraphQL::Types::ID, "Unique ID of this participatory process type", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this participatory process type", null: true
+      field :created_at, Decidim::Core::DateTimeType, "The time this participatory process type was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this participatory process type was updated", null: false
+      field :processes, [Decidim::ParticipatoryProcesses::ParticipatoryProcessType, { null: true }],
+            description: "Lists all the participatory processes belonging to this type", null: false
+    end
+  end
+end

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -20,6 +20,7 @@ module Decidim
             resources :content_blocks, only: [:edit, :update], controller: "participatory_process_group_landing_page_content_blocks"
           end
         end
+        resources :participatory_process_types
         resources :participatory_processes, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "participatory_process_publications", only: [:create, :destroy]
           resources :copies, controller: "participatory_process_copies", only: [:new, :create]
@@ -59,6 +60,7 @@ module Decidim
             resources :imports, only: [:new, :create] do
               get :example, on: :collection
             end
+            resources :reminders, only: [:new, :create]
           end
 
           resources :moderations do
@@ -75,7 +77,9 @@ module Decidim
               post :resend_invitation, to: "participatory_space_private_users#resend_invitation"
             end
             collection do
-              resource :participatory_space_private_users_csv_import, only: [:new, :create], path: "csv_import"
+              resource :participatory_space_private_users_csv_imports, only: [:new, :create], path: "csv_import" do
+                delete :destroy_all
+              end
             end
           end
         end
@@ -119,6 +123,13 @@ module Decidim
                         position: 2,
                         if: allowed_to?(:enter, :space_area, space_name: :process_groups),
                         active: is_active_link?(decidim_admin_participatory_processes.participatory_process_groups_path)
+
+          menu.add_item :participatory_process_types,
+                        I18n.t("menu.participatory_process_types", scope: "decidim.admin"),
+                        decidim_admin_participatory_processes.participatory_process_types_path,
+                        position: 3,
+                        if: allowed_to?(:manage, :participatory_process_type),
+                        active: is_active_link?(decidim_admin_participatory_processes.participatory_process_types_path)
         end
       end
 

data/lib/decidim/participatory_processes/api.rb

@@ -7,5 +7,6 @@ module Decidim
     autoload :ParticipatoryProcessGroupType, "decidim/api/participatory_process_group_type"
     autoload :ParticipatoryProcessStepType, "decidim/api/participatory_process_step_type"
     autoload :ParticipatoryProcessType, "decidim/api/participatory_process_type"
+    autoload :ParticipatoryProcessTypeType, "decidim/api/participatory_process_type_type"
   end
 end

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -74,7 +74,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         hashtag: Faker::Internet.slug,
         group_url: Faker::Internet.url,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
@@ -104,6 +104,14 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
       end
     end
 
+    process_types = []
+    2.times do
+      process_types << Decidim::ParticipatoryProcessType.create!(
+        title: Decidim::Faker::Localized.word,
+        organization: organization
+      )
+    end
+
     2.times do |n|
       params = {
         title: Decidim::Faker::Localized.sentence(word_count: 5),
@@ -117,13 +125,13 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: ActiveStorage::Blob.create_after_upload!(
+        hero_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "hero_image.jpeg",
           content_type: "image/jpeg",
           metadata: nil
         ), # Keep after organization
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -140,6 +148,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         start_date: Date.current,
         end_date: 2.months.from_now,
         participatory_process_group: process_groups.sample,
+        participatory_process_type: process_types.sample,
         scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first
       }
 
@@ -173,8 +182,8 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         user.update!(
           name: Faker::Name.name,
           nickname: Faker::Twitter.unique.screen_name,
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           organization: organization,
           confirmed_at: Time.current,
           locale: I18n.default_locale,
@@ -200,7 +209,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         attachment_collection: attachment_collection,
         content_type: "application/pdf",
         attached_to: process,
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",
@@ -213,7 +222,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",
@@ -226,7 +235,7 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: process,
         content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
           filename: "Exampledocument.pdf",
           content_type: "application/pdf",

data/lib/decidim/participatory_processes/query_extensions.rb

@@ -19,6 +19,15 @@ module Decidim
           description "Finds a participatory process group"
           argument :id, GraphQL::Types::ID, required: true, description: "The ID of the Participatory process group"
         end
+
+        type.field :participatory_process_types, [ParticipatoryProcessTypeType],
+                   null: false,
+                   description: "List all participatory process types"
+
+        type.field :participatory_process_type, ParticipatoryProcessTypeType, null: true do
+          description "Finds a participatory process type"
+          argument :id, GraphQL::Types::ID, required: true, description: "The ID of the participatory process type"
+        end
       end
 
       def participatory_process_groups(*)
@@ -33,6 +42,19 @@ module Decidim
           id: id
         )
       end
+
+      def participatory_process_types(*)
+        Decidim::ParticipatoryProcessType.where(
+          organization: context[:current_organization]
+        )
+      end
+
+      def participatory_process_type(id:)
+        Decidim::ParticipatoryProcessType.find_by(
+          organization: context[:current_organization],
+          id: id
+        )
+      end
     end
   end
 end

data/lib/decidim/participatory_processes/test/factories.rb

@@ -128,13 +128,29 @@ FactoryBot.define do
     end
   end
 
+  factory :participatory_process_type, class: "Decidim::ParticipatoryProcessType" do
+    title { generate_localized_title }
+    organization
+
+    trait :with_active_participatory_processes do
+      after(:create) do |participatory_process_type|
+        create_list(:participatory_process, 2, :active, :published, organization: participatory_process_type.organization, participatory_process_type: participatory_process_type)
+      end
+    end
+
+    trait :with_past_participatory_processes do
+      after(:create) do |participatory_process_type|
+        create_list(:participatory_process, 2, :past, :published, organization: participatory_process_type.organization, participatory_process_type: participatory_process_type)
+      end
+    end
+  end
+
   factory :process_admin, parent: :user, class: "Decidim::User" do
     transient do
       participatory_process { create(:participatory_process) }
     end
 
     organization { participatory_process.organization }
-    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
@@ -150,7 +166,6 @@ FactoryBot.define do
     end
 
     organization { participatory_process.organization }
-    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
@@ -166,7 +181,6 @@ FactoryBot.define do
     end
 
     organization { participatory_process.organization }
-    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,
@@ -182,7 +196,6 @@ FactoryBot.define do
     end
 
     organization { participatory_process.organization }
-    admin_terms_accepted_at { Time.current }
 
     after(:create) do |user, evaluator|
       create :participatory_process_user_role,

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.26.5"
+      "0.27.0.rc1"
     end
   end
 end