decidim-participatory_processes 0.26.10 → 0.27.0.rc1

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.10"
+      "0.27.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.26.10
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.10
+        version: 0.27.0.rc1
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -106,6 +106,7 @@ files:
 - app/cells/decidim/participatory_processes/process_cell.rb
 - app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb
 - app/cells/decidim/participatory_processes/process_filters/show.erb
+- app/cells/decidim/participatory_processes/process_filters/type_filter.erb
 - app/cells/decidim/participatory_processes/process_filters_cell.rb
 - app/cells/decidim/participatory_processes/process_group_cell.rb
 - app/cells/decidim/participatory_processes/process_group_m/footer.erb
@@ -126,9 +127,11 @@ files:
 - app/commands/decidim/participatory_processes/admin/create_participatory_process_admin.rb
 - app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb
 - app/commands/decidim/participatory_processes/admin/create_participatory_process_step.rb
+- app/commands/decidim/participatory_processes/admin/create_participatory_process_type.rb
 - app/commands/decidim/participatory_processes/admin/destroy_participatory_process_admin.rb
 - app/commands/decidim/participatory_processes/admin/destroy_participatory_process_group.rb
 - app/commands/decidim/participatory_processes/admin/destroy_participatory_process_step.rb
+- app/commands/decidim/participatory_processes/admin/destroy_participatory_process_type.rb
 - app/commands/decidim/participatory_processes/admin/import_participatory_process.rb
 - app/commands/decidim/participatory_processes/admin/notify_role_assigned_to_participatory_process.rb
 - app/commands/decidim/participatory_processes/admin/publish_participatory_process.rb
@@ -138,6 +141,7 @@ files:
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_admin.rb
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb
 - app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb
+- app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb
 - app/constraints/decidim/participatory_processes/current_component.rb
 - app/constraints/decidim/participatory_processes/current_participatory_process.rb
 - app/controllers/concerns/decidim/participatory_processes/admin/filterable.rb
@@ -162,10 +166,12 @@ files:
 - app/controllers/decidim/participatory_processes/admin/participatory_process_step_activations_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_step_ordering_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_steps_controller.rb
+- app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_process_user_roles_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_processes_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb
 - app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_csv_imports_controller.rb
+- app/controllers/decidim/participatory_processes/admin/reminders_controller.rb
 - app/controllers/decidim/participatory_processes/application_controller.rb
 - app/controllers/decidim/participatory_processes/participatory_process_groups_controller.rb
 - app/controllers/decidim/participatory_processes/participatory_process_steps_controller.rb
@@ -179,6 +185,7 @@ files:
 - app/forms/decidim/participatory_processes/admin/participatory_process_group_form.rb
 - app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb
 - app/forms/decidim/participatory_processes/admin/participatory_process_step_form.rb
+- app/forms/decidim/participatory_processes/admin/participatory_process_type_form.rb
 - app/forms/decidim/participatory_processes/admin/participatory_process_user_role_form.rb
 - app/helpers/decidim/participatory_processes/admin/participatory_process_helper.rb
 - app/helpers/decidim/participatory_processes/admin/process_groups_for_select_helper.rb
@@ -189,6 +196,7 @@ files:
 - app/models/decidim/participatory_process.rb
 - app/models/decidim/participatory_process_group.rb
 - app/models/decidim/participatory_process_step.rb
+- app/models/decidim/participatory_process_type.rb
 - app/models/decidim/participatory_process_user_role.rb
 - app/packs/entrypoints/decidim_participatory_processes.js
 - app/packs/entrypoints/decidim_participatory_processes_admin.js
@@ -196,8 +204,10 @@ files:
 - app/packs/src/decidim/participatory_processes/admin/participatory_processes.js
 - app/packs/src/decidim/participatory_processes/filters.js
 - app/permissions/decidim/participatory_processes/permissions.rb
+- app/presenters/decidim/log/value_types/participatory_process_type_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_group_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb
+- app/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/participatory_process_user_role_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/step_presenter.rb
 - app/presenters/decidim/participatory_processes/admin_log/value_types/role_presenter.rb
@@ -232,7 +242,6 @@ files:
 - app/queries/decidim/participatory_processes/visible_participatory_processes.rb
 - app/serializers/decidim/participatory_processes/participatory_process_importer.rb
 - app/serializers/decidim/participatory_processes/participatory_process_serializer.rb
-- app/services/decidim/participatory_processes/participatory_process_search.rb
 - app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb
 - app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
 - app/views/decidim/participatory_processes/_participatory_process.html.erb
@@ -249,6 +258,10 @@ files:
 - app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_steps/new.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_steps/show.html.erb
+- app/views/decidim/participatory_processes/admin/participatory_process_types/_form.html.erb
+- app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb
+- app/views/decidim/participatory_processes/admin/participatory_process_types/index.html.erb
+- app/views/decidim/participatory_processes/admin/participatory_process_types/new.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_user_roles/_form.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_user_roles/edit.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_user_roles/index.html.erb
@@ -277,10 +290,10 @@ files:
 - app/views/layouts/decidim/admin/participatory_process.html.erb
 - app/views/layouts/decidim/admin/participatory_process_group.html.erb
 - app/views/layouts/decidim/admin/participatory_process_groups.html.erb
+- app/views/layouts/decidim/admin/participatory_process_type.html.erb
 - app/views/layouts/decidim/admin/participatory_processes.html.erb
 - app/views/layouts/decidim/participatory_process.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -303,7 +316,6 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
-- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -312,7 +324,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -321,13 +332,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
-- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -335,7 +343,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -347,11 +354,9 @@ files:
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
-- config/locales/sq-AL.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/sw-KE.yml
-- config/locales/th-TH.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -406,6 +411,7 @@ files:
 - db/migrate/20210204154593_add_weight_field_to_participatory_processes.rb
 - db/migrate/20210310120750_add_followable_counter_cache_to_participatory_processes.rb
 - db/migrate/20210415163339_allow_null_file_column_in_decidim_attachments_table.rb
+- db/migrate/20211125202008_create_decidim_participatory_process_types.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -415,6 +421,7 @@ files:
 - lib/decidim/api/participatory_process_input_sort.rb
 - lib/decidim/api/participatory_process_step_type.rb
 - lib/decidim/api/participatory_process_type.rb
+- lib/decidim/api/participatory_process_type_type.rb
 - lib/decidim/participatory_processes.rb
 - lib/decidim/participatory_processes/admin.rb
 - lib/decidim/participatory_processes/admin_engine.rb
@@ -436,14 +443,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim participatory processes module

data/app/services/decidim/participatory_processes/participatory_process_search.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    # Service that encapsulates all logic related to filtering participatory processes.
-    class ParticipatoryProcessSearch < ParticipatorySpaceSearch
-      def initialize(options = {})
-        base_relation = options.has_key?(:base_relation) ? options.delete(:base_relation) : ParticipatoryProcess.all
-        super(base_relation, options)
-      end
-
-      def search_date
-        case date
-        when "active"
-          query.active.order(start_date: :desc)
-        when "past"
-          query.past.order(end_date: :desc)
-        when "upcoming"
-          query.upcoming.order(start_date: :asc)
-        else # Assume 'all'
-          timezone = ActiveSupport::TimeZone.find_tzinfo(Time.zone.name).identifier
-          query.order(Arel.sql("ABS(start_date - (CURRENT_DATE at time zone '#{timezone}')::date)").to_s)
-        end
-      end
-    end
-  end
-end

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails

data/config/locales/fa-IR.yml

@@ -1 +0,0 @@
-fa:

data/config/locales/gn-PY.yml

@@ -1 +0,0 @@
-gn:

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka:

data/config/locales/kaa.yml

@@ -1,6 +0,0 @@
-kaa:
-  layouts:
-    decidim:
-      participatory_process_groups:
-        participatory_process_group:
-          browse: Kóriw

data/config/locales/lo-LA.yml

@@ -1 +0,0 @@
-lo:

data/config/locales/oc-FR.yml

@@ -1 +0,0 @@
-oc:

data/config/locales/sq-AL.yml

@@ -1 +0,0 @@
-sq:

data/config/locales/th-TH.yml

@@ -1 +0,0 @@
-th: