decidim-proposals 0.29.1 → 0.30.0.rc1

data/lib/decidim/proposals/component.rb

@@ -29,14 +29,13 @@ Decidim.register_component(:proposals) do |component|
   POSSIBLE_SORT_ORDERS = %w(automatic random recent most_endorsed most_voted most_commented most_followed with_more_authors).freeze
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
     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 :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 :proposal_edit_time, type: :enum, default: "limited", choices: -> { %w(infinite limited) }
+    settings.attribute :edit_time, type: :integer_with_units, default: [5, "minutes"], required: true, units: %w(minutes hours days)
     settings.attribute :threshold_per_proposal, type: :integer, default: 0, required: true
     settings.attribute :can_accumulate_votes_beyond_threshold, type: :boolean, default: false
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
@@ -137,7 +136,7 @@ Decidim.register_component(:proposals) do |component|
                    .published
                    .not_hidden
                    .where(component: component_instance)
-                   .includes(:scope, :category, :component)
+                   .includes(:taxonomies, :component)
 
       if space.user_roles(:valuator).where(user:).any?
         collection.with_valuation_assigned_to(user, space)

data/lib/decidim/proposals/download_your_data_proposal_serializer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class DownloadYourDataProposalSerializer < Decidim::Proposals::ProposalSerializer
+      # Serializes a Proposal for download your data feature
+      #
+      # Remove the author information as it is the same of the user that
+      # requested the data
+      def serialize
+        super.except!(:author)
+      end
+    end
+  end
+end

data/lib/decidim/proposals/engine.rb

@@ -22,6 +22,11 @@ module Decidim
           end
           resource :proposal_vote, only: [:create, :destroy]
           resources :versions, only: [:show]
+          resources :invite_coauthors, only: [:index, :create, :update, :destroy] do
+            collection do
+              delete :cancel
+            end
+          end
         end
         resources :collaborative_drafts, except: [:destroy] do
           member do

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

@@ -45,7 +45,7 @@ module Decidim
 
         def resource
           @resource ||= Decidim::Proposals::Proposal.new(
-            category:,
+            taxonomies:,
             scope:,
             title:,
             body:,
@@ -57,9 +57,9 @@ module Decidim
           )
         end
 
-        def category
-          id = data.has_key?(:category) ? data[:category]["id"] : data[:"category/id"].to_i
-          Decidim::Category.find_by(id:)
+        def taxonomies
+          id = data.has_key?(:taxonomies) ? data[:taxonomies]["ids"] : data[:"taxonomies/ids"]&.split(",")&.map(&:to_i)
+          Decidim::Taxonomy.where(id:)
         end
 
         def scope

data/lib/decidim/proposals/proposal_serializer.rb

@@ -22,14 +22,7 @@ module Decidim
           author: {
             **author_fields
           },
-          category: {
-            id: proposal.category.try(:id),
-            name: proposal.category.try(:name) || empty_translatable
-          },
-          scope: {
-            id: proposal.scope.try(:id),
-            name: proposal.scope.try(:name) || empty_translatable
-          },
+          taxonomies:,
           participatory_space: {
             id: proposal.participatory_space.id,
             url: Decidim::ResourceLocatorPresenter.new(proposal.participatory_space).url
@@ -41,17 +34,19 @@ module Decidim
           latitude: proposal.latitude,
           longitude: proposal.longitude,
           state: proposal.state.to_s,
+          state_published_at: proposal.state_published_at,
           reference: proposal.reference,
           answer: ensure_translatable(proposal.answer),
           answered_at: proposal.answered_at,
-          votes: proposal.proposal_votes_count,
+          votes: (proposal.proposal_votes_count unless
+          proposal.component.current_settings.votes_hidden?),
           endorsements: {
             total_count: proposal.endorsements.size,
             user_endorsements:
           },
           comments: proposal.comments_count,
           attachments: proposal.attachments.size,
-          followers: proposal.follows.size,
+          follows_count: proposal.follows_count,
           published_at: proposal.published_at,
           url:,
           meeting_urls: meetings,
@@ -62,7 +57,14 @@ module Decidim
             url: original_proposal_url
           },
           withdrawn: proposal.withdrawn?,
-          withdrawn_at: proposal.withdrawn_at
+          withdrawn_at: proposal.withdrawn_at,
+          created_at: proposal.created_at,
+          updated_at: proposal.updated_at,
+          created_in_meeting: proposal.created_in_meeting,
+          coauthorships_count: proposal.coauthorships_count,
+          cost: proposal.cost,
+          cost_report: proposal.cost_report,
+          execution_period: proposal.execution_period
         }
       end
 
@@ -71,10 +73,6 @@ module Decidim
       attr_reader :proposal
       alias resource proposal
 
-      def component
-        proposal.component
-      end
-
       def meetings
         proposal.linked_resources(:meetings, "proposals_from_meeting").map do |meeting|
           Decidim::ResourceLocatorPresenter.new(meeting).url
@@ -82,7 +80,7 @@ module Decidim
       end
 
       def related_proposals
-        proposal.linked_resources(:proposals, "copied_from_component").map do |proposal|
+        proposal.linked_resources(:proposals, %w(copied_from_component merged_from_component splitted_from_component)).map do |proposal|
           Decidim::ResourceLocatorPresenter.new(proposal).url
         end
       end
@@ -132,7 +130,7 @@ module Decidim
 
       def author_url(author)
         if author.respond_to?(:nickname)
-          profile_url(author.nickname) # is a Decidim::User or Decidim::UserGroup
+          profile_url(author) # is a Decidim::User or Decidim::UserGroup
         elsif author.respond_to?(:title)
           meeting_url(author) # is a Decidim::Meetings::Meeting
         else
@@ -140,21 +138,9 @@ module Decidim
         end
       end
 
-      def profile_url(nickname)
-        Decidim::Core::Engine.routes.url_helpers.profile_url(nickname, host:)
-      end
-
       def meeting_url(meeting)
         Decidim::EngineRouter.main_proxy(meeting.component).meeting_url(id: meeting.id, host:)
       end
-
-      def root_url
-        Decidim::Core::Engine.routes.url_helpers.root_url(host:)
-      end
-
-      def host
-        resource.organization.host
-      end
     end
   end
 end

data/lib/decidim/proposals/seeds.rb

@@ -20,10 +20,13 @@ module Decidim
         5.times do |n|
           proposal = create_proposal!(component:)
 
-          emendation = create_emendation!(proposal:) if proposal.state.nil?
+          if proposal.state.nil? && component.settings.amendments_enabled?
+            emendation = create_emendation!(proposal:)
+            create_proposal_votes!(proposal: emendation)
+          end
 
           (n % 3).times do |_m|
-            create_proposal_votes!(proposal:, emendation:)
+            create_proposal_votes!(proposal:)
           end
 
           (n % 3).times do
@@ -60,7 +63,9 @@ module Decidim
           settings: {
             vote_limit: 0,
             attachments_allowed: [true, false].sample,
-            collaborative_drafts_enabled: true
+            amendments_enabled: participatory_space.id.odd?,
+            collaborative_drafts_enabled: true,
+            geocoding_enabled: [true, false].sample
           },
           step_settings:
         }
@@ -81,10 +86,8 @@ module Decidim
 
         params = {
           component:,
-          category: participatory_space.categories.sample,
-          scope: random_scope(participatory_space:),
-          title: { en: ::Faker::Lorem.sentence(word_count: 2) },
-          body: { en: ::Faker::Lorem.paragraphs(number: 2).join("\n") },
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          body: Decidim::Faker::Localized.paragraph(sentence_count: 1),
           proposal_state:,
           answer:,
           answered_at: proposal_state.present? ? Time.current : nil,
@@ -92,6 +95,14 @@ module Decidim
           published_at: Time.current
         }
 
+        if component.settings.geocoding_enabled?
+          params = params.merge({
+                                  address: "#{::Faker::Address.street_address} #{::Faker::Address.zip} #{::Faker::Address.city}",
+                                  latitude: ::Faker::Address.latitude,
+                                  longitude: ::Faker::Address.longitude
+                                })
+        end
+
         proposal = Decidim.traceability.perform_action!(
           "publish",
           Decidim::Proposals::Proposal,
@@ -186,10 +197,8 @@ module Decidim
 
         params = {
           component: proposal.component,
-          category: participatory_space.categories.sample,
-          scope: random_scope(participatory_space:),
-          title: { en: "#{proposal.title["en"]} #{::Faker::Lorem.sentence(word_count: 1)}" },
-          body: { en: "#{proposal.body["en"]} #{::Faker::Lorem.sentence(word_count: 3)}" },
+          title: Decidim::Faker::Localized.literal(proposal.title[I18n.locale]),
+          body: Decidim::Faker::Localized.paragraph(sentence_count: 3),
           proposal_state: Decidim::Proposals::ProposalState.where(component: proposal.component, token: :evaluating).first,
           answer: nil,
           answered_at: Time.current,
@@ -218,11 +227,10 @@ module Decidim
         emendation
       end
 
-      def create_proposal_votes!(proposal:, emendation: nil)
+      def create_proposal_votes!(proposal:)
         author = find_or_initialize_user_by(email: random_email(suffix: "vote"))
 
         Decidim::Proposals::ProposalVote.create!(proposal:, author:) unless proposal.published_state? && proposal.rejected?
-        Decidim::Proposals::ProposalVote.create!(proposal: emendation, author:) if emendation
       end
 
       def create_proposal_notes!(proposal:)
@@ -249,8 +257,6 @@ module Decidim
         draft = Decidim.traceability.perform_action!("create", Decidim::Proposals::CollaborativeDraft, author) do
           draft = Decidim::Proposals::CollaborativeDraft.new(
             component:,
-            category: participatory_space.categories.sample,
-            scope: random_scope(participatory_space:),
             title: ::Faker::Lorem.sentence(word_count: 2),
             body: ::Faker::Lorem.paragraphs(number: 2).join("\n"),
             state:,
@@ -280,8 +286,6 @@ module Decidim
           Decidim::Proposals::CollaborativeDraft.all.sample,
           Decidim::User.where(organization:).all.sample,
           component:,
-          category: participatory_space.categories.sample,
-          scope: random_scope(participatory_space:),
           title: ::Faker::Lorem.sentence(word_count: 2),
           body: ::Faker::Lorem.paragraphs(number: 2).join("\n")
         )

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

@@ -306,6 +306,7 @@ FactoryBot.define do
     body { generate_localized_description(:proposal_body, skip_injection:) }
     component { create(:proposal_component, skip_injection:) }
     published_at { Time.current }
+    deleted_at { nil }
     address { "#{Faker::Address.street_name}, #{Faker::Address.city}" }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
@@ -356,7 +357,7 @@ FactoryBot.define do
     trait :participant_author do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        user = build(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
+        user = build(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
         proposal.coauthorships.build(author: user)
       end
     end
@@ -380,8 +381,8 @@ FactoryBot.define do
     trait :official_meeting do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        component = build(:meeting_component, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
-        proposal.coauthorships.build(author: build(:meeting, component:, skip_injection: evaluator.skip_injection))
+        component = build(:meeting_component, :published, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
+        proposal.coauthorships.build(author: build(:meeting, :published, component:, skip_injection: evaluator.skip_injection))
       end
     end
 
@@ -444,7 +445,8 @@ FactoryBot.define do
     trait :with_endorsements do
       after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
+          create(:endorsement, resource: proposal,
+                               author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
                                skip_injection: evaluator.skip_injection)
         end
       end
@@ -489,7 +491,7 @@ FactoryBot.define do
     end
     amendable { build(:proposal, skip_injection:) }
     emendation { build(:proposal, component: amendable.component, skip_injection:) }
-    amender { build(:user, organization: amendable.component.participatory_space.organization, skip_injection:) }
+    amender { build(:user, :confirmed, organization: amendable.component.participatory_space.organization, skip_injection:) }
     state { Decidim::Amendment::STATES.keys.sample }
   end
 
@@ -572,7 +574,7 @@ FactoryBot.define do
     valuator_role do
       space = proposal.component.participatory_space
       organization = space.organization
-      build :participatory_process_user_role, role: :valuator, skip_injection:, user: build(:user, organization:, skip_injection:)
+      build(:participatory_process_user_role, role: :valuator, skip_injection:, user: build(:user, organization:, skip_injection:))
     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.29.1"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -11,7 +11,11 @@ module Decidim
   # This namespace holds the logic of the `Proposals` component. This component
   # allows users to create proposals in a participatory process.
   module Proposals
+    autoload :ProposalListHelper, "decidim/api/functions/proposal_list_helper"
+    autoload :ProposalFinderHelper, "decidim/api/functions/proposal_finder_helper"
+
     autoload :ProposalSerializer, "decidim/proposals/proposal_serializer"
+    autoload :DownloadYourDataProposalSerializer, "decidim/proposals/download_your_data_proposal_serializer"
     autoload :CommentableProposal, "decidim/proposals/commentable_proposal"
     autoload :CommentableCollaborativeDraft, "decidim/proposals/commentable_collaborative_draft"
     autoload :MarkdownToProposals, "decidim/proposals/markdown_to_proposals"