decidim-proposals 0.14.4 → 0.15.0

data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to import a collection of proposals
+      # from a participatory text.
+      class ImportParticipatoryTextForm < Decidim::Form
+        include TranslatableAttributes
+
+        translatable_attribute :title, String
+        translatable_attribute :description, String
+        attribute :document
+
+        validates :document, presence: true
+        validates :title, translatable_presence: true
+
+        def default_locale
+          current_participatory_space.organization.default_locale
+        end
+
+        def document_text
+          document&.read
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/preview_participatory_text_form.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to review a collection of proposals
+      # from a participatory text.
+      class PreviewParticipatoryTextForm < Decidim::Form
+        attribute :proposals, Array[ProposalForm]
+
+        def from_models(proposals)
+          self.proposals = proposals.collect do |proposal|
+            ProposalForm.from_model(proposal)
+          end
+        end
+
+        def proposals_attributes=(attributes); end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -15,8 +15,10 @@ module Decidim
         attribute :category_id, Integer
         attribute :scope_id, Integer
         attribute :attachment, AttachmentForm
+        attribute :position, Integer
 
-        validates :title, :body, presence: true
+        validates :title, :body, presence: true, etiquette: true
+        validates :title, length: { maximum: 150 }
         validates :address, geocoding: true, if: -> { current_component.settings.geocoding_enabled? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
@@ -31,6 +33,7 @@ module Decidim
           return unless model.categorization
 
           self.category_id = model.categorization.decidim_category_id
+          self.scope_id = model.decidim_scope_id
         end
 
         alias component current_component

data/app/forms/decidim/proposals/admin/proposals_fork_form.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A common abstract to be used by the Merge and Split proposals forms.
+      class ProposalsForkForm < Decidim::Form
+        mimic :proposals_import
+
+        attribute :target_component_id, Integer
+        attribute :proposal_ids, Array
+
+        validates :target_component, :proposals, :current_component, presence: true
+        validate :same_participatory_space
+        validate :mergeable_to_same_component
+
+        def proposals
+          @proposals ||= Decidim::Proposals::Proposal.where(component: current_component, id: proposal_ids).uniq
+        end
+
+        def target_component
+          return current_component if clean_target_component_id == current_component.id
+          @target_component ||= current_component.siblings.find_by(id: target_component_id)
+        end
+
+        def same_component?
+          target_component == current_component
+        end
+
+        private
+
+        def mergeable_to_same_component
+          return true unless same_component?
+
+          public_proposals = proposals.any? do |proposal|
+            !proposal.official? || proposal.votes.any? || proposal.endorsements.any?
+          end
+
+          errors.add(:proposal_ids, :invalid) if public_proposals
+        end
+
+        def same_participatory_space
+          return if !target_component || !current_component
+
+          errors.add(:target_component, :invalid) if current_component.participatory_space != target_component.participatory_space
+        end
+
+        # Private: Returns the id of the target component.
+        #
+        # We receive this as ["id"] since it's from a select in a form.
+        def clean_target_component_id
+          target_component_id.first.to_i
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/proposals_merge_form.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users wants to merge two or more
+      # proposals into a new one to another proposal component in the same space.
+      class ProposalsMergeForm < ProposalsForkForm
+        validates :proposals, length: { minimum: 2 }
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/proposals_split_form.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users wants to split two or more
+      # proposals into a new one to another proposal component in the same space.
+      class ProposalsSplitForm < ProposalsForkForm
+      end
+    end
+  end
+end

data/app/helpers/decidim/proposals/application_helper.rb

@@ -13,6 +13,8 @@ module Decidim
       include Decidim::Proposals::MapHelper
       include CollaborativeDraftHelper
 
+      delegate :minimum_votes_per_user, to: :component_settings
+
       # Public: The state of a proposal in a way a human can understand.
       #
       # state - The String state of the proposal.
@@ -69,12 +71,23 @@ module Decidim
         proposal_limit.present?
       end
 
+      def minimum_votes_per_user_enabled?
+        minimum_votes_per_user.positive?
+      end
+
       def proposal_limit
         return if component_settings.proposal_limit.zero?
 
         component_settings.proposal_limit
       end
 
+      def votes_given
+        @votes_given ||= ProposalVote.where(
+          proposal: Proposal.where(component: current_component),
+          author: current_user
+        ).count
+      end
+
       def current_user_proposals
         Proposal.where(component: current_component, author: current_user)
       end
@@ -102,6 +115,16 @@ module Decidim
       def authors_for(collaborative_draft)
         collaborative_draft.identities.map { |identity| present(identity) }
       end
+
+      def show_voting_rules?
+        return false unless votes_enabled?
+
+        return true if vote_limit_enabled?
+        return true if threshold_per_proposal_enabled?
+        return true if proposal_limit_enabled?
+        return true if can_accumulate_supports_beyond_threshold?
+        return true if minimum_votes_per_user_enabled?
+      end
     end
   end
 end

data/app/helpers/decidim/proposals/map_helper.rb

@@ -10,7 +10,7 @@ module Decidim
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
         geocoded_proposals.map do |proposal|
-          proposal.slice(:latitude, :longitude, :address).merge(title: present(proposal).title,
+          proposal.slice(:latitude, :longitude, :address).merge(title:  present(proposal).title,
                                                                 body: truncate(present(proposal).body, length: 100),
                                                                 icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
                                                                 link: proposal_path(proposal))

data/app/helpers/decidim/proposals/participatory_texts_helper.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Simple helper to handle markup variations for participatory texts related partials
+    module ParticipatoryTextsHelper
+      # Returns the title for a given participatory text section.
+      #
+      # proposal - The current proposal item.
+      #
+      # Returns a string with the title of the section, subsection or article.
+      def preview_participatory_text_section_title(proposal)
+        translated = t(proposal.participatory_text_level, scope: "decidim.proposals.admin.participatory_texts.sections", title: proposal.title)
+        translated.html_safe
+      end
+    end
+  end
+end

data/app/helpers/decidim/proposals/proposal_endorsements_helper.rb

@@ -79,7 +79,7 @@ module Decidim
       def fully_endorsed?(proposal, user)
         return false unless user
 
-        user_group_endorsements = user.user_groups.verified.all? { |user_group| proposal.endorsed_by?(user, user_group) }
+        user_group_endorsements = Decidim::UserGroups::ManageableUserGroups.for(user).verified.all? { |user_group| proposal.endorsed_by?(user, user_group) }
 
         user_group_endorsements && proposal.endorsed_by?(user)
       end

data/app/helpers/decidim/proposals/proposal_wizard_helper.rb

@@ -101,9 +101,10 @@ module Decidim
       # Returns nothing.
       def user_group_select_field(form, name)
         selected = @form.user_group_id.presence
+        user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
         form.select(
           name,
-          current_user.user_groups.verified.map { |g| [g.name, g.id] },
+          user_groups.map { |g| [g.name, g.id] },
           selected: selected,
           include_blank: current_user.name
         )

data/app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb

@@ -3,14 +3,13 @@
 module Decidim
   module Proposals
     class NotifyProposalsMentionedJob < ApplicationJob
-      def perform(comment_id, proposal_metadata)
+      def perform(comment_id, linked_proposals)
         comment = Decidim::Comments::Comment.find(comment_id)
-        linked_proposals = proposal_metadata.linked_proposals
+
         linked_proposals.each do |proposal_id|
           proposal = Proposal.find(proposal_id)
-          next if proposal.official?
+          recipient_ids = proposal.notifiable_authors.map(&:id)
 
-          recipient_ids = proposal.authors.pluck(:decidim_author_id)
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_mentioned",
             event_class: Decidim::Proposals::ProposalMentionedEvent,

data/app/models/decidim/proposals/participatory_text.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Contains the meta data of the document, like title and description.
+    #
+    class ParticipatoryText < Proposals::ApplicationRecord
+      include Decidim::HasComponent
+      include Decidim::Traceable
+      include Decidim::Loggable
+    end
+  end
+end

data/app/models/decidim/proposals/proposal.rb

@@ -20,13 +20,21 @@ module Decidim
       include Decidim::Fingerprintable
       include Decidim::DataPortability
       include Decidim::Hashtaggable
+      include Decidim::Proposals::ParticipatoryTextSection
 
       fingerprint fields: [:title, :body]
 
       component_manifest_name "proposals"
 
       has_many :endorsements, foreign_key: "decidim_proposal_id", class_name: "ProposalEndorsement", dependent: :destroy, counter_cache: "proposal_endorsements_count"
-      has_many :votes, foreign_key: "decidim_proposal_id", class_name: "ProposalVote", dependent: :destroy, counter_cache: "proposal_votes_count"
+
+      has_many :votes,
+               -> { final },
+               foreign_key: "decidim_proposal_id",
+               class_name: "Decidim::Proposals::ProposalVote",
+               dependent: :destroy,
+               counter_cache: "proposal_votes_count"
+
       has_many :notes, foreign_key: "decidim_proposal_id", class_name: "ProposalNote", dependent: :destroy, counter_cache: "proposal_notes_count"
 
       validates :title, :body, presence: true
@@ -39,8 +47,11 @@ module Decidim
       scope :withdrawn, -> { where(state: "withdrawn") }
       scope :except_rejected, -> { where.not(state: "rejected").or(where(state: nil)) }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
+      scope :drafts, -> { where(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
 
+      acts_as_list scope: :decidim_component_id
+
       searchable_fields({
                           scope_id: :decidim_scope_id,
                           participatory_space: { component: :participatory_space },
@@ -62,19 +73,30 @@ module Decidim
         Decidim::Proposals::AdminLog::ProposalPresenter
       end
 
-      # Returns a collection scoped by user.
+      # Returns a collection scoped by an author.
       # Overrides this method in DataPortability to support Coauthorable.
-      def self.user_collection(user)
+      def self.user_collection(author)
+        return unless author.is_a?(Decidim::User)
+
         joins(:coauthorships)
           .where("decidim_coauthorships.coauthorable_type = ?", name)
-          .where("decidim_coauthorships.decidim_author_id = ?", user.id)
+          .where("decidim_coauthorships.decidim_author_id = ? AND decidim_coauthorships.decidim_author_type = ? ", author.id, author.class.base_class.name)
       end
 
+      # Public: Updates the vote count of this proposal.
+      #
+      # Returns nothing.
+      # rubocop:disable Rails/SkipsModelValidations
+      def update_votes_count
+        update_columns(proposal_votes_count: votes.count)
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+
       # Public: Check if the user has voted the proposal.
       #
       # Returns Boolean.
       def voted_by?(user)
-        votes.where(author: user).any?
+        ProposalVote.where(proposal: self, author: user).any?
       end
 
       # Public: Check if the user has endorsed the proposal.
@@ -134,7 +156,7 @@ module Decidim
 
       # Public: Whether the proposal is official or not.
       def official?
-        authors.empty?
+        authors.first.is_a?(Decidim::Organization)
       end
 
       # Public: The maximum amount of votes allowed for this proposal.
@@ -201,7 +223,7 @@ module Decidim
       end
 
       def self.data_portability_images(user)
-        user_collection(user).map { |p| p.attachments.collect(&:file_url) }
+        user_collection(user).map { |p| p.attachments.collect(&:file) }
       end
 
       # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
@@ -209,8 +231,6 @@ module Decidim
         component.settings.resources_permissions_enabled
       end
 
-      private
-
       # Checks whether the proposal is inside the time window to be editable or not once published.
       def within_edit_time_limit?
         return true if draft?
@@ -218,6 +238,8 @@ module Decidim
         Time.current < limit
       end
 
+      private
+
       def copied_from_other_component?
         linked_resources(:proposals, "copied_from_component").any?
       end

data/app/models/decidim/proposals/proposal_vote.rb

@@ -4,15 +4,35 @@ module Decidim
   module Proposals
     # A proposal can include a vote per user.
     class ProposalVote < ApplicationRecord
-      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
+      belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal"
       belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
 
       validates :proposal, uniqueness: { scope: :author }
       validate :author_and_proposal_same_organization
       validate :proposal_not_rejected
 
+      after_save :update_proposal_votes_count
+      after_destroy :update_proposal_votes_count
+
+      # Temporary votes are used when a minimum amount of votes is configured in
+      # a component. They aren't taken into account unless the amount of votes
+      # exceeds a threshold - meanwhile, they're marked as temporary.
+      def self.temporary
+        where(temporary: true)
+      end
+
+      # Final votes are votes that will be taken into account, that is, they're
+      # not temporary.
+      def self.final
+        where(temporary: false)
+      end
+
       private
 
+      def update_proposal_votes_count
+        proposal.update_votes_count
+      end
+
       # Private: check if the proposal and the author have the same organization
       def author_and_proposal_same_organization
         return if !proposal || !author

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -22,22 +22,48 @@ module Decidim
             toggle_allow(admin_proposal_answering_is_enabled?) if permission_action.subject == :proposal_answer
           end
 
+          # Admins can only edit official proposals if they are within the
+          # time limit.
+          allow! if permission_action.subject == :proposal && permission_action.action == :edit && admin_edition_is_available?
+
           # Every user allowed by the space can update the category of the proposal
           allow! if permission_action.subject == :proposal_category && permission_action.action == :update
 
           # Every user allowed by the space can import proposals from another_component
           allow! if permission_action.subject == :proposals && permission_action.action == :import
 
+          # Every user allowed by the space can merge proposals to another component
+          allow! if permission_action.subject == :proposals && permission_action.action == :merge
+
+          # Every user allowed by the space can split proposals to another component
+          allow! if permission_action.subject == :proposals && permission_action.action == :split
+
+          if permission_action.subject == :participatory_texts && participatory_texts_are_enabled?
+            # Every user allowed by the space can import participatory texts to proposals
+            allow! if permission_action.action == :import
+            # Every user allowed by the space can publish participatory texts to proposals
+            allow! if permission_action.action == :publish
+          end
+
           permission_action
         end
 
         private
 
+        def proposal
+          @proposal ||= context.fetch(:proposal, nil)
+        end
+
         def admin_creation_is_enabled?
           current_settings.try(:creation_enabled?) &&
             component_settings.try(:official_proposals_enabled)
         end
 
+        def admin_edition_is_available?
+          return unless proposal
+          proposal.official? && proposal.votes.empty?
+        end
+
         def admin_proposal_answering_is_enabled?
           current_settings.try(:proposal_answering_enabled) &&
             component_settings.try(:proposal_answering_enabled)
@@ -46,6 +72,10 @@ module Decidim
         def create_permission_action?
           permission_action.action == :create
         end
+
+        def participatory_texts_are_enabled?
+          component_settings.participatory_texts_enabled?
+        end
       end
     end
   end