decidim-participatory_processes 0.20.0 → 0.23.1.rc1

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateParticipatoryProcessAdmin < Rectify::Command
+      class UpdateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -47,6 +47,8 @@ module Decidim
             { role: form.role },
             extra_info
           )
+
+          send_notification user_role.user
         end
       end
     end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def extra_filters
+            [:decidim_participatory_process_group_id_eq]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,10 @@ module Decidim
           current_participatory_process
         end
 
+        def manifest_name
+          current_participatory_process.manifest.name.to_s
+        end
+
         def after_export_path
           participatory_processes_path
         end

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

@@ -25,12 +25,13 @@ module Decidim
           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
 
             on(:invalid) do
               flash[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
+              render :new
             end
-            redirect_to participatory_process_user_roles_path(current_participatory_process)
           end
         end
 

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

@@ -7,18 +7,19 @@ module Decidim
       #
       class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
         include Decidim::Admin::ParticipatorySpaceAdminContext
+        include Decidim::ParticipatoryProcesses::Admin::Filterable
         participatory_space_admin_layout only: [:edit]
-        include Decidim::Paginable
 
         helper ProcessGroupsForSelectHelper
+        helper Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessHelper
 
-        helper_method :current_participatory_process, :current_participatory_space, :query
+        helper_method :current_participatory_process, :current_participatory_space, :process_group
 
         layout "decidim/admin/participatory_processes"
 
         def index
           enforce_permission_to :read, :process_list
-          @participatory_processes = collection
+          @participatory_processes = filtered_collection
         end
 
         def new
@@ -76,22 +77,11 @@ module Decidim
         private
 
         def process_group
-          @process_group ||= ParticipatoryProcessGroup.find_by(id: params[:group_id])
-        end
-
-        def participatory_processes
-          @participatory_processes ||= Rectify::Query.merge(
-            ParticipatoryProcessesWithUserRole.for(current_user),
-            ParticipatoryProcessesByGroup.for(process_group)
-          )
-        end
-
-        def query
-          @query ||= participatory_processes.ransack(params[:q])
+          @process_group ||= ParticipatoryProcessGroup.find_by(id: ransack_params[:decidim_participatory_process_group_id_eq])
         end
 
         def collection
-          @collection ||= paginate(query.result)
+          @collection ||= ParticipatoryProcessesWithUserRole.for(current_user)
         end
 
         def current_participatory_process

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

@@ -6,10 +6,17 @@ module Decidim
     # public layout.
     class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
-      participatory_space_layout only: [:show, :statistics]
+      participatory_space_layout only: [:show, :all_metrics]
       include FilterResource
 
-      helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :metrics, :default_date_filter
+      helper_method :collection,
+                    :promoted_participatory_processes,
+                    :participatory_processes,
+                    :stats,
+                    :metrics,
+                    :default_date_filter,
+                    :related_processes,
+                    :linked_assemblies
 
       def index
         raise ActionController::RoutingError, "Not Found" if published_processes.none?
@@ -22,8 +29,12 @@ module Decidim
         enforce_permission_to :read, :process, process: current_participatory_space
       end
 
-      def statistics
-        enforce_permission_to :read, :process, process: current_participatory_space
+      def all_metrics
+        if current_participatory_space.show_statistics
+          enforce_permission_to :read, :process, process: current_participatory_space
+        else
+          render status: :not_found
+        end
       end
 
       private
@@ -92,6 +103,18 @@ module Decidim
 
         "all"
       end
+
+      def related_processes
+        @related_processes ||=
+          current_participatory_space
+          .linked_participatory_space_resources(:participatory_processes, "related_processes")
+          .published
+          .all
+      end
+
+      def linked_assemblies
+        @linked_assemblies ||= current_participatory_space.linked_participatory_space_resources(:assembly, "included_participatory_processes").public_spaces
+      end
     end
   end
 end

data/app/controllers/decidim/participatory_processes/{participatory_process_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module ParticipatoryProcesses
-    class ParticipatoryProcessWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
       private
@@ -20,7 +20,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= participatory_process_participatory_process_widget_url(model)
+        @iframe_url ||= participatory_process_widget_url(model)
       end
     end
   end

data/app/events/decidim/participatory_process_role_assigned_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    include Decidim::Events::AuthorEvent
+
+    def notification_title
+      I18n.t("notification_title", i18n_options).html_safe
+    end
+
+    def i18n_role
+      I18n.t(extra["role"], "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
+    end
+
+    def i18n_options
+      {
+        resource_path: resource_path,
+        resource_title: resource_title,
+        resource_url: resource_url,
+        scope: event_name,
+        participatory_space_title: participatory_space_title,
+        participatory_space_url: participatory_space_url,
+        role: i18n_role
+      }
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
       #
       class ParticipatoryProcessForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         mimic :participatory_process
 
@@ -29,10 +30,13 @@ module Decidim
         attribute :area_id, Integer
         attribute :participatory_process_group_id, Integer
         attribute :scope_id, Integer
+        attribute :related_process_ids, Array[Integer]
+        attribute :scope_type_max_depth_id, Integer
 
         attribute :private_space, Boolean
         attribute :promoted, Boolean
         attribute :scopes_enabled, Boolean
+        attribute :show_metrics, Boolean
         attribute :show_statistics, Boolean
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
@@ -51,22 +55,26 @@ module Decidim
 
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :hero_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image, passthru: { to: Decidim::ParticipatoryProcess }
+        validates :hero_image, passthru: { to: Decidim::ParticipatoryProcess }
+
+        alias organization current_organization
 
         def map_model(model)
           self.scope_id = model.decidim_scope_id
           self.participatory_process_group_id = model.decidim_participatory_process_group_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
 
         def scope
           @scope ||= current_organization.scopes.find_by(id: scope_id)
         end
 
+        def scope_type_max_depth
+          @scope_type_max_depth ||= current_organization.scope_types.find_by(id: scope_type_max_depth_id)
+        end
+
         def area
           @area ||= current_organization.areas.find_by(id: area_id)
         end
@@ -75,6 +83,10 @@ module Decidim
           Decidim::ParticipatoryProcessGroup.find_by(id: participatory_process_group_id)
         end
 
+        def processes
+          @processes ||= Decidim::ParticipatoryProcess.where(organization: current_organization)
+        end
+
         private
 
         def organization_participatory_processes

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

@@ -8,6 +8,7 @@ module Decidim
       #
       class ParticipatoryProcessGroupForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         translatable_attribute :name, String
         translatable_attribute :description, String
@@ -20,7 +21,9 @@ module Decidim
 
         validates :name, :description, translatable_presence: true
 
-        validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image, passthru: { to: Decidim::ParticipatoryProcessGroup }
+
+        alias organization current_organization
       end
     end
   end

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

@@ -13,6 +13,9 @@ module Decidim
         # Accepted mime types
         # keys: are used for dynamic help text on admin form.
         # values: are used to validate the file format of imported document.
+        #
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.participatory_processes.admin.new_import.accepted_types when modifying this hash
         ACCEPTED_TYPES = {
           json: JSON_MIME_TYPE
         }.freeze

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

@@ -13,10 +13,12 @@ module Decidim
         attribute :email, String
         attribute :role, String
 
-        validates :email, :role, presence: true
-        validates :name, presence: true
+        validates :name, :email, :role, presence: true
         validates :role, inclusion: { in: Decidim::ParticipatoryProcessUserRole::ROLES }
 
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+        validate :admin_uniqueness
+
         def roles
           Decidim::ParticipatoryProcessUserRole::ROLES.map do |role|
             [
@@ -25,6 +27,10 @@ module Decidim
             ]
           end
         end
+
+        def admin_uniqueness
+          errors.add(:email, :taken) if context && context.current_organization && context.current_organization.admins.where(email: email).exists?
+        end
       end
     end
   end

data/app/functions/decidim/participatory_processes/participatory_process_finder.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # Adds slug finder for participatory_processes
+    class ParticipatoryProcessFinder < Decidim::Core::ParticipatorySpaceFinder
+      argument :slug, types.String, "The slug of the participatory process"
+    end
+  end
+end

data/app/functions/decidim/participatory_processes/participatory_process_list.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # Adds some filter values for participatory_processes
+    class ParticipatoryProcessList < Decidim::Core::ParticipatorySpaceListBase
+      argument :filter, ParticipatoryProcessInputFilter, "This argument let's you filter the results"
+      argument :order, ParticipatoryProcessInputSort, "This argument let's you order the results"
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # Helpers related to the Admin of Participatory Process layout.
+      module ParticipatoryProcessHelper
+        def scope_type_depth_select_options
+          {
+            include_blank: true,
+            selected: current_participatory_process.try(:decidim_scope_type_id)
+          }
+        end
+
+        def scope_type_depth_select_html_options
+          html_options = {}
+          html_options[:disabled] = "disabled" unless current_participatory_process.try(:scopes_enabled)
+          html_options
+        end
+      end
+    end
+  end
+end

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

@@ -21,6 +21,17 @@ module Decidim
         dates = [participatory_process_step.start_date, participatory_process_step.end_date]
         dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
       end
+
+      # Public: Returns the path for the participatory process cta button
+      #
+      # Returns a String with path.
+      def participatory_process_cta_path(process)
+        return participatory_process_path(process) if process.active_step&.cta_path.blank?
+
+        path, params = participatory_process_path(process).split("?")
+
+        "#{path}/#{process.active_step.cta_path}" + (params.present? ? "?#{params}" : "")
+      end
     end
   end
 end

data/app/models/decidim/participatory_process.rb

@@ -11,7 +11,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
@@ -19,6 +19,11 @@ module Decidim
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
+                        :target, :participatory_scope, :participatory_structure, :announcement
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -49,6 +54,10 @@ module Decidim
              foreign_type: "decidim_participatory_space_type",
              dependent: :destroy,
              as: :participatory_space
+    belongs_to :scope_type_max_depth,
+               foreign_key: "decidim_scope_type_id",
+               class_name: "Decidim::ScopeType",
+               optional: true
 
     has_many :components, as: :participatory_space, dependent: :destroy
 
@@ -57,7 +66,10 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
@@ -149,9 +161,20 @@ module Decidim
       "#{admin_module_name}::Moderators".constantize.for(self)
     end
 
+    def user_roles(role_name = nil)
+      roles = Decidim::ParticipatoryProcessUserRole.where(participatory_process: self)
+      return roles if role_name.blank?
+
+      roles.where(role: role_name)
+    end
+
+    def attachment_context
+      :admin
+    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))
+      Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
     end
   end
 end