decidim-proposals 0.24.3 → 0.25.0.rc4

data/config/locales/zh-CN.yml

@@ -44,7 +44,9 @@ zh-CN:
               invalid_document_type: '无效的文档类型。接受的格式为： %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: 需要重新连接
+            add_photos:
               needs_to_be_reattached: 需要重新连接
             body:
               cant_be_equal_to_template: 不能等于模板

data/db/migrate/20201002085508_fix_proposals_data.rb

@@ -12,14 +12,13 @@ class FixProposalsData < ActiveRecord::Migration[5.2]
 
         locale = author.try(:locale).presence || author.try(:default_locale).presence || author.try(:organization).try(:default_locale).presence
 
-        proposal.title = {
-          locale => proposal.title
-        }
-        proposal.body = {
-          locale => proposal.body
-        }
-
-        proposal.save!
+        # rubocop:disable Rails/SkipsModelValidations
+        values = {}
+        values[:title] = { locale => proposal.title } unless proposal.title.is_a?(Hash)
+        values[:body] = { locale => proposal.body } unless proposal.body.is_a?(Hash)
+
+        proposal.update_columns(values)
+        # rubocop:enable Rails/SkipsModelValidations
       end
     end
 

data/db/migrate/20210318082934_fix_counters_for_copied_proposals.rb

@@ -2,11 +2,12 @@
 
 class FixCountersForCopiedProposals < ActiveRecord::Migration[5.2]
   def up
-    copies_ids = Decidim::ResourceLink.where(
-      name: "copied_from_component",
-      from_type: "Decidim::Proposals::Proposal",
-      to_type: "Decidim::Proposals::Proposal"
-    ).pluck(:to_id)
+    copies_ids = Decidim::ResourceLink
+                 .where(
+                   name: "copied_from_component",
+                   from_type: "Decidim::Proposals::Proposal",
+                   to_type: "Decidim::Proposals::Proposal"
+                 ).pluck(:to_id)
 
     Decidim::Proposals::Proposal.where(id: copies_ids).find_each do |record|
       record.class.reset_counters(record.id, :follows)

data/lib/decidim/proposals/admin_engine.rb

@@ -38,10 +38,6 @@ module Decidim
         root to: "proposals#index"
       end
 
-      initializer "decidim_proposals.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_proposals_manifest.js)
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/proposals/commentable_proposal.rb

@@ -5,19 +5,9 @@ module Decidim
     # The data store for a Proposal in the Decidim::Proposals component.
     module CommentableProposal
       extend ActiveSupport::Concern
-      include Decidim::Comments::Commentable
+      include Decidim::Comments::CommentableWithComponent
 
       included do
-        # Public: Overrides the `commentable?` Commentable concern method.
-        def commentable?
-          component.settings.comments_enabled?
-        end
-
-        # Public: Overrides the `accepts_new_comments?` Commentable concern method.
-        def accepts_new_comments?
-          commentable? && !component.current_settings.comments_blocked
-        end
-
         # Public: Overrides the `comments_have_alignment?` Commentable concern method.
         def comments_have_alignment?
           true
@@ -35,8 +25,10 @@ module Decidim
           followers
         end
 
-        def user_allowed_to_comment?(user)
-          can_participate_in_space?(user)
+        def user_allowed_to_vote_comment?(user)
+          return unless can_participate_in_space?(user)
+
+          ActionAuthorizer.new(user, "vote_comment", component, self).authorize.ok?
         end
       end
     end

data/lib/decidim/proposals/component.rb

@@ -6,7 +6,7 @@ Decidim.register_component(:proposals) do |component|
   component.engine = Decidim::Proposals::Engine
   component.admin_engine = Decidim::Proposals::AdminEngine
   component.stylesheet = "decidim/proposals/proposals"
-  component.icon = "decidim/proposals/icon.svg"
+  component.icon = "media/images/decidim_proposals.svg"
 
   component.on(:before_destroy) do |instance|
     raise "Can't destroy this component when there are proposals" if Decidim::Proposals::Proposal.where(component: instance).any?
@@ -16,7 +16,7 @@ Decidim.register_component(:proposals) do |component|
 
   component.newsletter_participant_entities = ["Decidim::Proposals::Proposal"]
 
-  component.actions = %w(endorse vote create withdraw amend)
+  component.actions = %w(endorse vote create withdraw amend comment vote_comment)
 
   component.query_type = "Decidim::Proposals::ProposalsType"
 
@@ -83,7 +83,7 @@ Decidim.register_component(:proposals) do |component|
     resource.template = "decidim/proposals/proposals/linked_proposals"
     resource.card = "decidim/proposals/proposal"
     resource.reported_content_cell = "decidim/proposals/reported_content"
-    resource.actions = %w(endorse vote amend)
+    resource.actions = %w(endorse vote amend comment vote_comment)
     resource.searchable = true
   end
 
@@ -108,7 +108,7 @@ Decidim.register_component(:proposals) do |component|
 
   component.register_stat :endorsements_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     proposals = Decidim::Proposals::FilteredProposals.for(components, start_at, end_at).not_hidden
-    Decidim::Endorsement.where(resource_id: proposals.pluck(:id), resource_type: Decidim::Proposals::Proposal.name).count
+    proposals.sum(:endorsements_count)
   end
 
   component.register_stat :comments_count, tag: :comments do |components, start_at, end_at|

data/lib/decidim/proposals/engine.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-require "kaminari"
-require "social-share-button"
-require "ransack"
-require "cells/rails"
-require "cells-erb"
-require "cell/partial"
+require "decidim/core"
 
 module Decidim
   module Proposals
@@ -44,10 +39,6 @@ module Decidim
         root to: "proposals#index"
       end
 
-      initializer "decidim_proposals.assets" do |app|
-        app.config.assets.precompile += %w(decidim_proposals_manifest.js)
-      end
-
       initializer "decidim.content_processors" do |_app|
         Decidim.configure do |config|
           config.content_processors += [:proposal]
@@ -61,19 +52,23 @@ module Decidim
       end
 
       initializer "decidim_changes" do
-        Decidim::SettingsChange.subscribe "surveys" do |changes|
-          Decidim::Proposals::SettingsChangeJob.perform_later(
-            changes[:component_id],
-            changes[:previous_settings],
-            changes[:current_settings]
-          )
+        config.to_prepare do
+          Decidim::SettingsChange.subscribe "surveys" do |changes|
+            Decidim::Proposals::SettingsChangeJob.perform_later(
+              changes[:component_id],
+              changes[:previous_settings],
+              changes[:current_settings]
+            )
+          end
         end
       end
 
       initializer "decidim_proposals.mentions_listener" do
-        Decidim::Comments::CommentCreation.subscribe do |data|
-          proposals = data.dig(:metadatas, :proposal).try(:linked_proposals)
-          Decidim::Proposals::NotifyProposalsMentionedJob.perform_later(data[:comment_id], proposals) if proposals
+        config.to_prepare do
+          Decidim::Comments::CommentCreation.subscribe do |data|
+            proposals = data.dig(:metadatas, :proposal).try(:linked_proposals)
+            Decidim::Proposals::NotifyProposalsMentionedJob.perform_later(data[:comment_id], proposals) if proposals
+          end
         end
       end
 

data/lib/decidim/proposals/proposal_serializer.rb

@@ -59,6 +59,7 @@ module Decidim
       private
 
       attr_reader :proposal
+      alias resource proposal
 
       def component
         proposal.component

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

@@ -41,6 +41,16 @@ module Capybara
 
       expect(proposals_picker).to have_proposals_picked(proposals)
     end
+
+    def proposals_remove(proposals_picker, proposals)
+      data_picker = proposals_picker.data_picker
+
+      proposals.each do |proposal|
+        data_picker.find("a", text: proposal.title["en"]).find("span").click
+      end
+
+      expect(proposals_picker).to have_proposals_not_picked(proposals)
+    end
   end
 end
 

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

@@ -277,6 +277,9 @@ FactoryBot.define do
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
+    cost { 20_000 }
+    cost_report { { en: "My cost report" } }
+    execution_period { { en: "My execution period" } }
 
     after(:build) do |proposal, evaluator|
       proposal.title = if evaluator.title.is_a?(String)

data/lib/decidim/proposals/version.rb

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

data/lib/decidim/proposals.rb

@@ -5,7 +5,6 @@ require "decidim/proposals/api"
 require "decidim/proposals/engine"
 require "decidim/proposals/admin_engine"
 require "decidim/proposals/component"
-require "acts_as_list"
 
 module Decidim
   # This namespace holds the logic of the `Proposals` component. This component

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,78 +10,36 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: acts_as_list
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: cells-erb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: cells-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -96,40 +54,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: ransack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -156,84 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc4
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -245,21 +169,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_proposals_manifest.js
-- app/assets/config/decidim_proposals_manifest.js
-- app/assets/documents/decidim/proposals/participatory_texts/participatory_text.md
-- app/assets/documents/decidim/proposals/participatory_texts/participatory_text.odt
-- app/assets/images/decidim/gamification/badges/accepted_proposals.svg
-- app/assets/images/decidim/gamification/badges/proposal_votes.svg
-- app/assets/images/decidim/gamification/badges/proposals.svg
-- app/assets/images/decidim/proposals/icon.svg
-- 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/admin/proposals_picker.js.es6
-- app/assets/javascripts/decidim/proposals/utils.js.es6
-- app/assets/stylesheets/decidim/proposals/_proposals.css.scss
-- app/assets/stylesheets/decidim/proposals/proposals/_preview.css.scss
 - app/cells/decidim/proposals/collaborative_draft_cell.rb
 - app/cells/decidim/proposals/collaborative_draft_link_to_proposal/show.erb
 - app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb
@@ -415,6 +324,21 @@ files:
 - app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_vote.rb
 - app/models/decidim/proposals/valuation_assignment.rb
+- app/packs/documents/decidim/proposals/participatory_texts/participatory_text.md
+- app/packs/documents/decidim/proposals/participatory_texts/participatory_text.odt
+- app/packs/entrypoints/decidim_proposals.js
+- app/packs/entrypoints/decidim_proposals_admin.js
+- app/packs/images/decidim/gamification/badges/decidim_gamification_badges_accepted_proposals.svg
+- app/packs/images/decidim/gamification/badges/decidim_gamification_badges_proposal_votes.svg
+- app/packs/images/decidim/gamification/badges/decidim_gamification_badges_proposals.svg
+- app/packs/images/decidim/proposals/decidim_proposals.svg
+- app/packs/src/decidim/proposals/add_proposal.js
+- app/packs/src/decidim/proposals/admin/proposals.js
+- app/packs/src/decidim/proposals/admin/proposals_form.js
+- app/packs/src/decidim/proposals/admin/proposals_picker.js
+- app/packs/src/decidim/proposals/utils.js
+- app/packs/stylesheets/decidim/proposals/_proposals.scss
+- app/packs/stylesheets/decidim/proposals/proposals/_preview.scss
 - app/permissions/decidim/proposals/admin/permissions.rb
 - app/permissions/decidim/proposals/permissions.rb
 - app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb
@@ -519,6 +443,7 @@ files:
 - app/views/decidim/proposals/proposals/show.html.erb
 - app/views/decidim/proposals/versions/index.html.erb
 - app/views/decidim/proposals/versions/show.html.erb
+- config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -545,6 +470,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -555,10 +481,10 @@ files:
 - 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/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -681,9 +607,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key:

data/app/assets/config/admin/decidim_proposals_manifest.js

@@ -1,2 +0,0 @@
-//= link decidim/proposals/admin/proposals.js
-//= link decidim/proposals/admin/proposals_picker.js

data/app/assets/config/decidim_proposals_manifest.js

@@ -1,4 +0,0 @@
-//= link decidim/proposals/add_proposal.js
-//= link decidim/proposals/admin/proposals_form.js
-//= link_tree ../images/decidim
-//= link_tree ../documents/decidim

data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6

@@ -1,31 +0,0 @@
-$(() => {
-  const { attachGeocoding } = window.Decidim;
-
-  window.DecidimProposals = window.DecidimProposals || {};
-
-  window.DecidimProposals.bindProposalAddress = () => {
-    const $checkbox = $("input:checkbox[name$='[has_address]']");
-    const $addressInput = $("#address_input");
-    const $addressInputField = $("input", $addressInput);
-
-    if ($checkbox.length > 0) {
-      const toggleInput = () => {
-        if ($checkbox[0].checked) {
-          $addressInput.show();
-          $addressInputField.prop("disabled", false);
-        } else {
-          $addressInput.hide();
-          $addressInputField.prop("disabled", true);
-        }
-      }
-      toggleInput();
-      $checkbox.on("change", toggleInput);
-    }
-
-    if ($addressInput.length > 0) {
-      attachGeocoding($addressInputField);
-    }
-  };
-
-  window.DecidimProposals.bindProposalAddress();
-});