decidim-proposals 0.23.5 → 0.24.2

data/lib/decidim/proposals/engine.rb

@@ -32,8 +32,6 @@ module Decidim
           resources :versions, only: [:show, :index]
         end
         resources :collaborative_drafts, except: [:destroy] do
-          get :compare, on: :collection
-          get :complete, on: :collection
           member do
             post :request_access, controller: "collaborative_draft_collaborator_requests"
             post :request_accept, controller: "collaborative_draft_collaborator_requests"
@@ -60,27 +58,6 @@ module Decidim
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
           view_context.cell("decidim/proposals/highlighted_proposals", view_context.current_participatory_space)
         end
-
-        if defined? Decidim::ParticipatoryProcesses
-          Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::MEDIUM_PRIORITY) do |view_context|
-            published_components = Decidim::Component.where(participatory_space: view_context.participatory_processes).published
-            proposals = Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
-                                                    .where(component: published_components)
-                                                    .order_randomly(rand * 2 - 1)
-                                                    .limit(Decidim::Proposals.config.process_group_highlighted_proposals_limit)
-
-            next unless proposals.any?
-
-            view_context.extend Decidim::ResourceReferenceHelper
-            view_context.extend Decidim::Proposals::ApplicationHelper
-            view_context.render(
-              partial: "decidim/participatory_processes/participatory_process_groups/highlighted_proposals",
-              locals: {
-                proposals: proposals
-              }
-            )
-          end
-        end
       end
 
       initializer "decidim_changes" do
@@ -125,13 +102,14 @@ module Decidim
           badge.valid_for = [:user, :user_group]
 
           badge.reset = lambda { |model|
-            if model.is_a?(User)
+            case model
+            when User
               Decidim::Coauthorship.where(
                 coauthorable_type: "Decidim::Proposals::Proposal",
                 author: model,
                 user_group: nil
               ).count
-            elsif model.is_a?(UserGroup)
+            when UserGroup
               Decidim::Coauthorship.where(
                 coauthorable_type: "Decidim::Proposals::Proposal",
                 user_group: model
@@ -146,13 +124,14 @@ module Decidim
           badge.valid_for = [:user, :user_group]
 
           badge.reset = lambda { |model|
-            proposal_ids = if model.is_a?(User)
+            proposal_ids = case model
+                           when User
                              Decidim::Coauthorship.where(
                                coauthorable_type: "Decidim::Proposals::Proposal",
                                author: model,
                                user_group: nil
                              ).select(:coauthorable_id)
-                           elsif model.is_a?(UserGroup)
+                           when UserGroup
                              Decidim::Coauthorship.where(
                                coauthorable_type: "Decidim::Proposals::Proposal",
                                user_group: model

data/lib/decidim/proposals/proposal_creator.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This class is responsible for creating the imported proposals
+    # and must be included in proposals component's import manifest.
+    class ProposalCreator < Decidim::Admin::Import::Creator
+      # Retuns the resource class to be created with the provided data.
+      def self.resource_klass
+        Decidim::Proposals::Proposal
+      end
+
+      # Produces a proposal from parsed data
+      #
+      # Returns a proposal
+      def produce
+        resource.add_coauthor(context[:current_user], user_group: context[:user_group])
+
+        resource
+      end
+
+      # Saves the proposal
+      def finish!
+        super # resource.save!
+        notify(resource)
+        publish(resource)
+      end
+
+      private
+
+      attr_reader :context
+
+      def resource
+        @resource ||= Decidim::Proposals::Proposal.new(
+          category: category,
+          scope: scope,
+          title: title,
+          body: body,
+          component: component,
+          published_at: Time.current
+        )
+      end
+
+      def category
+        id = data.has_key?(:category) ? data[:category]["id"] : data[:"category/id"].to_i
+        Decidim::Category.find_by(id: id)
+      end
+
+      def scope
+        id = data.has_key?(:scope) ? data[:scope]["id"] : data[:"scope/id"].to_i
+        Decidim::Scope.find_by(id: id)
+      end
+
+      def title
+        locale_hasher("title", available_locales)
+      end
+
+      def body
+        locale_hasher("body", available_locales)
+      end
+
+      def available_locales
+        @available_locales ||= component.participatory_space.organization.available_locales
+      end
+
+      def component
+        context[:current_component]
+      end
+
+      def notify(proposal)
+        return if proposal.coauthorships.empty?
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.proposal_published",
+          event_class: Decidim::Proposals::PublishProposalEvent,
+          resource: proposal,
+          followers: coauthors_followers(proposal)
+        )
+      end
+
+      def publish(proposal)
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.proposal_published",
+          event_class: Decidim::Proposals::PublishProposalEvent,
+          resource: proposal,
+          followers: proposal.participatory_space.followers - coauthors_followers(proposal),
+          extra: {
+            participatory_space: true
+          }
+        )
+      end
+
+      def coauthors_followers(proposal)
+        @coauthors_followers ||= proposal.authors.flat_map(&:followers)
+      end
+    end
+  end
+end

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

@@ -262,19 +262,21 @@ FactoryBot.define do
       if skip_injection
         Decidim::Faker::Localized.localized { generate(:title) }
       else
-        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> " + generate(:title) }
+        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
       end
     end
     body do
       if skip_injection
-        Decidim::Faker::Localized.localized { Faker::Lorem.sentences(3).join("\n") }
+        Decidim::Faker::Localized.localized { Faker::Lorem.sentences(number: 3).join("\n") }
       else
-        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> " + Faker::Lorem.sentences(3).join("\n") }
+        Decidim::Faker::Localized.localized { "<script>alert(\"TITLE\");</script> #{Faker::Lorem.sentences(number: 3).join("\n")}" }
       end
     end
     component { create(:proposal_component) }
     published_at { Time.current }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
+    latitude { Faker::Address.latitude }
+    longitude { Faker::Address.longitude }
 
     after(:build) do |proposal, evaluator|
       proposal.title = if evaluator.title.is_a?(String)
@@ -409,6 +411,18 @@ FactoryBot.define do
         create_list(:proposal_amendment, 5, amendable: proposal)
       end
     end
+
+    trait :with_photo do
+      after :create do |proposal|
+        proposal.attachments << create(:attachment, :with_image, attached_to: proposal)
+      end
+    end
+
+    trait :with_document do
+      after :create do |proposal|
+        proposal.attachments << create(:attachment, :with_pdf, attached_to: proposal)
+      end
+    end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
@@ -424,7 +438,7 @@ FactoryBot.define do
   end
 
   factory :proposal_note, class: "Decidim::Proposals::ProposalNote" do
-    body { Faker::Lorem.sentences(3).join("\n") }
+    body { Faker::Lorem.sentences(number: 3).join("\n") }
     proposal { build(:proposal) }
     author { build(:user, organization: proposal.organization) }
   end
@@ -436,8 +450,8 @@ FactoryBot.define do
       user_groups { [] }
     end
 
-    title { "<script>alert(\"TITLE\");</script> " + generate(:title) }
-    body { "<script>alert(\"BODY\");</script>\n" + Faker::Lorem.sentences(3).join("\n") }
+    title { "<script>alert(\"TITLE\");</script> #{generate(:title)}" }
+    body { "<script>alert(\"BODY\");</script>\n#{Faker::Lorem.sentences(number: 3).join("\n")}" }
     component { create(:proposal_component) }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
     state { "open" }
@@ -467,8 +481,8 @@ FactoryBot.define do
   end
 
   factory :participatory_text, class: "Decidim::Proposals::ParticipatoryText" do
-    title { { en: "<script>alert(\"TITLE\");</script> " + generate(:title) } }
-    description { { en: "<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(number: 3).join("\n")}" } }
     component { create(:proposal_component) }
   end
 

data/lib/decidim/proposals/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.23.5
+  version: 0.24.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-08 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,42 +60,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -136,98 +136,104 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.5
+        version: 0.24.2
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -252,12 +258,19 @@ files:
 - 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
 - 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/collaborative_drafts/reported_content/show.erb
+- app/cells/decidim/proposals/collaborative_drafts/reported_content_cell.rb
+- app/cells/decidim/proposals/content_blocks/highlighted_proposals/elements.erb
+- app/cells/decidim/proposals/content_blocks/highlighted_proposals/heading.erb
+- app/cells/decidim/proposals/content_blocks/highlighted_proposals_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
@@ -284,6 +297,8 @@ files:
 - 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/cells/decidim/proposals/reported_content/show.erb
+- app/cells/decidim/proposals/reported_content_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
@@ -304,7 +319,6 @@ files:
 - 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/gallery_methods.rb
 - app/commands/decidim/proposals/hashtags_methods.rb
@@ -388,7 +402,6 @@ files:
 - app/helpers/decidim/proposals/map_helper.rb
 - app/helpers/decidim/proposals/participatory_texts_helper.rb
 - app/helpers/decidim/proposals/proposal_cells_helper.rb
-- 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
@@ -422,18 +435,12 @@ files:
 - app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb
 - app/queries/decidim/proposals/metrics/proposals_metric_manage.rb
 - app/queries/decidim/proposals/metrics/votes_metric_manage.rb
-- app/queries/decidim/proposals/similar_collaborative_drafts.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
-- 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
@@ -472,8 +479,7 @@ files:
 - app/views/decidim/proposals/collaborative_drafts/_reject_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_wizard_aside.html.erb
-- app/views/decidim/proposals/collaborative_drafts/compare.html.erb
-- app/views/decidim/proposals/collaborative_drafts/complete.html.erb
+- app/views/decidim/proposals/collaborative_drafts/_wizard_header.html.erb
 - app/views/decidim/proposals/collaborative_drafts/edit.html.erb
 - app/views/decidim/proposals/collaborative_drafts/index.html.erb
 - app/views/decidim/proposals/collaborative_drafts/index.js.erb
@@ -481,6 +487,7 @@ files:
 - app/views/decidim/proposals/collaborative_drafts/show.html.erb
 - app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
+- app/views/decidim/proposals/proposals/_dynamic_map_instructions.html.erb
 - app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
 - app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb
 - app/views/decidim/proposals/proposals/_filters.html.erb
@@ -488,7 +495,6 @@ files:
 - app/views/decidim/proposals/proposals/_linked_proposals.html.erb
 - app/views/decidim/proposals/proposals/_proposal.html.erb
 - app/views/decidim/proposals/proposals/_proposal_badge.html.erb
-- app/views/decidim/proposals/proposals/_proposal_preview.html.erb
 - app/views/decidim/proposals/proposals/_proposal_similar.html.erb
 - app/views/decidim/proposals/proposals/_proposals.html.erb
 - app/views/decidim/proposals/proposals/_remaining_votes_count.html.erb
@@ -633,12 +639,19 @@ files:
 - db/migrate/20200827154156_add_commentable_counter_cache_to_proposals.rb
 - db/migrate/20201002085508_fix_proposals_data.rb
 - db/migrate/20210127115628_fix_answered_proposals_after_copy.rb
+- db/migrate/20210310102839_add_followable_counter_cache_to_proposals.rb
+- db/migrate/20210310120812_add_followable_counter_cache_to_collaborative_drafts.rb
 - db/migrate/20210318082934_fix_counters_for_copied_proposals.rb
+- lib/decidim/api/proposal_input_filter.rb
+- lib/decidim/api/proposal_input_sort.rb
+- lib/decidim/api/proposal_type.rb
+- lib/decidim/api/proposals_type.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
 - lib/decidim/proposals/admin.rb
 - lib/decidim/proposals/admin_engine.rb
+- lib/decidim/proposals/api.rb
 - lib/decidim/proposals/commentable_collaborative_draft.rb
 - lib/decidim/proposals/commentable_proposal.rb
 - lib/decidim/proposals/component.rb
@@ -647,6 +660,7 @@ files:
 - lib/decidim/proposals/markdown_to_proposals.rb
 - lib/decidim/proposals/odt_to_markdown.rb
 - lib/decidim/proposals/participatory_text_section.rb
+- lib/decidim/proposals/proposal_creator.rb
 - lib/decidim/proposals/proposal_serializer.rb
 - lib/decidim/proposals/test/capybara_proposals_picker.rb
 - lib/decidim/proposals/test/factories.rb
@@ -664,14 +678,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim proposals module