decidim-participatory_processes 0.28.0 → 0.28.2

data/decidim-participatory_processes.gemspec

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
+
+require "decidim/participatory_processes/version"
+
+Gem::Specification.new do |s|
+  s.version = Decidim::ParticipatoryProcesses.version
+  s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
+  s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
+  s.license = "AGPL-3.0"
+  s.homepage = "https://decidim.org"
+  s.metadata = {
+    "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
+    "documentation_uri" => "https://docs.decidim.org/",
+    "funding_uri" => "https://opencollective.com/decidim",
+    "homepage_uri" => "https://decidim.org",
+    "source_code_uri" => "https://github.com/decidim/decidim"
+  }
+  s.required_ruby_version = "~> 3.1.0"
+
+  s.name = "decidim-participatory_processes"
+  s.summary = "Decidim participatory processes module"
+  s.description = "Participatory processes component for decidim."
+
+  s.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").select do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
+    end
+  end
+
+  s.add_dependency "decidim-core", Decidim::ParticipatoryProcesses.version
+
+  s.add_development_dependency "decidim-admin", Decidim::ParticipatoryProcesses.version
+  s.add_development_dependency "decidim-dev", Decidim::ParticipatoryProcesses.version
+  s.add_development_dependency "decidim-meetings", Decidim::ParticipatoryProcesses.version
+end

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -101,26 +101,12 @@ module Decidim
 
       initializer "decidim_participatory_processes_admin.menu" do
         Decidim::ParticipatoryProcesses::Menu.register_admin_menu_modules!
-      end
-
-      initializer "decidim_participatory_processes_admin.participatory_processes_menu" do
         Decidim::ParticipatoryProcesses::Menu.register_admin_participatory_processes_menu!
-      end
-
-      initializer "decidim_participatory_processes_admin.process_attachments_menu" do
         Decidim::ParticipatoryProcesses::Menu.register_participatory_process_admin_attachments_menu!
-      end
-
-      initializer "decidim_participatory_processes_admin.process_components_menu" do
         Decidim::ParticipatoryProcesses::Menu.register_admin_participatory_process_components_menu!
-      end
-
-      initializer "decidim_participatory_processes_admin.process_menu" do
         Decidim::ParticipatoryProcesses::Menu.register_admin_participatory_process_menu!
-      end
-
-      initializer "decidim_participatory_processes_admin.process_group_menu" do
         Decidim::ParticipatoryProcesses::Menu.register_admin_participatory_process_group_menu!
+        Decidim::ParticipatoryProcesses::Menu.register_admin_participatory_processes_manage_menu!
       end
     end
   end

data/lib/decidim/participatory_processes/content_blocks/registry_manager.rb

@@ -27,22 +27,21 @@ module Decidim
             content_block.default!
           end
 
-          Decidim.content_blocks.register(:participatory_process_group_homepage, :cta) do |content_block|
-            content_block.cell = "decidim/content_blocks/cta"
-            content_block.settings_form_cell = "decidim/content_blocks/cta_settings_form"
-            content_block.public_name_key = "decidim.content_blocks.cta.name"
+          Decidim.content_blocks.register(:participatory_process_group_homepage, :hero) do |content_block|
+            content_block.cell = "decidim/content_blocks/participatory_space_hero"
+            content_block.settings_form_cell = "decidim/content_blocks/participatory_space_hero_settings_form"
+            content_block.public_name_key = "decidim.participatory_processes.content_blocks.hero.name"
 
             content_block.images = [
               {
                 name: :background_image,
-                uploader: "Decidim::HomepageImageUploader"
+                uploader: "Decidim::BackgroundImageUploader"
               }
             ]
 
             content_block.settings do |settings|
               settings.attribute :button_text, type: :text, translated: true
-              settings.attribute :button_url, type: :string, required: true
-              settings.attribute :description, type: :string, translated: true, editor: true
+              settings.attribute :button_url, type: :text, translated: true
             end
 
             content_block.default!
@@ -70,9 +69,24 @@ module Decidim
             end
           end
 
-          Decidim.content_blocks.register(:participatory_process_homepage, :process_hero) do |content_block|
-            content_block.cell = "decidim/participatory_processes/content_blocks/hero"
+          Decidim.content_blocks.register(:participatory_process_homepage, :hero) do |content_block|
+            content_block.cell = "decidim/content_blocks/participatory_space_hero"
+            content_block.settings_form_cell = "decidim/content_blocks/participatory_space_hero_settings_form"
             content_block.public_name_key = "decidim.participatory_processes.content_blocks.hero.name"
+
+            content_block.images = [
+              {
+                name: :background_image,
+                uploader: "Decidim::BackgroundImageUploader"
+              }
+            ]
+
+            content_block.settings do |settings|
+              settings.attribute :button_text, type: :text, translated: true
+              settings.attribute :button_url, type: :text, translated: true
+            end
+
+            content_block.default!
           end
 
           Decidim.content_blocks.register(:participatory_process_homepage, :announcement) do |content_block|

data/lib/decidim/participatory_processes/menu.rb

@@ -80,10 +80,8 @@ module Decidim
       def self.register_admin_participatory_process_components_menu!
         Decidim.menu :admin_participatory_process_components_menu do |menu|
           current_participatory_space.components.each do |component|
-            caption = translated_attribute(component.name)
-            if component.primary_stat.present?
-              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
-            end
+            caption = decidim_escape_translated(component.name)
+            caption += content_tag(:span, component.primary_stat, class: "component-counter") if component.primary_stat.present?
 
             menu.add_item [component.manifest_name, component.id].join("_"),
                           caption.html_safe,
@@ -185,6 +183,34 @@ module Decidim
                         active: is_active_link?(decidim_admin_participatory_processes.participatory_process_group_landing_page_path(participatory_process_group))
         end
       end
+
+      def self.register_admin_participatory_processes_manage_menu!
+        Decidim.menu :admin_participatory_processes_manage_menu do |menu|
+          menu.add_item :processes,
+                        I18n.t("menu.participatory_processes", scope: "decidim.admin"),
+                        decidim_admin_participatory_processes.participatory_processes_path,
+                        position: 1,
+                        icon_name: "treasure-map-line",
+                        if: allowed_to?(:read, :process_list),
+                        active: is_active_link?(decidim_admin_participatory_processes.participatory_processes_path)
+
+          menu.add_item :import_process,
+                        I18n.t("actions.import_process", scope: "decidim.admin"),
+                        decidim_admin_participatory_processes.new_import_path,
+                        position: 2,
+                        icon_name: "upload-line",
+                        if: allowed_to?(:import, :process),
+                        active: is_active_link?(decidim_admin_participatory_processes.new_import_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,
+                        icon_name: "price-tag-3-line",
+                        if: allowed_to?(:manage, :participatory_process_type),
+                        active: is_active_link?(decidim_admin_participatory_processes.participatory_process_types_path)
+        end
+      end
     end
   end
 end

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

@@ -11,23 +11,26 @@ FactoryBot.define do
   end
 
   factory :participatory_process, class: "Decidim::ParticipatoryProcess" do
-    title { generate_localized_title }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:participatory_process_title, skip_injection:) }
     slug { generate(:participatory_process_slug) }
-    subtitle { generate_localized_title }
+    subtitle { generate_localized_title(:participatory_process_subtitle, skip_injection:) }
     weight { 1 }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    short_description { generate_localized_description(:participatory_process_short_description, skip_injection:) }
+    description { generate_localized_description(:participatory_process_description, skip_injection:) }
     organization
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
     published_at { Time.current }
-    meta_scope { Decidim::Faker::Localized.word }
-    developer_group { generate_localized_title }
-    local_area { generate_localized_title }
-    target { generate_localized_title }
-    participatory_scope { generate_localized_title }
-    participatory_structure { generate_localized_title }
-    announcement { generate_localized_title }
+    meta_scope { generate_localized_word(:participatory_process_meta_scope, skip_injection:) }
+    developer_group { generate_localized_title(:participatory_process_developer_group, skip_injection:) }
+    local_area { generate_localized_title(:participatory_process_local_area, skip_injection:) }
+    target { generate_localized_title(:participatory_process_target, skip_injection:) }
+    participatory_scope { generate_localized_title(:participatory_process_participatory_scope, skip_injection:) }
+    participatory_structure { generate_localized_title(:participatory_process_participatory_structure, skip_injection:) }
+    announcement { generate_localized_title(:participatory_process_announcement, skip_injection:) }
     show_metrics { true }
     show_statistics { true }
     private_space { false }
@@ -58,6 +61,7 @@ FactoryBot.define do
         create(:participatory_process_step,
                active: true,
                end_date: evaluator.current_step_ends,
+               skip_injection: evaluator.skip_injection,
                participatory_process:)
         participatory_process.reload
         participatory_process.steps.reload
@@ -81,11 +85,11 @@ FactoryBot.define do
 
     trait :with_scope do
       scopes_enabled { true }
-      scope { create :scope, organization: }
+      scope { create :scope, organization:, skip_injection: }
     end
 
     trait :with_content_blocks do
-      transient { blocks_manifests { [:process_hero] } }
+      transient { blocks_manifests { [:hero] } }
 
       after(:create) do |participatory_process, evaluator|
         evaluator.blocks_manifests.each do |manifest_name|
@@ -94,6 +98,7 @@ FactoryBot.define do
             organization: participatory_process.organization,
             scope_name: :participatory_process_homepage,
             manifest_name:,
+            skip_injection: evaluator.skip_injection,
             scoped_resource_id: participatory_process.id
           )
         end
@@ -102,33 +107,41 @@ FactoryBot.define do
   end
 
   factory :participatory_process_group, class: "Decidim::ParticipatoryProcessGroup" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:participatory_process_group_title, skip_injection:) }
+    description { generate_localized_description(:participatory_process_group_description, skip_injection:) }
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     organization
     hashtag { Faker::Internet.slug }
     group_url { Faker::Internet.url }
-    developer_group { generate_localized_title }
-    local_area { generate_localized_title }
+    developer_group { generate_localized_title(:participatory_process_group_developer_group, skip_injection:) }
+    local_area { generate_localized_title(:participatory_process_group_local_area, skip_injection:) }
     meta_scope { Decidim::Faker::Localized.word }
-    target { generate_localized_title }
-    participatory_scope { generate_localized_title }
-    participatory_structure { generate_localized_title }
+    target { generate_localized_title(:participatory_process_group_target, skip_injection:) }
+    participatory_scope { generate_localized_title(:participatory_process_group_participatory_scope, skip_injection:) }
+    participatory_structure { generate_localized_title(:participatory_process_group_participatory_structure, skip_injection:) }
 
     trait :promoted do
       promoted { true }
     end
 
     trait :with_participatory_processes do
-      after(:create) do |participatory_process_group|
-        create_list(:participatory_process, 2, :published, organization: participatory_process_group.organization, participatory_process_group:)
+      after(:create) do |participatory_process_group, evaluator|
+        create_list(:participatory_process, 2, :published, organization: participatory_process_group.organization, participatory_process_group:,
+                                                           skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :participatory_process_step, class: "Decidim::ParticipatoryProcessStep" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:participatory_process_step_title, skip_injection:) }
+    description { generate_localized_description(:participatory_process_step_description, skip_injection:) }
+    cta_text { generate_localized_description(:participatory_process_step_cta_text, skip_injection:) }
     start_date { 1.month.ago }
     end_date { 2.months.from_now }
     position { nil }
@@ -145,25 +158,31 @@ FactoryBot.define do
   end
 
   factory :participatory_process_type, class: "Decidim::ParticipatoryProcessType" do
-    title { generate_localized_title }
+    transient do
+      skip_injection { false }
+    end
+    title { generate_localized_title(:participatory_process_type_title, skip_injection:) }
     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:)
+      after(:create) do |participatory_process_type, evaluator|
+        create_list(:participatory_process, 2, :active, :published, organization: participatory_process_type.organization, participatory_process_type:,
+                                                                    skip_injection: evaluator.skip_injection)
       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:)
+      after(:create) do |participatory_process_type, evaluator|
+        create_list(:participatory_process, 2, :past, :published, organization: participatory_process_type.organization, participatory_process_type:,
+                                                                  skip_injection: evaluator.skip_injection)
       end
     end
   end
 
   factory :process_admin, parent: :user, class: "Decidim::User" do
     transient do
-      participatory_process { create(:participatory_process) }
+      skip_injection { false }
+      participatory_process { create(:participatory_process, skip_injection:) }
     end
 
     organization { participatory_process.organization }
@@ -173,13 +192,14 @@ FactoryBot.define do
       create :participatory_process_user_role,
              user:,
              participatory_process: evaluator.participatory_process,
-             role: :admin
+             role: :admin, skip_injection: evaluator.skip_injection
     end
   end
 
   factory :process_collaborator, parent: :user, class: "Decidim::User" do
     transient do
-      participatory_process { create(:participatory_process) }
+      skip_injection { false }
+      participatory_process { create(:participatory_process, skip_injection:) }
     end
 
     organization { participatory_process.organization }
@@ -189,13 +209,14 @@ FactoryBot.define do
       create :participatory_process_user_role,
              user:,
              participatory_process: evaluator.participatory_process,
-             role: :collaborator
+             role: :collaborator, skip_injection: evaluator.skip_injection
     end
   end
 
   factory :process_moderator, parent: :user, class: "Decidim::User" do
     transient do
-      participatory_process { create(:participatory_process) }
+      skip_injection { false }
+      participatory_process { create(:participatory_process, skip_injection:) }
     end
 
     organization { participatory_process.organization }
@@ -205,13 +226,14 @@ FactoryBot.define do
       create :participatory_process_user_role,
              user:,
              participatory_process: evaluator.participatory_process,
-             role: :moderator
+             role: :moderator, skip_injection: evaluator.skip_injection
     end
   end
 
   factory :process_valuator, parent: :user, class: "Decidim::User" do
     transient do
-      participatory_process { create(:participatory_process) }
+      skip_injection { false }
+      participatory_process { create(:participatory_process, skip_injection:) }
     end
 
     organization { participatory_process.organization }
@@ -221,13 +243,16 @@ FactoryBot.define do
       create :participatory_process_user_role,
              user:,
              participatory_process: evaluator.participatory_process,
-             role: :valuator
+             role: :valuator, skip_injection: evaluator.skip_injection
     end
   end
 
   factory :participatory_process_user_role, class: "Decidim::ParticipatoryProcessUserRole" do
+    transient do
+      skip_injection { false }
+    end
     user
-    participatory_process { create :participatory_process, organization: user.organization }
+    participatory_process { create :participatory_process, organization: user.organization, skip_injection: }
     role { "admin" }
   end
 end

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.28.0"
+      "0.28.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-07-16 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.28.0
+        version: 0.28.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.2
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -91,7 +91,6 @@ files:
 - app/cells/decidim/participatory_processes/content_block_cell.rb
 - app/cells/decidim/participatory_processes/content_blocks/extra_data/active_step.erb
 - app/cells/decidim/participatory_processes/content_blocks/extra_data_cell.rb
-- app/cells/decidim/participatory_processes/content_blocks/hero_cell.rb
 - app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb
 - app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_settings_form/show.erb
 - app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_settings_form_cell.rb
@@ -285,7 +284,6 @@ files:
 - 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
@@ -318,6 +316,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -413,6 +412,7 @@ files:
 - db/migrate/20210415163339_allow_null_file_column_in_decidim_attachments_table.rb
 - db/migrate/20211125202008_create_decidim_participatory_process_types.rb
 - db/migrate/20220315100140_change_steps_dates_to_datetime.rb
+- decidim-participatory_processes.gemspec
 - lib/decidim/api/participatory_process_group_type.rb
 - lib/decidim/api/participatory_process_input_filter.rb
 - lib/decidim/api/participatory_process_input_sort.rb
@@ -447,16 +447,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Decidim participatory processes module

data/app/cells/decidim/participatory_processes/content_blocks/hero_cell.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module ParticipatoryProcesses
-    module ContentBlocks
-      class HeroCell < Decidim::ContentBlocks::ParticipatorySpaceHeroCell
-        include Decidim::ApplicationHelper
-
-        delegate :active_step, to: :resource
-
-        def decidim_participatory_processes
-          Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
-        end
-
-        def cta_text
-          return if active_step.blank?
-
-          @cta_text ||= translated_attribute(active_step.cta_text).presence
-        end
-
-        def cta_path
-          return if active_step.blank?
-
-          @cta_path ||= active_step.cta_path.presence && step_cta_url(resource)
-        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