decidim-proposals 0.10.1 → 0.11.0.pre1

data/app/controllers/decidim/proposals/proposal_endorsements_controller.rb

@@ -49,7 +49,7 @@ module Decidim
       private
 
       def proposal
-        @proposal ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
+        @proposal ||= Proposal.where(component: current_component).find(params[:proposal_id])
       end
     end
   end

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -41,7 +41,7 @@ module Decidim
       private
 
       def proposal
-        @proposal ||= Proposal.where(feature: current_feature).find(params[:proposal_id])
+        @proposal ||= Proposal.where(component: current_component).find(params[:proposal_id])
       end
     end
   end

data/app/controllers/decidim/proposals/proposal_widgets_controller.rb

@@ -8,7 +8,7 @@ module Decidim
       private
 
       def model
-        @model ||= Proposal.where(feature: params[:feature_id]).find(params[:proposal_id])
+        @model ||= Proposal.where(component: params[:component_id]).find(params[:proposal_id])
       end
 
       def iframe_url

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -12,8 +12,8 @@ module Decidim
       include Paginable
 
       helper_method :geocoded_proposals
-      before_action :authenticate_user!, only: [:new, :create]
-      before_action :ensure_is_draft, only: [:compare, :preview, :publish, :edit_draft, :update_draft]
+      before_action :authenticate_user!, only: [:new, :create, :complete]
+      before_action :ensure_is_draft, only: [:preview, :publish, :edit_draft, :update_draft, :destroy_draft]
 
       def index
         @proposals = search
@@ -38,7 +38,7 @@ module Decidim
       end
 
       def show
-        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(component: current_component).find(params[:id])
         @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
@@ -46,29 +46,27 @@ module Decidim
         authorize! :create, Proposal
         @step = :step_1
         if proposal_draft.present?
-          redirect_to edit_draft_proposal_path(proposal_draft, feature_id: proposal_draft.feature.id, assembly_slug: proposal_draft.feature.participatory_space.slug)
+          redirect_to edit_draft_proposal_path(proposal_draft, component_id: proposal_draft.component.id, question_slug: proposal_draft.component.participatory_space.slug)
         else
-          @form = form(ProposalForm).from_params(
-            attachment: form(AttachmentForm).from_params({})
-          )
+          @form = form(ProposalForm).from_params(params)
         end
       end
 
       def create
         authorize! :create, Proposal
-        @step = :step_1
+        @step = :step_3
         @form = form(ProposalForm).from_params(params)
 
         CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
-            compare_path = Decidim::ResourceLocatorPresenter.new(proposal).path + "/compare"
-            redirect_to compare_path
+
+            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/preview"
           end
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("proposals.create.error", scope: "decidim")
-            render :new
+            render :complete
           end
         end
       end
@@ -76,25 +74,39 @@ module Decidim
       def compare
         @step = :step_2
         @similar_proposals ||= Decidim::Proposals::SimilarProposals
-                               .for(current_feature, @proposal)
+                               .for(current_component, params[:proposal])
                                .all
+        @form = form(ProposalForm).from_params(params)
 
         if @similar_proposals.blank?
           flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
-          redirect_to preview_proposal_path(@proposal)
+          redirect_to complete_proposals_path(proposal: { title: @form.title, body: @form.body })
         end
       end
 
-      def preview
+      def complete
+        authorize! :create, Proposal
         @step = :step_3
+        if params[:proposal].present?
+          params[:proposal][:attachment] = form(AttachmentForm).from_params({})
+          @form = form(ProposalForm).from_params(params)
+        else
+          @form = form(ProposalForm).from_params(
+            attachment: form(AttachmentForm).from_params({})
+          )
+        end
+      end
+
+      def preview
+        @step = :step_4
       end
 
       def publish
-        @step = :step_3
+        @step = :step_4
         PublishProposal.call(@proposal, current_user) do
-          on(:ok) do |proposal|
+          on(:ok) do
             flash[:notice] = I18n.t("proposals.publish.success", scope: "decidim")
-            redirect_to proposal_path(proposal)
+            redirect_to proposal_path(@proposal)
           end
 
           on(:invalid) do
@@ -105,7 +117,7 @@ module Decidim
       end
 
       def edit_draft
-        @step = :step_1
+        @step = :step_3
         authorize! :edit, Proposal
 
         @form = form(ProposalForm).from_model(@proposal)
@@ -119,7 +131,7 @@ module Decidim
         UpdateProposal.call(@form, current_user, @proposal) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.update_draft.success", scope: "decidim")
-            redirect_to preview_proposal_path(proposal)
+            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/preview"
           end
 
           on(:invalid) do
@@ -129,15 +141,31 @@ module Decidim
         end
       end
 
+      def destroy_draft
+        authorize! :edit, Proposal
+
+        DestroyProposal.call(@proposal, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("proposals.destroy_draft.success", scope: "decidim")
+            redirect_to new_proposal_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("proposals.destroy_draft.error", scope: "decidim")
+            render :edit_draft
+          end
+        end
+      end
+
       def edit
-        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(component: current_component).find(params[:id])
         authorize! :edit, @proposal
 
         @form = form(ProposalForm).from_model(@proposal)
       end
 
       def update
-        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.not_hidden.where(component: current_component).find(params[:id])
         authorize! :edit, @proposal
 
         @form = form(ProposalForm).from_params(params)
@@ -155,7 +183,7 @@ module Decidim
       end
 
       def withdraw
-        @proposal = Proposal.published.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.published.not_hidden.where(component: current_component).find(params[:id])
         authorize! :withdraw, @proposal
 
         WithdrawProposal.call(@proposal, current_user) do
@@ -193,11 +221,11 @@ module Decidim
       end
 
       def proposal_draft
-        Proposal.not_hidden.where(feature: current_feature, author: current_user).find_by(published_at: nil)
+        Proposal.not_hidden.where(component: current_component, author: current_user).find_by(published_at: nil)
       end
 
       def ensure_is_draft
-        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @proposal = Proposal.not_hidden.where(component: current_component).find(params[:id])
         redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path unless @proposal.draft?
       end
     end

data/app/events/decidim/proposals/proposal_mentioned_event.rb

@@ -0,0 +1,19 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Proposals
+    class ProposalMentionedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :mentioned_proposal_title
+
+      private
+
+      def mentioned_proposal_title
+        mentioned_proposal.title
+      end
+
+      def mentioned_proposal
+        @mentioned_proposal ||= Decidim::Proposals::Proposal.find(extra[:mentioned_proposal_id])
+      end
+    end
+  end
+end

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

@@ -17,13 +17,13 @@ module Decidim
         attribute :attachment, AttachmentForm
 
         validates :title, :body, presence: true
-        validates :address, geocoding: true, if: -> { current_feature.settings.geocoding_enabled? }
+        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? }
 
         validate :scope_belongs_to_participatory_space_scope
 
-        delegate :categories, to: :current_feature
+        delegate :categories, to: :current_component
 
         def map_model(model)
           return unless model.categorization
@@ -31,7 +31,7 @@ module Decidim
           self.category_id = model.categorization.decidim_category_id
         end
 
-        alias feature current_feature
+        alias component current_component
 
         # Finds the Category from the category_id.
         #

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

@@ -8,11 +8,11 @@ module Decidim
       class ProposalsImportForm < Decidim::Form
         mimic :proposals_import
 
-        attribute :origin_feature_id, Integer
+        attribute :origin_component_id, Integer
         attribute :import_proposals, Boolean
         attribute :states, Array
 
-        validates :origin_feature_id, :origin_feature, :states, :current_feature, presence: true
+        validates :origin_component_id, :origin_component, :states, :current_component, presence: true
         validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
@@ -31,17 +31,17 @@ module Decidim
           super.reject(&:blank?)
         end
 
-        def origin_feature
-          @origin_feature ||= origin_features.find_by(id: origin_feature_id)
+        def origin_component
+          @origin_component ||= origin_components.find_by(id: origin_component_id)
         end
 
-        def origin_features
-          @origin_features ||= current_participatory_space.features.where.not(id: current_feature.id).where(manifest_name: :proposals)
+        def origin_components
+          @origin_components ||= current_participatory_space.components.where.not(id: current_component.id).where(manifest_name: :proposals)
         end
 
-        def origin_features_collection
-          origin_features.map do |feature|
-            [feature.name[I18n.locale.to_s], feature.id]
+        def origin_components_collection
+          origin_components.map do |component|
+            [component.name[I18n.locale.to_s], component.id]
           end
         end
 

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

@@ -26,15 +26,16 @@ module Decidim
       validate :proposal_length
       validate :scope_belongs_to_participatory_space_scope
 
-      delegate :categories, to: :current_feature
+      delegate :categories, to: :current_component
 
       def map_model(model)
+        self.user_group_id = model.decidim_user_group_id
         return unless model.categorization
 
         self.category_id = model.categorization.decidim_category_id
       end
 
-      alias feature current_feature
+      alias component current_component
       # Finds the Category from the category_id.
       #
       # Returns a Decidim::Category
@@ -57,14 +58,14 @@ module Decidim
       end
 
       def has_address?
-        current_feature.settings.geocoding_enabled? && has_address
+        current_component.settings.geocoding_enabled? && has_address
       end
 
       private
 
       def proposal_length
         return unless body.presence
-        length = current_feature.settings.proposal_length
+        length = current_component.settings.proposal_length
         errors.add(:body, :too_long, count: length) if body.length > length
       end
 

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

@@ -63,13 +63,48 @@ module Decidim
       end
 
       def proposal_limit
-        return if feature_settings.proposal_limit.zero?
+        return if component_settings.proposal_limit.zero?
 
-        feature_settings.proposal_limit
+        component_settings.proposal_limit
       end
 
       def current_user_proposals
-        Proposal.where(feature: current_feature, author: current_user)
+        Proposal.where(component: current_component, author: current_user)
+      end
+
+      def follow_button_for(model)
+        if current_user
+          render partial: "decidim/shared/follow_button", 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
+      end
+
+      # Public - A widget that lists all identities in an xxs card format.
+      # Shows the first 5 identities and hides the rest, but presents a 'see all'
+      # button to make the rest of identities visible.
+      #
+      # @param identities: The list of identities. Each item must have a user_group or author method.
+      # @param widget_id: Mandatory when placing more than 1 widget in a page, optional otherwise. Is the id
+      #   uniquely identify this widget in the page.
+      #
+      def identities_list_xxs(identities, widget_id = "identities-xxs")
+        widget_ids = {
+          ellipsis: "#{widget_id}-ellipsis",
+          remaining_identities: "#{widget_id}-remaining-identities",
+          see_all_identities: "#{widget_id}-see-all-identities"
+        }
+        render partial: "identities_listing", locals: { identities: identities, widget_ids: widget_ids }
+      end
+
+      def identities_xxs(identities)
+        identities.collect do |identity|
+          render partial: "identity_xxs", locals: { identity: identity.normalized_author }
+        end.join(", ").html_safe
       end
     end
   end

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

@@ -52,8 +52,12 @@ module Decidim
         endorsements_enabled?
       end
 
-      def endorsement_identity(endorsement)
-        endorsement.user_group ? endorsement.user_group : endorsement.author
+      def endorsement_identity_presenter(endorsement)
+        if endorsement.user_group
+          Decidim::UserGroupPresenter.new(endorsement.user_group)
+        else
+          Decidim::UserPresenter.new(endorsement.author)
+        end
       end
 
       # Public: Renders a button to endorse the given proposal.
@@ -67,7 +71,7 @@ module Decidim
           from_proposals_list: from_proposals_list,
           user_group_id: user_group&.id
         )
-        endorse_label = btn_label || t(".endorse")
+        endorse_label = btn_label || t("decidim.proposals.proposal_endorsements_helper.endorsement_button.endorse")
         unendorse_label = btn_label || t("decidim.proposals.proposal_endorsements_helper.endorsement_button.already_endorsed")
 
         render partial: "decidim/proposals/proposals/endorsement_button", locals: { proposal: proposal,

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

@@ -28,11 +28,11 @@ module Decidim
       #
       # Returns an Integer if set, nil otherwise.
       def vote_limit
-        return nil if feature_settings.vote_limit.zero?
-        feature_settings.vote_limit
+        return nil if component_settings.vote_limit.zero?
+        component_settings.vote_limit
       end
 
-      # Check if the vote limit is enabled for the current feature
+      # Check if the vote limit is enabled for the current component
       #
       # Returns true if the vote limit is enabled
       def vote_limit_enabled?
@@ -50,15 +50,15 @@ module Decidim
       #
       # Returns an Integer with the maximum amount of votes, nil otherwise.
       def threshold_per_proposal
-        return nil unless feature_settings.threshold_per_proposal.to_i.positive?
-        feature_settings.threshold_per_proposal
+        return nil unless component_settings.threshold_per_proposal.positive?
+        component_settings.threshold_per_proposal
       end
 
       # Public: Checks if can accumulate more than maxium is enabled
       #
       # Returns true if enabled, false otherwise.
       def can_accumulate_supports_beyond_threshold?
-        feature_settings.can_accumulate_supports_beyond_threshold
+        component_settings.can_accumulate_supports_beyond_threshold
       end
 
       # Public: Checks if voting is enabled in this step.
@@ -82,16 +82,16 @@ module Decidim
         current_user && votes_enabled? && vote_limit_enabled? && !votes_blocked?
       end
 
-      # Return the remaining votes for a user if the current feature has a vote limit
+      # Return the remaining votes for a user if the current component has a vote limit
       #
       # user - A User object
       #
       # Returns a number with the remaining votes for that user
       def remaining_votes_count_for(user)
         return 0 unless vote_limit_enabled?
-        proposals = Proposal.where(feature: current_feature)
+        proposals = Proposal.where(component: current_component)
         votes_count = ProposalVote.where(author: user, proposal: proposals).size
-        feature_settings.vote_limit - votes_count
+        component_settings.vote_limit - votes_count
       end
     end
   end