decidim-participatory_processes 0.26.2 → 0.27.0.rc2

data/app/commands/decidim/participatory_processes/admin/reorder_participatory_process_steps.rb

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that reorders the steps in a participatory process.
-      class ReorderParticipatoryProcessSteps < Rectify::Command
+      class ReorderParticipatoryProcessSteps < Decidim::Command
         # Public: Initializes the command.
         #
         # collection - an ActiveRecord::Relation of steps

data/app/commands/decidim/participatory_processes/admin/unpublish_participatory_process.rb

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that sets a participatory process as unpublished.
-      class UnpublishParticipatoryProcess < Rectify::Command
+      class UnpublishParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # process - A ParticipatoryProcess that will be unpublished

data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class UpdateParticipatoryProcess < Rectify::Command
+      class UpdateParticipatoryProcess < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.
@@ -77,6 +77,7 @@ module Decidim
             start_date: form.start_date,
             end_date: form.end_date,
             participatory_process_group: form.participatory_process_group,
+            participatory_process_type: form.participatory_process_type,
             show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_group.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process group in the system.
-      class UpdateParticipatoryProcessGroup < Rectify::Command
+      class UpdateParticipatoryProcessGroup < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_step.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class UpdateParticipatoryProcessStep < Rectify::Command
+      class UpdateParticipatoryProcessStep < Decidim::Command
         attr_reader :step
 
         # Public: Initializes the command.

data/app/commands/decidim/participatory_processes/admin/update_participatory_process_type.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when updating a participatory
+      # process type in the system.
+      class UpdateParticipatoryProcessType < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_process_type - A participatory_process_type object to
+        # update
+        # form - A form object with the params.
+        def initialize(participatory_process_type, form)
+          @participatory_process_type = participatory_process_type
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          update_participatory_process_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :participatory_process_type
+
+        def update_participatory_process_type!
+          transaction do
+            Decidim.traceability.update!(
+              participatory_process_type,
+              form.current_user,
+              title: form.title
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_copies_controller.rb

@@ -17,7 +17,7 @@ module Decidim
           enforce_permission_to :create, :process
           @form = form(ParticipatoryProcessCopyForm).from_params(params)
 
-          CopyParticipatoryProcess.call(@form, current_participatory_process) do
+          CopyParticipatoryProcess.call(@form, current_participatory_process, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_processes_copies.create.success", scope: "decidim.admin")
               redirect_to participatory_processes_path

data/app/controllers/decidim/participatory_processes/admin/participatory_process_types_controller.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Controller used to manage participatory process types for the current
+      # organization
+      class ParticipatoryProcessTypesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
+        helper_method :collection, :current_participatory_process_type
+        layout "decidim/admin/participatory_process_type"
+
+        # GET /admin/participatory_process_types
+        def index
+          enforce_permission_to :index, :participatory_process_type
+        end
+
+        # GET /admin/participatory_process_types/new
+        def new
+          enforce_permission_to :create, :participatory_process_type
+          @form = participatory_process_type_form.instance
+        end
+
+        # POST /admin/participatory_process_types
+        def create
+          enforce_permission_to :create, :participatory_process_type
+          @form = participatory_process_type_form.from_params(params)
+
+          CreateParticipatoryProcessType.call(@form) do
+            on(:ok) do |_process_type|
+              flash[:notice] = I18n.t("participatory_process_types.create.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("participatory_process_types.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        # GET /admin/participatory_process_types/:id/edit
+        def edit
+          enforce_permission_to :edit, :participatory_process_type, participatory_process_type: current_participatory_process_type
+          @form = participatory_process_type_form.from_model(
+            current_participatory_process_type,
+            participatory_process_type: current_participatory_process_type
+          )
+        end
+
+        # PUT /admin/participatory_process_types/:id
+        def update
+          enforce_permission_to :update, :participatory_process_type, participatory_process_type: current_participatory_process_type
+
+          @form = participatory_process_type_form
+                  .from_params(params, participatory_process_type: current_participatory_process_type)
+
+          UpdateParticipatoryProcessType.call(current_participatory_process_type, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_process_types.update.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("participatory_process_types.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        # DELETE /admin/participatory_process_types/:id
+        def destroy
+          enforce_permission_to :destroy, :participatory_process_type, participatory_process_type: current_participatory_process_type
+
+          DestroyParticipatoryProcessType.call(current_participatory_process_type, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_process_types.destroy.success", scope: "decidim.admin")
+              redirect_to participatory_process_types_path
+            end
+          end
+        end
+
+        private
+
+        def participatory_process_type_form
+          form(Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessTypeForm)
+        end
+
+        def current_participatory_process_type
+          @current_participatory_process_type ||= Decidim::ParticipatoryProcessType.find(params[:id])
+        end
+
+        def collection
+          @collection ||= Decidim::ParticipatoryProcessType.where(organization: current_organization)
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/admin/reminders_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # a participatory process.
+      class RemindersController < Decidim::Admin::RemindersController
+        include Concerns::ParticipatoryProcessAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -40,15 +40,16 @@ module Decidim
 
       private
 
-      def search_klass
-        ParticipatoryProcessSearch
+      def search_collection
+        ParticipatoryProcess.where(organization: current_organization).published.visible_for(current_user).includes(:area)
       end
 
       def default_filter_params
         {
-          scope_id: nil,
-          area_id: nil,
-          date: default_date_filter
+          with_scope: nil,
+          with_area: nil,
+          with_type: nil,
+          with_date: default_date_filter
         }
       end
 
@@ -85,7 +86,7 @@ module Decidim
       end
 
       def filtered_processes
-        search.results
+        search.result
       end
 
       def participatory_processes
@@ -102,7 +103,7 @@ module Decidim
       end
 
       def metrics
-        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space)
+        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space, view_context: view_context)
       end
 
       def participatory_process_group

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -6,7 +6,7 @@ module Decidim
     include Decidim::Events::AuthorEvent
 
     def notification_title
-      I18n.t("notification_title", i18n_options).html_safe
+      I18n.t("notification_title", **i18n_options).html_safe
     end
 
     def i18n_role

data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb

@@ -39,6 +39,7 @@ module Decidim
         attribute :scopes_enabled, Boolean
         attribute :show_metrics, Boolean
         attribute :show_statistics, Boolean
+        attribute :participatory_process_type_id, Integer
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :start_date, Decidim::Attributes::LocalizedDate
@@ -66,6 +67,7 @@ module Decidim
         def map_model(model)
           self.scope_id = model.decidim_scope_id
           self.participatory_process_group_id = model.decidim_participatory_process_group_id
+          self.participatory_process_type_id = model.decidim_participatory_process_type_id
           self.related_process_ids = model.linked_participatory_space_resources(:participatory_process, "related_processes").pluck(:id)
           @processes = Decidim::ParticipatoryProcess.where(organization: model.organization).where.not(id: model.id)
         end
@@ -86,12 +88,26 @@ module Decidim
           Decidim::ParticipatoryProcessGroup.find_by(id: participatory_process_group_id)
         end
 
+        def participatory_process_type
+          Decidim::ParticipatoryProcessType.find_by(id: participatory_process_type_id)
+        end
+
         def processes
           @processes ||= Decidim::ParticipatoryProcess.where(organization: current_organization)
         end
 
+        def participatory_process_types_for_select
+          @participatory_process_types_for_select ||= participatory_process_types.map do |type|
+            [translated_attribute(type.title), type.id]
+          end
+        end
+
         private
 
+        def participatory_process_types
+          Decidim::ParticipatoryProcessType.where(organization: current_organization)
+        end
+
         def organization_participatory_processes
           OrganizationParticipatoryProcesses.new(current_organization).query
         end

data/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb

@@ -8,7 +8,6 @@ module Decidim
       #
       class ParticipatoryProcessImportForm < Form
         include TranslatableAttributes
-        include Decidim::HasUploadValidations
 
         JSON_MIME_TYPE = "application/json"
         # Accepted mime types
@@ -30,10 +29,9 @@ module Decidim
         attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
-        attribute :document
-
-        validates :document, presence: true
+        attribute :document, Decidim::Attributes::Blob
 
+        validates :document, file_content_type: { allow: ACCEPTED_TYPES.values }
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
         validate :slug_uniqueness
@@ -41,7 +39,7 @@ module Decidim
         validate :document_type_must_be_valid, if: :document
 
         def document_text
-          @document_text ||= document&.read
+          @document_text ||= document&.download
         end
 
         def document_type_must_be_valid
@@ -60,9 +58,9 @@ module Decidim
         end
 
         def i18n_invalid_document_type_text
-          I18n.t("invalid_document_type",
+          I18n.t("allowed_file_content_types",
                  scope: "activemodel.errors.models.participatory_process.attributes.document",
-                 valid_mime_types: i18n_valid_mime_types_text)
+                 types: i18n_valid_mime_types_text)
         end
 
         def i18n_valid_mime_types_text

data/app/forms/decidim/participatory_processes/admin/participatory_process_type_form.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A form object used to create participatory process types from the admin
+      # dashboard.
+      #
+      class ParticipatoryProcessTypeForm < Form
+        include TranslatableAttributes
+
+        mimic :participatory_process_type
+
+        translatable_attribute :title, String
+
+        validates :title, translatable_presence: true
+      end
+    end
+  end
+end

data/app/models/decidim/participatory_process.rb

@@ -21,6 +21,8 @@ module Decidim
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::HasArea
+    include Decidim::FilterableResource
 
     translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
                         :target, :participatory_scope, :participatory_structure, :announcement
@@ -28,10 +30,6 @@ module Decidim
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
-    belongs_to :area,
-               foreign_key: "decidim_area_id",
-               class_name: "Decidim::Area",
-               optional: true
     belongs_to :participatory_process_group,
                foreign_key: "decidim_participatory_process_group_id",
                class_name: "Decidim::ParticipatoryProcessGroup",
@@ -58,6 +56,10 @@ module Decidim
                foreign_key: "decidim_scope_type_id",
                class_name: "Decidim::ScopeType",
                optional: true
+    belongs_to :participatory_process_type,
+               foreign_key: "decidim_participatory_process_type_id",
+               class_name: "Decidim::ParticipatoryProcessType",
+               optional: true
 
     has_many :components, as: :participatory_space, dependent: :destroy
 
@@ -76,6 +78,31 @@ module Decidim
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
     scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gteq(Date.current).or(arel_table[:end_date].eq(nil)))) }
 
+    scope :with_date, lambda { |date_key|
+      case date_key
+      when "active"
+        active.order(start_date: :desc)
+      when "past"
+        past.order(end_date: :desc)
+      when "upcoming"
+        upcoming.order(start_date: :asc)
+      else # Assume 'all'
+        timezone = ActiveSupport::TimeZone.find_tzinfo(Time.zone.name).identifier
+        order(
+          Arel.sql(
+            sanitize_sql_array(
+              [
+                "ABS(start_date - (CURRENT_DATE at time zone :timezone)::date)",
+                { timezone: timezone }
+              ]
+            )
+          )
+        )
+      end
+    }
+
+    scope :with_type, ->(type_id) { where(decidim_participatory_process_type_id: type_id) }
+
     searchable_fields({
                         scope_id: :decidim_scope_id,
                         participatory_space: :itself,
@@ -177,8 +204,10 @@ module Decidim
     end
 
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
-    ransacker :title do |parent|
-      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    ransacker_i18n :title
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_date, :with_area, :with_scope, :with_type]
     end
   end
 end

data/app/models/decidim/participatory_process_type.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ParticipatoryProcessType < ApplicationRecord
+    include Decidim::Traceable
+    include Decidim::Loggable
+    include Decidim::TranslatableResource
+
+    translatable_fields :title
+
+    belongs_to :organization,
+               foreign_key: "decidim_organization_id",
+               class_name: "Decidim::Organization"
+
+    has_many :processes,
+             foreign_key: "decidim_participatory_process_type_id",
+             class_name: "Decidim::ParticipatoryProcess",
+             inverse_of: :participatory_process_type,
+             dependent: :nullify
+
+    validates :title, presence: true
+
+    def self.log_presenter_class_for(_log)
+      Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessTypePresenter
+    end
+  end
+end

data/app/permissions/decidim/participatory_processes/permissions.rb

@@ -38,6 +38,7 @@ module Decidim
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
+        participatory_process_type_action?
 
         return permission_action unless process
 
@@ -252,6 +253,19 @@ module Decidim
         allow! if is_allowed
       end
 
+      def participatory_process_type_action?
+        return unless permission_action.subject == :participatory_process_type
+        return disallow! unless user.admin?
+
+        participatory_process_type = context.fetch(:participatory_process_type, nil)
+        case permission_action.action
+        when :destroy
+          toggle_allow(participatory_process_type&.processes&.none?)
+        else
+          allow!
+        end
+      end
+
       # Checks if the permission_action is to read the admin processes list or
       # not.
       def read_process_list_permission_action?

data/app/presenters/decidim/log/value_types/participatory_process_type_presenter.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Log
+    module ValueTypes
+      # This class presents the given value as a
+      # Decidim::ParticipatoryProcessType. If the type can be found, it shows
+      # its title. Otherwise it shows its ID.
+      #
+      # Returns an HTML-safe String
+      class ParticipatoryProcessTypePresenter < Decidim::Log::ValueTypes::DefaultPresenter
+        def present
+          return unless value
+          return h.translated_attribute(type.title) if type
+
+          I18n.t("not_found", id: value, scope: "decidim.log.value_types.participatory_process_type_presenter")
+        end
+
+        private
+
+        def type
+          @type ||= Decidim::ParticipatoryProcessType.find_by(id: value)
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb

@@ -31,13 +31,14 @@ module Decidim
             slug: :string,
             subtitle: :i18n,
             target: :i18n,
-            title: :i18n
+            title: :i18n,
+            decidim_participatory_process_type_id: :participatory_process_type
           }
         end
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update"
+          when "create", "publish", "unpublish", "update", "import", "export", "duplicate"
             "decidim.admin_log.participatory_process.#{action}"
           else
             super

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_type_presenter.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module AdminLog
+      # This class holds the logic to present a
+      # `Decidim::ParticipatoryProcessType`
+      # 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
+      #    ParticipatoryProcessTypePresenter.new(action_log, view_helpers).present
+      class ParticipatoryProcessTypePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          { title: :i18n }
+        end
+
+        def action_string
+          case action
+          when "create", "update"
+            "decidim.admin_log.participatory_process_type.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.participatory_process_type"
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/participatory_processes/participatory_process_group_stats_presenter.rb

@@ -4,9 +4,12 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
     class ParticipatoryProcessGroupStatsPresenter < Decidim::StatsPresenter
-      attribute :participatory_process_group, Decidim::ParticipatoryProcessGroup
       include Decidim::IconHelper
 
+      def participatory_process_group
+        __getobj__.fetch(:participatory_process_group)
+      end
+
       # Public: returns a collection of stats (Hash) for the participatory
       # process group landing page.
       def collection

data/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb

@@ -4,7 +4,11 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render metrics in ParticipatoryProcesses statistics page
     class ParticipatoryProcessMetricChartsPresenter < Decidim::MetricChartsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
+      delegate :hidden_field_tag, :link_to, :capture, to: :view_context
+
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
 
       def params
         capture do

data/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb

@@ -4,9 +4,12 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
     class ParticipatoryProcessStatsPresenter < Decidim::StatsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
       include Decidim::IconHelper
 
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
+
       # Public: returns a collection of stats (Hash) for the Process Home.
       def collection
         highlighted_stats = process_participants_stats

data/app/queries/decidim/participatory_processes/admin/admin_users.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A class used to find the admins for a participatory process including
       # organization admins.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its process admins

data/app/queries/decidim/participatory_processes/admin/moderators.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A class used to find the users that can moderate the participatory
       # process.
-      class Moderators < Rectify::Query
+      class Moderators < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its moderators