decidim-participatory_processes 0.29.2 → 0.30.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50006f44b95b80b2cc1d868b2931d9a91648dcf1d47e97caf4529fe5a584570d
-  data.tar.gz: d48192569d4f10ea0436170383d0e156401a46bbea492db3e6b933330eea171b
+  metadata.gz: b6a11e0c9f05b1eee643aca3a7b317175011cca2c55049260ec96b4cdfe6c9a6
+  data.tar.gz: 5d84912c0464f58ff2b0869fe2b60b61ec2915a0f84e0fd7f6ba30b17d0dae89
 SHA512:
-  metadata.gz: '09df640be6a53ed017f5bb3dc147e2895cafec7ebb68d572314784e6e6cce8f899a1162694259061941c26d776f66a6178f032b5ee5923607e0d24db5da4eb99'
-  data.tar.gz: 76ec597c5c7775cc4b365ada76ebe71ee6cb45265c6a75f65424f44441e2954f6fc28a77ffcf97ef3b78ad7bb56b906bbcd8ceb4be010dde38abb07c7aca6327
+  metadata.gz: ab8c8b2a1105c9b43abb305331ac209cd2e809af690e0d18f8d3d47a7d34a07ab70a328b446925321eb5c42201236e40f71dc2efd5e0e9ed2163c23be38613c9
+  data.tar.gz: 5555e5d11038508da1c4ac24faf2d24df7be04a8243f6ebaf81eed3bab9bb1be72519a8abc18c107fa138db5b470f248193c20f7aac1e64968e6b24d2f411788

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

@@ -25,11 +25,11 @@ module Decidim
     #   date_filter: "active"
     # )
     class ProcessFiltersCell < Decidim::ParticipatoryProcesses::ProcessFiltersCell
-      def filter_link(date_filter, type_filter = nil)
+      def filter_link(date_filter)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_process_group_path(model, **filter_params(date_filter, type_filter))
+          .participatory_process_group_path(model, **filter_params(date_filter))
       end
 
       def current_filter
@@ -52,13 +52,12 @@ module Decidim
         end
       end
 
-      def filtered_processes(date_filter, filter_with_type: true)
+      def filtered_processes(date_filter)
         query = base_relation.ransack(
           {
             with_date: date_filter,
             with_any_scope: get_filter(:with_any_scope),
-            with_any_area: get_filter(:with_any_area),
-            with_any_type: filter_with_type ? get_filter(:with_any_type) : nil
+            with_any_area: get_filter(:with_any_area)
           },
           current_user:,
           organization: current_organization

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_settings_form/show.erb

@@ -1,3 +1,3 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [6, 9, 12], prompt: "", label: %>
+  <%= settings_fields.number_field :max_results, label: %>
 <% end %>

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

@@ -20,11 +20,18 @@ module Decidim
         hash << "decidim/process_dropdown_metadata"
         hash << id
         hash << current_user.try(:id).to_s
+        hash << nav_items_hashes.join("-")
         hash << I18n.locale.to_s
 
         hash.join(Decidim.cache_key_separator)
       end
 
+      def nav_items_hashes
+        nav_items.map do |item|
+          item[:id]
+        end
+      end
+
       def step_title
         decidim_html_escape translated_attribute(process.active_step&.title)
       end

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

@@ -4,7 +4,6 @@
       <%= title %>
       <%= render :filter_tabs %>
     </h3>
-    <%= render :type_filter if participatory_process_types_for_select.present? %>
   </div>
   <hr>
 </div>

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

@@ -5,22 +5,17 @@ module Decidim
     class ProcessFiltersCell < Decidim::ViewModel
       ALL_FILTERS = %w(active upcoming past all).freeze
 
-      def filter_link(date_filter, type_filter = nil)
+      def filter_link(date_filter)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_processes_path(**filter_params(date_filter, type_filter))
+          .participatory_processes_path(**filter_params(date_filter))
       end
 
       def current_filter
         get_filter_in(:with_date, ALL_FILTERS, model[:default_filter])
       end
 
-      def current_type_filter_name
-        participatory_process_types_for_select.find { |_, id| id == get_filter(:with_any_type) }&.first ||
-          I18n.t("all_types", scope: "decidim.participatory_processes.participatory_processes.filters")
-      end
-
       def get_filter(filter_name, default = nil)
         params&.dig(:filter, filter_name) || default
       end
@@ -30,24 +25,22 @@ module Decidim
         options.include?(value) ? value : default
       end
 
-      def filter_params(date_filter, type_filter)
+      def filter_params(date_filter)
         {
           filter: {
             with_date: date_filter,
             with_any_scope: get_filter(:with_any_scope),
-            with_any_area: get_filter(:with_any_area),
-            with_any_type: type_filter || get_filter(:with_any_type)
+            with_any_area: get_filter(:with_any_area)
           }
         }
       end
 
-      def filtered_processes(date_filter, filter_with_type: true)
+      def filtered_processes(date_filter)
         query = ParticipatoryProcess.where(organization: current_organization).ransack(
           {
             with_date: date_filter,
             with_any_scope: get_filter(:with_any_scope),
-            with_any_area: get_filter(:with_any_area),
-            with_any_type: filter_with_type ? get_filter(:with_any_type) : nil
+            with_any_area: get_filter(:with_any_area)
           },
           current_user:
         ).result
@@ -86,10 +79,6 @@ module Decidim
         I18n.t(current_filter, scope: "decidim.participatory_processes.participatory_processes.filters.counters", count: process_count_by_filter[current_filter])
       end
 
-      def filter_type_label
-        I18n.t("filter_by", scope: "decidim.participatory_processes.participatory_processes.filters")
-      end
-
       def filter_name(filter)
         I18n.t(filter, scope: "decidim.participatory_processes.participatory_processes.filters.names")
       end
@@ -108,21 +97,6 @@ module Decidim
 
         "no_active_nor_upcoming"
       end
-
-      def participatory_process_types
-        @participatory_process_types ||= Decidim::ParticipatoryProcessType.joins(:processes).where(
-          decidim_participatory_processes: { id: filtered_processes(current_filter, filter_with_type: false) }
-        ).distinct
-      end
-
-      def participatory_process_types_for_select
-        return if participatory_process_types.blank?
-
-        [[I18n.t("all_types", scope: "decidim.participatory_processes.participatory_processes.filters"), ""]] +
-          participatory_process_types.map do |type|
-            [translated_attribute(type.title), type.id.to_s]
-          end
-      end
     end
   end
 end

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

@@ -30,7 +30,6 @@ module Decidim
               copy_participatory_process
               copy_participatory_process_attachments
               copy_participatory_process_steps if @form.copy_steps?
-              copy_participatory_process_categories if @form.copy_categories?
               copy_participatory_process_components if @form.copy_components?
             end
           end
@@ -52,10 +51,8 @@ module Decidim
             description: @participatory_process.description,
             short_description: @participatory_process.short_description,
             promoted: @participatory_process.promoted,
-            scope: @participatory_process.scope,
             developer_group: @participatory_process.developer_group,
             local_area: @participatory_process.local_area,
-            area: @participatory_process.area,
             target: @participatory_process.target,
             participatory_scope: @participatory_process.participatory_scope,
             participatory_structure: @participatory_process.participatory_structure,
@@ -63,7 +60,8 @@ module Decidim
             start_date: @participatory_process.start_date,
             end_date: @participatory_process.end_date,
             participatory_process_group: @participatory_process.participatory_process_group,
-            private_space: @participatory_process.private_space
+            private_space: @participatory_process.private_space,
+            taxonomies: @participatory_process.taxonomies
           )
         end
 
@@ -90,25 +88,6 @@ module Decidim
           end
         end
 
-        def copy_participatory_process_categories
-          @participatory_process.categories.first_class.each do |category|
-            new_category = Category.create!(
-              name: category.name,
-              description: category.description,
-              participatory_space: @copied_process
-            )
-
-            category.descendants.each do |child|
-              Category.create!(
-                name: child.name,
-                description: child.description,
-                participatory_space: @copied_process,
-                parent: new_category
-              )
-            end
-          end
-        end
-
         def copy_participatory_process_components
           @participatory_process.components.each do |component|
             copied_step_settings = @form.copy_steps? ? map_step_settings(component.step_settings) : {}

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

@@ -9,10 +9,10 @@ module Decidim
         fetch_file_attributes :hero_image
 
         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,
+                              :short_description, :promoted, :taxonomizations, :announcement,
+                              :private_space, :developer_group, :local_area, :target,
                               :participatory_scope, :participatory_structure, :meta_scope, :start_date, :end_date,
-                              :participatory_process_group, :participatory_process_type
+                              :participatory_process_group
 
         protected
 

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

@@ -42,7 +42,6 @@ module Decidim
             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?
               importer.import_components(original_process["components"]) if form.import_components?
               @imported_process

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

@@ -9,10 +9,10 @@ module Decidim
         fetch_file_attributes :hero_image
 
         fetch_form_attributes :title, :subtitle, :weight, :slug, :hashtag, :promoted, :description,
-                              :short_description, :scopes_enabled, :scope, :scope_type_max_depth,
-                              :private_space, :developer_group, :local_area, :area, :target, :participatory_scope,
+                              :short_description, :taxonomizations,
+                              :private_space, :developer_group, :local_area, :target, :participatory_scope,
                               :participatory_structure, :meta_scope, :start_date, :end_date, :participatory_process_group,
-                              :participatory_process_type, :announcement
+                              :announcement
 
         private
 

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # This controller allows sharing unpublished things.
+      # It is targeted for customizations for sharing unpublished things that lives under
+      # an process.
+      class ComponentShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::ParticipatoryProcessAdmin
+
+        def resource
+          @resource ||= current_participatory_space.components.find(params[:component_id])
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # This controller allows admins to manage moderations in a participatory process.
+      class ParticipatoryProcessShareTokensController < Decidim::Admin::ShareTokensController
+        include Concerns::ParticipatoryProcessAdmin
+
+        def resource
+          current_participatory_process
+        end
+      end
+    end
+  end
+end

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

@@ -8,13 +8,13 @@ module Decidim
       class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
         include Decidim::Admin::ParticipatorySpaceAdminContext
         include Decidim::ParticipatoryProcesses::Admin::Filterable
+        include Decidim::Admin::HasTrashableResources
 
         add_breadcrumb_item_from_menu :admin_participatory_process_menu, only: :show
 
         participatory_space_admin_layout only: [:edit]
 
         helper ProcessGroupsForSelectHelper
-        helper Decidim::ParticipatoryProcesses::Admin::ParticipatoryProcessHelper
 
         helper_method :current_participatory_process, :current_participatory_space, :process_group
 
@@ -79,6 +79,18 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :participatory_process
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= current_participatory_process
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection = filtered_collection.only_deleted.deleted_at_desc
+        end
+
         def process_group
           @process_group ||= ParticipatoryProcessGroup.find_by(id: ransack_params[:decidim_participatory_process_group_id_eq], organization: current_organization)
         end
@@ -88,8 +100,8 @@ module Decidim
         end
 
         def current_participatory_process
-          @current_participatory_process ||= collection.where(slug: params[:slug]).or(
-            collection.where(id: params[:slug])
+          @current_participatory_process ||= collection.with_deleted.where(slug: params[:slug]).or(
+            collection.with_deleted.where(id: params[:slug])
           ).first
         end
 

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

@@ -38,14 +38,12 @@ module Decidim
       private
 
       def search_collection
-        ParticipatoryProcess.where(organization: current_organization).published.visible_for(current_user).includes(:area)
+        ParticipatoryProcess.where(organization: current_organization).published.visible_for(current_user)
       end
 
       def default_filter_params
         {
-          with_any_scope: nil,
-          with_any_area: nil,
-          with_any_type: nil,
+          with_any_taxonomies: nil,
           with_date: default_date_filter
         }
       end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ParticipatorySpacePrivateUsersController < Decidim::ParticipatoryProcesses::ApplicationController
+      include ParticipatorySpaceContext
+      include Decidim::HasMembersPage
+
+      def index
+        raise ActionController::RoutingError, "No members for this participatory process" if members.none?
+
+        enforce_permission_to :list, :members
+        redirect_to decidim_participatory_processes.participatory_process_path(current_participatory_space) unless can_visit_index?
+      end
+
+      private
+
+      def current_participatory_space
+        return unless params[:participatory_process_slug]
+
+        @current_participatory_space ||= OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: params[:participatory_process_slug]).or(
+          OrganizationParticipatoryProcesses.new(current_organization).query.where(id: params[:participatory_process_slug])
+        ).first!
+      end
+    end
+  end
+end

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

@@ -15,7 +15,6 @@ module Decidim
 
         attribute :slug, String
         attribute :copy_steps, Boolean
-        attribute :copy_categories, Boolean
         attribute :copy_components, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }

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

@@ -9,6 +9,7 @@ module Decidim
       class ParticipatoryProcessForm < Form
         include TranslatableAttributes
         include Decidim::HasUploadValidations
+        include Decidim::HasTaxonomyFormAttributes
 
         mimic :participatory_process
 
@@ -27,17 +28,12 @@ module Decidim
         attribute :hashtag, String
         attribute :slug, String
 
-        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 :weight, Integer, default: 0
 
         attribute :private_space, Boolean
         attribute :promoted, Boolean
-        attribute :scopes_enabled, Boolean
-        attribute :participatory_process_type_id, Integer
 
         attribute :end_date, Decidim::Attributes::LocalizedDate
         attribute :start_date, Decidim::Attributes::LocalizedDate
@@ -45,8 +41,6 @@ module Decidim
         attribute :hero_image
         attribute :remove_hero_image, Boolean, default: false
 
-        validates :area, presence: true, if: proc { |object| object.area_id.present? }
-        validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
         validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
 
         validate :slug_uniqueness
@@ -60,49 +54,25 @@ module Decidim
         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.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
 
-        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)
+        def participatory_space_manifest
+          :participatory_processes
         end
 
         def participatory_process_group
           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

@@ -26,7 +26,6 @@ module Decidim
 
         attribute :slug, String
         attribute :import_steps, Boolean, default: true
-        attribute :import_categories, Boolean, default: true
         attribute :import_attachments, Boolean, default: true
         attribute :import_components, Boolean, default: true
         attribute :document, Decidim::Attributes::Blob

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

@@ -59,37 +59,45 @@ module Decidim
 
       # 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 = participatory_space
+                     .components
+                     .published.or(Decidim::Component.where(id: try(:current_component)))
+                     .where(visible: true)
 
-        components.map do |component|
+        [
+          *(if participatory_space.members_public_page?
+              [{
+                name: t("member_menu_item", scope: "layouts.decidim.participatory_process_navigation"),
+                url: decidim_participatory_processes.participatory_process_participatory_space_private_users_path(participatory_space),
+                active: is_active_link?(decidim_participatory_processes.participatory_process_participatory_space_private_users_path(participatory_space), :inclusive)
+              }]
+            end
+           )
+        ] + components.map do |component|
           {
+            id: component.id,
             name: decidim_escape_translated(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }
-        end
+        end.compact
       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
+        items = [
+          { method: :with_date, collection: filter_dates_values, label: t("decidim.participatory_processes.participatory_processes.filters.date"), id: "date" }
+        ]
+        available_taxonomy_filters.find_each do |taxonomy_filter|
+          items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                       collection: filter_taxonomy_values_for(taxonomy_filter),
+                       label: decidim_sanitize_translated(taxonomy_filter.name),
+                       id: "taxonomy")
+        end
+        items.reject { |item| item[:collection].blank? }
       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)
+      def available_taxonomy_filters
+        Decidim::TaxonomyFilter.for(current_organization).for_manifest(:participatory_processes)
       end
 
       def filter_dates_values

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

@@ -16,7 +16,7 @@ module Decidim
           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)
+            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)

data/app/models/decidim/participatory_process.rb

@@ -12,6 +12,7 @@ module Decidim
     include Decidim::Participable
     include Decidim::Publicable
     include Decidim::ScopableParticipatorySpace
+    include Decidim::Taxonomizable
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
@@ -23,6 +24,8 @@ module Decidim
     include Decidim::TranslatableResource
     include Decidim::HasArea
     include Decidim::FilterableResource
+    include Decidim::SoftDeletable
+    include Decidim::ShareableWithToken
 
     translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
                         :target, :participatory_scope, :participatory_structure, :announcement
@@ -98,8 +101,6 @@ module Decidim
       end
     }
 
-    scope :with_any_type, ->(*type_ids) { where(decidim_participatory_process_type_id: type_ids) }
-
     searchable_fields({
                         scope_id: :decidim_scope_id,
                         participatory_space: :itself,
@@ -200,11 +201,26 @@ module Decidim
       :admin
     end
 
+    def shareable_url(share_token)
+      EngineRouter.main_proxy(self).participatory_process_url(self, share_token: share_token.token)
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker_i18n :title
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_date, :with_any_area, :with_any_scope, :with_any_type]
+      [:with_date, :with_any_taxonomies]
+    end
+
+    def self.ransackable_attributes(auth_object = nil)
+      base = %w(title short_description description id)
+      return base unless auth_object&.admin?
+
+      base + %w(private_space published_at decidim_participatory_process_group_id)
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w(participatory_process_type participatory_process_group taxonomies)
     end
   end
 end