decidim-initiatives 0.20.0 → 0.23.1.rc1

data/app/controllers/decidim/initiatives/create_initiative_controller.rb

@@ -12,11 +12,13 @@ module Decidim
       include Decidim::FormFactory
       include InitiativeHelper
       include TypeSelectorOptions
+      include SingleInitiativeType
 
       helper Decidim::Admin::IconLinkHelper
       helper InitiativeHelper
       helper_method :similar_initiatives
       helper_method :scopes
+      helper_method :areas
       helper_method :current_initiative
       helper_method :initiative_type
       helper_method :promotal_committee_required?
@@ -43,7 +45,14 @@ module Decidim
       def select_initiative_type_step(_parameters)
         @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
         session[:initiative] = {}
-        render_wizard
+
+        if single_initiative_type?
+          redirect_to next_wizard_path
+          return
+        end
+
+        @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
+        render_wizard unless performed?
       end
 
       def previous_form_step(parameters)
@@ -68,10 +77,18 @@ module Decidim
 
       def fill_data_step(parameters)
         @form = build_form(Decidim::Initiatives::InitiativeForm, parameters)
+        @form.attachment = form(AttachmentForm).from_params({})
+
         render_wizard
       end
 
       def promotal_committee_step(parameters)
+        @form = build_form(Decidim::Initiatives::InitiativeForm, parameters)
+        unless @form.valid?
+          redirect_to previous_wizard_path(validate_form: true)
+          return
+        end
+
         skip_step unless promotal_committee_required?
 
         if session_initiative.has_key?(:id)
@@ -79,8 +96,6 @@ module Decidim
           return
         end
 
-        @form = build_form(Decidim::Initiatives::InitiativeForm, parameters)
-
         CreateInitiative.call(@form, current_user) do
           on(:ok) do |initiative|
             session[:initiative][:id] = initiative.id
@@ -109,7 +124,12 @@ module Decidim
       end
 
       def build_form(klass, parameters)
-        @form = form(klass).from_params(parameters)
+        @form = if single_initiative_type?
+                  form(klass).from_params(parameters.merge(type_id: current_organization_initiatives_type.first.id), extra_context)
+                else
+                  form(klass).from_params(parameters, extra_context)
+                end
+
         attributes = @form.attributes_with_values
         session[:initiative] = session_initiative.merge(attributes)
         @form.valid? if params[:validate_form]
@@ -117,8 +137,14 @@ module Decidim
         @form
       end
 
+      def extra_context
+        return {} unless initiative_type_id
+
+        { initiative_type: initiative_type }
+      end
+
       def scopes
-        @scopes ||= InitiativesTypeScope.where(decidim_initiatives_types_id: @form.type_id)
+        @scopes ||= @form.available_scopes
       end
 
       def current_initiative
@@ -126,7 +152,11 @@ module Decidim
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.find(session_initiative[:type_id] || @form&.type_id)
+        @initiative_type ||= InitiativesType.find(initiative_type_id)
+      end
+
+      def initiative_type_id
+        session_initiative[:type_id] || @form&.type_id
       end
 
       def session_initiative

data/app/controllers/decidim/initiatives/initiative_signatures_controller.rb

@@ -20,30 +20,27 @@ module Decidim
 
       # GET /initiatives/:initiative_id/initiative_signatures/:step
       def show
-        group_id = params[:group_id] || (session[:initiative_vote_form] ||= {})["group_id"]
-        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, group_id: group_id, signature_has_steps: signature_has_steps?
+        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
         send("#{step}_step", initiative_vote_form: session[:initiative_vote_form])
       end
 
       # PUT /initiatives/:initiative_id/initiative_signatures/:step
       def update
-        group_id = params.dig(:initiatives_vote, :group_id) || session[:initiative_vote_form]["group_id"]
-        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, group_id: group_id, signature_has_steps: signature_has_steps?
+        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
         send("#{step}_step", params)
       end
 
       # POST /initiatives/:initiative_id/initiative_signatures
       def create
-        group_id = params[:group_id] || session[:initiative_vote_form]&.dig("group_id")
-        enforce_permission_to :vote, :initiative, initiative: current_initiative, group_id: group_id
+        enforce_permission_to :vote, :initiative, initiative: current_initiative
+
         @form = form(Decidim::Initiatives::VoteForm)
                 .from_params(
-                  initiative_id: current_initiative.id,
-                  author_id: current_user.id,
-                  group_id: group_id
+                  initiative: current_initiative,
+                  signer: current_user
                 )
 
-        VoteInitiative.call(@form, current_user) do
+        VoteInitiative.call(@form) do
           on(:ok) do
             current_initiative.reload
             render :update_buttons_and_counters
@@ -62,11 +59,11 @@ module Decidim
       def fill_personal_data_step(_unused)
         @form = form(Decidim::Initiatives::VoteForm)
                 .from_params(
-                  initiative_id: current_initiative.id,
-                  author_id: current_user.id,
-                  group_id: params[:group_id]
+                  initiative: current_initiative,
+                  signer: current_user
                 )
-        session[:initiative_vote_form] = { group_id: @form.group_id }
+
+        session[:initiative_vote_form] = {}
         skip_step unless initiative_type.collect_user_extra_fields
         render_wizard
       end
@@ -128,7 +125,7 @@ module Decidim
           end
         end
 
-        VoteInitiative.call(@vote_form, current_user) do
+        VoteInitiative.call(@vote_form) do
           on(:ok) do
             session[:initiative_vote_form] = {}
           end
@@ -139,25 +136,24 @@ module Decidim
             jump_to previous_step
           end
         end
+
         render_wizard
       end
 
       def build_vote_form(parameters)
         @vote_form = form(Decidim::Initiatives::VoteForm).from_params(parameters).tap do |form|
-          form.initiative_id = current_initiative.id
-          form.author_id = current_user.id
+          form.initiative = current_initiative
+          form.signer = current_user
         end
 
-        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values)
+        session[:initiative_vote_form] ||= {}
+        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values.except(:initiative, :signer))
       end
 
       def session_vote_form
-        raw_birth_date = session[:initiative_vote_form]["date_of_birth"]
-        return unless raw_birth_date
+        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, signer: current_user)
 
-        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(
-          session[:initiative_vote_form].merge("date_of_birth" => Date.parse(raw_birth_date))
-        )
+        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(attributes)
       end
 
       def initiative_type

data/app/controllers/decidim/initiatives/initiative_votes_controller.rb

@@ -13,9 +13,14 @@ module Decidim
 
       # POST /initiatives/:initiative_id/initiative_vote
       def create
-        enforce_permission_to :vote, :initiative, initiative: current_initiative, group_id: params[:group_id]
-        @form = form(Decidim::Initiatives::VoteForm).from_params(initiative_id: current_initiative.id, author_id: current_user.id, group_id: params[:group_id])
-        VoteInitiative.call(@form, current_user) do
+        enforce_permission_to :vote, :initiative, initiative: current_initiative
+
+        @form = form(Decidim::Initiatives::VoteForm).from_params(
+          initiative: current_initiative,
+          signer: current_user
+        )
+
+        VoteInitiative.call(@form) do
           on(:ok) do
             current_initiative.reload
             render :update_buttons_and_counters
@@ -31,8 +36,9 @@ module Decidim
 
       # DELETE /initiatives/:initiative_id/initiative_vote
       def destroy
-        enforce_permission_to :unvote, :initiative, initiative: current_initiative, group_id: params[:group_id]
-        UnvoteInitiative.call(current_initiative, current_user, params[:group_id]) do
+        enforce_permission_to :unvote, :initiative, initiative: current_initiative
+
+        UnvoteInitiative.call(current_initiative, current_user) do
           on(:ok) do
             current_initiative.reload
             render :update_buttons_and_counters

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -19,18 +19,29 @@ module Decidim
       helper PaginateHelper
       helper InitiativeHelper
       include InitiativeSlug
-
       include FilterResource
       include Paginable
       include Decidim::Initiatives::Orderable
       include TypeSelectorOptions
       include NeedsInitiative
+      include SingleInitiativeType
 
       helper_method :collection, :initiatives, :filter, :stats
 
       # GET /initiatives
       def index
         enforce_permission_to :list, :initiative
+
+        return unless search.results.blank? && params.dig("filter", "state") != %w(closed)
+
+        @closed_initiatives = search_klass.new(search_params.merge(state: %w(closed)))
+
+        if @closed_initiatives.results.present?
+          params[:filter] ||= {}
+          params[:filter][:date] = %w(closed)
+          @forced_closed_initiatives = true
+          @search = @closed_initiatives
+        end
       end
 
       # GET /initiatives/:id
@@ -38,15 +49,6 @@ module Decidim
         enforce_permission_to :read, :initiative, initiative: current_initiative
       end
 
-      # GET /initiatives/:id/signature_identities
-      def signature_identities
-        @voted_groups = InitiativesVote
-                        .supports
-                        .where(initiative: current_initiative, author: current_user)
-                        .pluck(:decidim_user_group_id)
-        render layout: false
-      end
-
       private
 
       alias current_initiative current_participatory_space
@@ -70,13 +72,26 @@ module Decidim
       def default_filter_params
         {
           search_text: "",
-          state: "open",
-          type: "all",
+          state: ["open"],
+          type_id: default_filter_type_params,
           author: "any",
-          scope_id: nil
+          scope_id: default_filter_scope_params,
+          area_id: default_filter_area_params
         }
       end
 
+      def default_filter_type_params
+        %w(all) + Decidim::InitiativesType.where(organization: current_organization).pluck(:id).map(&:to_s)
+      end
+
+      def default_filter_scope_params
+        %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
+      end
+
+      def default_filter_area_params
+        %w(all) + current_organization.areas.pluck(:id).map(&:to_s)
+      end
+
       def context_params
         {
           organization: current_organization,

data/app/controllers/decidim/initiatives/initiatives_type_scopes_controller.rb

@@ -15,7 +15,15 @@ module Decidim
       private
 
       def scoped_types
-        @scoped_types ||= InitiativesType.find(params[:type_id]).scopes
+        @scoped_types ||= if initiative_type.only_global_scope_enabled?
+                            initiative_type.scopes.where(scope: nil)
+                          else
+                            initiative_type.scopes
+                          end
+      end
+
+      def initiative_type
+        @initiative_type ||= InitiativesType.find(params[:type_id])
       end
     end
   end

data/app/controllers/decidim/initiatives/versions_controller.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # Exposes Initiatives versions so users can see how an Initiative
+    # has been updated through time.
+    class VersionsController < Decidim::Initiatives::ApplicationController
+      include ParticipatorySpaceContext
+      participatory_space_layout
+      helper InitiativeHelper
+
+      include NeedsInitiative
+      include Decidim::ResourceVersionsConcern
+
+      def versioned_resource
+        current_initiative
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/{initiative_widgets_controller.rb → widgets_controller.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # This controller provides a widget that allows embedding the initiative
-    class InitiativeWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper InitiativesHelper
       helper PaginateHelper
       helper InitiativeHelper
@@ -23,7 +23,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= initiative_initiative_widget_url(model)
+        @iframe_url ||= initiative_widget_url(model)
       end
     end
   end

data/app/events/decidim/initiatives/admin/initiative_sent_to_technical_validation_event.rb

@@ -0,0 +1,21 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      class InitiativeSentToTechnicalValidationEvent < Decidim::Events::SimpleEvent
+        include Rails.application.routes.mounted_helpers
+
+        i18n_attributes :admin_initiative_url, :admin_initiative_path
+
+        def admin_initiative_path
+          ResourceLocatorPresenter.new(resource).edit
+        end
+
+        def admin_initiative_url
+          decidim_admin_initiatives.edit_initiative_url(resource, resource.mounted_params)
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/initiatives/admin/support_threshold_reached_event.rb

@@ -0,0 +1,13 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      class SupportThresholdReachedEvent < Decidim::Events::SimpleEvent
+        def participatory_space
+          resource
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -14,30 +14,50 @@ module Decidim
         translatable_attribute :description, String
         attribute :type_id, Integer
         attribute :decidim_scope_id, Integer
+        attribute :area_id, Integer
         attribute :signature_type, String
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
         attribute :hashtag, String
-        attribute :offline_votes, Integer
+        attribute :offline_votes, Hash[String => Integer]
         attribute :state, String
+        attribute :attachment, AttachmentForm
 
         validates :title, :description, presence: true
+        validates :area, presence: true, if: ->(form) { form.area_id.present? }
         validates :signature_type, presence: true, if: :signature_type_updatable?
         validates :signature_start_date, presence: true, if: ->(form) { form.context.initiative.published? }
         validates :signature_end_date, presence: true, if: ->(form) { form.context.initiative.published? }
         validates :signature_end_date, date: { after: :signature_start_date }, if: lambda { |form|
           form.signature_start_date.present? && form.signature_end_date.present?
         }
+        validates :signature_end_date, date: { after: Date.current }, if: lambda { |form|
+          form.signature_start_date.blank? && form.signature_end_date.present?
+        }
 
-        validates :offline_votes,
-                  numericality: {
-                    only_integer: true,
-                    greater_than: 0
-                  }, allow_blank: true
+        validate :notify_missing_attachment_if_errored
+        validate :area_is_not_removed
 
         def map_model(model)
           self.type_id = model.type.id
           self.decidim_scope_id = model.scope&.id
+          self.offline_votes = model.offline_votes
+
+          if offline_votes.empty?
+            self.offline_votes = model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
+              all_votes[initiative_scope_type.decidim_scopes_id || "global"] = [0, initiative_scope_type.scope_name]
+            end
+          else
+            offline_votes.delete("total")
+            self.offline_votes = offline_votes.each_with_object({}) do |(decidim_scope_id, votes), all_votes|
+              scope_name = model.votable_initiative_type_scopes.find do |initiative_scope_type|
+                initiative_scope_type.global_scope? && decidim_scope_id == "global" ||
+                  initiative_scope_type.decidim_scopes_id == decidim_scope_id.to_i
+              end.scope_name
+
+              all_votes[decidim_scope_id || "global"] = [votes, scope_name]
+            end
+          end
         end
 
         def signature_type_updatable?
@@ -51,10 +71,18 @@ module Decidim
           false
         end
 
+        def area_updatable?
+          @area_updatable ||= current_user.admin? || context.initiative.created?
+        end
+
         def scoped_type_id
           return unless type && decidim_scope_id
 
-          type.scopes.find_by!(decidim_scopes_id: decidim_scope_id).id
+          type.scopes.find_by(decidim_scopes_id: decidim_scope_id.presence).id
+        end
+
+        def area
+          @area ||= current_organization.areas.find_by(id: area_id)
         end
 
         private
@@ -62,6 +90,20 @@ module Decidim
         def type
           @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
         end
+
+        # This method will add an error to the `attachment` field only if there's
+        # 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.
+        def notify_missing_attachment_if_errored
+          errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
+        end
+
+        def area_is_not_removed
+          return if context.initiative.decidim_area_id.blank? || context.initiative.created?
+
+          errors.add(:area_id, :blank) if area_id.blank?
+        end
       end
     end
   end