decidim-proposals 0.28.5 → 0.29.0.rc1

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -13,6 +13,8 @@ module Decidim
 
           private
 
+          delegate :filters, :dynamically_translated_filters, :filters_with_values, to: :filter_config
+
           # Comment about participatory_texts_enabled.
           def base_query
             return collection.order(:position) if current_component.settings.participatory_texts_enabled?
@@ -30,32 +32,18 @@ module Decidim
             :id_string_or_title_cont
           end
 
-          def filters
-            [
-              :is_emendation_true,
-              :with_any_state,
-              :state_eq,
-              :scope_id_eq,
-              :category_id_eq,
-              :valuator_role_ids_has
-            ]
+          def filter_config
+            @filter_config ||= Decidim::AdminFilter.new(:proposals).build_for(self)
           end
 
-          def filters_with_values
-            {
-              is_emendation_true: %w(true false),
-              state_eq: Proposal::STATES,
-              with_any_state: %w(state_published state_not_published),
-              scope_id_eq: scope_ids_hash(scopes.top_level),
-              category_id_eq: category_ids_hash(categories.first_class),
-              valuator_role_ids_has: valuator_role_ids
-            }
+          def translated_state_eq(state)
+            return t("decidim.admin.filters.proposals.state_eq.values.withdrawn") if state == "withdrawn"
+
+            translated_attribute(ProposalState.where(component: current_component, token: state).first&.title)
           end
 
-          # Cannot user `super` here, because it does not belong to a superclass
-          # but to a concern.
-          def dynamically_translated_filters
-            [:scope_id_eq, :category_id_eq, :valuator_role_ids_has]
+          def state_eq_values
+            ProposalState.where(component: current_component).pluck(:token) + ["withdrawn"]
           end
 
           def valuator_role_ids

data/app/controllers/decidim/proposals/admin/proposal_states_controller.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalStatesController < Admin::ApplicationController
+        include Decidim::Admin::Paginable
+
+        helper_method :proposal_states, :proposal_state
+        def index
+          enforce_permission_to :read, :proposal_state
+        end
+
+        def new
+          enforce_permission_to :create, :proposal_state
+          @form = form(Decidim::Proposals::Admin::ProposalStateForm).instance
+        end
+
+        def create
+          enforce_permission_to :create, :proposal_state
+
+          @form = form(ProposalStateForm).from_params(params)
+
+          CreateProposalState.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("proposal_states.create.success", scope: "decidim.proposals.admin")
+              redirect_to proposal_states_path
+            end
+
+            on(:invalid) do
+              flash.keep[:alert] = I18n.t("proposal_states.create.error", scope: "decidim.proposals.admin")
+
+              render action: :new
+            end
+          end
+        end
+
+        def edit
+          enforce_permission_to(:update, :proposal_state, proposal_state:)
+          @form = form(Decidim::Proposals::Admin::ProposalStateForm).from_model(proposal_state)
+        end
+
+        def update
+          enforce_permission_to(:update, :proposal_state, proposal_state:)
+          @form = form(ProposalStateForm).from_params(params)
+
+          UpdateProposalState.call(@form, proposal_state) do
+            on(:ok) do
+              flash[:notice] = I18n.t("proposal_states.update.success", scope: "decidim.proposals.admin")
+
+              redirect_to proposal_states_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposal_states.update.error", scope: "decidim.proposals.admin")
+
+              render action: :edit
+            end
+          end
+        end
+
+        def destroy
+          enforce_permission_to(:destroy, :proposal_state, proposal_state:)
+
+          DestroyProposalState.call(proposal_state, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("proposal_states.destroy.success", scope: "decidim.proposals.admin")
+
+              redirect_to proposal_states_path
+            end
+          end
+        end
+
+        private
+
+        def proposal_state
+          @proposal_state ||= proposal_states.find(params[:id])
+        end
+
+        def proposal_states
+          @proposal_states ||= paginate(ProposalState.where(component: current_component))
+        end
+      end
+    end
+  end
+end

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

@@ -14,6 +14,10 @@ module Decidim
         helper_method :proposals, :query, :form_presenter, :proposal, :proposal_ids
         helper Proposals::Admin::ProposalBulkActionsHelper
 
+        before_action :check_admin_session_filters, only: [:index]
+
+        def index; end
+
         def show
           @notes_form = form(ProposalNoteForm).instance
           @answer_form = form(Admin::ProposalAnswerForm).from_model(proposal)

data/app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb

@@ -5,10 +5,12 @@ module Decidim
     module Admin
       class ValuationAssignmentsController < Admin::ApplicationController
         def create
-          enforce_permission_to :assign_to_valuator, :proposals
-
           @form = form(Admin::ValuationAssignmentForm).from_params(params)
 
+          @form.proposals.each do |proposal|
+            enforce_permission_to :assign_to_valuator, :proposals, proposal:
+          end
+
           Admin::AssignProposalsToValuator.call(@form) do
             on(:ok) do |_proposal|
               flash[:notice] = I18n.t("valuation_assignments.create.success", scope: "decidim.proposals.admin")
@@ -23,9 +25,11 @@ module Decidim
         end
 
         def destroy
-          @form = form(Admin::ValuationAssignmentForm).from_params(destroy_params)
+          @form = form(Admin::ValuationAssignmentForm).from_params(params)
 
-          enforce_permission_to :unassign_from_valuator, :proposals, valuator: @form.valuator_user
+          @form.valuator_roles.each do |valuator_role|
+            enforce_permission_to :unassign_from_valuator, :proposals, valuator: valuator_role.user
+          end
 
           Admin::UnassignProposalsFromValuator.call(@form) do
             on(:ok) do |_proposal|
@@ -42,13 +46,6 @@ module Decidim
 
         private
 
-        def destroy_params
-          {
-            id: params.dig(:valuator_role, :id) || params[:id],
-            proposal_ids: params[:proposal_ids] || [params[:proposal_id]]
-          }
-        end
-
         def skip_manage_component_permission
           true
         end

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

@@ -7,6 +7,7 @@ module Decidim
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
       helper UserGroupHelper
+      helper Decidim::Admin::IconLinkHelper
       include Decidim::ApplicationHelper
       include Flaggable
       include Withdrawable
@@ -18,18 +19,17 @@ module Decidim
 
       helper_method :proposal_presenter, :form_presenter, :tab_panel_items
 
-      before_action :authenticate_user!, only: [:new, :create, :complete]
-      before_action :ensure_is_draft, only: [:compare, :complete, :preview, :publish, :edit_draft, :update_draft, :destroy_draft]
+      before_action :authenticate_user!, only: [:new, :create]
+      before_action :ensure_is_draft, only: [:preview, :publish, :edit_draft, :update_draft, :destroy_draft]
       before_action :set_proposal, only: [:show, :edit, :update, :withdraw]
       before_action :edit_form, only: [:edit_draft, :edit]
+      before_action :set_view_mode, only: [:index]
 
       before_action :set_participatory_text
 
       # rubocop:disable Naming/VariableNumber
       STEP1 = :step_1
       STEP2 = :step_2
-      STEP3 = :step_3
-      STEP4 = :step_4
       # rubocop:enable Naming/VariableNumber
 
       def index
@@ -43,11 +43,13 @@ module Decidim
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
-          @proposals = search.result
+          @base_query = search
+                        .result
+                        .published
+                        .not_hidden
 
-          @proposals = reorder(@proposals)
-          @proposals = paginate(@proposals)
-          @proposals = @proposals.includes(:component, :coauthorships, :attachments)
+          @proposals = @base_query.includes(:component, :coauthorships, :attachments)
+          @all_geocoded_proposals = @base_query.geocoded
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -57,6 +59,8 @@ module Decidim
                              else
                                []
                              end
+          @proposals = reorder(@proposals)
+          @proposals = paginate(@proposals)
         end
       end
 
@@ -70,20 +74,21 @@ module Decidim
         if proposal_draft.present?
           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(ProposalWizardCreateStepForm).from_params(body: translated_proposal_body_template)
+          @form = form(ProposalForm).from_params(body: translated_proposal_body_template)
         end
       end
 
       def create
         enforce_permission_to :create, :proposal
         @step = STEP1
-        @form = form(ProposalWizardCreateStepForm).from_params(proposal_creation_params)
+        @form = form(ProposalForm).from_params(proposal_creation_params)
 
         CreateProposal.call(@form, current_user) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
 
-            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/compare"
+            @proposal = proposal
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/preview"
           end
 
           on(:invalid) do
@@ -93,37 +98,15 @@ module Decidim
         end
       end
 
-      def compare
-        enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = STEP2
-        @similar_proposals ||= Decidim::Proposals::SimilarProposals
-                               .for(current_component, @proposal)
-                               .all
-
-        if @similar_proposals.blank?
-          flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
-          redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/complete"
-        end
-      end
-
-      def complete
-        enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = STEP3
-
-        @form = form_proposal_model
-
-        @form.attachment = form_attachment_new
-      end
-
       def preview
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = STEP4
+        @step = STEP2
         @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
         enforce_permission_to :edit, :proposal, proposal: @proposal
-        @step = STEP4
+        @step = STEP2
         PublishProposal.call(@proposal, current_user) do
           on(:ok) do
             flash[:notice] = I18n.t("proposals.publish.success", scope: "decidim")
@@ -138,7 +121,7 @@ module Decidim
       end
 
       def edit_draft
-        @step = STEP3
+        @step = STEP1
         enforce_permission_to :edit, :proposal, proposal: @proposal
       end
 
@@ -205,8 +188,8 @@ module Decidim
             flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
             redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
-          on(:has_supports) do
-            flash[:alert] = I18n.t("proposals.withdraw.errors.has_supports", scope: "decidim")
+          on(:has_votes) do
+            flash[:alert] = I18n.t("proposals.withdraw.errors.has_votes", scope: "decidim")
             redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path
           end
         end
@@ -224,13 +207,20 @@ module Decidim
           with_any_origin: nil,
           activity: "all",
           with_any_category: nil,
-          with_any_state: %w(accepted evaluating state_not_published),
+          with_any_state: default_states,
           with_any_scope: nil,
           related_to: "",
           type: "all"
         }
       end
 
+      def default_states
+        [
+          Decidim::Proposals::ProposalState.where(component: current_component).pluck(:token).map(&:to_s),
+          %w(state_not_published)
+        ].flatten - ["rejected"]
+      end
+
       def proposal_draft
         Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
                 .where(component: current_component).find_by(published_at: nil)
@@ -329,6 +319,15 @@ module Decidim
           }
         ] + attachments_tab_panel_items(@proposal)
       end
+
+      def set_view_mode
+        @view_mode ||= params[:view_mode] || session[:view_mode] || default_view_mode
+        session[:view_mode] = @view_mode
+      end
+
+      def default_view_mode
+        @default_view_mode ||= current_component.settings.attachments_allowed? ? "grid" : "list"
+      end
     end
   end
 end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.affected_user.notification_title')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.affected_user.email_subject')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.affected_user.email_outro')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.affected_user.email_intro')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.follower.notification_title')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.follower.email_subject')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.follower.email_outro')
+# i18n-tasks-use t('decidim.events.proposals.proposal_state_changed.follower.email_intro')
+module Decidim
+  module Proposals
+    class ProposalStateChangedEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::AuthorEvent
+
+      def resource_text
+        translated_attribute(resource.answer)
+      end
+
+      def event_has_roles?
+        true
+      end
+
+      def default_i18n_options
+        super.merge({ state: })
+      end
+
+      def state
+        if resource.emendation?
+          humanize_proposal_state(model.state)
+        else
+          translated_attribute(resource.proposal_state&.title)
+        end
+      end
+    end
+  end
+end

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

@@ -8,13 +8,13 @@ module Decidim
         include TranslatableAttributes
         mimic :proposal_answer
 
-        translatable_attribute :answer, Decidim::Attributes::RichText
-        translatable_attribute :cost_report, Decidim::Attributes::RichText
-        translatable_attribute :execution_period, Decidim::Attributes::RichText
+        translatable_attribute :answer, String
+        translatable_attribute :cost_report, String
+        translatable_attribute :execution_period, String
         attribute :cost, Float
         attribute :internal_state, String
 
-        validates :internal_state, presence: true, inclusion: { in: %w(not_answered accepted rejected evaluating) }
+        validates :internal_state, presence: true, inclusion: { in: :proposal_states }
         validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
 
         with_options if: :costs_required? do
@@ -35,6 +35,10 @@ module Decidim
 
         private
 
+        def proposal_states
+          Decidim::Proposals::ProposalState.where(component: current_component).pluck(:token).map(&:to_s) + ["not_answered"]
+        end
+
         def costs_enabled?
           current_component.current_settings.answers_with_costs?
         end

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

@@ -10,7 +10,7 @@ module Decidim
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
-        translatable_attribute :body, Decidim::Attributes::RichText
+        translatable_attribute :body, String
 
         validates :title, :body, translatable_presence: true
 

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalStateForm < Decidim::Form
+        include Decidim::TranslatableAttributes
+
+        mimic :proposal_state
+
+        translatable_attribute :title, String
+        translatable_attribute :announcement_title, String
+        attribute :bg_color, String, default: "#F3F4F7"
+        attribute :text_color, String, default: "#3E4C5C"
+
+        validates :title, translatable_presence: true
+        validates :bg_color, presence: true
+        validates :text_color, presence: true
+      end
+    end
+  end
+end

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

@@ -39,7 +39,7 @@ module Decidim
 
           proposals.each do |proposal|
             errors_set << :not_official unless proposal.official?
-            errors_set << :supported if proposal.votes.any? || proposal.endorsements.any?
+            errors_set << :voted if proposal.votes.any? || proposal.endorsements.any?
           end
 
           errors_set.each { |error| errors.add(:base, error) } if errors_set.any?

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

@@ -19,7 +19,7 @@ module Decidim
         validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
-        VALID_STATES = %w(accepted not_answered evaluating rejected withdrawn).freeze
+        VALID_STATES = %w(accepted not_answered evaluating rejected).freeze
 
         def states_collection
           VALID_STATES.map do |state|

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

@@ -4,32 +4,30 @@ module Decidim
   module Proposals
     module Admin
       class ValuationAssignmentForm < Decidim::Form
-        mimic :valuator_role
-
         attribute :id, Integer
         attribute :proposal_ids, Array
+        attribute :valuator_role_ids, Array
 
-        validates :valuator_role, :proposals, :current_component, presence: true
+        validates :valuator_roles, :proposals, :current_component, presence: true
         validate :same_participatory_space
 
         def proposals
           @proposals ||= Decidim::Proposals::Proposal.where(component: current_component, id: proposal_ids).uniq
         end
 
-        def valuator_role
-          @valuator_role ||= current_component.participatory_space.user_roles(:valuator).find_by(id:)
-        end
-
-        def valuator_user
-          return unless valuator_role
-
-          @valuator_user ||= valuator_role.user
+        def valuator_roles
+          @valuator_roles ||= current_component.participatory_space.user_roles(:valuator).where(id: valuator_role_ids)
         end
 
         def same_participatory_space
-          return if !valuator_role || !current_component
-
-          errors.add(:id, :invalid) if current_component.participatory_space != valuator_role.participatory_space
+          return if valuator_roles.empty? || !current_component
+
+          valuator_roles.each do |valuator_role|
+            if current_component.participatory_space != valuator_role.participatory_space
+              errors.add(:id, :invalid)
+              break
+            end
+          end
         end
       end
     end

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

@@ -3,13 +3,17 @@
 module Decidim
   module Proposals
     # A form object to be used when public users want to create a proposal.
-    class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
+    class ProposalForm < Decidim::Form
       include Decidim::TranslatableAttributes
       include Decidim::AttachmentAttributes
       include Decidim::HasUploadValidations
 
       mimic :proposal
 
+      attribute :title, String
+      attribute :body, Decidim::Attributes::CleanString
+      attribute :body_template, String
+      attribute :user_group_id, Integer
       attribute :address, String
       attribute :latitude, Float
       attribute :longitude, Float
@@ -20,23 +24,34 @@ module Decidim
 
       attachments_attribute :documents
 
+      validates :title, :body, presence: true, etiquette: true
+      validates :title, length: { in: 15..150 }
+      validates :body, proposal_length: {
+        minimum: 15,
+        maximum: ->(record) { record.component.settings.proposal_length }
+      }
       validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
       validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
+
+      validate :body_is_not_bare_template
       validate :notify_missing_attachment_if_errored
 
+      alias component current_component
       delegate :categories, to: :current_component
 
       def map_model(model)
-        super
-
-        body = translated_attribute(model.body)
+        self.title = translated_attribute(model.title)
+        self.body = translated_attribute(model.body)
         @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
 
         presenter = ProposalPresenter.new(model)
         self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
 
+        self.user_group_id = model.user_groups.first&.id
+        self.category_id = model.categorization.decidim_category_id if model.categorization
+
         # The scope attribute is with different key (decidim_scope_id), so it
         # has to be manually mapped.
         self.scope_id = model.scope.id if model.scope
@@ -100,6 +115,12 @@ module Decidim
 
       private
 
+      def body_is_not_bare_template
+        return if body_template.blank?
+
+        errors.add(:body, :cant_be_equal_to_template) if body.presence == body_template.presence
+      end
+
       # This method will add an error to the "add_documents" field only if there is any error
       # in any other field. This is needed because when the form has an error, the attachment
       # is lost, so we need a way to inform the user of this problem.

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Proposals
-    # A form object to be used when Collaborative Draft editors rejects a request to acces it.
+    # A form object to be used when Collaborative Draft editors rejects a request to access it.
     class RejectAccessToCollaborativeDraftForm < AccessToCollaborativeDraftForm
     end
   end

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Proposals
-    # A form object to be used when public users want to request acces to a Collaborative Draft.
+    # A form object to be used when public users want to request access to a Collaborative Draft.
     class RequestAccessToCollaborativeDraftForm < Decidim::Form
       mimic :collaborative_draft
 

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

@@ -8,26 +8,16 @@ module Decidim
           Decidim::Proposals::Proposal.find(id)
         end
 
-        # Public: Generates a select field with the valuators of the given participatory space.
-        #
-        # participatory_space - A participatory space instance.
-        # prompt - An i18n string to show as prompt
-        #
-        # Returns a String.
-        def bulk_valuators_select(participatory_space, prompt)
-          options_for_select = find_valuators_for_select(participatory_space)
-          select(:valuator_role, :id, options_for_select, prompt:)
-        end
-
-        # Internal: A method to cache to queries to find the valuators for the
-        # current space.
-        def find_valuators_for_select(participatory_space)
-          return @valuators_for_select if @valuators_for_select
-
+        # find the valuators for the current space.
+        def find_valuators_for_select(participatory_space, current_user)
           valuator_roles = participatory_space.user_roles(:valuator)
           valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
 
-          @valuators_for_select = valuator_roles.map do |role|
+          filtered_valuator_roles = valuator_roles.filter do |role|
+            role.decidim_user_id != current_user.id
+          end
+
+          filtered_valuator_roles.map do |role|
             valuator = valuators.find { |user| user.id == role.decidim_user_id }
 
             [valuator.name, role.id]