decidim-initiatives 0.28.6 → 0.29.0.rc1

data/config/locales/uk.yml

@@ -62,9 +62,6 @@ uk:
             created_at: 'Створено:'
             title: Різновиди починів
           name: Різновид почину
-        initiatives_votes:
-          fields:
-            scope: Обсяг
       titles:
         initiatives: Почини
         initiatives_types: Різновиди починів
@@ -178,9 +175,6 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за %{author_nickname}. Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: '%{author_nickname} підтримав почин'
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> підтримав почин <a href="%{resource_path}">%{resource_title}</a>.
-      initiative_signatures:
-        fill_personal_data:
-          continue: Продовжити
       initiative_votes:
         create:
           error: При підписанні цього почину сталися помилки.
@@ -213,7 +207,6 @@ uk:
           recent: Найновіші
         print:
           city: Місто
-          print: Друк
         result:
           initiative_rejected_reason: Цей почин був відхилений через недостатню підтримку.
         signatures_count:
@@ -223,7 +216,6 @@ uk:
           other: " підписів"
         vote_cabin:
           already_voted: Вже підписалися
-          supports_required: "Необхідно %{total_supports} підписів"
           vote: Підписати
           votes_blocked: Підписування вимкнене
         votes_count:
@@ -248,15 +240,11 @@ uk:
         expired: Строк дії яких закінчився
     menu:
       initiatives: Почини
-    resources:
-      initiatives_type:
-        actions:
-          create: Створити
-          vote: Підписати
   layouts:
     decidim:
       initiative_creation_header:
         fill_data: Внести
+        finish: Завершити
         promotal_committee: Робочий гурт з просування
         select_initiative_type: Обрати
       initiatives:

data/config/locales/zh-CN.yml

@@ -344,14 +344,12 @@ zh-CN:
           recently_published: 最近发布的
         print:
           city: 城市
-          print: 打印
         result:
           initiative_rejected_reason: 这项倡议由于没有签字而被拒绝。
         signatures_count:
           other: " 签名"
         vote_cabin:
           already_voted: 已签名
-          supports_required: "需要 %{total_supports} 签名"
           verification_required: 验证您的帐户以签署倡议
           vote: 签名
           votes_blocked: 签名已禁用
@@ -391,7 +389,6 @@ zh-CN:
     resources:
       initiatives_type:
         actions:
-          create: 创建
           title: 行动
           vote: 签名
   layouts:

data/config/locales/zh-TW.yml

@@ -97,7 +97,6 @@ zh-TW:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: 透過標題、描述、ID 或作者姓名搜尋 %{collection}
       initiatives_settings:
         update:
-          error: 發生一個錯誤.
           success: 倡議設定已成功更新.
       menu:
         attachments: 附件
@@ -283,7 +282,6 @@ zh-TW:
         initiatives_types:
           create:
             error: 出現了一個錯誤.
-            success: 一個新的倡議類型已成功更新.
           destroy:
             success: 該倡議類型已成功刪除.
           edit:
@@ -352,6 +350,7 @@ zh-TW:
         finish:
           back: 返回
           back_to_initiatives: 回到倡議
+          callout_text: 恭喜您！您的倡議已成功建立。
           confirm: 您即將發送倡議給管理員進行審核和發佈。一旦發佈，您將無法編輯它。您確定要繼續嗎？"
           edit_my_initiative: 編輯我的倡議
           go_to_my_initiatives: 前往我的倡議
@@ -507,7 +506,6 @@ zh-TW:
           other: " 簽名"
         vote_cabin:
           already_voted: 已簽署
-          supports_required: "需要 %{total_supports} 個簽署支持"
           verification_required: 驗證您的帳戶以簽署該倡議
           vote: 簽署
           votes_blocked: 簽署已禁用

data/decidim-initiatives.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Initiatives.version
   s.authors = ["Juan Salvador Perez Garcia"]
   s.email = ["jsperezg@gmail.com"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-initiatives"
   s.summary = "Decidim initiatives module"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_dependency "decidim-verifications", Decidim::Initiatives.version
   s.add_dependency "hexapdf", "~> 0.32.0"
   s.add_dependency "wicked_pdf", "~> 2.1"
+  s.add_dependency "wkhtmltopdf-binary", "~> 0.12"
 
   s.add_development_dependency "decidim-dev", Decidim::Initiatives.version
   s.add_development_dependency "decidim-meetings", Decidim::Initiatives.version

data/lib/decidim/api/initiative_api_type.rb

@@ -17,13 +17,13 @@ module Decidim
       field :minimum_committee_members, GraphQL::Types::Int, "Minimum of committee members", null: true
       field :validate_sms_code_on_votes, GraphQL::Types::Boolean, "Add SMS code validation step to signature process", null: true
       field :undo_online_signatures_enabled, GraphQL::Types::Boolean, "Enable participants to undo their online signatures", null: true
-      field :promoting_comittee_enabled, GraphQL::Types::Boolean, "If promoting committee is enabled", method: :promoting_committee_enabled, null: true
+      field :promoting_committee_enabled, GraphQL::Types::Boolean, "If promoting committee is enabled", method: :promoting_committee_enabled, null: true
       field :signature_type, GraphQL::Types::String, "Signature type of the initiative", null: true
 
       field :initiatives, [Decidim::Initiatives::InitiativeType, { null: true }], "The initiatives that have this type", null: false
 
       def banner_image
-        object.attached_uploader(:banner_image).url
+        object.attached_uploader(:banner_image).path
       end
     end
   end

data/lib/decidim/initiatives/engine.rb

@@ -104,6 +104,7 @@ module Decidim
 
       initializer "decidim_initiatives.menu" do
         Decidim::Initiatives::Menu.register_menu!
+        Decidim::Initiatives::Menu.register_mobile_menu!
         Decidim::Initiatives::Menu.register_home_content_block_menu!
       end
 

data/lib/decidim/initiatives/menu.rb

@@ -5,6 +5,17 @@ module Decidim
     class Menu
       def self.register_menu!
         Decidim.menu :menu do |menu|
+          menu.add_item :initiatives,
+                        I18n.t("menu.initiatives", scope: "decidim"),
+                        decidim_initiatives.initiatives_path,
+                        position: 2.4,
+                        active: %r{^/(initiatives|create_initiative)},
+                        if: Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).any?
+        end
+      end
+
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
           menu.add_item :initiatives,
                         I18n.t("menu.initiatives", scope: "decidim"),
                         decidim_initiatives.initiatives_path,
@@ -21,7 +32,7 @@ module Decidim
                         decidim_initiatives.initiatives_path,
                         position: 30,
                         active: :inclusive,
-                        if: !Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
+                        if: Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).any?
         end
       end
 

data/lib/decidim/initiatives/seeds.rb

@@ -7,30 +7,13 @@ module Decidim
   module Initiatives
     class Seeds < Decidim::Seeds
       def call
-        organization = Decidim::Organization.first
+        create_content_block!
 
-        Decidim::ContentBlock.create(
-          organization:,
-          weight: 33,
-          scope_name: :homepage,
-          manifest_name: :highlighted_initiatives,
-          published_at: Time.current
-        )
-
-        3.times do |n|
-          type = Decidim::InitiativesType.create!(
-            title: Decidim::Faker::Localized.sentence(word_count: 5),
-            description: Decidim::Faker::Localized.sentence(word_count: 25),
-            organization:,
-            banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil # Keep after organization
-          )
+        3.times do |_n|
+          type = create_initiative_type!
 
           organization.top_scopes.each do |scope|
-            Decidim::InitiativesTypeScope.create(
-              type:,
-              scope:,
-              supports_required: (n + 1) * 1000
-            )
+            create_initiative_type_scope!(scope:, type:)
           end
         end
 
@@ -38,58 +21,100 @@ module Decidim
           Decidim::Initiative.skip_callback(:save, :after, :notify_state_change, raise: false)
           Decidim::Initiative.skip_callback(:create, :after, :notify_creation, raise: false)
 
-          params = {
-            title: Decidim::Faker::Localized.sentence(word_count: 3),
-            description: Decidim::Faker::Localized.sentence(word_count: 25),
-            scoped_type: Decidim::InitiativesTypeScope.all.sample,
-            state:,
-            signature_type: "online",
-            signature_start_date: Date.current - 7.days,
-            signature_end_date: Date.current + 7.days,
-            published_at: 7.days.ago,
-            author: Decidim::User.all.sample,
-            organization:
-          }
-
-          initiative = Decidim.traceability.perform_action!(
-            "publish",
-            Decidim::Initiative,
-            organization.users.first,
-            visibility: "all"
-          ) do
-            Decidim::Initiative.create!(params)
-          end
-          initiative.add_to_index_as_search_resource
-
-          if %w(published rejected accepted).include? state
-            users = []
-            rand(50).times do
-              author = (Decidim::User.all - users).sample
-              initiative.votes.create!(author:, scope: initiative.scope, hash_id: SecureRandom.hex)
-              users << author
-            end
-          end
+          initiative = create_initiative!(state:)
+
+          create_initiative_votes!(initiative:) if %w(published rejected accepted).include? state
 
           Decidim::Comments::Seed.comments_for(initiative)
 
           create_attachment(attached_to: initiative, filename: "city.jpeg")
 
           Decidim::Initiatives.default_components.each do |component_name|
-            component = Decidim::Component.create!(
-              name: Decidim::Components::Namer.new(initiative.organization.available_locales, component_name).i18n_name,
-              manifest_name: component_name,
-              published_at: Time.current,
-              participatory_space: initiative
-            )
-
-            next unless component_name.in? ["pages", :pages]
-
-            Decidim::Pages::CreatePage.call(component) do
-              on(:invalid) { raise "Cannot create page" }
-            end
+            create_component!(initiative:, component_name:)
           end
         end
       end
+
+      def create_content_block!
+        Decidim::ContentBlock.create(
+          organization:,
+          weight: 33,
+          scope_name: :homepage,
+          manifest_name: :highlighted_initiatives,
+          published_at: Time.current
+        )
+      end
+
+      def create_initiative_type!
+        Decidim::InitiativesType.create!(
+          title: Decidim::Faker::Localized.sentence(word_count: 5),
+          description: Decidim::Faker::Localized.sentence(word_count: 25),
+          organization:,
+          banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil # Keep after organization
+        )
+      end
+
+      def create_initiative_type_scope!(scope:, type:)
+        n = rand(3)
+        Decidim::InitiativesTypeScope.create(
+          type:,
+          scope:,
+          supports_required: (n + 1) * 1000
+        )
+      end
+
+      def create_initiative!(state:)
+        published_at = %w(published rejected accepted).include?(state) ? 7.days.ago : nil
+
+        params = {
+          title: Decidim::Faker::Localized.sentence(word_count: 3),
+          description: Decidim::Faker::Localized.sentence(word_count: 25),
+          scoped_type: Decidim::InitiativesTypeScope.all.sample,
+          state:,
+          signature_type: "online",
+          signature_start_date: Date.current - 7.days,
+          signature_end_date: Date.current + 7.days,
+          published_at:,
+          author: Decidim::User.all.sample,
+          organization:
+        }
+
+        initiative = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Initiative,
+          organization.users.first,
+          visibility: "all"
+        ) do
+          Decidim::Initiative.create!(params)
+        end
+        initiative.add_to_index_as_search_resource
+
+        initiative
+      end
+
+      def create_initiative_votes!(initiative:)
+        users = []
+        rand(50).times do
+          author = (Decidim::User.all - users).sample
+          initiative.votes.create!(author:, scope: initiative.scope, hash_id: SecureRandom.hex)
+          users << author
+        end
+      end
+
+      def create_component!(initiative:, component_name:)
+        component = Decidim::Component.create!(
+          name: Decidim::Components::Namer.new(initiative.organization.available_locales, component_name).i18n_name,
+          manifest_name: component_name,
+          published_at: Time.current,
+          participatory_space: initiative
+        )
+
+        return unless component_name.in? ["pages", :pages]
+
+        Decidim::Pages::CreatePage.call(component) do
+          on(:invalid) { raise "Cannot create page" }
+        end
+      end
     end
   end
 end

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.28.6"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/decidim/initiatives.rb

@@ -17,18 +17,6 @@ module Decidim
       true
     end
 
-    # Public Setting that defines the similarity minimum value to consider two
-    # initiatives similar. Defaults to 0.25.
-    config_accessor :similarity_threshold do
-      0.25
-    end
-
-    # Public Setting that defines how many similar initiatives will be shown.
-    # Defaults to 5.
-    config_accessor :similarity_limit do
-      5
-    end
-
     # Minimum number of committee members required to pass the initiative to
     # technical validation phase. Only applies to initiatives created by
     # individuals.

data/lib/tasks/decidim_initiatives.rake

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 namespace :decidim_initiatives do
-  desc "Check validating initiatives and moves all without changes for a configured time to discarded state"
+  desc "Checks validating initiatives and moves all without changes for a configured time to discarded state"
   task check_validating: :environment do
     Decidim::Initiatives::OutdatedValidatingInitiatives
       .for(Decidim::Initiatives.max_time_in_validating_state)
       .each(&:discarded!)
   end
 
-  desc "Check published initiatives and moves to accepted/rejected state depending on the votes collected when the signing period has finished"
+  desc "Checks published initiatives and moves to accepted/rejected state depending on the votes collected when the signing period has finished"
   task check_published: :environment do
     Decidim::Initiatives::SupportPeriodFinishedInitiatives.new.each do |initiative|
       if initiative.supports_goal_reached?
@@ -19,7 +19,7 @@ namespace :decidim_initiatives do
     end
   end
 
-  desc "Notify progress on published initiatives"
+  desc "Notifies progress on published initiatives"
   task notify_progress: :environment do
     Decidim::Initiative
       .published

data/lib/tasks/initiatives/upgrade/decidim_initiatives_upgrade_tasks.rake

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
-namespace :decidim do
-  namespace :initiatives do
-    namespace :upgrade do
-      desc "Fix the broken pages"
-      task fix_broken_pages: :environment do
-        Decidim::Initiative.find_each do |initiative|
-          initiative.components.where(manifest_name: "pages").each do |component|
-            next unless Decidim::Pages::Page.where(component:).empty?
+namespace :decidim_initiatives do
+  namespace :upgrade do
+    desc "Fixes the broken pages"
+    task fix_broken_pages: :environment do
+      Decidim::Initiative.find_each do |initiative|
+        initiative.components.where(manifest_name: "pages").each do |component|
+          next unless Decidim::Pages::Page.where(component:).empty?
 
-            Decidim::Pages::CreatePage.call(component) do
-              on(:invalid) { raise "Cannot create page" }
-            end
+          Decidim::Pages::CreatePage.call(component) do
+            on(:invalid) { raise "Cannot create page" }
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.28.6
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-29 00:00:00.000000000 Z
+date: 2024-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: hexapdf
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.6
+        version: 0.29.0.rc1
 description: Participants initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -218,7 +232,6 @@ files:
 - app/forms/decidim/initiatives/admin/initiatives_settings_form.rb
 - app/forms/decidim/initiatives/committee_member_form.rb
 - app/forms/decidim/initiatives/initiative_form.rb
-- app/forms/decidim/initiatives/previous_form.rb
 - app/forms/decidim/initiatives/select_initiative_type_form.rb
 - app/forms/decidim/initiatives/vote_form.rb
 - app/helpers/decidim/initiatives/admin/initiatives_helper.rb
@@ -237,7 +250,6 @@ files:
 - app/models/decidim/initiatives_vote.rb
 - app/packs/entrypoints/decidim_initiatives.js
 - app/packs/entrypoints/decidim_initiatives_admin.js
-- app/packs/entrypoints/decidim_initiatives_admin.scss
 - app/packs/entrypoints/decidim_initiatives_initiatives_votes.js
 - app/packs/entrypoints/decidim_initiatives_initiatives_votes.scss
 - app/packs/entrypoints/decidim_initiatives_print.js
@@ -249,7 +261,6 @@ files:
 - app/packs/src/decidim/initiatives/application.js
 - app/packs/src/decidim/initiatives/identity_selector_dialog.js
 - app/packs/src/decidim/initiatives/scoped_type.js
-- app/packs/stylesheets/decidim/initiatives/admin/initiatives.scss
 - app/packs/stylesheets/decidim/initiatives/initiatives-votes.scss
 - app/packs/stylesheets/decidim/initiatives/print-initiative.scss
 - app/packs/stylesheets/initiatives.scss
@@ -268,7 +279,6 @@ files:
 - app/queries/decidim/initiatives/initiatives_promoted.rb
 - app/queries/decidim/initiatives/organization_prioritized_initiatives.rb
 - app/queries/decidim/initiatives/outdated_validating_initiatives.rb
-- app/queries/decidim/initiatives/similar_initiatives.rb
 - app/queries/decidim/initiatives/support_period_finished_initiatives.rb
 - app/queries/decidim/initiatives/user_authorizations.rb
 - app/serializers/decidim/initiatives/initiative_serializer.rb
@@ -360,9 +370,6 @@ files:
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
-- config/locales/bn-BD.yml
-- config/locales/bs-BA.yml
-- config/locales/ca-IT.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -520,7 +527,7 @@ files:
 - lib/tasks/initiatives/upgrade/decidim_initiatives_upgrade_tasks.rake
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0-or-later
+- AGPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/
@@ -535,14 +542,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim initiatives module

data/app/forms/decidim/initiatives/previous_form.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    # A form object used to collect the title and description for an initiative.
-    class PreviousForm < Form
-      include TranslatableAttributes
-
-      mimic :initiative
-
-      attribute :title, String
-      attribute :description, String
-      attribute :type_id, Integer
-
-      validates :title, :description, presence: true
-      validates :title, length: { maximum: 150 }
-      validates :type_id, presence: true
-
-      def type
-        @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
-      end
-    end
-  end
-end