decidim-participatory_processes 0.30.2 → 0.31.0.rc1

data/app/commands/decidim/participatory_processes/admin/{copy_participatory_process.rb → duplicate_participatory_process.rb}

@@ -3,9 +3,9 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command with all the business logic when copying a new participatory
+      # A command with all the business logic when duplicating a new participatory
       # process in the system.
-      class CopyParticipatoryProcess < Decidim::Command
+      class DuplicateParticipatoryProcess < Decidim::Command
         delegate :current_user, to: :form
         # Public: Initializes the command.
         #
@@ -27,28 +27,27 @@ module Decidim
 
           Decidim.traceability.perform_action!("duplicate", @participatory_process, current_user) do
             ParticipatoryProcess.transaction do
-              copy_participatory_process
-              copy_participatory_process_attachments
-              copy_participatory_process_steps if @form.copy_steps?
-              copy_participatory_process_components if @form.copy_components?
-              copy_landing_page_blocks if @form.copy_landing_page_blocks?
+              duplicate_participatory_process
+              duplicate_participatory_process_attachments
+              duplicate_participatory_process_steps if @form.duplicate_steps?
+              duplicate_participatory_process_components if @form.duplicate_components?
+              duplicate_landing_page_blocks if @form.duplicate_landing_page_blocks?
             end
           end
 
-          broadcast(:ok, @copied_process)
+          broadcast(:ok, @duplicated_process)
         end
 
         private
 
         attr_reader :form
 
-        def copy_participatory_process
-          @copied_process = ParticipatoryProcess.create!(
+        def duplicate_participatory_process
+          @duplicated_process = ParticipatoryProcess.create!(
             organization: @participatory_process.organization,
             title: form.title,
             subtitle: @participatory_process.subtitle,
             slug: form.slug,
-            hashtag: @participatory_process.hashtag,
             description: @participatory_process.description,
             short_description: @participatory_process.short_description,
             promoted: @participatory_process.promoted,
@@ -66,13 +65,13 @@ module Decidim
           )
         end
 
-        def copy_participatory_process_attachments
+        def duplicate_participatory_process_attachments
           return unless @participatory_process.attached_uploader(:hero_image).attached?
 
-          @copied_process.send(:hero_image).attach(@participatory_process.send(:hero_image).blob)
+          @duplicated_process.send(:hero_image).attach(@participatory_process.send(:hero_image).blob)
         end
 
-        def copy_participatory_process_steps
+        def duplicate_participatory_process_steps
           @steps_relationship = {}
 
           @participatory_process.steps.each do |step|
@@ -81,7 +80,7 @@ module Decidim
               description: step.description,
               start_date: step.start_date,
               end_date: step.end_date,
-              participatory_process: @copied_process,
+              participatory_process: @duplicated_process,
               position: step.position,
               active: step.active
             )
@@ -89,18 +88,18 @@ module Decidim
           end
         end
 
-        def copy_participatory_process_components
+        def duplicate_participatory_process_components
           @participatory_process.components.each do |component|
-            copied_step_settings = @form.copy_steps? ? map_step_settings(component.step_settings) : {}
+            duplicated_step_settings = @form.duplicate_steps? ? map_step_settings(component.step_settings) : {}
             new_component = Component.create!(
               manifest_name: component.manifest_name,
               name: component.name,
-              participatory_space: @copied_process,
+              participatory_space: @duplicated_process,
               settings: component.settings,
-              step_settings: copied_step_settings,
+              step_settings: duplicated_step_settings,
               weight: component.weight
             )
-            component.manifest.run_hooks(:copy, new_component:, old_component: component)
+            component.manifest.run_hooks(:duplicate, new_component:, old_component: component)
           end
         end
 
@@ -110,26 +109,26 @@ module Decidim
           end
         end
 
-        def copy_landing_page_blocks
+        def duplicate_landing_page_blocks
           blocks = Decidim::ContentBlock.where(scoped_resource_id: @participatory_process.id, scope_name: "participatory_process_homepage",
                                                organization: @participatory_process.organization)
           return if blocks.blank?
 
           blocks.each do |block|
             new_block = Decidim::ContentBlock.create!(
-              organization: @copied_process.organization,
+              organization: @duplicated_process.organization,
               scope_name: "participatory_process_homepage",
-              scoped_resource_id: @copied_process.id,
+              scoped_resource_id: @duplicated_process.id,
               manifest_name: block.manifest_name,
               settings: block.settings,
               weight: block.weight,
-              published_at: block.published_at.present? ? @copied_process.created_at : nil # determine if block is active/inactive
+              published_at: block.published_at.present? ? @duplicated_process.created_at : nil # determine if block is active/inactive
             )
-            copy_block_attachments(block, new_block) if block.attachments.present?
+            duplicate_block_attachments(block, new_block) if block.attachments.present?
           end
         end
 
-        def copy_block_attachments(block, new_block)
+        def duplicate_block_attachments(block, new_block)
           block.attachments.map(&:name).each do |name|
             original_image = block.images_container.send(name).blob
             next if original_image.blank?

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command with all the business logic when copying a new participatory
+      # A command with all the business logic when duplicating a new participatory
       # process in the system.
       class ImportParticipatoryProcess < Decidim::Command
         delegate :current_user, to: :form

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

@@ -8,12 +8,24 @@ module Decidim
       class UpdateParticipatoryProcess < Decidim::Commands::UpdateResource
         fetch_file_attributes :hero_image
 
-        fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :promoted, :description,
-                              :short_description, :taxonomizations,
-                              :private_space, :developer_group, :local_area, :target, :participatory_scope,
-                              :participatory_structure, :meta_scope, :start_date, :end_date, :participatory_process_group,
+        fetch_form_attributes :title, :subtitle, :weight, :slug, :promoted,
+                              :taxonomizations, :private_space, :developer_group, :local_area,
+                              :target, :participatory_scope, :participatory_structure,
+                              :meta_scope, :start_date, :end_date, :participatory_process_group,
                               :announcement
 
+        protected
+
+        def attributes
+          parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
+          parsed_short_description = Decidim::ContentProcessor.parse(form.short_description, current_organization: form.current_organization).rewrite
+
+          super.merge(
+            description: parsed_description,
+            short_description: parsed_short_description
+          )
+        end
+
         private
 
         def related_processes

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

@@ -8,7 +8,7 @@ module Decidim
       class UpdateParticipatoryProcessGroup < Decidim::Commands::UpdateResource
         fetch_file_attributes :hero_image
 
-        fetch_form_attributes :title, :description, :hashtag, :group_url, :developer_group, :local_area,
+        fetch_form_attributes :title, :description, :group_url, :developer_group, :local_area,
                               :meta_scope, :participatory_scope, :participatory_structure, :target, :promoted
 
         private

data/app/controllers/decidim/participatory_processes/admin/{participatory_process_copies_controller.rb → participatory_process_duplicates_controller.rb}

@@ -5,27 +5,27 @@ module Decidim
     module Admin
       # Controller that allows managing participatory processes.
       #
-      class ParticipatoryProcessCopiesController < Decidim::Admin::ApplicationController
+      class ParticipatoryProcessDuplicatesController < Decidim::Admin::ApplicationController
         include Concerns::ParticipatoryProcessAdmin
 
         def new
           enforce_permission_to :create, :process
-          @form = form(ParticipatoryProcessCopyForm).from_model(current_participatory_process)
+          @form = form(ParticipatoryProcessDuplicateForm).from_model(current_participatory_process)
         end
 
         def create
           enforce_permission_to :create, :process
-          @form = form(ParticipatoryProcessCopyForm).from_params(params)
+          @form = form(ParticipatoryProcessDuplicateForm).from_params(params)
 
-          CopyParticipatoryProcess.call(@form, current_participatory_process) do
+          DuplicateParticipatoryProcess.call(@form, current_participatory_process) do
             on(:ok) do
-              flash[:notice] = I18n.t("participatory_processes_copies.create.success", scope: "decidim.admin")
+              flash[:notice] = I18n.t("participatory_processes_duplicates.create.success", scope: "decidim.admin")
               redirect_to participatory_processes_path
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("participatory_processes_copies.create.error", scope: "decidim.admin")
-              render :new
+              flash.now[:alert] = I18n.t("participatory_processes_duplicates.create.error", scope: "decidim.admin")
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -43,6 +43,10 @@ module Decidim
 
         alias participatory_process_group scoped_resource
 
+        def content_blocks_title
+          t("decidim.admin.menu.participatory_process_groups_submenu.landing_page")
+        end
+
         private
 
         def collection

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

@@ -36,7 +36,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_processes_group.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -61,7 +61,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_groups.update.error", scope: "decidim.admin")
-              render :edit, layout: "decidim/admin/participatory_process_group"
+              render :edit, layout: "decidim/admin/participatory_process_group", status: :unprocessable_entity
             end
           end
         end
@@ -78,7 +78,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_groups.destroy.error", scope: "decidim.admin")
-              render :index
+              render :index, status: :unprocessable_entity
             end
           end
         end

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

@@ -25,7 +25,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_imports.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end

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

@@ -31,6 +31,10 @@ module Decidim
         def resource_content_block_cell
           "decidim/participatory_processes/content_block"
         end
+
+        def content_blocks_title
+          t("decidim.admin.menu.participatory_processes_submenu.landing_page")
+        end
       end
     end
   end

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

@@ -32,7 +32,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_steps.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -54,7 +54,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_process_steps.update.error", scope: "decidim.admin")
-              render :edit
+              render :edit, status: :unprocessable_entity
             end
           end
         end

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

@@ -42,7 +42,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_processes.create.error", scope: "decidim.admin")
-              render :new
+              render :new, status: :unprocessable_entity
             end
           end
         end
@@ -68,12 +68,12 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("participatory_processes.update.error", scope: "decidim.admin")
-              render :edit, layout: "decidim/admin/participatory_process"
+              render :edit, layout: "decidim/admin/participatory_process", status: :unprocessable_entity
             end
           end
         end
 
-        def copy
+        def duplicate
           enforce_permission_to :create, Decidim::ParticipatoryProcess
         end
 

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

@@ -14,7 +14,6 @@ module Decidim
                     :promoted_collection,
                     :participatory_processes,
                     :stats,
-                    :metrics,
                     :participatory_process_group,
                     :default_date_filter,
                     :related_processes,
@@ -31,10 +30,6 @@ module Decidim
         enforce_permission_to :read, :process, process: current_participatory_space
       end
 
-      def all_metrics
-        enforce_permission_to :read, :process, process: current_participatory_space
-      end
-
       private
 
       def search_collection
@@ -110,10 +105,6 @@ module Decidim
         @stats ||= ParticipatoryProcessStatsPresenter.new(participatory_process: current_participatory_space)
       end
 
-      def metrics
-        @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space, view_context:)
-      end
-
       def participatory_process_group
         @participatory_process_group ||= current_participatory_space.participatory_process_group
       end

data/app/forms/decidim/participatory_processes/admin/{participatory_process_copy_form.rb → participatory_process_duplicate_form.rb}

@@ -3,10 +3,10 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A form object used to copy a participatory processes from the admin
+      # A form object used to duplicate a participatory processes from the admin
       # dashboard.
       #
-      class ParticipatoryProcessCopyForm < Form
+      class ParticipatoryProcessDuplicateForm < Form
         include TranslatableAttributes
 
         translatable_attribute :title, String
@@ -14,9 +14,9 @@ module Decidim
         mimic :participatory_process
 
         attribute :slug, String
-        attribute :copy_steps, Boolean
-        attribute :copy_components, Boolean
-        attribute :copy_landing_page_blocks, Boolean
+        attribute :duplicate_steps, Boolean
+        attribute :duplicate_components, Boolean
+        attribute :duplicate_landing_page_blocks, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true

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

@@ -25,7 +25,6 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :target, String
 
-        attribute :hashtag, String
         attribute :slug, String
 
         attribute :participatory_process_group_id, Integer
@@ -56,6 +55,8 @@ module Decidim
         def map_model(model)
           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)
+          self.description = model.presenter.editor_description(all_locales: true)
+          self.short_description = model.presenter.editor_short_description(all_locales: true)
           @processes = Decidim::ParticipatoryProcess.where(organization: model.organization).where.not(id: model.id)
         end
 

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

@@ -20,7 +20,6 @@ module Decidim
         translatable_attribute :target, String
 
         attribute :group_url, String
-        attribute :hashtag, String
         attribute :participatory_process_ids, Array[Integer]
 
         attribute :promoted, Boolean

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

@@ -11,6 +11,20 @@ module Decidim
       def component_name
         (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.menu.processes")
       end
+
+      def safe_content?
+        true
+      end
+
+      def safe_content_admin?
+        true
+      end
+
+      def render_rich_text(process, method)
+        sanitized = render_sanitized_content(process, method, presenter_class: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter)
+
+        Decidim::ContentProcessor.render_without_format(sanitized).html_safe
+      end
     end
   end
 end

data/app/models/decidim/participatory_process.rb

@@ -146,6 +146,10 @@ module Decidim
       Decidim::ParticipatoryProcesses::AdminLog::ParticipatoryProcessPresenter
     end
 
+    def presenter
+      @presenter ||= Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(self)
+    end
+
     def active?
       return false if start_date.blank?
 
@@ -173,10 +177,6 @@ module Decidim
       past?
     end
 
-    def hashtag
-      attributes["hashtag"].to_s.delete("#")
-    end
-
     def to_param
       slug
     end

data/app/models/decidim/participatory_process_group.rb

@@ -3,6 +3,7 @@
 module Decidim
   class ParticipatoryProcessGroup < ApplicationRecord
     include Decidim::Resourceable
+    include Decidim::Searchable
     include Decidim::Traceable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
@@ -23,6 +24,14 @@ module Decidim
     has_one_attached :hero_image
     validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
+    searchable_fields({
+                        participatory_space: :itself,
+                        A: :title,
+                        B: :description
+                      },
+                      index_on_create: ->(_process) { true },
+                      index_on_update: ->(_process) { true })
+
     # Scope to return only the promoted groups.
     #
     # Returns an ActiveRecord::Relation.

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

@@ -47,7 +47,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
-        valuator_action?
+        evaluator_action?
         process_admin_action?
         permission_action
       end
@@ -217,9 +217,9 @@ module Decidim
         allow! if permission_action.action == :preview
       end
 
-      # Valuators can only read the components of a process.
-      def valuator_action?
-        return unless can_manage_process?(role: :valuator)
+      # Evaluators can only read the components of a process.
+      def evaluator_action?
+        return unless can_manage_process?(role: :evaluator)
 
         allow! if permission_action.action == :read && permission_action.subject == :component
         allow! if permission_action.action == :export && permission_action.subject == :component_data

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

@@ -19,7 +19,6 @@ module Decidim
           {
             description: :i18n,
             developer_group: :i18n,
-            hashtag: :string,
             group_url: :string,
             local_area: :i18n,
             meta_scope: :i18n,

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

@@ -19,7 +19,6 @@ module Decidim
           {
             description: :i18n,
             developer_group: :i18n,
-            hashtag: :string,
             decidim_area_id: :area,
             local_area: :i18n,
             meta_scope: :i18n,