decidim-initiatives 0.27.6 → 0.28.0.rc4

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

@@ -2,13 +2,10 @@
 
 module Decidim
   module Initiatives
-    require "wicked"
-
     # Controller in charge of managing the create initiative wizard.
     class CreateInitiativeController < Decidim::Initiatives::ApplicationController
       layout "layouts/decidim/initiative_creation"
 
-      include Wicked::Wizard
       include Decidim::FormFactory
       include InitiativeHelper
       include TypeSelectorOptions
@@ -18,7 +15,6 @@ module Decidim
       helper InitiativeHelper
       helper SignatureTypeOptionsHelper
 
-      helper_method :similar_initiatives
       helper_method :scopes
       helper_method :areas
       helper_method :current_initiative
@@ -26,136 +22,95 @@ module Decidim
       helper_method :promotal_committee_required?
 
       before_action :authenticate_user!
+      before_action :ensure_type_exists,
+                    only: [:store_initiative_type, :fill_data, :store_data, :promotal_committee, :finish]
+      before_action :ensure_user_can_create_initiative,
+                    only: [:fill_data, :store_data, :promotal_committee, :finish]
+      before_action :ensure_initiative_exists, only: [:promotal_committee, :finish]
+
+      def select_initiative_type
+        @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).from_params(params)
 
-      steps :select_initiative_type,
-            :previous_form,
-            :show_similar_initiatives,
-            :fill_data,
-            :promotal_committee,
-            :finish
+        redirect_to fill_data_create_initiative_index_path if single_initiative_type?
+      end
 
-      before_action :ensure_type_exists, only: :show
+      def store_initiative_type
+        @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).from_params(params)
 
-      def show
-        enforce_permission_to :create, :initiative
-        send("#{step}_step", initiative: session_initiative)
+        if @form.valid?
+          session[:type_id] = @form.type_id
+          redirect_to fill_data_create_initiative_index_path
+        else
+          render :select_initiative_type
+        end
       end
 
-      def update
-        enforce_permission_to :create, :initiative
-        send("#{step}_step", params)
+      def fill_data
+        @form = if session[:initiative_id].present?
+                  form(Decidim::Initiatives::InitiativeForm).from_model(current_initiative, { initiative_type: })
+                else
+                  extras = { type_id: initiative_type_id, signature_type: initiative_type.signature_type }
+                  form(Decidim::Initiatives::InitiativeForm).from_params(params.merge(extras), { initiative_type: })
+                end
       end
 
-      private
+      def store_data
+        @form = form(Decidim::Initiatives::InitiativeForm).from_params(params, { initiative_type: })
 
-      def ensure_type_exists
-        destination_step = single_initiative_type? ? :previous_form : :select_initiative_type
+        CreateInitiative.call(@form, current_user) do
+          on(:ok) do |initiative|
+            session[:initiative_id] = initiative.id
 
-        return if step == destination_step
-        return if initiative_type_id.present? && initiative_type.present?
+            path = promotal_committee_required? ? "promotal_committee" : "finish"
 
-        redirect_to wizard_path(destination_step)
-      end
-
-      def select_initiative_type_step(_parameters)
-        @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
-        session[:initiative] = {}
+            redirect_to send("#{path}_create_initiative_index_path".to_sym)
+          end
 
-        if single_initiative_type?
-          redirect_to next_wizard_path
-          return
+          on(:invalid) do
+            render :fill_data
+          end
         end
-
-        @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
-        render_wizard unless performed?
       end
 
-      def previous_form_step(parameters)
-        @form = build_form(Decidim::Initiatives::PreviousForm, parameters)
-        render_wizard
+      def promotal_committee
+        redirect_to finish_create_initiative_index_path unless promotal_committee_required?
       end
 
-      def show_similar_initiatives_step(parameters)
-        @form = build_form(Decidim::Initiatives::PreviousForm, parameters)
-        unless @form.valid?
-          redirect_to previous_wizard_path(validate_form: true)
-          return
-        end
-
-        if similar_initiatives.empty?
-          @form = build_form(Decidim::Initiatives::InitiativeForm, parameters)
-          redirect_to wizard_path(:fill_data)
-        end
-
-        render_wizard unless performed?
+      def finish
+        current_initiative.presence
+        session[:type_id] = nil
+        session[:initiative_id] = nil
       end
 
-      def fill_data_step(parameters)
-        @form = build_form(Decidim::Initiatives::InitiativeForm, parameters)
-        @form.attachment = form(AttachmentForm).from_params({})
+      private
 
-        render_wizard
+      def ensure_user_can_create_initiative
+        enforce_permission_to :create, :initiative, { initiative_type: }
       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)
-          render_wizard
-          return
-        end
-
-        CreateInitiative.call(@form, current_user) do
-          on(:ok) do |initiative|
-            session[:initiative][:id] = initiative.id
-            if current_initiative.created_by_individual?
-              render_wizard
-            else
-              redirect_to wizard_path(:finish)
-            end
-          end
-
-          on(:invalid) do |initiative|
-            logger.fatal "Failed creating initiative: #{initiative.errors.full_messages.join(", ")}" if initiative
-            redirect_to previous_wizard_path(validate_form: true)
-          end
-        end
+      def initiative_type_id
+        @initiative_type_id ||= fetch_initiative_type_id
       end
 
-      def finish_step(_parameters)
-        render_wizard
-      end
+      def fetch_initiative_type_id
+        return current_organization_initiatives_type.first.id if single_initiative_type?
+        return params.dig(:initiative, :type_id) if params.dig(:initiative, :type_id).present?
+        return current_initiative&.type&.id if session[:initiative_id].present?
 
-      def similar_initiatives
-        @similar_initiatives ||= Decidim::Initiatives::SimilarInitiatives
-                                 .for(current_organization, @form)
-                                 .all
+        session[:type_id]
       end
 
-      def build_form(klass, parameters)
-        @form = if single_initiative_type?
-                  form(klass).from_params(parameters.except(:id).merge(type_id: current_organization_initiatives_type.first.id), extra_context)
-                else
-                  form(klass).from_params(parameters.except(:id), extra_context)
-                end
-
-        attributes = @form.attributes_with_values
-        session[:initiative] = session_initiative.merge(attributes)
-        @form.valid? if params[:validate_form]
-
-        @form
+      def ensure_initiative_exists
+        redirect_to fill_data_create_initiative_index_path if session[:initiative_id].blank?
       end
 
-      def extra_context
-        return {} unless initiative_type_id
+      def ensure_type_exists
+        destination_step = single_initiative_type? ? "fill_data" : "select_initiative_type"
+
+        return if action_name == destination_step
+        return if initiative_type_id.present? && initiative_type.present?
 
-        { initiative_type: initiative_type }
+        redirect_to send("#{destination_step}_create_initiative_index_path".to_sym)
       end
 
       def scopes
@@ -163,23 +118,15 @@ module Decidim
       end
 
       def current_initiative
-        Initiative.where(organization: current_organization).find_by(id: session_initiative[:id]) if session_initiative.has_key?(:id)
+        @current_initiative ||= Initiative.where(organization: current_organization).find_by(id: session[:initiative_id] || nil)
       end
 
       def initiative_type
         @initiative_type ||= InitiativesType.where(organization: current_organization).find_by(id: initiative_type_id)
       end
 
-      def initiative_type_id
-        session_initiative[:type_id] || @form&.type_id
-      end
-
-      def session_initiative
-        session[:initiative] ||= {}
-        session[:initiative].with_indifferent_access
-      end
-
       def promotal_committee_required?
+        return false if initiative_type.blank?
         return false unless initiative_type.promoting_committee_enabled?
 
         minimum_committee_members = initiative_type.minimum_committee_members ||

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

@@ -1,33 +1,35 @@
 # frozen_string_literal: true
 
+# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.fill_personal_data')
+# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.finish')
+# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.sms_code')
+# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.sms_phone_number')
+# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.finish')
 module Decidim
   module Initiatives
-    require "wicked"
-
     class InitiativeSignaturesController < Decidim::Initiatives::ApplicationController
       layout "layouts/decidim/initiative_signature_creation"
-
-      include Wicked::Wizard
       include Decidim::Initiatives::NeedsInitiative
       include Decidim::FormFactory
 
       prepend_before_action :set_wizard_steps
       before_action :authenticate_user!
+      before_action :authorize_wizard_step, only: [
+        :fill_personal_data,
+        :store_personal_data,
+        :sms_phone_number,
+        :store_sms_phone_number,
+        :sms_code,
+        :store_sms_code,
+        :finish
+      ]
 
       helper InitiativeHelper
 
-      helper_method :initiative_type, :extra_data_legal_information
-
-      # GET /initiatives/:initiative_id/initiative_signatures/:step
-      def show
-        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
+      helper_method :initiative_type, :extra_data_legal_information, :sms_step?, :fill_personal_data_step?
 
-      # PUT /initiatives/:initiative_id/initiative_signatures/:step
-      def update
-        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
-        send("#{step}_step", params)
+      def index
+        redirect_to send(fill_personal_data_step? ? :fill_personal_data_path : :sms_phone_number_path)
       end
 
       # POST /initiatives/:initiative_id/initiative_signatures
@@ -52,76 +54,86 @@ module Decidim
         end
       end
 
-      private
+      def fill_personal_data
+        redirect_to(sms_phone_number_path) && return unless fill_personal_data_step?
 
-      def fill_personal_data_step(_unused)
         @form = form(Decidim::Initiatives::VoteForm)
                 .from_params(
                   initiative: current_initiative,
                   signer: current_user
                 )
-
-        session[:initiative_vote_form] = {}
-        skip_step unless initiative_type.collect_user_extra_fields
-        render_wizard
       end
 
-      def sms_phone_number_step(parameters)
-        if parameters.has_key?(:initiatives_vote) || !fill_personal_data_step?
-          build_vote_form(parameters)
-        else
-          check_session_personal_data
-        end
-        clear_session_sms_code
+      def store_personal_data
+        redirect_to(sms_phone_number_path) && return unless fill_personal_data_step?
+
+        build_vote_form(params)
 
         if @vote_form.invalid?
           flash[:alert] = I18n.t("personal_data.invalid", scope: "decidim.initiatives.initiative_votes")
-          jump_to(previous_step)
+          @form = @vote_form
+
+          render :fill_personal_data
+        else
+          redirect_to sms_phone_number_path
         end
+      end
+
+      def sms_phone_number
+        redirect_to(finish_path) && return unless sms_step?
 
         @form = Decidim::Verifications::Sms::MobilePhoneForm.new
-        render_wizard
       end
 
-      def sms_code_step(parameters)
-        check_session_personal_data if fill_personal_data_step?
-        @phone_form = Decidim::Verifications::Sms::MobilePhoneForm.from_params(parameters.merge(user: current_user))
-        @form = Decidim::Verifications::Sms::ConfirmationForm.new
-        render_wizard && return if session_sms_code.present?
+      def store_sms_phone_number
+        redirect_to(finish_path) && return unless sms_step?
 
-        ValidateMobilePhone.call(@phone_form, current_user) do
+        @form = Decidim::Verifications::Sms::MobilePhoneForm.from_params(params.merge(user: current_user))
+
+        ValidateMobilePhone.call(@form, current_user) do
           on(:ok) do |metadata|
             store_session_sms_code(metadata)
-            render_wizard
+            redirect_to sms_code_path
           end
 
           on(:invalid) do
             flash[:alert] = I18n.t("sms_phone.invalid", scope: "decidim.initiatives.initiative_votes")
-            redirect_to wizard_path(:sms_phone_number)
+            render :sms_phone_number
           end
         end
       end
 
-      def finish_step(parameters)
-        if parameters.has_key?(:initiatives_vote) || !fill_personal_data_step?
-          build_vote_form(parameters)
-        else
-          check_session_personal_data
-        end
+      def sms_code
+        redirect_to(finish_path) && return unless sms_step?
+
+        redirect_to sms_phone_number_path && return if session_sms_code.blank?
 
-        if sms_step?
-          @confirmation_code_form = Decidim::Verifications::Sms::ConfirmationForm.from_params(parameters)
+        @form = Decidim::Verifications::Sms::ConfirmationForm.new
+      end
+
+      def store_sms_code
+        redirect_to(finish_path) && return unless sms_step?
 
-          ValidateSmsCode.call(@confirmation_code_form, session_sms_code) do
-            on(:ok) { clear_session_sms_code }
+        @form = Decidim::Verifications::Sms::ConfirmationForm.from_params(params)
+        ValidateSmsCode.call(@form, session_sms_code) do
+          on(:ok) do
+            clear_session_sms_code
+            redirect_to finish_path
+          end
 
-            on(:invalid) do
-              flash[:alert] = I18n.t("sms_code.invalid", scope: "decidim.initiatives.initiative_votes")
-              jump_to :sms_code
-              render_wizard && return
-            end
+          on(:invalid) do
+            flash[:alert] = I18n.t("sms_code.invalid", scope: "decidim.initiatives.initiative_votes")
+            render :sms_code
           end
         end
+      end
+
+      def finish
+        if params.has_key?(:initiatives_vote) || !fill_personal_data_step?
+          build_vote_form(params)
+        else
+          check_session_personal_data
+        end
 
         VoteInitiative.call(@vote_form) do
           on(:ok) do
@@ -131,11 +143,29 @@ module Decidim
           on(:invalid) do |vote|
             logger.fatal "Failed creating signature: #{vote.errors.full_messages.join(", ")}" if vote
             flash[:alert] = I18n.t("create.invalid", scope: "decidim.initiatives.initiative_votes")
-            jump_to previous_step
+            send(sms_step? ? :sms_code_path : :fill_personal_data_path)
           end
         end
+      end
+
+      private
+
+      attr_reader :wizard_steps
+
+      def fill_personal_data_path
+        fill_personal_data_initiative_signatures_path(current_initiative)
+      end
 
-        render_wizard
+      def sms_code_path
+        sms_code_initiative_signatures_path(current_initiative)
+      end
+
+      def finish_path
+        finish_initiative_signatures_path(current_initiative)
+      end
+
+      def sms_phone_number_path
+        sms_phone_number_initiative_signatures_path(current_initiative)
       end
 
       def build_vote_form(parameters)
@@ -148,53 +178,55 @@ module Decidim
         session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values.except(:initiative, :signer))
       end
 
-      def session_vote_form
-        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, signer: current_user)
+      def initiative_type
+        @initiative_type ||= current_initiative&.scoped_type&.type
+      end
 
-        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(attributes)
+      def sms_step?
+        current_initiative.validate_sms_code_on_votes?
       end
 
-      def initiative_type
-        @initiative_type ||= current_initiative&.scoped_type&.type
+      def fill_personal_data_step?
+        initiative_type.collect_user_extra_fields?
+      end
+
+      def authorize_wizard_step
+        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
+      end
+
+      def set_wizard_steps
+        @wizard_steps = [:finish]
+        @wizard_steps.unshift(:sms_phone_number, :sms_code) if sms_step?
+        @wizard_steps.unshift(:fill_personal_data) if fill_personal_data_step?
       end
 
       def extra_data_legal_information
         @extra_data_legal_information ||= initiative_type.extra_fields_legal_information
       end
 
-      def check_session_personal_data
-        return if session[:initiative_vote_form].present? && session_vote_form&.valid?
+      def session_vote_form
+        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, signer: current_user)
 
-        flash[:alert] = I18n.t("create.error", scope: "decidim.initiatives.initiative_votes")
-        jump_to(:fill_personal_data)
+        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(attributes)
       end
 
-      def store_session_sms_code(metadata)
-        session[:initiative_sms_code] = metadata
-      end
+      def check_session_personal_data
+        return if session[:initiative_vote_form].present? && session_vote_form&.valid?
 
-      def session_sms_code
-        session[:initiative_sms_code]
+        flash[:alert] = I18n.t("create.error", scope: "decidim.initiatives.initiative_votes")
+        redirect_to fill_personal_data_path
       end
 
       def clear_session_sms_code
         session[:initiative_sms_code] = {}
       end
 
-      def sms_step?
-        current_initiative.validate_sms_code_on_votes?
-      end
-
-      def fill_personal_data_step?
-        initiative_type.collect_user_extra_fields?
+      def store_session_sms_code(metadata)
+        session[:initiative_sms_code] = metadata
       end
 
-      def set_wizard_steps
-        initial_wizard_steps = [:finish]
-        initial_wizard_steps.unshift(:sms_phone_number, :sms_code) if sms_step?
-        initial_wizard_steps.unshift(:fill_personal_data) if fill_personal_data_step?
-
-        self.steps = initial_wizard_steps
+      def session_sms_code
+        session[:initiative_sms_code]
       end
     end
   end

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

@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.accepted')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.created')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.discarded')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.published')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.rejected')
+# i18n-tasks-use t('decidim.initiatives.show.badge_name.validating')
+#
 module Decidim
   module Initiatives
     # Exposes the initiative type text search so users can choose a type writing its name.

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

@@ -5,9 +5,7 @@ module Decidim
     # This controller contains the logic regarding participants initiatives
     class InitiativesController < Decidim::Initiatives::ApplicationController
       include ParticipatorySpaceContext
-      participatory_space_layout only: [:show]
 
-      helper Decidim::WidgetUrlsHelper
       helper Decidim::AttachmentsHelper
       helper Decidim::FiltersHelper
       helper Decidim::OrdersHelper
@@ -28,9 +26,12 @@ module Decidim
       include TypeSelectorOptions
       include NeedsInitiative
       include SingleInitiativeType
+      include Decidim::IconHelper
 
-      helper_method :collection, :initiatives, :filter, :stats
-      helper_method :initiative_type
+      helper_method :collection, :initiatives, :filter, :stats, :tabs, :panels
+      helper_method :initiative_type, :available_initiative_types
+
+      before_action :authorize_participatory_space, only: [:show]
 
       # GET /initiatives
       def index
@@ -51,6 +52,8 @@ module Decidim
       # GET /initiatives/:id
       def show
         enforce_permission_to :read, :initiative, initiative: current_initiative
+
+        render layout: "decidim/initiative_head"
       end
 
       # GET /initiatives/:id/send_to_technical_validation
@@ -79,8 +82,6 @@ module Decidim
                   initiative: current_initiative
                 )
         @form.attachment = form_attachment_model
-
-        render layout: "decidim/initiative"
       end
 
       # PUT /initiatives/:id
@@ -114,6 +115,8 @@ module Decidim
       alias current_initiative current_participatory_space
 
       def current_participatory_space
+        return unless params["slug"]
+
         @current_participatory_space ||= Initiative.find(id_from_slug(params[:slug]))
       end
 
@@ -140,27 +143,44 @@ module Decidim
         {
           search_text_cont: "",
           with_any_state: %w(open),
-          with_any_type: default_filter_type_params,
+          with_any_type: nil,
           author: "any",
-          with_any_scope: default_filter_scope_params,
-          with_any_area: default_filter_area_params
+          with_any_scope: nil,
+          with_any_area: nil
         }
       end
 
-      def default_filter_type_params
-        %w(all) + Decidim::InitiativesType.where(organization: current_organization).pluck(:id).map(&:to_s)
+      def stats
+        @stats ||= InitiativeStatsPresenter.new(initiative: current_initiative)
       end
 
-      def default_filter_scope_params
-        %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
+      def tabs
+        @tabs ||= items.map { |item| item.slice(:id, :text, :icon) }
       end
 
-      def default_filter_area_params
-        %w(all) + current_organization.areas.pluck(:id).map(&:to_s)
+      def panels
+        @panels ||= items.map { |item| item.slice(:id, :method, :args) }
       end
 
-      def stats
-        @stats ||= InitiativeStatsPresenter.new(initiative: current_initiative)
+      def items
+        @items ||= [
+          {
+            enabled: @current_initiative.photos.present?,
+            id: "images",
+            text: t("decidim.application.photos.photos"),
+            icon: resource_type_icon_key("images"),
+            method: :cell,
+            args: ["decidim/images_panel", @current_initiative]
+          },
+          {
+            enabled: @current_initiative.documents.present?,
+            id: "documents",
+            text: t("decidim.application.documents.documents"),
+            icon: resource_type_icon_key("documents"),
+            method: :cell,
+            args: ["decidim/documents_panel", @current_initiative]
+          }
+        ].select { |item| item[:enabled] }
       end
     end
   end

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

@@ -6,7 +6,6 @@ module Decidim
     # has been updated through time.
     class VersionsController < Decidim::Initiatives::ApplicationController
       include ParticipatorySpaceContext
-      participatory_space_layout
       helper InitiativeHelper
 
       include NeedsInitiative

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Initiatives
@@ -13,7 +13,7 @@ module Decidim
         end
 
         def admin_initiative_url
-          EngineRouter.admin_proxy(resource).edit_initiative_url(resource)
+          decidim_admin_initiatives.edit_initiative_url(resource, resource.mounted_params)
         end
       end
     end