decidim-participatory_processes 0.27.10 → 0.28.0.rc4

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

@@ -5,105 +5,22 @@ module Decidim
     module Admin
       # Controller that allows managing participatory process user roles.
       #
-      class ParticipatoryProcessUserRolesController < Decidim::Admin::ApplicationController
+      class ParticipatoryProcessUserRolesController < Decidim::Admin::ParticipatorySpace::UserRoleController
         include Concerns::ParticipatoryProcessAdmin
-        include Decidim::Admin::Officializations::Filterable
 
-        def index
-          enforce_permission_to :read, :process_user_role
-          @participatory_process_user_roles = filtered_collection
-        end
+        def authorization_scope = :process_user_role
 
-        def new
-          enforce_permission_to :create, :process_user_role
-          @form = form(ParticipatoryProcessUserRoleForm).instance
-        end
+        def resource_form = form(ParticipatoryProcessUserRoleForm)
 
-        def create
-          enforce_permission_to :create, :process_user_role
-          @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
+        def space_index_path = participatory_process_user_roles_path(current_participatory_space)
 
-          CreateParticipatoryProcessAdmin.call(@form, current_user, current_participatory_process) do
-            on(:ok) do
-              flash[:notice] = I18n.t("participatory_process_user_roles.create.success", scope: "decidim.admin")
-              redirect_to participatory_process_user_roles_path(current_participatory_process)
-            end
+        def i18n_scope = "decidim.admin.participatory_process_user_roles"
 
-            on(:invalid) do
-              flash[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
-              render :new
-            end
-          end
-        end
+        def role_class = Decidim::ParticipatoryProcessUserRole
 
-        def edit
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :process_user_role, process_user_role: @user_role
-          @form = form(ParticipatoryProcessUserRoleForm).from_model(@user_role.user)
-        end
+        def event = "decidim.events.participatory_process.role_assigned"
 
-        def update
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :update, :process_user_role, process_user_role: @user_role
-          @form = form(ParticipatoryProcessUserRoleForm).from_params(params)
-
-          UpdateParticipatoryProcessAdmin.call(@form, @user_role) do
-            on(:ok) do
-              flash[:notice] = I18n.t("participatory_process_user_roles.update.success", scope: "decidim.admin")
-              redirect_to participatory_process_user_roles_path(current_participatory_process)
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t("participatory_process_user_roles.update.error", scope: "decidim.admin")
-              render :edit
-            end
-          end
-        end
-
-        def destroy
-          @participatory_process_user_role = collection.find(params[:id])
-          enforce_permission_to :destroy, :process_user_role, process_user_role: @participatory_process_user_role
-
-          DestroyParticipatoryProcessAdmin.call(@participatory_process_user_role, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("participatory_process_user_roles.destroy.success", scope: "decidim.admin")
-              redirect_to participatory_process_user_roles_path(current_participatory_process)
-            end
-          end
-        end
-
-        def resend_invitation
-          @user_role = collection.find(params[:id])
-          enforce_permission_to :invite, :process_user_role, process_user_role: @user_role
-
-          InviteUserAgain.call(@user_role.user, "invite_admin") do
-            on(:ok) do
-              flash[:notice] = I18n.t("users.resend_invitation.success", scope: "decidim.admin")
-            end
-
-            on(:invalid) do
-              flash[:alert] = I18n.t("users.resend_invitation.error", scope: "decidim.admin")
-            end
-          end
-
-          redirect_to participatory_process_user_roles_path(current_participatory_process)
-        end
-
-        private
-
-        def search_field_predicate
-          :name_or_nickname_or_email_cont
-        end
-
-        def filters
-          [:invitation_accepted_at_present, :last_sign_in_at_present]
-        end
-
-        def collection
-          @collection ||= Decidim::ParticipatoryProcessUserRole
-                          .joins(:user)
-                          .where(participatory_process: current_participatory_process) # .order(:role, "decidim_users.name")
-        end
+        def event_class = Decidim::ParticipatoryProcessRoleAssignedEvent
       end
     end
   end

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

@@ -8,6 +8,9 @@ module Decidim
       class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
         include Decidim::Admin::ParticipatorySpaceAdminContext
         include Decidim::ParticipatoryProcesses::Admin::Filterable
+
+        add_breadcrumb_item_from_menu :admin_participatory_process_menu, only: :show
+
         participatory_space_admin_layout only: [:edit]
 
         helper ProcessGroupsForSelectHelper

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessGroupsController < Decidim::ParticipatoryProcesses::ApplicationController
       helper Decidim::SanitizeHelper
-      helper_method :participatory_processes, :group
+      helper_method :participatory_processes, :group, :active_content_blocks
 
       before_action :set_group
 
@@ -32,6 +32,19 @@ module Decidim
         @group = Decidim::ParticipatoryProcessGroup.where(organization: current_organization).find(params[:id])
       end
 
+      def active_content_blocks
+        @active_content_blocks ||= if group.present?
+                                     Decidim::ContentBlock.published.for_scope(
+                                       :participatory_process_group_homepage,
+                                       organization: current_organization
+                                     ).where(
+                                       scoped_resource_id: group.id
+                                     )
+                                   else
+                                     Decidim::ContentBlock.none
+                                   end
+      end
+
       attr_reader :group
     end
   end

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

@@ -8,6 +8,8 @@ module Decidim
       include ParticipatorySpaceContext
       participatory_space_layout only: [:show, :all_metrics]
       include FilterResource
+      include Paginable
+      include HasParticipatorySpaceContentBlocks
 
       helper_method :collection,
                     :promoted_collection,
@@ -47,8 +49,8 @@ module Decidim
       def default_filter_params
         {
           with_any_scope: nil,
-          with_area: nil,
-          with_type: nil,
+          with_any_area: nil,
+          with_any_type: nil,
           with_date: default_date_filter
         }
       end
@@ -65,6 +67,19 @@ module Decidim
         ).first!
       end
 
+      def active_content_blocks
+        @active_content_blocks ||= if current_participatory_space.present?
+                                     Decidim::ContentBlock.published.for_scope(
+                                       :participatory_process_homepage,
+                                       organization: current_organization
+                                     ).where(
+                                       scoped_resource_id: current_participatory_space.id
+                                     )
+                                   else
+                                     Decidim::ContentBlock.none
+                                   end
+      end
+
       def published_processes
         @published_processes ||= OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user)
       end
@@ -82,7 +97,7 @@ module Decidim
       end
 
       def collection
-        @collection ||= participatory_processes + participatory_process_groups
+        @collection ||= paginate(Kaminari.paginate_array(participatory_processes + participatory_process_groups))
       end
 
       def filtered_processes
@@ -103,7 +118,7 @@ module Decidim
       end
 
       def metrics
-        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space, view_context: view_context)
+        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space, view_context:)
       end
 
       def participatory_process_group

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
@@ -15,12 +15,12 @@ module Decidim
 
     def i18n_options
       {
-        resource_path: resource_path,
-        resource_title: resource_title,
-        resource_url: resource_url,
+        resource_path:,
+        resource_title:,
+        resource_url:,
         scope: event_name,
-        participatory_space_title: participatory_space_title,
-        participatory_space_url: participatory_space_url,
+        participatory_space_title:,
+        participatory_space_url:,
         role: i18n_role
       }
     end

data/app/events/decidim/participatory_process_step_activated_event.rb

@@ -1,17 +1,18 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class ParticipatoryProcessStepActivatedEvent < Decidim::Events::SimpleEvent
     include Rails.application.routes.mounted_helpers
 
     def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
+      @resource_path ||= decidim_participatory_processes.participatory_process_path(participatory_space, display_steps: true)
     end
 
     def resource_url
       @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
+                        .participatory_process_url(
+                          participatory_space,
+                          display_steps: true,
                           host: participatory_space.organization.host
                         )
     end

data/app/events/decidim/participatory_process_step_changed_event.rb

@@ -1,17 +1,18 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   class ParticipatoryProcessStepChangedEvent < Decidim::Events::SimpleEvent
     include Rails.application.routes.mounted_helpers
 
     def resource_path
-      @resource_path ||= decidim_participatory_processes.participatory_process_participatory_process_steps_path(participatory_process_slug: participatory_space.slug)
+      @resource_path ||= decidim_participatory_processes.participatory_process_path(participatory_space, display_steps: true)
     end
 
     def resource_url
       @resource_url ||= decidim_participatory_processes
-                        .participatory_process_participatory_process_steps_url(
-                          participatory_process_slug: participatory_space.slug,
+                        .participatory_process_url(
+                          participatory_space,
+                          display_steps: true,
                           host: participatory_space.organization.host
                         )
     end

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

@@ -25,7 +25,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -114,7 +114,7 @@ module Decidim
 
         def slug_uniqueness
           return unless organization_participatory_processes
-                        .where(slug: slug)
+                        .where(slug:)
                         .where.not(id: context[:process_id])
                         .any?
 

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

@@ -72,7 +72,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -15,8 +15,8 @@ module Decidim
 
         mimic :participatory_process_step
 
-        attribute :start_date, Decidim::Attributes::LocalizedDate
-        attribute :end_date, Decidim::Attributes::LocalizedDate
+        attribute :start_date, Decidim::Attributes::TimeWithZone
+        attribute :end_date, Decidim::Attributes::TimeWithZone
         attribute :cta_path, String
 
         validates :title, translatable_presence: true

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

@@ -6,26 +6,10 @@ module Decidim
       # A form object used to create participatory process user roles from the
       # admin dashboard.
       #
-      class ParticipatoryProcessUserRoleForm < Form
+      class ParticipatoryProcessUserRoleForm < Decidim::Admin::ParticipatorySpaceAdminUserForm
         mimic :participatory_process_user_role
 
-        attribute :name, String
-        attribute :email, String
-        attribute :role, String
-
-        validates :name, :email, :role, presence: true
-        validates :role, inclusion: { in: Decidim::ParticipatoryProcessUserRole::ROLES }
-
-        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
-
-        def roles
-          Decidim::ParticipatoryProcessUserRole::ROLES.map do |role|
-            [
-              I18n.t(role, scope: "decidim.admin.models.participatory_process_user_role.roles"),
-              role
-            ]
-          end
-        end
+        def scope = "decidim.admin.models.participatory_process_user_role.roles"
       end
     end
   end

data/app/helpers/decidim/participatory_processes/admin/participatory_process_helper.rb

@@ -8,6 +8,7 @@ module Decidim
         def scope_type_depth_select_options
           {
             include_blank: true,
+            help_text: t("scope_type_max_depth_help", scope: "decidim.participatory_processes.admin.participatory_processes.form"),
             selected: current_participatory_process.try(:decidim_scope_type_id)
           }
         end

data/app/helpers/decidim/participatory_processes/application_helper.rb

@@ -6,6 +6,11 @@ module Decidim
     #
     module ApplicationHelper
       include Decidim::ResourceHelper
+      include PaginateHelper
+
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.menu.processes")
+      end
     end
   end
 end

data/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -7,9 +7,9 @@ module Decidim
       include Decidim::FiltersHelper
       include Decidim::AttachmentsHelper
       include Decidim::IconHelper
-      include Decidim::WidgetUrlsHelper
       include Decidim::SanitizeHelper
       include Decidim::ResourceReferenceHelper
+      include Decidim::CheckBoxesTreeHelper
 
       # Public: Returns the dates for a step in a readable format like
       # "01/01/2016 - 05/02/2016".
@@ -57,15 +57,43 @@ module Decidim
         )
       end
 
-      # Public: Invokes the appropriate partial for a promoted
-      # participatory process or group based on the type name
-      #
-      # promoted_item - Can be a Decidim::ParticipatoryProcess or
-      #                 Decidim::ParticipatoryProcessGroup
-      def render_highlighted_partial_for(promoted_item)
-        name = promoted_item.class.name.demodulize.underscore.gsub("participatory_", "promoted_")
+      # Items to display in the navigation of a process
+      def process_nav_items(participatory_space)
+        components = participatory_space.components.published.or(Decidim::Component.where(id: try(:current_component)))
+
+        components.map do |component|
+          {
+            name: translated_attribute(component.name),
+            url: main_component_path(component),
+            active: is_active_link?(main_component_path(component), :inclusive)
+          }
+        end
+      end
+
+      def filter_sections
+        [
+          { method: :with_date, collection: filter_dates_values, label_scope: "decidim.participatory_processes.participatory_processes.filters", id: "date" },
+          { method: :with_any_scope, collection: filter_global_scopes_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "scope" },
+          { method: :with_any_area, collection: filter_areas_values, label_scope: "decidim.shared.participatory_space_filters.filters", id: "area" },
+          { method: :with_any_type, collection: filter_types_values, label_scope: "decidim.participatory_processes.participatory_processes.filters", id: "type" }
+        ].reject { |item| item[:collection].blank? }
+      end
+
+      def process_types
+        @process_types ||= Decidim::ParticipatoryProcessType.joins(:processes).distinct
+      end
+
+      def filter_types_values
+        return if process_types.blank?
+
+        type_values = process_types.map { |type| [type.id.to_s, translated_attribute(type.title)] }
+        type_values.prepend(["", t("decidim.participatory_processes.participatory_processes.filters.names.all")])
+
+        filter_tree_from_array(type_values)
+      end
 
-        render partial: name, locals: { name => promoted_item }.symbolize_keys
+      def filter_dates_values
+        flat_filter_values(:all, :upcoming, :past, :active, scope: "decidim.participatory_processes.participatory_processes.filters.names")
       end
     end
   end

data/app/helpers/decidim/participatory_processes/participatory_space_content_blocks_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # Method shared by different content blocks for the process
+    #
+    module ParticipatorySpaceContentBlocksHelper
+      def base_model
+        Decidim::ParticipatoryProcess
+      end
+
+      def decidim_participatory_processes
+        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
+      end
+    end
+  end
+end

data/app/jobs/decidim/participatory_processes/change_active_step_job.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ChangeActiveStepJob < ApplicationJob
+      queue_as :default
+
+      def perform
+        participatory_processes = Decidim::ParticipatoryProcess.published.where("start_date <= ? AND end_date >= ?", Time.zone.now.to_date, Time.zone.now.to_date)
+
+        participatory_processes.each do |process|
+          steps = Decidim::ParticipatoryProcessStep.unscoped
+                                                   .where(decidim_participatory_process_id: process.id)
+                                                   .where("start_date <= ? AND end_date >= ?", Time.zone.now, Time.zone.now).order("end_date ASC", :position)
+
+          active_step = process.steps.find_by(active: true)
+          if steps.empty? && active_step
+            next_position = active_step.position + 1
+            next_step = process.steps.where("start_date <= ?", Time.zone.now.to_date).find_by(position: next_position)
+            if next_step.present?
+              active_step.update(active: false)
+              next_step.update(active: true)
+            end
+          else
+            step_to_activate = steps.first
+            if active_step != step_to_activate
+              active_step&.update(active: false)
+              step_to_activate.update(active: true)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/participatory_process.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   # Interaction between a user and an organization is done via a
-  # ParticipatoryProcess. It's a unit of action from the Organization point of
+  # ParticipatoryProcess. It is a unit of action from the Organization point of
   # view that groups several components (proposals, debates...) distributed in
   # steps that get enabled or disabled depending on which step is currently
   # active.
@@ -93,7 +93,7 @@ module Decidim
             sanitize_sql_array(
               [
                 "ABS(start_date - (CURRENT_DATE at time zone :timezone)::date)",
-                { timezone: timezone }
+                { timezone: }
               ]
             )
           )
@@ -101,7 +101,7 @@ module Decidim
       end
     }
 
-    scope :with_type, ->(type_id) { where(decidim_participatory_process_type_id: type_id) }
+    scope :with_any_type, ->(*type_ids) { where(decidim_participatory_process_type_id: type_ids) }
 
     searchable_fields({
                         scope_id: :decidim_scope_id,
@@ -122,7 +122,7 @@ module Decidim
       where(promoted: true)
     end
 
-    # Return processes that DON'T belong to a process group.
+    # Return processes that DO NOT belong to a process group.
     def self.groupless
       where(decidim_participatory_process_group_id: nil)
     end
@@ -207,7 +207,7 @@ module Decidim
     ransacker_i18n :title
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_date, :with_area, :with_any_scope, :with_type]
+      [:with_date, :with_any_area, :with_any_scope, :with_any_type]
     end
   end
 end

data/app/models/decidim/participatory_process_group.rb

@@ -33,5 +33,9 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessGroupPresenter
     end
+
+    def self.participatory_spaces(group_id)
+      find(group_id).participatory_processes
+    end
   end
 end

data/app/models/decidim/participatory_process_user_role.rb

@@ -6,47 +6,18 @@ module Decidim
   class ParticipatoryProcessUserRole < ApplicationRecord
     include Traceable
     include Loggable
+    include ParticipatorySpaceUser
 
-    belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User", optional: true
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess", optional: true
-
     alias participatory_space participatory_process
 
-    ROLES = %w(admin collaborator moderator valuator).freeze
-    validates :role, inclusion: { in: ROLES }, uniqueness: { scope: [:user, :participatory_process] }
-    validate :user_and_participatory_process_same_organization
+    scope :for_space, ->(participatory_space) { where(participatory_process: participatory_space) }
+
+    validates :role, inclusion: { in: ParticipatorySpaceUser::ROLES }, uniqueness: { scope: [:user, :participatory_process] }
+    def target_space_association = :participatory_process
 
     def self.log_presenter_class_for(_log)
       Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessUserRolePresenter
     end
-
-    ransacker :name do
-      Arel.sql(%{("decidim_users"."name")::text})
-    end
-
-    ransacker :nickname do
-      Arel.sql(%{("decidim_users"."nickname")::text})
-    end
-
-    ransacker :email do
-      Arel.sql(%{("decidim_users"."email")::text})
-    end
-
-    ransacker :invitation_accepted_at do
-      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
-    end
-
-    ransacker :last_sign_in_at do
-      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
-    end
-
-    private
-
-    # Private: check if the process and the user have the same organization
-    def user_and_participatory_process_same_organization
-      return if !participatory_process || !user
-
-      errors.add(:participatory_process, :invalid) unless user.organization == participatory_process.organization
-    end
   end
 end

data/app/packs/entrypoints/decidim_participatory_processes.js

@@ -1,4 +1,2 @@
-import "src/decidim/participatory_processes/filters"
-
 // Images
 require.context("../images", true)

data/app/packs/src/decidim/participatory_processes/admin/participatory_processes.js

@@ -6,13 +6,13 @@ $(() => {
   if ($(".edit_participatory_process, .new_participatory_process").length > 0) {
     $participatoryProcessScopeEnabled.on("change", (event) => {
       const checked = event.target.checked;
-      window.theDataPicker.enabled($participatoryProcessScopeId, checked);
+      $participatoryProcessScopeId.attr("disabled", !checked);
       if (checked === true) {
         $participatoryProcessScopeTypeId.removeAttr("disabled");
       } else {
         $participatoryProcessScopeTypeId.attr("disabled", true)
       }
+      $participatoryProcessScopeId.attr("disabled", !$participatoryProcessScopeEnabled.prop("checked"));
     })
-    window.theDataPicker.enabled($participatoryProcessScopeId, $participatoryProcessScopeEnabled.prop("checked"));
   }
 });