decidim-participatory_processes 0.29.3 → 0.30.0.rc1

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

@@ -3,8 +3,6 @@
 module Decidim
   module ParticipatoryProcesses
     class Permissions < Decidim::DefaultPermissions
-      include Decidim::UserRoleChecker
-
       def permissions
         user_can_enter_processes_space_area?
         user_can_enter_process_groups_space_area?
@@ -19,6 +17,7 @@ module Decidim
         if permission_action.scope == :public
           public_list_processes_action?
           public_list_process_groups_action?
+          public_list_members_action?
           public_read_process_group_action?
           public_read_process_action?
           return permission_action
@@ -37,11 +36,9 @@ module Decidim
         user_can_read_process_list?
         user_can_read_current_process?
         user_can_create_process?
-        user_can_upload_images_in_process?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
-        participatory_process_type_action?
 
         return permission_action unless process
 
@@ -51,6 +48,7 @@ module Decidim
         collaborator_action?
         valuator_action?
         process_admin_action?
+
         permission_action
       end
 
@@ -103,6 +101,13 @@ module Decidim
         allow!
       end
 
+      def public_list_members_action?
+        return unless permission_action.action == :list &&
+                      permission_action.subject == :members
+
+        allow!
+      end
+
       def public_read_process_group_action?
         return unless permission_action.action == :read &&
                       permission_action.subject == :process_group &&
@@ -119,6 +124,7 @@ module Decidim
         return disallow! unless can_view_private_space?
         return allow! if user&.admin?
         return allow! if process.published?
+        return allow! if user_can_preview_space?
 
         toggle_allow(can_manage_process?)
       end
@@ -231,7 +237,6 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
@@ -239,6 +244,7 @@ module Decidim
           :process_step,
           :process_user_role,
           :export_space,
+          :share_tokens,
           :import
         ].include?(permission_action.subject)
         allow! if is_allowed
@@ -250,7 +256,6 @@ module Decidim
         is_allowed = [
           :attachment,
           :attachment_collection,
-          :category,
           :component,
           :component_data,
           :moderation,
@@ -258,22 +263,16 @@ module Decidim
           :process_step,
           :process_user_role,
           :export_space,
+          :share_tokens,
           :import
         ].include?(permission_action.subject)
         allow! if is_allowed
       end
 
-      def participatory_process_type_action?
-        return unless permission_action.subject == :participatory_process_type
-        return disallow! unless user.admin?
-
-        participatory_process_type = context.fetch(:participatory_process_type, nil)
-        case permission_action.action
-        when :destroy
-          toggle_allow(participatory_process_type&.processes&.none?)
-        else
-          allow!
-        end
+      def user_can_preview_space?
+        context[:share_token].present? && Decidim::ShareToken.use!(token_for: process, token: context[:share_token], user:)
+      rescue ActiveRecord::RecordNotFound, StandardError
+        nil
       end
 
       # Checks if the permission_action is to read the admin processes list or
@@ -290,10 +289,6 @@ module Decidim
       def process_group
         @process_group ||= context.fetch(:process_group, nil)
       end
-
-      def user_can_upload_images_in_process?
-        allow! if user&.admin_terms_accepted? && user_has_any_role?(user, process, broad_check: true) && (permission_action.subject == :editor_image)
-      end
     end
   end
 end

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

@@ -38,7 +38,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update", "import", "export", "duplicate"
+          when "create", "publish", "unpublish", "update", "import", "export", "duplicate", "soft_delete", "restore"
             "decidim.admin_log.participatory_process.#{action}"
           else
             super

data/app/queries/decidim/participatory_processes/metrics/participatory_process_followers_metric_measure.rb

@@ -14,10 +14,10 @@ module Decidim
           participatory_process = @resource
 
           process_followers = Decidim::Follow.where(followable: participatory_process).joins(:user)
-                                             .where("decidim_follows.created_at <= ?", end_time)
+                                             .where(decidim_follows: { created_at: ..end_time })
           cumulative_users = process_followers.pluck(:decidim_user_id)
 
-          process_followers = process_followers.where("decidim_follows.created_at >= ?", start_time)
+          process_followers = process_followers.where(decidim_follows: { created_at: start_time.. })
           quantity_users = process_followers.pluck(:decidim_user_id)
 
           {

data/app/queries/decidim/participatory_processes/metrics/participatory_processes_metric_manage.rb

@@ -14,12 +14,12 @@ module Decidim
           return @query if @query
 
           @query = Decidim::ParticipatoryProcess.where(organization: @organization)
-          @query = @query.where("decidim_participatory_processes.published_at <= ?", end_time)
+          @query = @query.where(decidim_participatory_processes: { published_at: ..end_time })
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_participatory_processes.published_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_participatory_processes: { published_at: start_time.. }).count
         end
       end
     end

data/app/serializers/decidim/participatory_processes/open_data_participatory_process_serializer.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This class serializes a ParticipatoryProcess so it can be exported to CSV for the Open Data feature.
+    class OpenDataParticipatoryProcessSerializer < Decidim::Exporters::ParticipatorySpaceSerializer
+      # Public: Exports a hash with the serialized data for this resource.
+      def serialize
+        super.merge(
+          {
+            url: EngineRouter.main_proxy(resource).participatory_process_url(resource),
+            subtitle: resource.subtitle,
+            remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
+            announcement: resource.announcement,
+            start_date: resource.start_date,
+            end_date: resource.end_date,
+            developer_group: resource.developer_group,
+            local_area: resource.local_area,
+            meta_scope: resource.meta_scope,
+            participatory_scope: resource.participatory_scope,
+            participatory_structure: resource.participatory_structure,
+            target: resource.target,
+            area: {
+              id: resource.area.try(:id),
+              name: resource.area.try(:name) || empty_translatable
+            },
+            participatory_process_group: {
+              id: resource.participatory_process_group.try(:id),
+              title: resource.participatory_process_group.try(:title) || empty_translatable,
+              description: resource.participatory_process_group.try(:description) || empty_translatable,
+              remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessGroupPresenter.new(resource.participatory_process_group).hero_image_url
+            },
+            scope: {
+              id: resource.scope.try(:id),
+              name: resource.scope.try(:name) || empty_translatable
+            },
+            scopes_enabled: resource.scopes_enabled,
+            participatory_process_type: {
+              id: resource.participatory_process_type.try(:id),
+              title: resource.participatory_process_type.try(:title) || empty_translatable
+            }
+          }
+        )
+      end
+    end
+  end
+end

data/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -41,9 +41,7 @@ module Decidim
             end_date: attributes["end_date"],
             announcement: attributes["announcement"],
             private_space: attributes["private_space"],
-            scopes_enabled: attributes["scopes_enabled"],
-            participatory_process_group: import_process_group(attributes["participatory_process_group"]),
-            participatory_process_type: import_participatory_process_type(attributes["participatory_process_type"])
+            participatory_process_group: import_process_group(attributes["participatory_process_group"])
           )
           @imported_process.attached_uploader(:hero_image).remote_url = attributes["remote_hero_image_url"] if attributes["remote_hero_image_url"].present?
 
@@ -71,19 +69,6 @@ module Decidim
         end
       end
 
-      def import_participatory_process_type(participatory_process_type)
-        return if participatory_process_type.blank?
-
-        return if compact_translation(participatory_process_type["title"]).blank?
-
-        Decidim.traceability.perform_action!("create", ParticipatoryProcessType, @user) do
-          Decidim::ParticipatoryProcessType.find_or_create_by(
-            title: participatory_process_type["title"],
-            organization: @organization
-          )
-        end
-      end
-
       def import_participatory_process_steps(steps)
         return if steps.nil?
 
@@ -102,33 +87,6 @@ module Decidim
         end
       end
 
-      def import_categories(categories)
-        return if categories.nil?
-
-        categories.map do |category_attributes|
-          category = Decidim.traceability.create!(
-            Category,
-            @user,
-            name: category_attributes["name"],
-            description: category_attributes["description"],
-            parent_id: category_attributes["parent_id"],
-            participatory_space: @imported_process
-          )
-          next if category_attributes["subcategories"].nil?
-
-          category_attributes["subcategories"].map do |subcategory_attributes|
-            Decidim.traceability.create!(
-              Category,
-              @user,
-              name: subcategory_attributes["name"],
-              description: subcategory_attributes["description"],
-              parent_id: category.id,
-              participatory_space: @imported_process
-            )
-          end
-        end
-      end
-
       def import_folders_and_attachments(attachments)
         return if attachments["files"].nil?
 

data/app/serializers/decidim/participatory_processes/participatory_process_serializer.rb

@@ -4,76 +4,31 @@ module Decidim
   module ParticipatoryProcesses
     # This class serializes a ParticipatoryProcesses so can be exported to CSV, JSON or other
     # formats.
-    class ParticipatoryProcessSerializer < Decidim::Exporters::Serializer
-      include Decidim::ApplicationHelper
-      include Decidim::ResourceHelper
-      include Decidim::TranslationsHelper
-
-      # Public: Initializes the serializer with a participatory_process.
-      def initialize(participatory_process)
-        @participatory_process = participatory_process
-      end
-
+    class ParticipatoryProcessSerializer < Decidim::ParticipatoryProcesses::OpenDataParticipatoryProcessSerializer
       # Public: Exports a hash with the serialized data for this participatory_process.
       def serialize
-        {
-          id: participatory_process.id,
-          title: participatory_process.title,
-          subtitle: participatory_process.subtitle,
-          slug: participatory_process.slug,
-          hashtag: participatory_process.hashtag,
-          short_description: participatory_process.short_description,
-          description: participatory_process.description,
-          announcement: participatory_process.announcement,
-          start_date: participatory_process.start_date,
-          end_date: participatory_process.end_date,
-          remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(participatory_process).hero_image_url,
-          developer_group: participatory_process.developer_group,
-          local_area: participatory_process.local_area,
-          meta_scope: participatory_process.meta_scope,
-          participatory_scope: participatory_process.participatory_scope,
-          participatory_structure: participatory_process.participatory_structure,
-          target: participatory_process.target,
-          area: {
-            id: participatory_process.area.try(:id),
-            name: participatory_process.area.try(:name) || empty_translatable
-          },
-          participatory_process_group: {
-            id: participatory_process.participatory_process_group.try(:id),
-            title: participatory_process.participatory_process_group.try(:title) || empty_translatable,
-            description: participatory_process.participatory_process_group.try(:description) || empty_translatable,
-            remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessGroupPresenter.new(participatory_process.participatory_process_group).hero_image_url
-          },
-          scope: {
-            id: participatory_process.scope.try(:id),
-            name: participatory_process.scope.try(:name) || empty_translatable
-          },
-          private_space: participatory_process.private_space,
-          promoted: participatory_process.promoted,
-          scopes_enabled: participatory_process.scopes_enabled,
-          participatory_process_type: {
-            id: participatory_process.participatory_process_type.try(:id),
-            title: participatory_process.participatory_process_type.try(:title) || empty_translatable
-          },
-          participatory_process_steps: serialize_participatory_process_steps,
-          participatory_process_categories: serialize_categories,
-          attachments: {
-            attachment_collections: serialize_attachment_collections,
-            files: serialize_attachments
-          },
-          components: serialize_components
-        }
+        super.merge(
+          {
+            categories: serialize_categories,
+            taxonomies:,
+            attachments: {
+              attachment_collections: serialize_attachment_collections,
+              files: serialize_attachments
+            },
+            private_space: resource.private_space,
+            weight: resource.weight,
+            components: serialize_components,
+            participatory_process_steps: serialize_participatory_process_steps
+          }
+        )
       end
 
       private
 
-      attr_reader :participatory_process
-      alias resource participatory_process
-
       def serialize_participatory_process_steps
-        return unless participatory_process.steps.any?
+        return unless resource.steps.any?
 
-        participatory_process.steps.map do |step|
+        resource.steps.map do |step|
           {
             id: step.try(:id),
             title: step.try(:title),
@@ -87,70 +42,6 @@ module Decidim
           }
         end
       end
-
-      def serialize_categories
-        return unless participatory_process.categories.first_class.any?
-
-        participatory_process.categories.first_class.map do |category|
-          {
-            id: category.try(:id),
-            name: category.try(:name),
-            description: category.try(:description),
-            parent_id: category.try(:parent_id),
-            subcategories: serialize_subcategories(category.subcategories)
-          }
-        end
-      end
-
-      def serialize_subcategories(subcategories)
-        return unless subcategories.any?
-
-        subcategories.map do |subcategory|
-          {
-            id: subcategory.try(:id),
-            name: subcategory.try(:name),
-            description: subcategory.try(:description),
-            parent_id: subcategory.try(:parent_id)
-          }
-        end
-      end
-
-      def serialize_attachment_collections
-        return unless participatory_process.attachment_collections.any?
-
-        participatory_process.attachment_collections.map do |collection|
-          {
-            id: collection.try(:id),
-            name: collection.try(:name),
-            weight: collection.try(:weight),
-            description: collection.try(:description)
-          }
-        end
-      end
-
-      def serialize_attachments
-        return unless participatory_process.attachments.any?
-
-        participatory_process.attachments.map do |attachment|
-          {
-            id: attachment.try(:id),
-            title: attachment.try(:title),
-            weight: attachment.try(:weight),
-            description: attachment.try(:description),
-            attachment_collection: {
-              name: attachment.attachment_collection.try(:name),
-              weight: attachment.attachment_collection.try(:weight),
-              description: attachment.attachment_collection.try(:description)
-            },
-            remote_file_url: Decidim::AttachmentPresenter.new(attachment).attachment_file_url
-          }
-        end
-      end
-
-      def serialize_components
-        serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(@participatory_process)
-        serializer.run
-      end
     end
   end
 end

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/_form.html.erb

@@ -18,10 +18,6 @@
                 <%= form.check_box :copy_steps %>
               </div>
 
-              <div class="columns">
-                <%= form.check_box :copy_categories %>
-              </div>
-
               <div class="columns">
                 <%= form.check_box :copy_components %>
               </div>

data/app/views/decidim/participatory_processes/admin/participatory_process_groups/_form.html.erb

@@ -21,7 +21,6 @@
         <% if processes_for_select %>
           <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
         <% end %>
-        <%= form.label :participatory_process_ids, t("decidim.participatory_process_groups.related_processes.help") %>
       </div>
 
       <div class="row column">

data/app/views/decidim/participatory_processes/admin/participatory_process_imports/_form.html.erb

@@ -23,9 +23,6 @@
           <div class="columns">
             <%= form.check_box :import_steps %>
           </div>
-          <div class="columns">
-            <%= form.check_box :import_categories %>
-          </div>
           <div class="columns">
             <%= form.check_box :import_attachments %>
           </div>

data/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb

@@ -100,14 +100,12 @@
       </button>
     </div>
     <div id="panel-metadata" class="card-section">
-      <div class="row">
-        <div class="columns">
-          <%= form.translated :text_field, :developer_group, aria: { label: :developer_group } %>
-        </div>
+      <div class="row column">
+        <%= form.translated :text_field, :developer_group, aria: { label: :developer_group } %>
+      </div>
 
-        <div class="columns">
-          <%= form.translated :text_field, :local_area, aria: { label: :local_area } %>
-        </div>
+      <div class="row column">
+        <%= form.translated :text_field, :local_area, aria: { label: :local_area } %>
       </div>
 
       <div class="row column">
@@ -128,39 +126,30 @@
     </div>
   </div>
 
-  <div class="card" data-component="accordion" id="accordion-filters">
+  <div class="card" data-component="accordion" id="accordion-taxonomies">
     <div class="card-divider">
-      <button class="card-divider-button" data-open="true" data-controls="panel-filters" type="button">
+      <button class="card-divider-button" data-open="true" data-controls="panel-taxonomies" type="button">
         <%= icon "arrow-right-s-line" %>
-        <h2 class="card-title" id="filters">
-          <%= t("filters", scope: "decidim.participatory_processes.admin.participatory_processes.form") %>
+        <h2 class="card-title" id="taxonomies">
+          <%= t("taxonomies", scope: "decidim.participatory_processes.admin.participatory_processes.form") %>
         </h2>
       </button>
     </div>
-    <div id="panel-filters" class="card-section">
-      <div class="row column">
-        <%= form.check_box :scopes_enabled %>
-      </div>
-
-      <div class="row column">
-        <%= scopes_select_field form, :scope_id, root: nil %>
-      </div>
-
-      <div class="row column" id="scope-depth ">
-        <%= form.collection_select :scope_type_max_depth_id,
-                                   organization_scope_depths,
-                                   :id,
-                                   :name,
-                                   scope_type_depth_select_options,
-                                   scope_type_depth_select_html_options %>
-      </div>
-
-      <div class="row column">
-        <%= form.areas_select :area_id,
-                              areas_for_select(current_organization),
-                              selected: current_participatory_process.try(:decidim_area_id),
-                              include_blank: t(".select_an_area") %>
-      </div>
+    <div id="panel-taxonomies" class="card-section">
+      <% if @form.taxonomy_filters.blank? %>
+        <div class="row column">
+          <p class="text-gray mr-2 mt-4">
+            <%= t("no_taxonomy_filters_found", scope: "decidim.participatory_processes.admin.participatory_processes.form") %>
+            <%= link_to(t("define_taxonomy_filters", scope: "decidim.participatory_processes.admin.participatory_processes.form"), decidim_admin.taxonomies_path, class: "button button__text-secondary") %>
+          </p>
+        </div>
+      <% else %>
+        <% @form.taxonomy_filters.each do |filter| %>
+          <div class="row column">
+            <%= filter_taxonomy_items_select_field form, :taxonomies, filter %>
+          </div>
+        <% end %>
+      <% end %>
     </div>
   </div>
 
@@ -184,6 +173,7 @@
 
       <div class="row column">
         <%= form.check_box :private_space %>
+        <p class="help-text"><%= t(".private_notice") %></p>
       </div>
       <div class="row column">
         <%= form.check_box :promoted %>
@@ -211,29 +201,4 @@
       </div>
     </div>
   </div>
-
-  <div class="card" data-component="accordion" id="accordion-other">
-    <div class="card-divider">
-      <button class="card-divider-button" data-open="true" data-controls="panel-other" type="button">
-        <%= icon "arrow-right-s-line" %>
-        <h2 class="card-title" id="other">
-          <%= t("other", scope: "decidim.participatory_processes.admin.participatory_processes.form") %>
-        </h2>
-      </button>
-    </div>
-
-    <div id="panel-other" class="card-section">
-      <% if @form.participatory_process_types_for_select.present? %>
-        <div class="row column">
-          <%= form.select(
-                :participatory_process_type_id,
-                @form.participatory_process_types_for_select,
-                include_blank: t(".select_participatory_process_type")
-              ) %>
-        </div>
-      <% end %>
-    </div>
-  </div>
-
 </div>
-<%= append_javascript_pack_tag "decidim_participatory_processes_admin" %>

data/app/views/decidim/participatory_processes/admin/participatory_processes/_process_row.html.erb

@@ -0,0 +1,83 @@
+<tr>
+  <td>
+    <% if process.promoted? %>
+      <%= icon_with_tooltip "star-s-fill", t("models.assembly.fields.promoted", scope: "decidim.admin") %>
+    <% end %>
+    <% if allowed_to? :update, :process, process: process %>
+      <%= link_to translated_attribute(process.title), edit_participatory_process_path(process) %><br>
+    <% elsif allowed_to? :read, :component, process: process %>
+      <%= link_to translated_attribute(process.title), components_path(process) %><br>
+    <% else %>
+      <%= translated_attribute(process.title) %>
+    <% end %>
+  </td>
+  <td class="table-list__date">
+    <%= l process.created_at, format: :short %>
+  </td>
+  <td class="table-list__state">
+    <% if process.private_space? %>
+      <span><%= t("participatory_processes.index.private", scope: "decidim.admin") %></span>
+    <% else %>
+      <span><%= t("participatory_processes.index.public", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__state">
+    <% if process.published? %>
+      <span class="label success !text-sm"><%= t("participatory_processes.index.published", scope: "decidim.admin") %></span>
+    <% else %>
+      <span class="label alert !text-sm"><%= t("participatory_processes.index.unpublished", scope: "decidim.admin") %></span>
+    <% end %>
+  </td>
+  <td class="table-list__actions">
+    <% if view == :deleted %>
+      <% if allowed_to? :restore, :process, trashable_deleted_resource: process %>
+        <%= icon_link_to "refresh-line", restore_participatory_process_path(process), t("actions.restore", scope: "decidim.admin"), method: :patch, class: "action-icon--restore" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+    <% else %>
+      <% if allowed_to? :read, :share_tokens, current_participatory_space: process %>
+        <%= icon_link_to "share-line", decidim_admin_participatory_processes.participatory_process_share_tokens_path(process), t("actions.share_tokens", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+      <% if allowed_to? :update, :process, process: process %>
+        <%= icon_link_to "pencil-line", edit_participatory_process_path(process), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :create, :process, process: process %>
+        <%= icon_link_to "download-line", participatory_process_export_path(process), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :create, :process, process: process %>
+        <%= icon_link_to "file-copy-line", new_participatory_process_copy_path(process), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :preview, :process, process: process %>
+        <%= icon_link_to "eye-line", decidim_participatory_processes.participatory_process_path(process), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview", target: "_blank", data: { "external-link": false } %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :read, :moderation, process: process %>
+        <%= icon_link_to "flag-line", moderations_path(process), t("actions.moderate", scope: "decidim.admin"), class: "action-icon--moderate" %>
+      <% else %>
+        <span class="action-space icon"></span>
+      <% end %>
+
+      <% if allowed_to? :soft_delete, :process, trashable_deleted_resource: process %>
+        <% if process.published? %>
+          <%= icon "delete-bin-line", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.soft_delete", scope: "decidim.admin") %>
+        <% else %>
+          <%= icon_link_to "delete-bin-line", soft_delete_participatory_process_path(process), t("actions.soft_delete", scope: "decidim.admin"), method: :patch, class: "action-icon--delete", data: { confirm: t("actions.confirm_delete_process", scope: "decidim.admin") } %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>