decidim-proposals 0.19.1 → 0.23.0

data/lib/decidim/proposals/engine.rb

@@ -17,9 +17,6 @@ module Decidim
 
       routes do
         resources :proposals, except: [:destroy] do
-          resource :proposal_endorsement, only: [:create, :destroy] do
-            get :identities, on: :collection
-          end
           member do
             get :compare
             get :complete
@@ -31,7 +28,7 @@ module Decidim
             put :withdraw
           end
           resource :proposal_vote, only: [:create, :destroy]
-          resource :proposal_widget, only: :show, path: "embed"
+          resource :widget, only: :show, path: "embed"
           resources :versions, only: [:show, :index]
         end
         resources :collaborative_drafts, except: [:destroy] do
@@ -50,8 +47,7 @@ module Decidim
       end
 
       initializer "decidim_proposals.assets" do |app|
-        app.config.assets.precompile += %w(decidim_proposals_manifest.js
-                                           decidim/proposals/identity_selector_dialog.js)
+        app.config.assets.precompile += %w(decidim_proposals_manifest.js)
       end
 
       initializer "decidim.content_processors" do |_app|
@@ -112,7 +108,7 @@ module Decidim
           payload = data[:this]
           if payload[:from_type] == Decidim::Accountability::Result.name && payload[:to_type] == Proposal.name
             proposal = Proposal.find(payload[:to_id])
-            proposal.update(state: "accepted")
+            proposal.update(state: "accepted", state_published_at: Time.current)
           end
         end
       end

data/lib/decidim/proposals/markdown_to_proposals.rb

@@ -131,8 +131,8 @@ module Decidim
       def create_proposal(title, body, participatory_text_level)
         attributes = {
           component: @component,
-          title: title,
-          body: body,
+          title: { I18n.locale => title },
+          body: { I18n.locale => body },
           participatory_text_level: participatory_text_level
         }
 

data/lib/decidim/proposals/proposal_serializer.rb

@@ -31,8 +31,8 @@ module Decidim
             url: Decidim::ResourceLocatorPresenter.new(proposal.participatory_space).url
           },
           component: { id: component.id },
-          title: present(proposal).title,
-          body: present(proposal).body,
+          title: proposal.title,
+          body: proposal.body,
           state: proposal.state.to_s,
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
@@ -41,7 +41,7 @@ module Decidim
             total_count: proposal.endorsements.count,
             user_endorsements: user_endorsements
           },
-          comments: proposal.comments.count,
+          comments: proposal.comments_count,
           attachments: proposal.attachments.count,
           followers: proposal.followers.count,
           published_at: proposal.published_at,

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require "decidim/dev/test/rspec_support/capybara_data_picker"
+
+module Capybara
+  module ProposalsPicker
+    include DataPicker
+
+    RSpec::Matchers.define :have_proposals_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{translated(proposal.title)}\")]]")
+        end
+      end
+    end
+
+    RSpec::Matchers.define :have_proposals_not_picked do |expected|
+      match do |proposals_picker|
+        data_picker = proposals_picker.data_picker
+
+        expected.each do |proposal|
+          expect(data_picker).not_to have_selector(".picker-values div input[value='#{proposal.id}']", visible: :all)
+          expect(data_picker).not_to have_selector(:xpath, "//div[contains(@class,'picker-values')]/div/a[text()[contains(.,\"#{translated(proposal.title)}\")]]")
+        end
+      end
+    end
+
+    def proposals_pick(proposals_picker, proposals)
+      data_picker = proposals_picker.data_picker
+
+      expect(data_picker).to have_selector(".picker-prompt")
+      data_picker.find(".picker-prompt").click
+
+      proposals.each do |proposal|
+        data_picker_choose_value(proposal.id)
+      end
+      data_picker_close
+
+      expect(proposals_picker).to have_proposals_picked(proposals)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Capybara::ProposalsPicker, type: :system
+end

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

@@ -160,15 +160,6 @@ FactoryBot.define do
       end
     end
 
-    trait :with_geocoding_and_collaborative_drafts_enabled do
-      settings do
-        {
-          geocoding_enabled: true,
-          collaborative_drafts_enabled: true
-        }
-      end
-    end
-
     trait :with_attachments_allowed_and_collaborative_drafts_enabled do
       settings do
         {
@@ -223,6 +214,14 @@ FactoryBot.define do
       end
     end
 
+    trait :with_card_image_allowed do
+      settings do
+        {
+          allow_card_image: true
+        }
+      end
+    end
+
     trait :with_extra_hashtags do
       transient do
         automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
@@ -239,6 +238,16 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :without_publish_answers_immediately do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            publish_answers_immediately: false
+          }
+        }
+      end
+    end
   end
 
   factory :proposal, class: "Decidim::Proposals::Proposal" do
@@ -250,20 +259,38 @@ FactoryBot.define do
     end
 
     title do
-      content = generate(:title).dup
-      content.prepend("<script>alert('TITLE');</script> ") unless skip_injection
-      content
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> " + generate(:title) }
+      end
     end
     body do
-      content = Faker::Lorem.sentences(3).join("\n")
-      content.prepend("<script>alert('BODY');</script> ") unless skip_injection
-      content
+      if skip_injection
+        Decidim::Faker::Localized.localized { Faker::Lorem.sentences(3).join("\n") }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> " + Faker::Lorem.sentences(3).join("\n") }
+      end
     end
     component { create(:proposal_component) }
     published_at { Time.current }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
 
     after(:build) do |proposal, evaluator|
+      proposal.title = if evaluator.title.is_a?(String)
+                         { proposal.try(:organization).try(:default_locale) || "en" => evaluator.title }
+                       else
+                         evaluator.title
+                       end
+      proposal.body = if evaluator.body.is_a?(String)
+                        { proposal.try(:organization).try(:default_locale) || "en" => evaluator.body }
+                      else
+                        evaluator.body
+                      end
+
+      proposal.title = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.title, current_organization: proposal.organization).rewrite
+      proposal.body = Decidim::ContentProcessor.parse_with_processor(:hashtag, proposal.body, current_organization: proposal.organization).rewrite
+
       if proposal.component
         users = evaluator.users || [create(:user, organization: proposal.component.participatory_space.organization)]
         users.each_with_index do |user, idx|
@@ -281,6 +308,23 @@ FactoryBot.define do
       published_at { nil }
     end
 
+    trait :citizen_author do
+      after :build do |proposal|
+        proposal.coauthorships.clear
+        user = build(:user, organization: proposal.component.participatory_space.organization)
+        proposal.coauthorships.build(author: user)
+      end
+    end
+
+    trait :user_group_author do
+      after :build do |proposal|
+        proposal.coauthorships.clear
+        user = create(:user, organization: proposal.component.participatory_space.organization)
+        user_group = create(:user_group, :verified, organization: user.organization, users: [user])
+        proposal.coauthorships.build(author: user, user_group: user_group)
+      end
+    end
+
     trait :official do
       after :build do |proposal|
         proposal.coauthorships.clear
@@ -291,7 +335,7 @@ FactoryBot.define do
     trait :official_meeting do
       after :build do |proposal|
         proposal.coauthorships.clear
-        component = create(:meeting_component, participatory_space: proposal.component.participatory_space)
+        component = build(:meeting_component, participatory_space: proposal.component.participatory_space)
         proposal.coauthorships.build(author: build(:meeting, component: component))
       end
     end
@@ -299,26 +343,41 @@ FactoryBot.define do
     trait :evaluating do
       state { "evaluating" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :accepted do
       state { "accepted" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :rejected do
       state { "rejected" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :withdrawn do
       state { "withdrawn" }
     end
 
+    trait :accepted_not_published do
+      state { "accepted" }
+      answered_at { Time.current }
+      state_published_at { nil }
+      answer { generate_localized_title }
+    end
+
     trait :with_answer do
       state { "accepted" }
       answer { generate_localized_title }
       answered_at { Time.current }
+      state_published_at { Time.current }
+    end
+
+    trait :not_answered do
+      state { nil }
     end
 
     trait :draft do
@@ -339,7 +398,15 @@ FactoryBot.define do
 
     trait :with_endorsements do
       after :create do |proposal|
-        create_list(:proposal_endorsement, 5, proposal: proposal)
+        5.times.collect do
+          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization))
+        end
+      end
+    end
+
+    trait :with_amendments do
+      after :create do |proposal|
+        create_list(:proposal_amendment, 5, amendable: proposal)
       end
     end
   end
@@ -349,15 +416,11 @@ FactoryBot.define do
     author { build(:user, organization: proposal.organization) }
   end
 
-  factory :proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
-  end
-
-  factory :user_group_proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
-    proposal { build(:proposal) }
-    author { build(:user, organization: proposal.organization) }
-    user_group { create(:user_group, verified_at: Time.current, organization: proposal.organization, users: [author]) }
+  factory :proposal_amendment, class: "Decidim::Amendment" do
+    amendable { build(:proposal) }
+    emendation { build(:proposal, component: amendable.component) }
+    amender { build(:user, organization: amendable.component.participatory_space.organization) }
+    state { Decidim::Amendment::STATES.sample }
   end
 
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
@@ -404,8 +467,17 @@ FactoryBot.define do
   end
 
   factory :participatory_text, class: "Decidim::Proposals::ParticipatoryText" do
-    title { "<script>alert(\"TITLE\");</script> " + generate(:title) }
-    description { "<script>alert(\"DESCRIPTION\");</script>\n" + Faker::Lorem.sentences(3).join("\n") }
+    title { { en: "<script>alert(\"TITLE\");</script> " + generate(:title) } }
+    description { { en: "<script>alert(\"DESCRIPTION\");</script>\n" + Faker::Lorem.sentences(3).join("\n") } }
     component { create(:proposal_component) }
   end
+
+  factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+    proposal
+    valuator_role do
+      space = proposal.component.participatory_space
+      organization = space.organization
+      build :participatory_process_user_role, role: :valuator, user: build(:user, organization: organization)
+    end
+  end
 end

data/lib/decidim/proposals/valuatable.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A set of methods and features related to proposal valuations.
+    module Valuatable
+      extend ActiveSupport::Concern
+      include Decidim::Comments::Commentable
+
+      included do
+        has_many :valuation_assignments, foreign_key: "decidim_proposal_id", dependent: :destroy
+
+        def valuators
+          valuator_role_ids = valuation_assignments.where(proposal: self).pluck(:valuator_role_id)
+          user_ids = participatory_space.user_roles(:valuator).where(id: valuator_role_ids).pluck(:decidim_user_id)
+          participatory_space.organization.users.where(id: user_ids)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,42 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
-- !ruby/object:Gem::Dependency
-  name: diffy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +102,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -158,84 +150,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -258,7 +250,7 @@ files:
 - app/assets/javascripts/decidim/proposals/add_proposal.js.es6
 - app/assets/javascripts/decidim/proposals/admin/proposals.es6
 - app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6
-- app/assets/javascripts/decidim/proposals/identity_selector_dialog.js.es6
+- app/assets/javascripts/decidim/proposals/admin/proposals_picker.js.es6
 - app/assets/javascripts/decidim/proposals/utils.js.es6
 - app/cells/decidim/proposals/collaborative_draft_cell.rb
 - app/cells/decidim/proposals/collaborative_draft_link_to_proposal/show.erb
@@ -266,8 +258,8 @@ files:
 - app/cells/decidim/proposals/collaborative_draft_m/footer.erb
 - app/cells/decidim/proposals/collaborative_draft_m/tags.erb
 - app/cells/decidim/proposals/collaborative_draft_m_cell.rb
-- app/cells/decidim/proposals/endorsers_list/show.erb
-- app/cells/decidim/proposals/endorsers_list_cell.rb
+- app/cells/decidim/proposals/cost_report/show.erb
+- app/cells/decidim/proposals/cost_report_cell.rb
 - app/cells/decidim/proposals/highlighted_proposals/show.erb
 - app/cells/decidim/proposals/highlighted_proposals_cell.rb
 - app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb
@@ -289,38 +281,45 @@ files:
 - app/cells/decidim/proposals/proposal_m_cell.rb
 - app/cells/decidim/proposals/proposal_tags/show.erb
 - app/cells/decidim/proposals/proposal_tags_cell.rb
+- app/cells/decidim/proposals/proposals_picker/proposals.erb
+- app/cells/decidim/proposals/proposals_picker/show.erb
+- app/cells/decidim/proposals/proposals_picker_cell.rb
 - app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
 - app/commands/decidim/proposals/admin/answer_proposal.rb
+- app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/admin/create_proposal_note.rb
 - app/commands/decidim/proposals/admin/discard_participatory_text.rb
 - app/commands/decidim/proposals/admin/import_participatory_text.rb
 - app/commands/decidim/proposals/admin/import_proposals.rb
 - app/commands/decidim/proposals/admin/merge_proposals.rb
+- app/commands/decidim/proposals/admin/notify_proposal_answer.rb
+- app/commands/decidim/proposals/admin/publish_answers.rb
 - app/commands/decidim/proposals/admin/publish_participatory_text.rb
 - app/commands/decidim/proposals/admin/split_proposals.rb
+- app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
 - app/commands/decidim/proposals/admin/update_participatory_text.rb
 - app/commands/decidim/proposals/admin/update_proposal.rb
 - app/commands/decidim/proposals/admin/update_proposal_category.rb
-- app/commands/decidim/proposals/attachment_methods.rb
+- app/commands/decidim/proposals/admin/update_proposal_scope.rb
 - app/commands/decidim/proposals/create_collaborative_draft.rb
 - app/commands/decidim/proposals/create_proposal.rb
 - app/commands/decidim/proposals/create_proposal_export.rb
 - app/commands/decidim/proposals/destroy_proposal.rb
-- app/commands/decidim/proposals/endorse_proposal.rb
 - app/commands/decidim/proposals/gallery_methods.rb
 - app/commands/decidim/proposals/hashtags_methods.rb
 - app/commands/decidim/proposals/publish_collaborative_draft.rb
 - app/commands/decidim/proposals/publish_proposal.rb
 - app/commands/decidim/proposals/reject_access_to_collaborative_draft.rb
 - app/commands/decidim/proposals/request_access_to_collaborative_draft.rb
-- app/commands/decidim/proposals/unendorse_proposal.rb
 - app/commands/decidim/proposals/unvote_proposal.rb
 - app/commands/decidim/proposals/update_collaborative_draft.rb
 - app/commands/decidim/proposals/update_proposal.rb
 - app/commands/decidim/proposals/vote_proposal.rb
 - app/commands/decidim/proposals/withdraw_collaborative_draft.rb
 - app/commands/decidim/proposals/withdraw_proposal.rb
+- app/controllers/concerns/decidim/proposals/admin/filterable.rb
+- app/controllers/concerns/decidim/proposals/admin/picker.rb
 - app/controllers/concerns/decidim/proposals/collaborative_orderable.rb
 - app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
@@ -331,16 +330,18 @@ files:
 - app/controllers/decidim/proposals/admin/proposals_imports_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_merges_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_splits_controller.rb
+- app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
 - app/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller.rb
 - app/controllers/decidim/proposals/collaborative_drafts_controller.rb
-- app/controllers/decidim/proposals/proposal_endorsements_controller.rb
 - app/controllers/decidim/proposals/proposal_votes_controller.rb
-- app/controllers/decidim/proposals/proposal_widgets_controller.rb
 - app/controllers/decidim/proposals/proposals_controller.rb
 - app/controllers/decidim/proposals/versions_controller.rb
+- app/controllers/decidim/proposals/widgets_controller.rb
 - app/events/decidim/proposals/accepted_proposal_event.rb
+- app/events/decidim/proposals/admin/proposal_note_created_event.rb
 - app/events/decidim/proposals/admin/update_proposal_category_event.rb
+- app/events/decidim/proposals/admin/update_proposal_scope_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_accepted_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_rejected_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_request_event.rb
@@ -359,20 +360,27 @@ files:
 - app/forms/decidim/proposals/accept_access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/admin/import_participatory_text_form.rb
+- app/forms/decidim/proposals/admin/participatory_text_proposal_form.rb
 - app/forms/decidim/proposals/admin/preview_participatory_text_form.rb
 - app/forms/decidim/proposals/admin/proposal_answer_form.rb
+- app/forms/decidim/proposals/admin/proposal_base_form.rb
 - app/forms/decidim/proposals/admin/proposal_form.rb
 - app/forms/decidim/proposals/admin/proposal_note_form.rb
 - app/forms/decidim/proposals/admin/proposals_fork_form.rb
 - app/forms/decidim/proposals/admin/proposals_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_merge_form.rb
 - app/forms/decidim/proposals/admin/proposals_split_form.rb
+- app/forms/decidim/proposals/admin/valuation_assignment_form.rb
 - app/forms/decidim/proposals/collaborative_draft_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
 - app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb
+- app/helpers/decidim/proposals/admin/filterable_helper.rb
+- app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb
+- app/helpers/decidim/proposals/admin/proposal_rankings_helper.rb
 - app/helpers/decidim/proposals/admin/proposals_helper.rb
+- app/helpers/decidim/proposals/admin/proposals_picker_helper.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/collaborative_draft_cells_helper.rb
 - app/helpers/decidim/proposals/collaborative_draft_helper.rb
@@ -383,6 +391,7 @@ files:
 - app/helpers/decidim/proposals/proposal_endorsements_helper.rb
 - app/helpers/decidim/proposals/proposal_votes_helper.rb
 - app/helpers/decidim/proposals/proposal_wizard_helper.rb
+- app/helpers/decidim/proposals/proposals_helper.rb
 - app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb
 - app/jobs/decidim/proposals/settings_change_job.rb
 - app/models/decidim/proposals/application_record.rb
@@ -390,17 +399,20 @@ files:
 - app/models/decidim/proposals/collaborative_draft_collaborator_request.rb
 - app/models/decidim/proposals/participatory_text.rb
 - app/models/decidim/proposals/proposal.rb
-- app/models/decidim/proposals/proposal_endorsement.rb
 - app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_vote.rb
+- app/models/decidim/proposals/valuation_assignment.rb
 - app/permissions/decidim/proposals/admin/permissions.rb
 - app/permissions/decidim/proposals/permissions.rb
 - app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_presenter.rb
+- app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_state_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
+- app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb
 - app/presenters/decidim/proposals/collaborative_draft_presenter.rb
 - app/presenters/decidim/proposals/log/resource_presenter.rb
+- app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/official_author_presenter.rb
 - app/presenters/decidim/proposals/proposal_presenter.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
@@ -416,31 +428,39 @@ files:
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
+- app/types/decidim/proposals/proposal_input_filter.rb
+- app/types/decidim/proposals/proposal_input_sort.rb
 - app/types/decidim/proposals/proposal_type.rb
 - app/types/decidim/proposals/proposals_type.rb
+- app/validators/proposal_length_validator.rb
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_proposals.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/index.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/new_import.html.erb
-- app/views/decidim/proposals/admin/proposal_answers/edit.html.erb
+- app/views/decidim/proposals/admin/proposal_answers/_form.html.erb
 - app/views/decidim/proposals/admin/proposal_notes/_form.html.erb
 - app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
-- app/views/decidim/proposals/admin/proposal_notes/index.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
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb
 - app/views/decidim/proposals/admin/proposals/edit.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - 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_imports/new.html.erb
-- app/views/decidim/proposals/admin/shared/_info_proposal.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborator_requests.html.erb
@@ -459,15 +479,9 @@ files:
 - app/views/decidim/proposals/collaborative_drafts/index.js.erb
 - app/views/decidim/proposals/collaborative_drafts/new.html.erb
 - app/views/decidim/proposals/collaborative_drafts/show.html.erb
-- app/views/decidim/proposals/proposal_endorsements/_identity.html.erb
-- app/views/decidim/proposals/proposal_endorsements/identities.html.erb
-- app/views/decidim/proposals/proposal_endorsements/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
-- app/views/decidim/proposals/proposal_widgets/show.html.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
 - app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
-- app/views/decidim/proposals/proposals/_endorsement_button.html.erb
-- app/views/decidim/proposals/proposals/_endorsement_identities_cabin.html.erb
 - app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
 - app/views/decidim/proposals/proposals/_filters_small_view.html.erb
@@ -497,38 +511,74 @@ files:
 - app/views/decidim/proposals/proposals/participatory_texts/participatory_text.html.erb
 - app/views/decidim/proposals/proposals/preview.html.erb
 - app/views/decidim/proposals/proposals/show.html.erb
-- app/views/decidim/proposals/versions/_version.html.erb
 - app/views/decidim/proposals/versions/index.html.erb
 - app/views/decidim/proposals/versions/show.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20161212110850_create_decidim_proposals.rb
 - db/migrate/20170112115253_create_proposal_votes.rb
 - db/migrate/20170113114245_add_text_search_indexes.rb
@@ -568,6 +618,19 @@ files:
 - db/migrate/20181017084221_make_author_polymorhpic_for_proposal_endorsements.rb
 - db/migrate/20181026073215_add_created_in_meeting.rb
 - db/migrate/20190215113158_use_md5_indexes.rb
+- db/migrate/20191206154128_add_endorsements_counter_cache_to_proposals.rb
+- db/migrate/20200120215928_move_proposal_endorsements_to_core_endorsements.rb
+- db/migrate/20200120230130_drop_proposal_endorsements.rb
+- db/migrate/20200203111239_add_proposal_valuation_assignments.rb
+- db/migrate/20200210135152_add_costs_to_proposals.rb
+- db/migrate/20200212120110_sync_proposals_state_with_amendments_state.rb
+- db/migrate/20200227175922_add_state_published_at_to_proposals.rb
+- db/migrate/20200306123652_publish_existing_proposals_state.rb
+- db/migrate/20200708091228_move_proposals_fields_to_i18n.rb
+- db/migrate/20200730131631_move_proposal_endorsed_event_notifications_to_resource_endorsed_event.rb
+- db/migrate/20200827154156_add_commentable_counter_cache_to_proposals.rb
+- db/migrate/20200915151348_fix_proposals_data_to_ensure_title_and_body_are_hashes.rb
+- db/migrate/20201002085508_fix_proposals_data.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
@@ -582,7 +645,9 @@ files:
 - lib/decidim/proposals/odt_to_markdown.rb
 - lib/decidim/proposals/participatory_text_section.rb
 - lib/decidim/proposals/proposal_serializer.rb
+- lib/decidim/proposals/test/capybara_proposals_picker.rb
 - lib/decidim/proposals/test/factories.rb
+- lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
 homepage: https://github.com/decidim/decidim
 licenses:
@@ -596,7 +661,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="