decidim-proposals 0.15.2 → 0.16.0

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

@@ -13,6 +13,7 @@ module Decidim
       attribute :scope_id, Integer
       attribute :has_address, Boolean
       attribute :attachment, AttachmentForm
+      attribute :suggested_hashtags, Array[String]
 
       validates :address, geocoding: true, if: ->(form) { Decidim.geocoder.present? && form.has_address? }
       validates :address, presence: true, if: ->(form) { form.has_address? }
@@ -25,6 +26,12 @@ module Decidim
 
       delegate :categories, to: :current_component
 
+      def map_model(model)
+        super
+
+        @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(model.body).extra_hashtags.map(&:name).map(&:downcase)
+      end
+
       # Finds the Category from the category_id.
       #
       # Returns a Decidim::Category
@@ -50,6 +57,27 @@ module Decidim
         current_component.settings.geocoding_enabled? && has_address
       end
 
+      def extra_hashtags
+        @extra_hashtags ||= (component_automatic_hashtags + suggested_hashtags).uniq
+      end
+
+      def suggested_hashtags
+        downcased_suggested_hashtags = Array(@suggested_hashtags&.map(&:downcase)).to_set
+        component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
+      end
+
+      def suggested_hashtag_checked?(hashtag)
+        suggested_hashtags.member?(hashtag)
+      end
+
+      def component_automatic_hashtags
+        @component_automatic_hashtags ||= ordered_hashtag_list(current_component.current_settings.automatic_hashtags)
+      end
+
+      def component_suggested_hashtags
+        @component_suggested_hashtags ||= ordered_hashtag_list(current_component.current_settings.suggested_hashtags)
+      end
+
       private
 
       def scope_belongs_to_participatory_space_scope
@@ -63,6 +91,10 @@ module Decidim
       def notify_missing_attachment_if_errored
         errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
       end
+
+      def ordered_hashtag_list(string)
+        string.to_s.split.reject(&:blank?).uniq.sort_by(&:parameterize)
+      end
     end
   end
 end

data/app/helpers/decidim/proposals/admin/proposals_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # This class contains helpers needed to format Meetings
+      # in order to use them in select forms for Proposals.
+      #
+      module ProposalsHelper
+        # Public: A formatted collection of Meetings to be used
+        # in forms.
+        def meetings_as_authors_selected
+          return unless @proposal.present? && @proposal.official_meeting?
+          @meetings_as_authors_selected ||= @proposal.authors.pluck(:id)
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Decidim
       include Decidim::MapHelper
       include Decidim::Proposals::MapHelper
       include CollaborativeDraftHelper
+      include ControlVersionHelper
 
       delegate :minimum_votes_per_user, to: :component_settings
 
@@ -36,9 +37,11 @@ module Decidim
         when "rejected"
           "text-alert"
         when "evaluating"
-          "text-info"
-        else
           "text-warning"
+        when "withdrawn"
+          "text-alert"
+        else
+          "text-info"
         end
       end
 
@@ -92,16 +95,16 @@ module Decidim
         Proposal.where(component: current_component, author: current_user)
       end
 
-      def follow_button_for(model)
-        if current_user
-          render partial: "decidim/shared/follow_button.html", locals: { followable: model }
-        else
-          content_tag(:p, class: "mt-s mb-none") do
-            t("decidim.proposals.proposals.show.sign_in_or_up",
-              in: link_to(t("decidim.proposals.proposals.show.sign_in"), decidim.new_user_session_path),
-              up: link_to(t("decidim.proposals.proposals.show.sign_up"), decidim.new_user_registration_path)).html_safe
-          end
-        end
+      def follow_button_for(model, large = nil)
+        render partial: "decidim/shared/follow_button.html", locals: { followable: model, large: large }
+      end
+
+      def votes_count_for(model, from_proposals_list)
+        render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count.html", locals: { proposal: model, from_proposals_list: from_proposals_list }
+      end
+
+      def vote_button_for(model, from_proposals_list)
+        render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button.html", locals: { proposal: model, from_proposals_list: from_proposals_list }
       end
 
       def endorsers_for(proposal)
@@ -125,6 +128,39 @@ module Decidim
         return true if can_accumulate_supports_beyond_threshold?
         return true if minimum_votes_per_user_enabled?
       end
+
+      def filter_origin_values
+        base = if component_settings.official_proposals_enabled
+                 [
+                   ["all", t("decidim.proposals.application_helper.filter_origin_values.all")],
+                   ["official", t("decidim.proposals.application_helper.filter_origin_values.official")]
+                 ]
+               else
+                 [["all", t("decidim.proposals.application_helper.filter_origin_values.all")]]
+               end
+
+        base += [["citizens", t("decidim.proposals.application_helper.filter_origin_values.citizens")]]
+        base += [["user_group", t("decidim.proposals.application_helper.filter_origin_values.user_groups")]] if current_organization.user_groups_enabled?
+        base + [["meeting", t("decidim.proposals.application_helper.filter_origin_values.meetings")]]
+      end
+
+      def filter_state_values
+        [
+          ["except_rejected", t("decidim.proposals.application_helper.filter_state_values.except_rejected")],
+          ["accepted", t("decidim.proposals.application_helper.filter_state_values.accepted")],
+          ["evaluating", t("decidim.proposals.application_helper.filter_state_values.evaluating")],
+          ["rejected", t("decidim.proposals.application_helper.filter_state_values.rejected")],
+          ["all", t("decidim.proposals.application_helper.filter_state_values.all")]
+        ]
+      end
+
+      def filter_type_values
+        [
+          ["all", t("decidim.proposals.application_helper.filter_type_values.all")],
+          ["proposals", t("decidim.proposals.application_helper.filter_type_values.proposals")],
+          ["amendments", t("decidim.proposals.application_helper.filter_type_values.amendments")]
+        ]
+      end
     end
   end
 end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # Custom helpers, scoped to the proposals engine.
+    #
+    module ControlVersionHelper
+      def versions_controller?
+        return true if params[:controller] == "decidim/proposals/versions"
+
+        false
+      end
+
+      def proposal?
+        return true if item.class == Decidim::Proposals::Proposal
+
+        false
+      end
+
+      def back_to_resource_path_text
+        return unless versions_controller?
+
+        if proposal?
+          t("versions.stats.back_to_proposal", scope: "decidim.proposals")
+        else
+          t("versions.stats.back_to_collaborative_draft", scope: "decidim.proposals")
+        end
+      end
+
+      def back_to_resource_path
+        return unless versions_controller?
+
+        if proposal?
+          proposal_path(item)
+        else
+          collaborative_draft_path(item)
+        end
+      end
+
+      def resource_version_path(index)
+        return unless versions_controller?
+
+        if proposal?
+          proposal_version_path(item, index + 1)
+        else
+          collaborative_draft_version_path(item, index + 1)
+        end
+      end
+
+      def resource_all_versions_path
+        return unless versions_controller?
+
+        if proposal?
+          proposal_versions_path(item)
+        else
+          collaborative_draft_versions_path(item)
+        end
+      end
+    end
+  end
+end

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

@@ -13,6 +13,14 @@ module Decidim
         translated = t(proposal.participatory_text_level, scope: "decidim.proposals.admin.participatory_texts.sections", title: proposal.title)
         translated.html_safe
       end
+
+      def render_participatory_text_title(participatory_text)
+        if participatory_text.nil?
+          t("alternative_title", scope: "decidim.proposals.participatory_text_proposal")
+        else
+          translated_attribute(participatory_text.title)
+        end
+      end
     end
   end
 end

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

@@ -14,9 +14,15 @@ module Decidim
       include Decidim::TranslatableAttributes
       include Decidim::CardHelper
 
-      delegate :title, :state, :answered?, :withdrawn?, to: :model
+      delegate :title, :state, :answered?, :withdrawn?, :amendable?, :emendation?, to: :model
 
       def has_actions?
+        return context[:has_actions] if context[:has_actions].present?
+        proposals_controller? && index_action? && current_settings.votes_enabled? && !model.draft?
+      end
+
+      def has_footer?
+        return context[:has_footer] if context[:has_footer].present?
         proposals_controller? && index_action? && current_settings.votes_enabled? && !model.draft?
       end
 

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

@@ -108,10 +108,11 @@ module Decidim
       end
 
       # Renders the counter of endorsements that appears in card at show Propoal.
-      def render_endorsements_count_card_part(proposal, fully_endorsed)
+      def render_endorsements_count_card_part(proposal, fully_endorsed, html_class = nil)
         content = icon("bullhorn", class: "icon--small", aria_label: "Endorsements", role: "img")
         content += proposal.proposal_endorsements_count.to_s
-        tag_params = { id: "proposal-#{proposal.id}-endorsements-count", class: "button small compact light button--sc button--shadow #{fully_endorsed ? "success" : "secondary"}" }
+        html_class = "button small compact light button--sc button--shadow" if html_class.blank?
+        tag_params = { id: "proposal-#{proposal.id}-endorsements-count", class: "#{html_class} #{fully_endorsed ? "success" : "secondary"}" }
         if proposal.proposal_endorsements_count.positive?
           link_to "#list-of-endorsements", tag_params do
             content
@@ -123,18 +124,19 @@ module Decidim
         end
       end
 
-      def render_endorsements_button_card_part(proposal, fully_endorsed)
+      def render_endorsements_button_card_part(proposal, fully_endorsed, html_class = nil)
         endorse_translated = t("decidim.proposals.proposal_endorsements_helper.render_endorsements_button_card_part.endorse")
+        html_class = "card__button button" if html_class.blank?
         if current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user)
-          content_tag :span, endorse_translated, class: "card__button button #{endorsement_button_classes(false)} disabled", disabled: true, title: endorse_translated
+          content_tag :span, endorse_translated, class: "#{html_class} #{endorsement_button_classes(false)} disabled", disabled: true, title: endorse_translated
         elsif current_user && allowed_to?(:endorse, :proposal, proposal: proposal)
           render partial: "endorsement_identities_cabin", locals: { proposal: proposal, fully_endorsed: fully_endorsed }
         elsif current_user
           button_to(endorse_translated, proposal_path(proposal),
                     data: { open: "authorizationModal", "open-url": modal_path(:endorse, proposal) },
-                    class: "card__button button #{endorsement_button_classes(false)} secondary")
+                    class: "#{html_class} #{endorsement_button_classes(false)} secondary")
         else
-          action_authorized_button_to :endorse, endorse_translated, "", resource: proposal, class: "card__button button #{endorsement_button_classes(false)} secondary"
+          action_authorized_button_to :endorse, endorse_translated, "", resource: proposal, class: "#{html_class} #{endorsement_button_classes(false)} secondary"
         end
       end
     end

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

@@ -8,13 +8,13 @@ module Decidim
 
         linked_proposals.each do |proposal_id|
           proposal = Proposal.find(proposal_id)
-          recipient_ids = proposal.notifiable_authors.map(&:id)
+          affected_users = proposal.notifiable_identities
 
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_mentioned",
             event_class: Decidim::Proposals::ProposalMentionedEvent,
             resource: comment.root_commentable,
-            recipient_ids: recipient_ids,
+            affected_users: affected_users,
             extra: {
               comment_id: comment.id,
               mentioned_proposal_id: proposal_id

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

@@ -23,26 +23,28 @@ module Decidim
           event: event,
           event_class: event_class,
           resource: component,
-          recipient_ids: component.participatory_space.followers.pluck(:id)
+          followers: component.participatory_space.followers
         )
       end
 
       private
 
+      # rubocop:disable Style/DoubleNegation
       def creation_enabled?(previous_settings, current_settings)
         current_settings[:creation_enabled] == true &&
-          previous_settings[:creation_enabled] == false
+          !!previous_settings[:creation_enabled] == false
       end
 
       def voting_enabled?(previous_settings, current_settings)
-        (current_settings[:votes_enabled] == true && current_settings[:votes_blocked] == false) &&
-          (previous_settings[:votes_enabled] == false || previous_settings[:votes_blocked] == true)
+        (current_settings[:votes_enabled] == true && !!current_settings[:votes_blocked] == false) &&
+          (!!previous_settings[:votes_enabled] == false || previous_settings[:votes_blocked] == true)
       end
 
       def endorsing_enabled?(previous_settings, current_settings)
-        (current_settings[:endorsements_enabled] == true && current_settings[:endorsements_blocked] == false) &&
-          (previous_settings[:endorsements_enabled] == false || previous_settings[:endorsements_blocked] == true)
+        (current_settings[:endorsements_enabled] == true && !!current_settings[:endorsements_blocked] == false) &&
+          (!!previous_settings[:endorsements_enabled] == false || previous_settings[:endorsements_blocked] == true)
       end
+      # rubocop:enable Style/DoubleNegation
     end
   end
 end

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

@@ -27,8 +27,11 @@ module Decidim
                class_name: "Decidim::User",
                foreign_key: :decidim_user_id
 
+      geocoded_by :address, http_headers: ->(collaborative_draft) { { "Referer" => collaborative_draft.component.organization.host } }
+
       scope :open, -> { where(state: "open") }
       scope :withdrawn, -> { where(state: "withdrawn") }
+      scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
       scope :published, -> { where(state: "published") }
 
       # Checks whether the user can edit the given proposal.

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

@@ -21,9 +21,16 @@ module Decidim
       include Decidim::DataPortability
       include Decidim::Hashtaggable
       include Decidim::Proposals::ParticipatoryTextSection
+      include Decidim::Amendable
 
       fingerprint fields: [:title, :body]
 
+      amendable(
+        fields: [:title, :body],
+        ignore: [:published_at, :reference, :state, :answered_at, :answer],
+        form:   "Decidim::Proposals::ProposalForm"
+      )
+
       component_manifest_name "proposals"
 
       has_many :endorsements, foreign_key: "decidim_proposal_id", class_name: "ProposalEndorsement", dependent: :destroy, counter_cache: "proposal_endorsements_count"
@@ -59,7 +66,7 @@ module Decidim
                           A: :search_title,
                           datetime: :published_at
                         },
-                        index_on_create: false,
+                        index_on_create: ->(proposal) { proposal.official? },
                         index_on_update: ->(proposal) { proposal.visible? })
 
       def self.order_randomly(seed)
@@ -159,6 +166,11 @@ module Decidim
         authors.first.is_a?(Decidim::Organization)
       end
 
+      # Public: Whether the proposal is created in a meeting or not.
+      def official_meeting?
+        authors.first.class.name == "Decidim::Meetings::Meeting"
+      end
+
       # Public: The maximum amount of votes allowed for this proposal.
       #
       # Returns an Integer with the maximum amount of votes, nil otherwise.
@@ -190,7 +202,7 @@ module Decidim
       # user - the user to check for authorship
       def editable_by?(user)
         return true if draft?
-        authored_by?(user) && !answered? && within_edit_time_limit? && !copied_from_other_component?
+        !answered? && within_edit_time_limit? && !copied_from_other_component? && created_by?(user)
       end
 
       # Checks whether the user can withdraw the given proposal.
@@ -208,12 +220,12 @@ module Decidim
       # method for sort_link by number of comments
       ransacker :commentable_comments_count do
         query = <<-SQL
-              (SELECT COUNT(decidim_comments_comments.id)
-                 FROM decidim_comments_comments
-                WHERE decidim_comments_comments.decidim_commentable_id = decidim_proposals_proposals.id
-                  AND decidim_comments_comments.decidim_commentable_type = 'Decidim::Proposals::Proposal'
-                GROUP BY decidim_comments_comments.decidim_commentable_id
-              )
+        (SELECT COUNT(decidim_comments_comments.id)
+         FROM decidim_comments_comments
+         WHERE decidim_comments_comments.decidim_commentable_id = decidim_proposals_proposals.id
+         AND decidim_comments_comments.decidim_commentable_type = 'Decidim::Proposals::Proposal'
+         GROUP BY decidim_comments_comments.decidim_commentable_id
+         )
         SQL
         Arel.sql(query)
       end

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

@@ -61,7 +61,7 @@ module Decidim
 
         def admin_edition_is_available?
           return unless proposal
-          proposal.official? && proposal.votes.empty?
+          (proposal.official? || proposal.official_meeting?) && proposal.votes.empty?
         end
 
         def admin_proposal_answering_is_enabled?

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb

@@ -7,8 +7,9 @@ module Decidim
         class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
           def present
             return unless value
+
             renderer = Decidim::ContentRenderers::HashtagRenderer.new(value)
-            renderer.render_without_link.html_safe
+            renderer.render(links: false).html_safe
           end
         end
       end