decidim-participatory_processes 0.28.2 → 0.29.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d07c02ed3c00dd29897ccfbbbec0a2d526525758f5301e8adae5b2ea74baafef
-  data.tar.gz: a7b906037157e287a4d3501562fa553be5f667d5b45b6ae4aab6115d3b6e3920
+  metadata.gz: b84cba31d60663fcc0d5019de35f7c4329d09e4e2153294eb010368d17af16ee
+  data.tar.gz: e673a844e3df55d1490f1cbe47cde4eeddbb93194dee57a99de1f5d394e35214
 SHA512:
-  metadata.gz: 4090af8da92aa6012fff7bb562049ad2a80e2bbb9f040ed2acabc18397a8b278f8f4229e860ff38506de8197bb8ef341d1bc383e13d997e0383b21dcc7656752
-  data.tar.gz: ec11735ab658b1f4ee0a0d800bd244b023ecb819350250fee2c5fe57c744d7e82c6a44465e6c3d7308b4120f67753fe860ea23463fc739805a5174685c7959ad
+  metadata.gz: 765151861f1ac86aa53205108476869605ad71a4fb21b5c3019951e17e16e8e9176bd6259ddf72115159f169ae89375cd748eb05b601cc40e0eef287b2a7e255
+  data.tar.gz: 0ed036e6c2c8e2516152f3c3d31976640a7536a6a178537d47b51a36295124fa3b7243adc59f37e28782d8313469047f7cf32c2e9444e6b2f71a805876938119

data/app/cells/decidim/participatory_process_groups/content_blocks/extra_data_cell.rb

@@ -15,7 +15,7 @@ module Decidim
         end
 
         def developer_group_item
-          return if (text = decidim_sanitize translated_attribute(developer_group)).blank?
+          return if (text = decidim_sanitize_translated(developer_group)).blank?
 
           {
             title: t("decidim.participatory_process_groups.content_blocks.extra_data.developer_group"),
@@ -25,7 +25,7 @@ module Decidim
         end
 
         def target_item
-          return if (text = decidim_sanitize translated_attribute(target)).blank?
+          return if (text = decidim_sanitize_translated(target)).blank?
 
           {
             title: t("decidim.participatory_process_groups.content_blocks.extra_data.target"),
@@ -35,7 +35,7 @@ module Decidim
         end
 
         def participatory_scope_item
-          return if (text = decidim_sanitize translated_attribute(participatory_scope)).blank?
+          return if (text = decidim_sanitize_translated(participatory_scope)).blank?
 
           {
             title: t("decidim.participatory_process_groups.content_blocks.extra_data.participatory_scope"),
@@ -45,7 +45,7 @@ module Decidim
         end
 
         def participatory_structure_item
-          return if (text = decidim_sanitize translated_attribute(participatory_structure)).blank?
+          return if (text = decidim_sanitize_translated(participatory_structure)).blank?
 
           {
             title: t("decidim.participatory_process_groups.content_blocks.extra_data.participatory_structure"),

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb

@@ -4,8 +4,6 @@ module Decidim
   module ParticipatoryProcesses
     module ContentBlocks
       class HighlightedProcessesCell < Decidim::ContentBlocks::HighlightedParticipatorySpacesCell
-        delegate :current_user, to: :controller
-
         def highlighted_spaces
           @highlighted_spaces ||= promoted_groups + highlighted_processes
         end

data/app/cells/decidim/participatory_processes/content_blocks/stats_cell.rb

@@ -9,7 +9,7 @@ module Decidim
         private
 
         def stats
-          @stats ||= resource.show_statistics && ParticipatoryProcessStatsPresenter.new(participatory_process: resource).collection
+          @stats ||= ParticipatoryProcessStatsPresenter.new(participatory_process: resource).collection
         end
       end
     end

data/app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb

@@ -1,7 +1,7 @@
-<span class="order-by__tabs ml-s">
+<span>
   <% if should_show_tabs? %>
     <%= explanation %>
-    <span class="muted mr-xs"><%= t("decidim.participatory_processes.participatory_processes.filters.see") %></span>
+    <span><%= t("decidim.participatory_processes.participatory_processes.filters.see") %></span>
     <% other_filters_with_value.each do |filter| %>
       <%= link_to filter_link(filter), remote: true, class: "order-by__tab" do %>
         <strong>

data/app/cells/decidim/participatory_processes/process_filters/show.erb

@@ -6,7 +6,7 @@
     </h3>
     <%= render :type_filter if participatory_process_types_for_select.present? %>
   </div>
-  <hr class="mt-s mb-s">
+  <hr>
 </div>
 <% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
   <div class="row column">

data/app/cells/decidim/participatory_processes/process_filters/type_filter.erb

@@ -1,4 +1,4 @@
-<div id="process-type-filter" class="inline-filters">
+<div id="process-type-filter">
   <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
     <ul>
       <% participatory_process_types_for_select.each do |title, id| %>

data/app/cells/decidim/participatory_processes/process_filters_cell.rb

@@ -99,8 +99,7 @@ module Decidim
 
         content_tag(
           :span,
-          I18n.t(explanation_text, scope: "decidim.participatory_processes.participatory_processes.filters.explanations"),
-          class: "muted mr-s ml-s"
+          I18n.t(explanation_text, scope: "decidim.participatory_processes.participatory_processes.filters.explanations")
         )
       end
 

data/app/cells/decidim/participatory_processes/process_group_s_cell.rb

@@ -7,8 +7,12 @@ module Decidim
     class ProcessGroupSCell < Decidim::CardSCell
       private
 
+      def resource_path
+        Decidim::ParticipatoryProcesses::Engine.routes.url_helpers.participatory_process_group_path(model)
+      end
+
       def metadata_cell
-        "decidim/participatory_processes/process_metadata"
+        "decidim/participatory_processes/process_group_metadata"
       end
     end
   end

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

@@ -6,14 +6,14 @@ module Decidim
       # A command with all the business logic when copying a new participatory
       # process in the system.
       class CopyParticipatoryProcess < Decidim::Command
+        delegate :current_user, to: :form
         # Public: Initializes the command.
         #
         # form - A form object with the params.
         # participatory_process - A participatory_process we want to duplicate
-        def initialize(form, participatory_process, current_user)
+        def initialize(form, participatory_process)
           @form = form
           @participatory_process = participatory_process
-          @current_user = current_user
         end
 
         # Executes the command. Broadcasts these events:
@@ -25,7 +25,7 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          Decidim.traceability.perform_action!("duplicate", @participatory_process, @current_user) do
+          Decidim.traceability.perform_action!("duplicate", @participatory_process, current_user) do
             ParticipatoryProcess.transaction do
               copy_participatory_process
               copy_participatory_process_attachments
@@ -68,11 +68,9 @@ module Decidim
         end
 
         def copy_participatory_process_attachments
-          [:hero_image, :banner_image].each do |attribute|
-            next unless @participatory_process.attached_uploader(attribute).attached?
+          return unless @participatory_process.attached_uploader(:hero_image).attached?
 
-            @copied_process.send(attribute).attach(@participatory_process.send(attribute).blob)
-          end
+          @copied_process.send(:hero_image).attach(@participatory_process.send(:hero_image).blob)
         end
 
         def copy_participatory_process_steps

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

@@ -5,118 +5,46 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class CreateParticipatoryProcess < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          create_participatory_process
-
-          if process.persisted?
-            add_admins_as_followers(process)
-            link_related_processes
-            Decidim::ContentBlocksCreator.new(process).create_default!
-
-            broadcast(:ok, process)
-          else
-            form.errors.add(:hero_image, process.errors[:hero_image]) if process.errors.include? :hero_image
-            form.errors.add(:banner_image, process.errors[:banner_image]) if process.errors.include? :banner_image
-            broadcast(:invalid)
-          end
-        end
+      class CreateParticipatoryProcess < Decidim::Commands::CreateResource
+        fetch_file_attributes :hero_image
 
-        private
+        fetch_form_attributes :organization, :title, :subtitle, :weight, :slug, :hashtag, :description,
+                              :short_description, :promoted, :scopes_enabled, :scope, :announcement,
+                              :scope_type_max_depth, :private_space, :developer_group, :local_area, :area, :target,
+                              :participatory_scope, :participatory_structure, :meta_scope, :start_date, :end_date,
+                              :participatory_process_group, :participatory_process_type
 
-        attr_reader :form, :process
+        protected
 
-        def create_participatory_process
-          @process = ParticipatoryProcess.new
-          @process.assign_attributes(attributes)
-
-          return process unless process.valid?
-
-          transaction do
-            process.save!
-
-            log_process_creation(process)
-
-            process.steps.create!(
-              title: TranslationsHelper.multi_translation(
-                "decidim.admin.participatory_process_steps.default_title",
-                form.current_organization.available_locales
-              ),
-              active: true
-            )
-
-            process
-          end
+        def run_after_hooks
+          create_steps
+          add_admins_as_followers
+          link_related_processes
+          Decidim::ContentBlocksCreator.new(resource).create_default!
         end
 
-        def attributes
-          {
-            organization: form.current_organization,
-            title: form.title,
-            subtitle: form.subtitle,
-            weight: form.weight,
-            slug: form.slug,
-            hashtag: form.hashtag,
-            description: form.description,
-            short_description: form.short_description,
-            hero_image: form.hero_image,
-            banner_image: form.banner_image,
-            promoted: form.promoted,
-            scopes_enabled: form.scopes_enabled,
-            scope: form.scope,
-            scope_type_max_depth: form.scope_type_max_depth,
-            private_space: form.private_space,
-            developer_group: form.developer_group,
-            local_area: form.local_area,
-            area: form.area,
-            target: form.target,
-            participatory_scope: form.participatory_scope,
-            participatory_structure: form.participatory_structure,
-            meta_scope: form.meta_scope,
-            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
-          }
-        end
+        def resource_class = Decidim::ParticipatoryProcess
 
-        def log_process_creation(process)
-          Decidim::ActionLogger.log(
-            "create",
-            form.current_user,
-            process,
-            process.versions.last.id
+        def create_steps
+          resource.steps.create!(
+            title: TranslationsHelper.multi_translation(
+              "decidim.admin.participatory_process_steps.default_title",
+              form.current_organization.available_locales
+            ),
+            active: true
           )
         end
 
-        def add_admins_as_followers(process)
-          process.organization.admins.each do |admin|
+        def add_admins_as_followers
+          resource.organization.admins.each do |admin|
             form = Decidim::FollowForm
-                   .from_params(followable_gid: process.to_signed_global_id.to_s)
+                   .from_params(followable_gid: resource.to_signed_global_id.to_s)
                    .with_context(
-                     current_organization: process.organization,
+                     current_organization: resource.organization,
                      current_user: admin
                    )
 
-            Decidim::CreateFollow.new(form, admin).call
+            Decidim::CreateFollow.new(form).call
           end
         end
 
@@ -125,7 +53,7 @@ module Decidim
         end
 
         def link_related_processes
-          process.link_participatory_space_resources(related_processes, "related_processes")
+          resource.link_participatory_space_resources(related_processes, "related_processes")
         end
       end
     end

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

@@ -5,65 +5,22 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process group in the system.
-      class CreateParticipatoryProcessGroup < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      class CreateParticipatoryProcessGroup < Decidim::Commands::CreateResource
+        fetch_file_attributes :hero_image
 
-          group = create_participatory_process_group
+        fetch_form_attributes :organization, :title, :description, :hashtag, :group_url, :target, :promoted,
+                              :developer_group, :local_area, :meta_scope, :participatory_scope, :participatory_structure
 
-          if group.persisted?
-            Decidim::ContentBlocksCreator.new(group).create_default!
+        protected
 
-            broadcast(:ok, group)
-          else
-            form.errors.add(:hero_image, group.errors[:hero_image]) if group.errors.include? :hero_image
-            form.errors.add(:banner_image, group.errors[:banner_image]) if group.errors.include? :banner_image
-            broadcast(:invalid)
-          end
+        def run_after_hooks
+          Decidim::ContentBlocksCreator.new(resource).create_default!
         end
 
-        private
-
-        attr_reader :form
+        def resource_class = Decidim::ParticipatoryProcessGroup
 
-        def create_participatory_process_group
-          transaction do
-            Decidim.traceability.perform_action!(
-              "create",
-              ParticipatoryProcessGroup,
-              form.current_user
-            ) do
-              ParticipatoryProcessGroup.create(
-                organization: form.current_organization,
-                title: form.title,
-                description: form.description,
-                hashtag: form.hashtag,
-                group_url: form.group_url,
-                hero_image: form.hero_image, # Keep after organization
-                participatory_processes:,
-                developer_group: form.developer_group,
-                local_area: form.local_area,
-                meta_scope: form.meta_scope,
-                participatory_scope: form.participatory_scope,
-                participatory_structure: form.participatory_structure,
-                target: form.target,
-                promoted: form.promoted
-              )
-            end
-          end
+        def attributes
+          super.merge({ participatory_processes: })
         end
 
         def participatory_processes

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

@@ -4,47 +4,20 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when creating a new participatory
-      # process in the system.
-      class CreateParticipatoryProcessStep < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        # participatory_process - The ParticipatoryProcess that will hold the
-        #   step
-        def initialize(form, participatory_process)
-          @form = form
-          @participatory_process = participatory_process
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
+      # process step in the system.
+      class CreateParticipatoryProcessStep < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :description, :start_date, :end_date
 
-          create_participatory_process_step
-          broadcast(:ok)
+        def attributes
+          super.merge({
+                        participatory_process: form.current_participatory_space,
+                        active: form.current_participatory_space.steps.empty?
+                      })
         end
 
         private
 
-        attr_reader :form
-
-        def create_participatory_process_step
-          Decidim.traceability.create!(
-            ParticipatoryProcessStep,
-            @form.current_user,
-            title: form.title,
-            description: form.description,
-            start_date: form.start_date,
-            end_date: form.end_date,
-            participatory_process: @participatory_process,
-            active: @participatory_process.steps.empty?
-          )
-        end
+        def resource_class = Decidim::ParticipatoryProcessStep
       end
     end
   end

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

@@ -5,42 +5,12 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process type in the system.
-      class CreateParticipatoryProcessType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # form - A form object with the params.
-        def initialize(form)
-          @form = form
-        end
+      class CreateParticipatoryProcessType < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :organization
 
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid) if form.invalid?
+        protected
 
-          create_participatory_process_type!
-
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :form
-
-        def create_participatory_process_type!
-          transaction do
-            Decidim.traceability.create!(
-              Decidim::ParticipatoryProcessType,
-              form.current_user,
-              organization: form.current_organization,
-              title: form.title
-            )
-          end
-        end
+        def resource_class = Decidim::ParticipatoryProcessType
       end
     end
   end

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

@@ -3,48 +3,17 @@
 module Decidim
   module ParticipatoryProcesses
     module Admin
-      # A command that sets all steps in a participatory process as inactive
-      class DestroyParticipatoryProcessStep < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # step - A ParticipatoryProcessStep that will be deactivated
-        # current_user - the user performing the action
-        def initialize(step, current_user)
-          @step = step
-          @participatory_process = step.participatory_process
-          @current_user = current_user
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the data was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          return broadcast(:invalid, :active_step) if active_step?
-
-          transaction do
-            Decidim.traceability.perform_action!(:delete, step, current_user) do
-              step.destroy!
-              step
-            end
-
-            reorder_steps
-          end
-
-          broadcast(:ok)
-        end
-
+      # A command that deletes a participatory process step
+      class DestroyParticipatoryProcessStep < Decidim::Commands::DestroyResource
         private
 
-        attr_reader :step, :participatory_process, :current_user
+        def participatory_process = resource.participatory_space
 
-        def active_step?
-          participatory_process.steps.count > 1 && step.active?
+        def invalid?
+          participatory_process.steps.count > 1 && resource.active?
         end
 
-        def reorder_steps
+        def run_after_hooks
           steps = participatory_process.steps.reload
 
           ReorderParticipatoryProcessSteps

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

@@ -6,6 +6,7 @@ module Decidim
       # A command with all the business logic when copying a new participatory
       # process in the system.
       class ImportParticipatoryProcess < Decidim::Command
+        delegate :current_user, to: :form
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -36,10 +37,10 @@ module Decidim
         attr_reader :form
 
         def import_participatory_process
-          importer = Decidim::ParticipatoryProcesses::ParticipatoryProcessImporter.new(form.current_organization, form.current_user)
+          importer = Decidim::ParticipatoryProcesses::ParticipatoryProcessImporter.new(form.current_organization, current_user)
           participatory_processes.each do |original_process|
-            Decidim.traceability.perform_action!("import", Decidim::ParticipatoryProcess, form.current_user) do
-              @imported_process = importer.import(original_process, form.current_user, title: form.title, slug: form.slug)
+            Decidim.traceability.perform_action!("import", Decidim::ParticipatoryProcess, current_user) do
+              @imported_process = importer.import(original_process, current_user, title: form.title, slug: form.slug)
               importer.import_participatory_process_steps(original_process["participatory_process_steps"]) if form.import_steps?
               importer.import_categories(original_process["participatory_process_categories"]) if form.import_categories?
               importer.import_folders_and_attachments(original_process["attachments"]) if form.import_attachments?
@@ -66,7 +67,7 @@ module Decidim
                      current_user: admin
                    )
 
-            Decidim::CreateFollow.new(form, admin).call
+            Decidim::CreateFollow.new(form).call
           end
         end
       end