decidim-proposals 0.26.8 → 0.27.0.rc1

data/db/migrate/20180529110230_move_authorships_to_coauthorships.rb

@@ -4,6 +4,7 @@ class MoveAuthorshipsToCoauthorships < ActiveRecord::Migration[5.1]
   class Proposal < ApplicationRecord
     self.table_name = :decidim_proposals_proposals
   end
+
   class Coauthorship < ApplicationRecord
     self.table_name = :decidim_coauthorships
   end

data/db/migrate/20181003074440_fix_user_groups_ids_in_proposals_endorsements.rb

@@ -5,20 +5,13 @@ class FixUserGroupsIdsInProposalsEndorsements < ActiveRecord::Migration[5.2]
     self.table_name = :decidim_proposals_proposal_endorsements
   end
 
-  class UserGroup < ApplicationRecord
-    self.table_name = :decidim_users
-    self.inheritance_column = nil # disable the default inheritance
-
-    default_scope { where(type: "Decidim::UserGroup") }
-  end
-
   # rubocop:disable Rails/SkipsModelValidations
   def change
-    UserGroup.find_each do |group|
+    Decidim::UserGroup.find_each do |group|
       old_id = group.extended_data["old_user_group_id"]
       next unless old_id
 
-      ProposalEndorsement
+      Decidim::Proposals::ProposalEndorsement
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
     end

data/db/migrate/20200708091228_move_proposals_fields_to_i18n.rb

@@ -1,38 +1,15 @@
 # frozen_string_literal: true
 
 class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
-  class Proposal < ApplicationRecord
-    include Decidim::HasComponent
-
-    self.table_name = :decidim_proposals_proposals
-  end
-
-  class Coauthorship < ApplicationRecord
-    self.table_name = :decidim_coauthorships
-  end
-
-  class UserBaseEntity < ApplicationRecord
-    self.table_name = :decidim_users
-    self.inheritance_column = nil # disable the default inheritance
-  end
-
-  class Organization < ApplicationRecord
-    self.table_name = :decidim_organizations
-  end
-
   def up
     add_column :decidim_proposals_proposals, :new_title, :jsonb
     add_column :decidim_proposals_proposals, :new_body, :jsonb
 
+    reset_column_information
+
     PaperTrail.request(enabled: false) do
-      Proposal.find_each do |proposal|
-        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
-        author =
-          if coauthorship.decidim_author_type == "Decidim::Organization"
-            Organization.find_by(id: coauthorship.decidim_author_id)
-          else
-            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
-          end
+      Decidim::Proposals::Proposal.find_each do |proposal|
+        author = proposal.coauthorships.first.author
 
         locale = if author
                    author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
@@ -61,13 +38,17 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
+
+    reset_column_information
   end
 
   def down
     add_column :decidim_proposals_proposals, :new_title, :string
     add_column :decidim_proposals_proposals, :new_body, :string
 
-    Proposal.find_each do |proposal|
+    reset_column_information
+
+    Decidim::Proposals::Proposal.find_each do |proposal|
       proposal.new_title = proposal.title.values.first
       proposal.new_body = proposal.body.values.first
 
@@ -82,6 +63,15 @@ class MoveProposalsFieldsToI18n < ActiveRecord::Migration[5.2]
     rename_column :decidim_proposals_proposals, :new_body, :body
 
     create_indexs
+
+    reset_column_information
+  end
+
+  def reset_column_information
+    Decidim::User.reset_column_information
+    Decidim::Coauthorship.reset_column_information
+    Decidim::Proposals::Proposal.reset_column_information
+    Decidim::Organization.reset_column_information
   end
 
   def remove_indexs

data/db/migrate/20201002085508_fix_proposals_data.rb

@@ -1,35 +1,14 @@
 # frozen_string_literal: true
 
 class FixProposalsData < ActiveRecord::Migration[5.2]
-  class Proposal < ApplicationRecord
-    self.table_name = :decidim_proposals_proposals
-  end
-
-  class Coauthorship < ApplicationRecord
-    self.table_name = :decidim_coauthorships
-  end
-
-  class UserBaseEntity < ApplicationRecord
-    self.table_name = :decidim_users
-    self.inheritance_column = nil # disable the default inheritance
-  end
-
-  class Organization < ApplicationRecord
-    self.table_name = :decidim_organizations
-  end
-
   def up
+    reset_column_information
+
     PaperTrail.request(enabled: false) do
-      Proposal.find_each do |proposal|
+      Decidim::Proposals::Proposal.find_each do |proposal|
         next if proposal.title.is_a?(Hash) && proposal.body.is_a?(Hash)
 
-        coauthorship = Coauthorship.order(:id).find_by(coauthorable_type: "Decidim::Proposals::Proposal", coauthorable_id: proposal.id)
-        author =
-          if coauthorship.decidim_author_type == "Decidim::Organization"
-            Organization.find_by(id: coauthorship.decidim_author_id)
-          else
-            UserBaseEntity.find_by(id: coauthorship.decidim_author_id)
-          end
+        author = proposal.coauthorships.first.author
 
         locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
 
@@ -42,7 +21,16 @@ class FixProposalsData < ActiveRecord::Migration[5.2]
         # rubocop:enable Rails/SkipsModelValidations
       end
     end
+
+    reset_column_information
   end
 
   def down; end
+
+  def reset_column_information
+    Decidim::User.reset_column_information
+    Decidim::Coauthorship.reset_column_information
+    Decidim::Proposals::Proposal.reset_column_information
+    Decidim::Organization.reset_column_information
+  end
 end

data/lib/decidim/proposals/component.rb

@@ -28,19 +28,19 @@ Decidim.register_component(:proposals) do |component|
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
-    settings.attribute :vote_limit, type: :integer, default: 0, required: true
-    settings.attribute :minimum_votes_per_user, type: :integer, default: 0, required: true
-    settings.attribute :proposal_limit, type: :integer, default: 0, required: true
+    settings.attribute :vote_limit, type: :integer, default: 0
+    settings.attribute :minimum_votes_per_user, type: :integer, default: 0
+    settings.attribute :proposal_limit, type: :integer, default: 0
     settings.attribute :proposal_length, type: :integer, default: 500
     settings.attribute :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(limited infinite) }
-    settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5, required: true
-    settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
+    settings.attribute :proposal_edit_before_minutes, type: :integer, default: 5
+    settings.attribute :threshold_per_proposal, type: :integer, default: 0
     settings.attribute :can_accumulate_supports_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
     settings.attribute :default_sort_order, type: :select, default: "default", choices: -> { POSSIBLE_SORT_ORDERS }
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
-    settings.attribute :comments_max_length, type: :integer, required: true
+    settings.attribute :comments_max_length, type: :integer, required: false
     settings.attribute :geocoding_enabled, type: :boolean, default: false
     settings.attribute :attachments_allowed, type: :boolean, default: false
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
@@ -131,7 +131,6 @@ Decidim.register_component(:proposals) do |component|
 
       collection = Decidim::Proposals::Proposal
                    .published
-                   .not_hidden
                    .where(component: component_instance)
                    .includes(:scope, :category, :component)
 
@@ -267,26 +266,31 @@ Decidim.register_component(:proposals) do |component|
         visibility: "all"
       ) do
         proposal = Decidim::Proposals::Proposal.new(params)
-        proposal.add_coauthor(participatory_space.organization)
+        meeting_component = participatory_space.components.find_by(manifest_name: "meetings")
+
+        coauthor = case n
+                   when 0
+                     Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 1
+                     Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).order(Arel.sql("RANDOM()")).first
+                   when 2
+                     Decidim::Meetings::Meeting.where(component: meeting_component).order(Arel.sql("RANDOM()")).first
+                   else
+                     participatory_space.organization
+                   end
+        proposal.add_coauthor(coauthor)
         proposal.save!
         proposal
       end
 
-      if n.positive?
-        Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample(n).each do |author|
-          user_group = [true, false].sample ? Decidim::UserGroups::ManageableUserGroups.for(author).verified.sample : nil
-          proposal.add_coauthor(author, user_group: user_group)
-        end
-      end
-
       if proposal.state.nil?
         email = "amendment-author-#{participatory_space.underscored_name}-#{participatory_space.id}-#{n}-amend#{n}@example.org"
         name = "#{Faker::Name.name} #{participatory_space.id} #{n} amend#{n}"
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -351,8 +355,8 @@ Decidim.register_component(:proposals) do |component|
 
         author = Decidim::User.find_or_initialize_by(email: email)
         author.update!(
-          password: "decidim123456",
-          password_confirmation: "decidim123456",
+          password: "decidim123456789",
+          password_confirmation: "decidim123456789",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
           organization: component.organization,
@@ -373,8 +377,8 @@ Decidim.register_component(:proposals) do |component|
 
           author = Decidim::User.find_or_initialize_by(email: email)
           author.update!(
-            password: "decidim123456",
-            password_confirmation: "decidim123456",
+            password: "decidim123456789",
+            password_confirmation: "decidim123456789",
             name: name,
             nickname: Faker::Twitter.unique.screen_name,
             organization: component.organization,

data/lib/decidim/proposals/engine.rb

@@ -90,12 +90,6 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Proposals::Engine.root}/app/views") # for proposal partials
       end
 
-      initializer "decidim_proposals.remove_space_admins" do
-        ActiveSupport::Notifications.subscribe("decidim.system.participatory_space.admin.destroyed") do |_event_name, klass, id|
-          Decidim::Proposals::ValuationAssignment.where(valuator_role_type: klass, valuator_role_id: id).destroy_all
-        end
-      end
-
       initializer "decidim_proposals.add_badges" do
         Decidim::Gamification.register_badge(:proposals) do |badge|
           badge.levels = [1, 5, 10, 30, 60]

data/lib/decidim/proposals/import/proposal_answer_creator.rb

@@ -32,16 +32,13 @@ module Decidim
             resource,
             current_user
           ) do
-            resource.try(:save!)
+            resource.save!
           end
-
-          notify
+          notify(resource)
         end
 
         private
 
-        attr_reader :initial_state
-
         def resource
           @resource ||= fetch_resource
         end
@@ -58,8 +55,6 @@ module Decidim
 
           proposal.answer = answer
           proposal.answered_at = Time.current
-          @initial_state = proposal.state
-
           if POSSIBLE_ANSWER_STATES.include?(state)
             proposal.state = state
             proposal.state_published_at = Time.current if component.current_settings.publish_answers_immediately?
@@ -93,9 +88,8 @@ module Decidim
           context[:current_user]
         end
 
-        def notify
-          state = initial_state || resource.try(:state)
-          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(resource, state)
+        def notify(proposal)
+          ::Decidim::Proposals::Admin::NotifyProposalAnswer.call(proposal, proposal.state)
         end
       end
     end

data/lib/decidim/proposals/proposal_serializer.rb

@@ -8,7 +8,6 @@ module Decidim
       include Decidim::ApplicationHelper
       include Decidim::ResourceHelper
       include Decidim::TranslationsHelper
-      include HtmlToPlainText
 
       # Public: Initializes the serializer with a proposal.
       def initialize(proposal)
@@ -33,7 +32,7 @@ module Decidim
           },
           component: { id: component.id },
           title: proposal.title,
-          body: convert_to_plain_text(proposal.body),
+          body: proposal.body,
           address: proposal.address,
           latitude: proposal.latitude,
           longitude: proposal.longitude,
@@ -94,13 +93,6 @@ module Decidim
 
         Decidim::ResourceLocatorPresenter.new(proposal.amendable).url
       end
-
-      # Recursively strips HTML tags from given Hash strings using convert_to_text from Premailer
-      def convert_to_plain_text(value)
-        return value.transform_values { |v| convert_to_plain_text(v) } if value.is_a?(Hash)
-
-        convert_to_text(value)
-      end
     end
   end
 end

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

@@ -305,7 +305,7 @@ FactoryBot.define do
       published_at { nil }
     end
 
-    trait :citizen_author do
+    trait :participant_author do
       after :build do |proposal|
         proposal.coauthorships.clear
         user = build(:user, organization: proposal.component.participatory_space.organization)

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.26.8"
+      "0.27.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.4.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
-- !ruby/object:Gem::Dependency
-  name: decidim-conference
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.8
+        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.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        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.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -375,7 +361,6 @@ files:
 - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
 - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
 - app/queries/decidim/proposals/similar_proposals.rb
-- app/services/decidim/proposals/collaborative_draft_search.rb
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
@@ -390,7 +375,6 @@ files:
 - app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
 - app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
-- app/views/decidim/proposals/admin/proposals/_js-callout.html.erb
 - app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb
@@ -405,8 +389,7 @@ files:
 - app/views/decidim/proposals/admin/proposals/new.html.erb
 - app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
 - app/views/decidim/proposals/admin/proposals/show.html.erb
-- app/views/decidim/proposals/admin/proposals/update_category.js.erb
-- app/views/decidim/proposals/admin/proposals/update_scope.js.erb
+- app/views/decidim/proposals/admin/proposals/update_attribute.js.erb
 - app/views/decidim/proposals/admin/proposals_imports/new.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
@@ -461,7 +444,6 @@ files:
 - app/views/decidim/proposals/versions/show.html.erb
 - config/assets.rb
 - config/brakeman.ignore
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -484,7 +466,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
@@ -493,7 +474,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
@@ -502,13 +482,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
@@ -516,7 +493,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
@@ -622,7 +598,6 @@ files:
 - lib/decidim/proposals/test/factories.rb
 - lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
-- lib/tasks/proposals/upgrade/decdim_proposal_upgrade_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -635,14 +610,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 proposals module