decidim-initiatives 0.21.0 → 0.22.0

data/app/commands/decidim/initiatives/vote_initiative.rb

@@ -32,6 +32,7 @@ module Decidim
         percentage_after = @initiative.reload.percentage
 
         notify_percentage_change(percentage_before, percentage_after)
+        notify_support_threshold_reached(percentage_after)
 
         broadcast(:ok, vote)
       end
@@ -92,6 +93,21 @@ module Decidim
           }
         )
       end
+
+      def notify_support_threshold_reached(percentage)
+        return unless percentage >= 100
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.initiatives.support_threshold_reached",
+          event_class: Decidim::Initiatives::Admin::SupportThresholdReachedEvent,
+          resource: @initiative,
+          followers: organization_admins
+        )
+      end
+
+      def organization_admins
+        Decidim::User.where(organization: @initiative.organization, admin: true)
+      end
     end
   end
 end

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

@@ -14,22 +14,36 @@ module Decidim
           private
 
           def base_query
-            collection
+            collection.joins(:scoped_type).left_joins(:area).joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
           end
 
           def search_field_predicate
-            :title_or_description_cont
+            :title_or_description_or_id_string_or_author_name_or_author_nickname_cont
           end
 
           def filters
-            [:state_eq]
+            [:state_eq, :type_id_eq, :decidim_area_id_eq]
           end
 
           def filters_with_values
             {
-              state_eq: Initiative.states.keys
+              state_eq: Initiative.states.keys,
+              type_id_eq: InitiativesType.where(organization: current_organization).pluck(:id),
+              decidim_area_id_eq: current_organization.areas.pluck(:id)
             }
           end
+
+          def dynamically_translated_filters
+            [:type_id_eq, :decidim_area_id_eq]
+          end
+
+          def translated_type_id_eq(id)
+            translated_attribute(Decidim::InitiativesType.find_by(id: id).title[I18n.locale.to_s])
+          end
+
+          def translated_decidim_area_id_eq(id)
+            translated_attribute(Decidim::Area.find_by(id: id).name[I18n.locale.to_s])
+          end
         end
       end
     end

data/app/controllers/concerns/decidim/initiatives/orderable.rb

@@ -14,7 +14,7 @@ module Decidim
         # Available orders based on enabled settings
         def available_orders
           @available_orders ||= begin
-            available_orders = %w(random recent most_voted most_commented)
+            available_orders = %w(random recent most_voted most_commented recently_published)
             available_orders
           end
         end
@@ -31,6 +31,8 @@ module Decidim
             initiatives.order_by_most_commented
           when "recent"
             initiatives.order_by_most_recent
+          when "recently_published"
+            initiatives.order_by_most_recently_published
           else
             initiatives.order_randomly(random_seed)
           end

data/app/controllers/concerns/decidim/initiatives/single_initiative_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Initiatives
+    # Common methods for elements that need specific behaviour when there is only one initiative type.
+    module SingleInitiativeType
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :single_initiative_type?
+
+        private
+
+        def current_organization_initiatives_type
+          Decidim::InitiativesType.where(organization: current_organization)
+        end
+
+        def single_initiative_type?
+          current_organization_initiatives_type.count == 1
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       # Controller used to manage the initiatives
       class InitiativesController < Decidim::Initiatives::Admin::ApplicationController
         include Decidim::Initiatives::NeedsInitiative
+        include Decidim::Initiatives::SingleInitiativeType
         include Decidim::Initiatives::TypeSelectorOptions
         include Decidim::Initiatives::Admin::Filterable
 
@@ -28,11 +29,14 @@ module Decidim
         # GET /admin/initiatives/:id/edit
         def edit
           enforce_permission_to :edit, :initiative, initiative: current_initiative
+
+          form_attachment_model = form(AttachmentForm).from_model(current_initiative.attachments.first)
           @form = form(Decidim::Initiatives::Admin::InitiativeForm)
                   .from_model(
                     current_initiative,
                     initiative: current_initiative
                   )
+          @form.attachment = form_attachment_model
 
           render layout: "decidim/admin/initiative"
         end
@@ -107,7 +111,7 @@ module Decidim
 
           SendInitiativeToTechnicalValidation.call(current_initiative, current_user) do
             on(:ok) do
-              redirect_to edit_initiative_path(current_initiative), flash: {
+              redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
                 notice: I18n.t(
                   "success",
                   scope: %w(decidim initiatives admin initiatives edit)
@@ -117,6 +121,17 @@ module Decidim
           end
         end
 
+        # GET /admin/initiatives/export
+        def export
+          enforce_permission_to :export, :initiatives
+
+          Decidim::Initiatives::ExportInitiativesJob.perform_later(current_user, params[:format] || default_format)
+
+          flash[:notice] = t("decidim.admin.exports.notice")
+
+          redirect_back(fallback_location: initiatives_path)
+        end
+
         # GET /admin/initiatives/:id/export_votes
         def export_votes
           enforce_permission_to :export_votes, :initiative, initiative: current_initiative
@@ -162,6 +177,10 @@ module Decidim
         def pdf_signature_service
           @pdf_signature_service ||= Decidim.pdf_signature_service.to_s.safe_constantize
         end
+
+        def default_format
+          "json"
+        end
       end
     end
   end

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,6 +137,12 @@ 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)
       end
@@ -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/initiatives_controller.rb

@@ -25,6 +25,7 @@ module Decidim
       include Decidim::Initiatives::Orderable
       include TypeSelectorOptions
       include NeedsInitiative
+      include SingleInitiativeType
 
       helper_method :collection, :initiatives, :filter, :stats
 
@@ -70,13 +71,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/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/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,20 +14,26 @@ 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 :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: {
@@ -35,6 +41,9 @@ module Decidim
                     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
@@ -51,17 +60,39 @@ 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
         end
 
+        def area
+          @area ||= current_organization.areas.find_by(id: area_id)
+        end
+
         private
 
         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

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

@@ -14,6 +14,9 @@ module Decidim
         attribute :banner_image, String
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
+        attribute :attachments_enabled, Boolean
+        attribute :custom_signature_end_date_enabled, Boolean
+        attribute :area_enabled, Boolean
         attribute :promoting_committee_enabled, Boolean
         attribute :minimum_committee_members, Integer
         attribute :collect_user_extra_fields, Boolean
@@ -22,7 +25,8 @@ module Decidim
         attribute :document_number_authorization_handler, String
 
         validates :title, :description, translatable_presence: true
-        validates :undo_online_signatures_enabled, :promoting_committee_enabled, inclusion: { in: [true, false] }
+        validates :attachments_enabled, :undo_online_signatures_enabled, :custom_signature_end_date_enabled,
+                  :area_enabled, :promoting_committee_enabled, inclusion: { in: [true, false] }
         validates :minimum_committee_members, numericality: { only_integer: true }, allow_nil: true
         validates :banner_image, presence: true, if: ->(form) { form.context.initiative_type.nil? }