decidim-initiatives 0.26.9 → 0.27.0.rc1

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

@@ -16,8 +16,6 @@ module Decidim
 
       helper Decidim::Admin::IconLinkHelper
       helper InitiativeHelper
-      helper SignatureTypeOptionsHelper
-
       helper_method :similar_initiatives
       helper_method :scopes
       helper_method :areas
@@ -25,8 +23,6 @@ module Decidim
       helper_method :initiative_type
       helper_method :promotal_committee_required?
 
-      before_action :authenticate_user!
-
       steps :select_initiative_type,
             :previous_form,
             :show_similar_initiatives,
@@ -34,8 +30,6 @@ module Decidim
             :promotal_committee,
             :finish
 
-      before_action :ensure_type_exists, only: :show
-
       def show
         enforce_permission_to :create, :initiative
         send("#{step}_step", initiative: session_initiative)
@@ -48,15 +42,6 @@ module Decidim
 
       private
 
-      def ensure_type_exists
-        destination_step = single_initiative_type? ? :previous_form : :select_initiative_type
-
-        return if step == destination_step
-        return if initiative_type_id.present? && initiative_type.present?
-
-        redirect_to wizard_path(destination_step)
-      end
-
       def select_initiative_type_step(_parameters)
         @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
         session[:initiative] = {}
@@ -140,9 +125,9 @@ module Decidim
 
       def build_form(klass, parameters)
         @form = if single_initiative_type?
-                  form(klass).from_params(parameters.merge(type_id: current_organization_initiatives_type.first.id), extra_context)
+                  form(klass).from_params(parameters.except(:id).merge(type_id: current_organization_initiatives_type.first.id), extra_context)
                 else
-                  form(klass).from_params(parameters, extra_context)
+                  form(klass).from_params(parameters.except(:id), extra_context)
                 end
 
         attributes = @form.attributes_with_values
@@ -163,11 +148,11 @@ module Decidim
       end
 
       def current_initiative
-        Initiative.where(organization: current_organization).find_by(id: session_initiative[:id]) if session_initiative.has_key?(:id)
+        Initiative.find(session_initiative[:id]) if session_initiative.has_key?(:id)
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.where(organization: current_organization).find_by(id: initiative_type_id)
+        @initiative_type ||= InitiativesType.find(initiative_type_id)
       end
 
       def initiative_type_id

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Initiatives
-    # This controller contains the logic regarding citizen initiatives
+    # This controller contains the logic regarding participants initiatives
     class InitiativesController < Decidim::Initiatives::ApplicationController
       include ParticipatorySpaceContext
       participatory_space_layout only: [:show]
@@ -18,8 +18,6 @@ module Decidim
       helper Decidim::ResourceReferenceHelper
       helper PaginateHelper
       helper InitiativeHelper
-      helper SignatureTypeOptionsHelper
-
       include InitiativeSlug
       include FilterResource
       include Paginable
@@ -35,13 +33,13 @@ module Decidim
       # GET /initiatives
       def index
         enforce_permission_to :list, :initiative
-        return unless search.results.blank? && params.dig("filter", "state") != %w(closed)
+        return unless search.result.blank? && params.dig("filter", "with_any_state") != %w(closed)
 
-        @closed_initiatives = search_klass.new(search_params.merge(state: %w(closed)))
+        @closed_initiatives ||= search_with(filter_params.merge(with_any_state: %w(closed)))
 
-        if @closed_initiatives.results.present?
+        if @closed_initiatives.result.present?
           params[:filter] ||= {}
-          params[:filter][:date] = %w(closed)
+          params[:filter][:with_any_state] = %w(closed)
           @forced_closed_initiatives = true
 
           @search = @closed_initiatives
@@ -62,7 +60,7 @@ module Decidim
             redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
               notice: I18n.t(
                 "success",
-                scope: %w(decidim initiatives admin initiatives edit)
+                scope: "decidim.initiatives.admin.initiatives.edit"
               )
             }
           end
@@ -88,7 +86,6 @@ module Decidim
         enforce_permission_to :update, :initiative, initiative: current_initiative
 
         params[:id] = params[:slug]
-        params[:type_id] = current_initiative.type&.id
         @form = form(Decidim::Initiatives::InitiativeForm)
                 .from_params(params, initiative_type: current_initiative.type, initiative: current_initiative)
 
@@ -122,25 +119,28 @@ module Decidim
       end
 
       def initiatives
-        @initiatives = search.results.includes(:scoped_type)
+        @initiatives = search.result.includes(:scoped_type)
         @initiatives = reorder(@initiatives)
         @initiatives = paginate(@initiatives)
       end
 
       alias collection initiatives
 
-      def search_klass
-        InitiativeSearch
+      def search_collection
+        Initiative
+          .includes(scoped_type: [:scope])
+          .joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
+          .where(organization: current_organization)
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: ["open"],
-          type_id: default_filter_type_params,
+          search_text_cont: "",
+          with_any_state: %w(open),
+          with_any_type: default_filter_type_params,
           author: "any",
-          scope_id: default_filter_scope_params,
-          area_id: default_filter_area_params
+          with_any_scope: default_filter_scope_params,
+          with_any_area: default_filter_area_params
         }
       end
 
@@ -156,13 +156,6 @@ module Decidim
         %w(all) + current_organization.areas.pluck(:id).map(&:to_s)
       end
 
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
-        }
-      end
-
       def stats
         @stats ||= InitiativeStatsPresenter.new(initiative: current_initiative)
       end

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

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.where(organization: current_organization).find(params[:type_id])
+        @initiative_type ||= InitiativesType.find(params[:type_id])
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Decidim
       private
 
       def allowed_signature_types_for_initiatives
-        @allowed_signature_types_for_initiatives ||= InitiativesType.where(organization: current_organization).find(params[:type_id]).allowed_signature_types_for_initiatives
+        @allowed_signature_types_for_initiatives ||= InitiativesType.find(params[:type_id]).allowed_signature_types_for_initiatives
       end
     end
   end

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

@@ -19,7 +19,7 @@ module Decidim
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
         attribute :hashtag, String
-        attribute :offline_votes, Hash[Symbol => Integer]
+        attribute :offline_votes, Hash
         attribute :state, String
         attribute :attachment, AttachmentForm
 
@@ -47,7 +47,7 @@ module Decidim
         def signature_type_updatable?
           @signature_type_updatable ||= begin
             state ||= context.initiative.state
-            state == "validating" && context.current_user.admin? || state == "created"
+            (state == "validating" && context.current_user.admin?) || state == "created"
           end
         end
 
@@ -74,7 +74,7 @@ module Decidim
         # Private: set the in-person signatures to zero for every scope
         def zero_offine_votes_with_scopes_names(model)
           model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
-            all_votes[initiative_scope_type.decidim_scopes_id&.to_s&.to_sym || "global"] = [0, initiative_scope_type.scope_name]
+            all_votes[initiative_scope_type.decidim_scopes_id || "global"] = [0, initiative_scope_type.scope_name]
           end
         end
 
@@ -83,7 +83,7 @@ module Decidim
           model.offline_votes.delete("total")
           model.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.global_scope? && decidim_scope_id == "global") ||
                 initiative_scope_type.decidim_scopes_id == decidim_scope_id.to_i
             end.scope_name
 

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

@@ -13,11 +13,12 @@ module Decidim
 
         translatable_attribute :title, String
         translatable_attribute :description, String
-        attribute :banner_image, String
+        attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
         attribute :attachments_enabled, Boolean
         attribute :custom_signature_end_date_enabled, Boolean
+        attribute :comments_enabled, Boolean
         attribute :area_enabled, Boolean
         attribute :child_scope_threshold_enabled, Boolean
         attribute :only_global_scope_enabled, Boolean

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A form object used to create initiatives settings from the admin dashboard.
+      class InitiativesSettingsForm < Form
+        mimic :initiatives_settings
+
+        attribute :initiatives_order, String
+      end
+    end
+  end
+end

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

@@ -39,9 +39,6 @@ module Decidim
       def map_model(model)
         self.type_id = model.type.id
         self.scope_id = model.scope&.id
-        self.signature_type = model.signature_type
-        self.title = translated_attribute(model.title)
-        self.description = translated_attribute(model.description)
       end
 
       def signature_type_updatable?

data/app/forms/decidim/initiatives/vote_form.rb

@@ -1,13 +1,10 @@
 # frozen_string_literal: true
 
-require "virtus/multiparams"
-
 module Decidim
   module Initiatives
     # A form object used to collect the data for a new initiative.
     class VoteForm < Form
       include TranslatableAttributes
-      include Virtus::Multiparams
 
       mimic :initiatives_vote
 
@@ -86,7 +83,6 @@ module Decidim
       def user_authorized_scope
         return scope if handler_name.blank?
         return unless authorized?
-        return if authorization.metadata.blank?
 
         @user_authorized_scope ||= authorized_scope_candidates.find do |scope|
           scope&.id == authorization.metadata.symbolize_keys[:scope_id]

data/app/helpers/decidim/initiatives/{signature_type_options_helper.rb → create_initiative_helper.rb}

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Helper methods for the create initiative wizard.
-    module SignatureTypeOptionsHelper
+    module CreateInitiativeHelper
       def signature_type_options(initiative_form)
         return all_signature_type_options unless initiative_form.signature_type_updatable?
 
@@ -27,7 +27,7 @@ module Decidim
           [
             I18n.t(
               "online",
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), "online"
           ]
         ]
@@ -38,7 +38,7 @@ module Decidim
           [
             I18n.t(
               "offline",
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), "offline"
           ]
         ]
@@ -49,7 +49,7 @@ module Decidim
           [
             I18n.t(
               type,
-              scope: %w(activemodel attributes initiative signature_type_values)
+              scope: "activemodel.attributes.initiative.signature_type_values"
             ), type
           ]
         end

data/app/helpers/decidim/initiatives/initiative_helper.rb

@@ -43,7 +43,9 @@ module Decidim
       def popularity_tag(initiative)
         content_tag(:div, class: "extra__popularity popularity #{popularity_class(initiative)}".strip) do
           5.times do
-            concat(content_tag(:span, class: "popularity__item") {})
+            concat(content_tag(:span, class: "popularity__item") do
+              # empty block
+            end)
           end
 
           concat(content_tag(:span, class: "popularity__desc") do
@@ -89,11 +91,11 @@ module Decidim
         tag = "button"
         html_options ||= {}
 
-        if !current_user
-          html_options["data-open"] = "loginModal"
-        else
+        if current_user
           html_options["data-open"] = "authorizationModal"
           html_options["data-open-url"] = authorization_sign_modal_initiative_path(initiative)
+        else
+          html_options["data-open"] = "loginModal"
         end
 
         html_options["onclick"] = "event.preventDefault();"

data/app/mailers/decidim/initiatives/initiatives_mailer.rb

@@ -7,8 +7,8 @@ module Decidim
       include Decidim::TranslatableAttributes
       include Decidim::SanitizeHelper
 
-      add_template_helper Decidim::TranslatableAttributes
-      add_template_helper Decidim::SanitizeHelper
+      helper Decidim::TranslatableAttributes
+      helper Decidim::SanitizeHelper
 
       # Notifies initiative creation
       def notify_creation(initiative)

data/app/models/decidim/initiative.rb

@@ -22,6 +22,8 @@ module Decidim
     include Decidim::Initiatives::HasArea
     include Decidim::TranslatableResource
     include Decidim::HasResourcePermission
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     translatable_fields :title, :description, :answer
 
@@ -64,9 +66,8 @@ module Decidim
 
     validates :title, :description, :state, :signature_type, presence: true
     validates :hashtag,
-              uniqueness: true,
-              allow_blank: true,
-              case_sensitive: false
+              uniqueness: { allow_blank: true, case_sensitive: false }
+
     validate :signature_type_allowed
 
     scope :open, lambda {
@@ -80,6 +81,8 @@ module Decidim
     scope :published, -> { where.not(published_at: nil) }
     scope :with_state, ->(state) { where(state: state) if state.present? }
 
+    scope_search_multi :with_any_state, [:accepted, :rejected, :answered, :open, :closed]
+
     scope :currently_signable, lambda {
       where("signature_start_date <= ?", Date.current)
         .where("signature_end_date >= ?", Date.current)
@@ -106,6 +109,42 @@ module Decidim
     scope :future_spaces, -> { none }
     scope :past_spaces, -> { closed }
 
+    scope :with_any_type, lambda { |*original_type_ids|
+      type_ids = original_type_ids.flatten
+      return self if type_ids.include?("all")
+
+      types = InitiativesTypeScope.where(decidim_initiatives_types_id: type_ids).pluck(:id)
+      where(scoped_type: types)
+    }
+
+    # Redefine the with_any_scope method as the initiative scope is defined by
+    # the initiative type scope.
+    scope :with_any_scope, lambda { |*original_scope_ids|
+      scope_ids = original_scope_ids.flatten
+      return self if scope_ids.include?("all")
+
+      clean_scope_ids = scope_ids
+
+      conditions = []
+      conditions << "decidim_initiatives_type_scopes.decidim_scopes_id IS NULL" if clean_scope_ids.delete("global")
+      conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+      joins(:scoped_type).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+    }
+
+    scope :authored_by, lambda { |author|
+      co_authoring_initiative_ids = Decidim::InitiativesCommitteeMember.where(
+        decidim_users_id: author
+      ).pluck(:decidim_initiatives_id)
+
+      where(
+        decidim_author_id: author,
+        decidim_author_type: Decidim::UserBaseEntity.name
+      ).or(
+        where(id: co_authoring_initiative_ids)
+      )
+    }
+
     before_update :set_offline_votes_total
     after_commit :notify_state_change
     after_create :notify_creation
@@ -124,6 +163,10 @@ module Decidim
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end
 
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_any_state, :with_any_type, :with_any_scope, :with_any_area]
+    end
+
     delegate :document_number_authorization_handler, :promoting_committee_enabled?, to: :type
     delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
 
@@ -135,6 +178,11 @@ module Decidim
       type.attached_uploader(:banner_image)
     end
 
+    # Public: Whether the object's comments are visible or not.
+    def commentable?
+      type.comments_enabled?
+    end
+
     # Public: Check if an initiative has been created by an individual person.
     # If it's false, then it has been created by an authorized organization.
     #
@@ -215,7 +263,7 @@ module Decidim
         published_at: Time.current,
         state: "published",
         signature_start_date: Date.current,
-        signature_end_date: signature_end_date || Date.current + Decidim::Initiatives.default_signature_time_period_length
+        signature_end_date: signature_end_date || (Date.current + Decidim::Initiatives.default_signature_time_period_length)
       )
     end
 
@@ -420,6 +468,10 @@ module Decidim
       ActionAuthorizer.new(user, "comment", self, nil).authorize.ok?
     end
 
+    def self.ransack(params = {}, options = {})
+      Initiatives::InitiativeSearch.new(self, params, options)
+    end
+
     private
 
     # Private: This is just an alias because the naming on InitiativeTypeScope
@@ -453,11 +505,10 @@ module Decidim
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    [:title, :description].each do |column|
-      ransacker column do |parent|
-        Arel::Nodes::InfixOperation.new("->>", parent.table[column], Arel::Nodes.build_quoted(I18n.locale.to_s))
-      end
-    end
+    [:title, :description].each { |column| ransacker_i18n(column) }
+
+    # Alias search_text as a grouped OR query with all the text searchable fields.
+    ransack_alias :search_text, :id_string_or_title_or_description_or_author_name_or_author_nickname
 
     # Allow ransacker to search on an Enum Field
     ransacker :state, formatter: proc { |int| states[int] }

data/app/models/decidim/initiatives_settings.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Initiatives setting.
+  class InitiativesSettings < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Initiatives::AdminLog::InitiativesSettingsPresenter
+    end
+  end
+end

data/app/models/decidim/initiatives_type.rb

@@ -6,6 +6,7 @@ module Decidim
     include Decidim::HasResourcePermission
     include Decidim::TranslatableResource
     include Decidim::HasUploadValidations
+    include Decidim::Traceable
 
     translatable_fields :title, :description, :extra_fields_legal_information
 
@@ -48,5 +49,9 @@ module Decidim
     def mounted_params
       { host: organization.host }
     end
+
+    def self.log_presenter_class_for(_log)
+      Decidim::Initiatives::AdminLog::InitiativesTypePresenter
+    end
   end
 end

data/app/packs/stylesheets/decidim/initiatives/print-initiative.scss

@@ -114,22 +114,6 @@
     display: none;
   }
 
-  h3.print-section-title{
-    display: none;
-  }
-
-  .print-button{
-    display: none;
-  }
-
-  .omnipresent-banner{
-    display: none;
-  }
-
-  .decidim-accessibility-indicator{
-    display: none;
-  }
-
   .main-nav{
     display: none;
   }

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -19,6 +19,7 @@ module Decidim
             initiative_committee_action?
             initiative_user_action?
             attachment_action?
+            initiatives_settings_action?
 
             return permission_action
           end
@@ -36,6 +37,7 @@ module Decidim
           initiative_committee_action?
           initiative_admin_user_action?
           initiative_export_action?
+          initiatives_settings_action?
           moderator_action?
           allow! if permission_action.subject == :attachment
 
@@ -134,12 +136,10 @@ module Decidim
           case permission_action.action
           when :read
             toggle_allow(Decidim::Initiatives.print_enabled)
-          when :publish
+          when :publish, :discard
             toggle_allow(initiative.validating?)
           when :unpublish
             toggle_allow(initiative.published?)
-          when :discard
-            toggle_allow(initiative.validating?)
           when :export_pdf_signatures
             toggle_allow(initiative.published? || initiative.accepted? || initiative.rejected?)
           when :export_votes
@@ -163,7 +163,13 @@ module Decidim
 
         def initiative_export_action?
           allow! if permission_action.subject == :initiatives && permission_action.action == :export
-          allow! if permission_action.action == :export && permission_action.subject == :component_data
+        end
+
+        def initiatives_settings_action?
+          return unless permission_action.action == :update &&
+                        permission_action.subject == :initiatives_settings
+
+          toggle_allow(user.admin?)
         end
 
         def moderator_action?

data/app/permissions/decidim/initiatives/permissions.rb

@@ -107,7 +107,7 @@ module Decidim
       end
 
       def access_request_without_user?
-        !initiative.published? && initiative.promoting_committee_enabled? || Decidim::Initiatives.do_not_require_authorization
+        (!initiative.published? && initiative.promoting_committee_enabled?) || Decidim::Initiatives.do_not_require_authorization
       end
 
       def access_request_membership?

data/app/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module AdminLog
+      # This class holds the logic to present a `Decidim::InitiativesSettings`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    InitiativesSettingsPresenter.new(action_log, view_helpers).present
+      class InitiativesSettingsPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.initiatives.admin_log.initiatives_settings.#{action}"
+          end
+        end
+      end
+    end
+  end
+end