decidim-participatory_processes 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a95c4d0dbdee61ca0400470956d3b0b480e4be7091348da82e03d489a19f816
-  data.tar.gz: 5a1a992ef12a5d6fd4d86ebb91723887289b9617b69f47343c305754b239ebfd
+  metadata.gz: b7ad9fa0949340ca366968accdef04f3802a9db9feb5db05fb866ea3195b3765
+  data.tar.gz: 8e0d7f0ed95de5f80c855b54b5d9f490bc35defd151f255fc06f00548fd87595
 SHA512:
-  metadata.gz: d810a6e0b52bf343a8f7aeda9a2575496a63a45186081a06a0fac4bd0e0e9edd25896cf4ae73e1c2e00f50681eb525880c76f9e7a96f88c589b95662fe934411
-  data.tar.gz: 347e436a64905691288c5f0bcc2e5c2490bec19f1b903bc1f04ef29205697e12817a1dd8025ba374efedb45003402dfa5bb0dfd3b587b455d29e8ecad6a73859
+  metadata.gz: c449ea83582883a26d1b7426d31c9abc30012bc1e3acd4cb266dceff6fc1dc62ae2471a78ddf588c4196c06b517ec1b158be722c03b8fc5a3ac7facb7e439005
+  data.tar.gz: a35d3a5af6ec6c3293e3f4a8a93032653d67c493206b344c291b66aa4815bc4330224c6b309a488256254eef018e60ad90c60eb803d4b0039e02e3c392d74ac5

data/README.md

@@ -33,10 +33,6 @@ This is on the default Decidim installation so you shouldn't change anything to
 
 ![Admin View](docs/screenshot02.png)
 
-## Documentation
-
-Read more about this Space on [Admin Manual](https://docs.decidim.org/admin-manual/en/processess/).
-
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/filters.erb

@@ -3,7 +3,7 @@
     <%= cell(
       "decidim/scopes_picker",
       form,
-      attribute: :scope_id,
+      attribute: :with_scope,
       multiple: true,
       legend_title: I18n.t("decidim.scopes.scopes"),
       label: false,
@@ -11,11 +11,11 @@
     ) %>
   </div>
   <div class="columns mediumlarge-6 large-5">
-    <%= form.areas_select :area_id,
+    <%= form.areas_select :with_area,
                           areas_for_select(current_organization),
                           legend_title: t("decidim.shared.participatory_space_filters.filters.areas"),
                           label: "",
-                          selected: filter.area_id,
+                          selected: filter.with_area,
                           include_blank: t("decidim.shared.participatory_space_filters.filters.select_an_area") %>
   </div>
 <% end %>

data/app/cells/decidim/participatory_process_groups/content_blocks/highlighted_participatory_processes/show.erb

@@ -1,6 +1,7 @@
 <section class="section" id="<%= block_id %>">
   <%= render :title_filter_order %>
   <%= render :participatory_space_filters %>
+  <p class="loading"><%= t("loading", scope: "decidim.participatory_processes.participatory_processes.index") %></p>
   <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
     <%= cell "decidim/participatory_processes/filtered_participatory_processes", filtered_relation, default_filter: default_date_filter %>
   </div>

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

@@ -23,7 +23,7 @@ module Decidim
         end
 
         def filtered_relation
-          @filtered_relation ||= search.results
+          @filtered_relation ||= search.result
         end
 
         def default_date_filter
@@ -36,20 +36,15 @@ module Decidim
 
         private
 
-        def search_klass
-          Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch
+        def search_collection
+          base_relation
         end
 
         def default_filter_params
           {
-            scope_id: nil,
-            area_id: nil
-          }
-        end
-
-        def default_search_params
-          {
-            base_relation: base_relation
+            with_scope: nil,
+            with_area: nil,
+            with_type: nil
           }
         end
 

data/app/cells/decidim/participatory_process_groups/content_blocks/title/show.erb

@@ -2,7 +2,7 @@
   <h2 class="heading2"><%= translated_attribute(participatory_process_group.title) %></h2>
   <div class="row">
     <div class="columns medium-9">
-      <%= decidim_sanitize_editor_admin translated_attribute(participatory_process_group.description) %>
+      <%= decidim_sanitize_editor translated_attribute(participatory_process_group.description) %>
       <div class="row">
         <div class="column medium-6 text-muted">
           <%= icon "grid-three-up", role: "img", "aria-hidden": true, class: "mr-xs" %>

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

@@ -43,18 +43,11 @@ module Decidim
         end
 
         def participatory_processes_count
-          @participatory_processes_count ||= processes.count
+          @participatory_processes_count ||= participatory_process_group.participatory_processes.count
         end
 
         private
 
-        def processes
-          @processes ||= Decidim::ParticipatoryProcesses::GroupPublishedParticipatoryProcesses.new(
-            participatory_process_group,
-            current_user
-          ).query
-        end
-
         def group_uri
           @group_uri = URI.parse(group_url)
         end

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

@@ -25,22 +25,15 @@ module Decidim
     #   date_filter: "active"
     # )
     class ProcessFiltersCell < Decidim::ParticipatoryProcesses::ProcessFiltersCell
-      def filter_link(filter)
+      def filter_link(date_filter, type_filter = nil)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_process_group_path(
-            model,
-            filter: {
-              scope_id: get_filter(:scope_id),
-              area_id: get_filter(:area_id),
-              date: filter
-            }
-          )
+          .participatory_process_group_path(model, **filter_params(date_filter, type_filter))
       end
 
       def current_filter
-        get_filter(:date, default_date_filter)
+        get_filter(:with_date, default_date_filter)
       end
 
       def base_relation
@@ -53,21 +46,25 @@ module Decidim
       def process_count_by_filter
         @process_count_by_filter ||= begin
           counts = ALL_FILTERS.without("all").each_with_object({}) do |filter_name, collection_by_filter|
-            collection_by_filter.update(filter_name => filtered_processes(filter_name).results.count)
+            collection_by_filter.update(filter_name => filtered_processes(filter_name).count)
           end
           counts.update("all" => counts.values.sum)
         end
       end
 
-      def filtered_processes(date_filter)
-        Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch.new(
-          base_relation: base_relation,
-          date: date_filter,
-          scope_id: get_filter(:scope_id),
-          area_id: get_filter(:area_id),
+      def filtered_processes(date_filter, filter_with_type: true)
+        query = base_relation.ransack(
+          {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: filter_with_type ? get_filter(:with_type) : nil
+          },
           current_user: current_user,
           organization: current_organization
-        )
+        ).result
+
+        query.published.visible_for(current_user)
       end
 
       def default_date_filter

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

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_processes" class="wrapper-home home-section">
   <div class="row" id="highlighted-processes">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb

@@ -22,7 +22,7 @@
               </div>
             </div>
             <div class="column large-6 card--process__column">
-              <div class="card--full__image" style="background-image:url('<%= process.attached_uploader(:hero_image).path %>')">
+              <div class="card--full__image" style="background-image:url(<%= process.attached_uploader(:hero_image).path %>)">
                 <div class="card__content row collapse">
                   <div class="large-6 large-offset-6 columns">
                     <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>

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

@@ -51,7 +51,7 @@ module Decidim
                                          OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
                                          HighlightedParticipatoryProcesses.new |
                                          FilteredParticipatoryProcesses.new("active")
-                                       ).query.includes([:organization]).limit(highlighted_processes_max_results)
+                                       ).query.with_attached_hero_image.includes([:organization, :hero_image_attachment]).limit(highlighted_processes_max_results)
                                      end
         end
 

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

@@ -17,26 +17,30 @@ module Decidim
     # cell(
     #   "decidim/participatory_processes/filtered_participatory_processes",
     #   group.participatory_processes.published,
-    #   date_filter: "active"
+    #   default_filter: "active"
     # )
     class FilteredParticipatoryProcessesCell < Decidim::ViewModel
       include Decidim::FilterResource
       include Decidim::CardHelper
 
       def elements
-        @elements ||= search.results
+        @elements ||= search.result
       end
 
       private
 
-      def search_klass
-        Decidim::ParticipatoryProcesses::ParticipatoryProcessSearch
+      def search_collection
+        base_relation.published.visible_for(current_user).includes(:area)
       end
 
-      def default_search_params
+      def base_relation
+        model
+      end
+
+      def default_filter_params
         {
-          base_relation: model,
-          date: default_date_filter
+          with_date: default_date_filter,
+          with_type: nil
         }
       end
 

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

@@ -1,13 +1,17 @@
-<div class="row collapse order-by">
-  <h3 class="order-by__text section-heading">
-    <%= title %>
-    <%= render :filter_tabs %>
-  </h3>
-</div>
-<% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
 <div class="row column">
-  <div class="callout warning mb-sm">
-    <p><%= t("decidim.participatory_processes.participatory_processes.filters.explanations.no_active_nor_upcoming_callout") %></p>
+  <div class="flex--sbe">
+    <h3 class="section-heading collapse">
+      <%= title %>
+      <%= render :filter_tabs %>
+    </h3>
+    <%= render :type_filter if participatory_process_types_for_select.present? %>
   </div>
+  <hr class="reset mt-s mb-s">
 </div>
+<% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
+  <div class="row column">
+    <div class="callout warning mb-sm">
+      <p><%= t("decidim.participatory_processes.participatory_processes.filters.explanations.no_active_nor_upcoming_callout") %></p>
+    </div>
+  </div>
 <% end %>

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

@@ -0,0 +1,17 @@
+<div id="process-type-filter" class="inline-filters">
+  <div id="inline-filter-sort" class="dropdown-pane" data-position="bottom" data-alignment="right" data-dropdown data-auto-focus="true">
+    <ul class="list-reset">
+      <% participatory_process_types_for_select.each do |title, id| %>
+        <li>
+          <%= link_to filter_link(current_filter, id), remote: true do %>
+            <%= title %>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
+  <label>
+    <span><%= filter_type_label %></span>
+    <button id="button-text" data-toggle="inline-filter-sort"><%= current_type_filter_name %></button>
+  </label>
+</div>

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

@@ -5,48 +5,57 @@ module Decidim
     class ProcessFiltersCell < Decidim::ViewModel
       ALL_FILTERS = %w(active upcoming past all).freeze
 
-      def filter_link(filter)
+      def filter_link(date_filter, type_filter = nil)
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_processes_path(
-            filter: {
-              scope_id: get_filter(:scope_id),
-              area_id: get_filter(:area_id),
-              date: filter
-            }
-          )
+          .participatory_processes_path(**filter_params(date_filter, type_filter))
       end
 
       def current_filter
-        date_filter = get_filter(:date)
-        return model[:default_filter] unless date_filter
-        return date_filter if ALL_FILTERS.include?(date_filter)
+        get_filter(:with_date, model[:default_filter])
+      end
 
-        # Default to "all" in case the filter is unknown, as the search also
-        # defaults to this.
-        "all"
+      def current_type_filter_name
+        participatory_process_types_for_select.find { |_, id| id == get_filter(:with_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
 
-      def filtered_processes(date_filter)
-        ParticipatoryProcessSearch.new(
-          date: date_filter,
-          scope_id: get_filter(:scope_id),
-          area_id: get_filter(:area_id),
+      def filter_params(date_filter, type_filter)
+        {
+          filter: {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: type_filter || get_filter(:with_type)
+          }
+        }
+      end
+
+      def filtered_processes(date_filter, filter_with_type: true)
+        query = ParticipatoryProcess.ransack(
+          {
+            with_date: date_filter,
+            with_scope: get_filter(:with_scope),
+            with_area: get_filter(:with_area),
+            with_type: filter_with_type ? get_filter(:with_type) : nil
+          },
           current_user: current_user,
           organization: current_organization
-        )
+        ).result
+
+        query.published.visible_for(current_user)
       end
 
       def process_count_by_filter
         return @process_count_by_filter if @process_count_by_filter
 
         @process_count_by_filter = %w(active upcoming past).inject({}) do |collection_by_filter, filter_name|
-          filtered_processes = filtered_processes(filter_name).results
+          filtered_processes = filtered_processes(filter_name)
           processes = filtered_processes.groupless
           groups = Decidim::ParticipatoryProcessGroup.where(id: filtered_processes.grouped.group_ids)
           collection_by_filter.merge(filter_name => processes.count + groups.count)
@@ -73,6 +82,10 @@ 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
@@ -92,6 +105,21 @@ 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/cells/decidim/participatory_processes/process_group_s/image.erb

@@ -1 +1 @@
-<div aria-hidden="true" class="card__image-top" style="background-image:url('<%= resource_image_path %>')"></div>
+<div aria-hidden="true" class="card__image-top" style="background-image:url(<%= resource_image_path %>)"></div>

data/app/cells/decidim/participatory_processes/process_s/image.erb

@@ -1 +1 @@
-<div aria-hidden="true" class="card__image-top" style="background-image:url('<%= resource_image_path %>')"></div>
+<div aria-hidden="true" class="card__image-top" style="background-image:url(<%= resource_image_path %>)"></div>

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command that sets a step in a participatory process as active (and
       # unsets a previous active step)
-      class ActivateParticipatoryProcessStep < Rectify::Command
+      class ActivateParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # step - A ParticipatoryProcessStep that will be activated

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

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # A command with all the business logic when copying a new participatory
       # process in the system.
-      class CopyParticipatoryProcess < Rectify::Command
+      class CopyParticipatoryProcess < Decidim::Command
         # 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)
+        def initialize(form, participatory_process, current_user)
           @form = form
           @participatory_process = participatory_process
+          @current_user = current_user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,12 +25,14 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          ParticipatoryProcess.transaction do
-            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?
+          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_categories if @form.copy_categories?
+              copy_participatory_process_components if @form.copy_components?
+            end
           end
 
           broadcast(:ok, @copied_process)

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class CreateParticipatoryProcess < Rectify::Command
+      class CreateParticipatoryProcess < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -89,6 +89,7 @@ module Decidim
             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

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process group in the system.
-      class CreateParticipatoryProcessGroup < Rectify::Command
+      class CreateParticipatoryProcessGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process in the system.
-      class CreateParticipatoryProcessStep < Rectify::Command
+      class CreateParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    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
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          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
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when destroying a participatory
       # process admin in the system.
-      class DestroyParticipatoryProcessAdmin < Rectify::Command
+      class DestroyParticipatoryProcessAdmin < Decidim::Command
         # Public: Initializes the command.
         #
         # role - the ParticipatoryProcessUserRole to destroy
@@ -23,7 +23,6 @@ module Decidim
         # Returns nothing.
         def call
           destroy_role!
-          dispatch_system_event
           broadcast(:ok)
         end
 
@@ -31,10 +30,6 @@ module Decidim
 
         attr_reader :role, :current_user
 
-        def dispatch_system_event
-          ActiveSupport::Notifications.publish("decidim.system.participatory_space.admin.destroyed", role.class.name, role.id)
-        end
-
         def destroy_role!
           extra_info = {
             resource: {

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command with all the business logic when deleting a ParticipatoryProcessGroup.
-      class DestroyParticipatoryProcessGroup < Rectify::Command
+      class DestroyParticipatoryProcessGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # participatory_process_group - the ParticipatoryProcessGroup to delete.

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     module Admin
       # A command that sets all steps in a participatory process as inactive
-      class DestroyParticipatoryProcessStep < Rectify::Command
+      class DestroyParticipatoryProcessStep < Decidim::Command
         # Public: Initializes the command.
         #
         # step - A ParticipatoryProcessStep that will be deactivated

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command with all the business logic when destroying a participatory
+      # process type in the system.
+      class DestroyParticipatoryProcessType < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # participatory_process_type - A participatory_process_type object to
+        # destroy
+        # current_user - the user performing the action
+        def initialize(participatory_process_type, current_user)
+          @participatory_process_type = participatory_process_type
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          destroy_participatory_process_type!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :current_user
+
+        def destroy_participatory_process_type!
+          transaction do
+            Decidim.traceability.perform_action!(
+              "delete",
+              @participatory_process_type,
+              current_user
+            ) do
+              @participatory_process_type.destroy!
+            end
+          end
+        end
+      end
+    end
+  end
+end