decidim-proposals 0.10.1 → 0.11.0.pre1

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

@@ -68,6 +68,7 @@ module Decidim
             #{proposal_wizard_stepper_step(:step_1, current_step)}
             #{proposal_wizard_stepper_step(:step_2, current_step)}
             #{proposal_wizard_stepper_step(:step_3, current_step)}
+            #{proposal_wizard_stepper_step(:step_4, current_step)}
           ).html_safe
         end
       end
@@ -89,7 +90,7 @@ module Decidim
       #
       # step - A symbol of the target step
       def proposal_wizard_step_help_text?(step)
-        translated_attribute(feature_settings.try("proposal_wizard_#{step}_help_text")).present?
+        translated_attribute(component_settings.try("proposal_wizard_#{step}_help_text")).present?
       end
 
       # Renders a user_group select field in a form.

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class NotifyProposalsMentionedJob < ApplicationJob
+      def perform(comment_id, proposal_metadata)
+        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.decidim_author_id.blank?
+
+          recipient_ids = [proposal.decidim_author_id]
+          Decidim::EventsManager.publish(
+            event: "decidim.events.proposals.proposal_mentioned",
+            event_class: Decidim::Proposals::ProposalMentionedEvent,
+            resource: comment.root_commentable,
+            recipient_ids: recipient_ids,
+            extra: {
+              comment_id: comment.id,
+              mentioned_proposal_id: proposal_id
+            }
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -3,8 +3,8 @@
 module Decidim
   module Proposals
     class SettingsChangeJob < ApplicationJob
-      def perform(feature_id, previous_settings, current_settings)
-        feature = Decidim::Feature.find(feature_id)
+      def perform(component_id, previous_settings, current_settings)
+        component = Decidim::Component.find(component_id)
 
         if creation_enabled?(previous_settings, current_settings)
           event = "decidim.events.proposals.creation_enabled"
@@ -22,8 +22,8 @@ module Decidim
         Decidim::EventsManager.publish(
           event: event,
           event_class: event_class,
-          resource: feature,
-          recipient_ids: feature.participatory_space.followers.pluck(:id)
+          resource: component,
+          recipient_ids: component.participatory_space.followers.pluck(:id)
         )
       end
 

data/app/models/decidim/proposals/abilities/admin_ability.rb

@@ -23,18 +23,18 @@ module Decidim
           @context.fetch(:current_settings, nil)
         end
 
-        def feature_settings
-          @context.fetch(:feature_settings, nil)
+        def component_settings
+          @context.fetch(:component_settings, nil)
         end
 
         def can_create_proposal?
           current_settings.try(:creation_enabled?) &&
-            feature_settings.try(:official_proposals_enabled)
+            component_settings.try(:official_proposals_enabled)
         end
 
         def can_update_proposal?
           current_settings.try(:proposal_answering_enabled) &&
-            feature_settings.try(:proposal_answering_enabled)
+            component_settings.try(:proposal_answering_enabled)
         end
       end
     end

data/app/models/decidim/proposals/abilities/current_user_ability.rb

@@ -51,14 +51,14 @@ module Decidim
         end
 
         def authorized?(action)
-          return unless feature
+          return unless component
 
-          ActionAuthorizer.new(user, feature, action).authorize.ok?
+          ActionAuthorizer.new(user, component, action).authorize.ok?
         end
 
         def vote_limit_enabled?
-          return unless feature_settings
-          feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
+          return unless component_settings
+          component_settings.vote_limit.present? && component_settings.vote_limit.positive?
         end
 
         def creation_enabled?
@@ -69,9 +69,9 @@ module Decidim
         def remaining_votes
           return 1 unless vote_limit_enabled?
 
-          proposals = Proposal.where(feature: feature)
+          proposals = Proposal.where(component: component)
           votes_count = ProposalVote.where(author: user, proposal: proposals).size
-          feature_settings.vote_limit - votes_count
+          component_settings.vote_limit - votes_count
         end
 
         def endorsements_enabled?
@@ -93,15 +93,15 @@ module Decidim
           context.fetch(:current_settings, nil)
         end
 
-        def feature_settings
-          context.fetch(:feature_settings, nil)
+        def component_settings
+          context.fetch(:component_settings, nil)
         end
 
-        def feature
-          feature = context.fetch(:current_feature, nil)
-          return nil unless feature && feature.manifest.name == :proposals
+        def component
+          component = context.fetch(:current_component, nil)
+          return nil unless component && component.manifest.name == :proposals
 
-          feature
+          component
         end
 
         def can_withdraw?(proposal)

data/app/models/decidim/proposals/abilities/participatory_process_admin_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:manage, :unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_space)
+            can_manage_process?(proposal.component.participatory_space)
           end
 
           cannot :create, Proposal unless can_create_proposal?
@@ -24,23 +24,23 @@ module Decidim
           @context.fetch(:current_settings, nil)
         end
 
-        def feature_settings
-          @context.fetch(:feature_settings, nil)
+        def component_settings
+          @context.fetch(:component_settings, nil)
         end
 
-        def current_feature
-          @context.fetch(:current_feature, nil)
+        def current_component
+          @context.fetch(:current_component, nil)
         end
 
         def can_create_proposal?
           current_settings.try(:creation_enabled?) &&
-            feature_settings.try(:official_proposals_enabled) &&
-            can_manage_process?(current_feature.try(:participatory_space))
+            component_settings.try(:official_proposals_enabled) &&
+            can_manage_process?(current_component.try(:participatory_space))
         end
 
         def can_update_proposal?
           current_settings.try(:proposal_answering_enabled) &&
-            feature_settings.try(:proposal_answering_enabled)
+            component_settings.try(:proposal_answering_enabled)
         end
       end
     end

data/app/models/decidim/proposals/abilities/participatory_process_moderator_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can [:unreport, :hide], Proposal do |proposal|
-            can_manage_process?(proposal.feature.participatory_space)
+            can_manage_process?(proposal.component.participatory_space)
           end
         end
       end

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

@@ -6,8 +6,8 @@ module Decidim
     class Proposal < Proposals::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::Authorable
-      include Decidim::HasFeature
-      include Decidim::ScopableFeature
+      include Decidim::HasComponent
+      include Decidim::ScopableComponent
       include Decidim::HasReference
       include Decidim::HasCategory
       include Decidim::Reportable
@@ -17,7 +17,7 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
 
-      feature_manifest_name "proposals"
+      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"
@@ -25,7 +25,7 @@ module Decidim
 
       validates :title, :body, presence: true
 
-      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
+      geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.component.organization.host } }
 
       scope :accepted, -> { where(state: "accepted") }
       scope :rejected, -> { where(state: "rejected") }
@@ -109,7 +109,7 @@ module Decidim
       #
       # Returns an Integer with the maximum amount of votes, nil otherwise.
       def maximum_votes
-        maximum_votes = feature.settings.threshold_per_proposal || 0
+        maximum_votes = component.settings.threshold_per_proposal
         return nil if maximum_votes.zero?
 
         maximum_votes
@@ -128,7 +128,7 @@ module Decidim
       #
       # Returns true if can accumulate, false otherwise
       def can_accumulate_supports_beyond_threshold
-        feature.settings.can_accumulate_supports_beyond_threshold
+        component.settings.can_accumulate_supports_beyond_threshold
       end
 
       # Checks whether the user can edit the given proposal.
@@ -169,7 +169,7 @@ module Decidim
       # 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?
-        limit = updated_at + feature.settings.proposal_edit_before_minutes.minutes
+        limit = updated_at + component.settings.proposal_edit_before_minutes.minutes
         Time.current < limit
       end
 

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

@@ -4,9 +4,9 @@ module Decidim
   module Proposals
     # A proposal can include an endorsement per user or group.
     class ProposalEndorsement < ApplicationRecord
+      include Decidim::Authorable
+
       belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
-      belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
-      belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
       validates :proposal, uniqueness: { scope: [:author, :user_group] }
       validate :author_and_proposal_same_organization
@@ -16,6 +16,10 @@ module Decidim
 
       private
 
+      def organization
+        proposal&.component&.organization
+      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/presenters/decidim/proposals/proposal_presenter.rb

@@ -6,6 +6,9 @@ module Decidim
     # Decorator for proposals
     #
     class ProposalPresenter < SimpleDelegator
+      include Rails.application.routes.mounted_helpers
+      include ActionView::Helpers::UrlHelper
+
       def author
         @author ||= if official?
                       Decidim::Proposals::OfficialAuthorPresenter.new
@@ -15,6 +18,15 @@ module Decidim
                       Decidim::UserPresenter.new(super)
                     end
       end
+
+      def proposal_path
+        proposal = __getobj__
+        Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      def display_mention
+        link_to title, proposal_path
+      end
     end
   end
 end

data/app/queries/decidim/proposals/filtered_proposals.rb

@@ -2,32 +2,32 @@
 
 module Decidim
   module Proposals
-    # A class used to find proposals filtered by features and a date range
+    # A class used to find proposals filtered by components and a date range
     class FilteredProposals < Rectify::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
-      # features - An array of Decidim::Feature
+      # components - An array of Decidim::Component
       # start_at - A date to filter resources created after it
       # end_at - A date to filter resources created before it.
-      def self.for(features, start_at = nil, end_at = nil)
-        new(features, start_at, end_at).query
+      def self.for(components, start_at = nil, end_at = nil)
+        new(components, start_at, end_at).query
       end
 
       # Initializes the class.
       #
-      # features - An array of Decidim::Feature
+      # components - An array of Decidim::Component
       # start_at - A date to filter resources created after it
       # end_at - A date to filter resources created before it.
-      def initialize(features, start_at = nil, end_at = nil)
-        @features = features
+      def initialize(components, start_at = nil, end_at = nil)
+        @components = components
         @start_at = start_at
         @end_at = end_at
       end
 
-      # Finds the Proposals scoped to an array of features and filtered
+      # Finds the Proposals scoped to an array of components and filtered
       # by a range of dates.
       def query
-        proposals = Decidim::Proposals::Proposal.where(feature: @features)
+        proposals = Decidim::Proposals::Proposal.where(component: @components)
         proposals = proposals.where("created_at >= ?", @start_at) if @start_at.present?
         proposals = proposals.where("created_at <= ?", @end_at) if @end_at.present?
         proposals

data/app/queries/decidim/proposals/similar_proposals.rb

@@ -8,30 +8,30 @@ module Decidim
 
       # Syntactic sugar to initialize the class and return the queried objects.
       #
-      # features - Decidim::CurrentFeature
+      # components - Decidim::CurrentComponent
       # proposal - Decidim::Proposals::Proposal
-      def self.for(features, proposal)
-        new(features, proposal).query
+      def self.for(components, proposal)
+        new(components, proposal).query
       end
 
       # Initializes the class.
       #
-      # features - Decidim::CurrentFeature
+      # components - Decidim::CurrentComponent
       # proposal - Decidim::Proposals::Proposal
-      def initialize(features, proposal)
-        @features = features
+      def initialize(components, proposal)
+        @components = components
         @proposal = proposal
       end
 
       # Retrieves similar proposals
       def query
         Decidim::Proposals::Proposal
-          .where(feature: @features)
+          .where(component: @components)
           .published
           .where(
             "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
-            proposal.title,
-            proposal.body,
+            @proposal[:title],
+            @proposal[:body],
             Decidim::Proposals.similarity_threshold
           )
           .limit(Decidim::Proposals.similarity_limit)

data/app/services/decidim/proposals/proposal_search.rb

@@ -6,7 +6,7 @@ module Decidim
     # proposals in a participatory process.
     class ProposalSearch < ResourceSearch
       # Public: Initializes the service.
-      # feature     - A Decidim::Feature to get the proposals from.
+      # component     - A Decidim::Component to get the proposals from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})

data/app/types/decidim/proposals/proposal_type.rb

@@ -6,17 +6,32 @@ module Decidim
       name "Proposal"
       description "A proposal"
 
+      interfaces [
+        Decidim::Comments::CommentableInterface,
+        Decidim::Core::AuthorableInterface,
+        Decidim::Core::CategorizableInterface,
+        Decidim::Core::ScopableInterface,
+        Decidim::Core::AttachableInterface
+      ]
+
       field :id, !types.ID
       field :title, !types.String, "This proposal's title"
       field :body, types.String, "This proposal's body"
       field :state, types.String, "The state in which proposal is in"
       field :address, types.String, "The physical address (location) of this proposal"
+      field :reference, types.String, "This proposa'ls unique reference"
 
       field :publishedAt, Decidim::Core::DateTimeType do
         description "The date and time this proposal was published"
         property :published_at
       end
 
+      field :endorsements, !types[Decidim::Core::AuthorInterface], "The endorsements of this proposal." do
+        resolve ->(proposal, _, _) {
+          proposal.endorsements.map(&:normalized_author)
+        }
+      end
+
       field :endorsementsCount, types.Int do
         description "The total amount of endorsements the proposal has received"
         property :proposal_endorsements_count
@@ -25,8 +40,8 @@ module Decidim
       field :voteCount, types.Int do
         description "The total amount of votes the proposal has received"
         resolve ->(proposal, _args, _ctx) {
-          current_feature = proposal.feature
-          proposal.proposal_votes_count unless current_feature.current_settings.votes_hidden?
+          current_component = proposal.component
+          proposal.proposal_votes_count unless current_component.current_settings.votes_hidden?
         }
       end
     end

data/app/types/decidim/proposals/proposals_type.rb

@@ -9,24 +9,24 @@ module Decidim
       description "A proposals component of a participatory space."
 
       connection :proposals, ProposalType.connection_type do
-        resolve ->(feature, _args, _ctx) {
-                  ProposalsTypeHelper.base_scope(feature).includes(:feature)
+        resolve ->(component, _args, _ctx) {
+                  ProposalsTypeHelper.base_scope(component).includes(:component)
                 }
       end
 
       field(:proposal, ProposalType) do
         argument :id, !types.ID
 
-        resolve ->(feature, args, _ctx) {
-          ProposalsTypeHelper.base_scope(feature).find_by(id: args[:id])
+        resolve ->(component, args, _ctx) {
+          ProposalsTypeHelper.base_scope(component).find_by(id: args[:id])
         }
       end
     end
 
     module ProposalsTypeHelper
-      def self.base_scope(feature)
+      def self.base_scope(component)
         Proposal
-          .where(feature: feature)
+          .where(component: component)
           .published
       end
     end