decidim-participatory_processes 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176a2a7a9be748ecb2217dde71303a1d67acd6929f2916acc390149d2338be24
-  data.tar.gz: 8bb4f6bca9d356a18b2367520966dae3eb10246206ab65db74916667091bc587
+  metadata.gz: 7c5c49a8f6a410df4a057cd94c07274a98a89e743d0df6d91c46583b2ed30d67
+  data.tar.gz: 5dc3e790a54d79406f05d9c96c44e313f8263cd8f0594d3e41e3c61168609c8c
 SHA512:
-  metadata.gz: 8136de315dcd89701dd19a07f4407c84c9bd69bc35f80554cb50ab51882c8a81c7d62ac1f50ae69bd8d02d1a063c506ecf11a5b45d33afcda2105649e648e2f6
-  data.tar.gz: aae36e8063b004550a2296cd9f64a5a5a83506013a004854a0c722ac2c3ef2f3714e751bf088bca95813b78fc259fa6353762b1c188c602025369b18d6c4b23b
+  metadata.gz: 7b2fdd90b1932caac47fd07f21efedfe7e9f558b9bbbdbf5db5287ce79d347863274ec41724579dfed413c6703df50d62516474db9523942926cde7a4c9ed81f
+  data.tar.gz: '05823400ffb5cd78475d1f6ad90487a2ebdfd8e508bfd47c2802a794579c1a4e25182f967ce45484a4e6ee128fa822700b984ca8937132bd5b3046ef51dd341e'

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

@@ -1,5 +1,4 @@
 <span class="order-by__tabs ml-s">
-  <%# <span class="muted mr-s ml-s">No hay procesos activos</span> %>
   <% if should_show_tabs? %>
     <%= explanation %>
     <span class="muted mr-xs"><%= t("decidim.participatory_processes.participatory_processes.filters.see") %></span>
@@ -7,7 +6,7 @@
       <%= link_to filter_link(filter), remote: true, class: "order-by__tab" do %>
         <strong>
           <%= filter_name(filter) %>
-        </strong>&nbsp;<span>(<%= model[filter] %>)</span>
+        </strong>&nbsp;<span>(<%= process_count_by_filter[filter] %>)</span>
       <% end %>
     <% end %>
   <% else %>

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

@@ -4,7 +4,7 @@
     <%= render :filter_tabs %>
   </h2>
 </div>
-<% if model["active"] == 0 && model["upcoming"] == 0 %>
+<% 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>

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

@@ -9,11 +9,46 @@ module Decidim
         Decidim::ParticipatoryProcesses::Engine
           .routes
           .url_helpers
-          .participatory_processes_path(filter: filter)
+          .participatory_processes_path(
+            filter: {
+              scope_id: get_filter(:scope_id),
+              area_id: get_filter(:area_id),
+              date: filter
+            }
+          )
       end
 
       def current_filter
-        options[:current_filter]
+        get_filter(:date, model[:default_filter])
+      end
+
+      def get_filter(filter_name, default = nil)
+        return default unless params[:filter].try(:[], filter_name)
+
+        params[:filter][filter_name]
+      end
+
+      def filtered_processes(date_filter)
+        ParticipatoryProcessSearch.new(
+          date: date_filter,
+          scope_id: get_filter(:scope_id),
+          area_id: get_filter(:area_id),
+          current_user: current_user,
+          organization: current_organization
+        )
+      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
+          processes = filtered_processes.groupless
+          groups = Decidim::ParticipatoryProcessGroup.where(id: filtered_processes.grouped.group_ids)
+          collection_by_filter.merge(filter_name => processes.count + groups.count)
+        end
+        @process_count_by_filter["all"] = @process_count_by_filter.values.sum
+        @process_count_by_filter
       end
 
       def other_filters
@@ -22,17 +57,16 @@ module Decidim
 
       def other_filters_with_value
         @other_filters_with_value ||= other_filters.select do |filter|
-          model[filter].positive?
+          process_count_by_filter[filter].positive?
         end
       end
 
       def should_show_tabs?
-        other_filters_with_value.any?
-        other_filters_with_value != ["all"]
+        other_filters_with_value.any? && other_filters_with_value != ["all"]
       end
 
       def title
-        I18n.t(current_filter, scope: "decidim.participatory_processes.participatory_processes.filters.counters", count: model[current_filter])
+        I18n.t(current_filter, scope: "decidim.participatory_processes.participatory_processes.filters.counters", count: process_count_by_filter[current_filter])
       end
 
       def filter_name(filter)
@@ -40,7 +74,7 @@ module Decidim
       end
 
       def explanation
-        return if model["active"].positive?
+        return if process_count_by_filter["active"].positive?
         content_tag(
           :span,
           I18n.t(explanation_text, scope: "decidim.participatory_processes.participatory_processes.filters.explanations"),
@@ -49,7 +83,7 @@ module Decidim
       end
 
       def explanation_text
-        return "no_active" if model["upcoming"].positive?
+        return "no_active" if process_count_by_filter["upcoming"].positive?
         "no_active_nor_upcoming"
       end
     end

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

@@ -47,7 +47,7 @@ module Decidim
 
         if current_user
           return processes.count.to_s if current_user.admin
-          processes.visible_for(current_user.id).count.to_s
+          processes.visible_for(current_user).count.to_s
         else
           processes.public_spaces.count.to_s
         end

data/app/cells/decidim/participatory_processes/process_m/footer.erb

@@ -7,7 +7,7 @@
       </div>
     <% end %>
     <%= link_to(
-      t("layouts.decidim.participatory_processes.participatory_process.take_part"),
+      t(model.cta_button_text_key, scope: "layouts.decidim.participatory_processes.participatory_process"),
       resource_path,
       class: "card__button button button--sc secondary light small"
     ) %>

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

@@ -53,6 +53,7 @@ module Decidim
             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,

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

@@ -54,6 +54,7 @@ module Decidim
             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,

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

@@ -67,6 +67,7 @@ module Decidim
             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,

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

@@ -5,6 +5,10 @@ module Decidim
     module Admin
       # The main admin application controller for participatory processes
       class ApplicationController < Decidim::Admin::ApplicationController
+        register_permissions(::Decidim::ParticipatoryProcesses::Admin::ApplicationController,
+                             ::Decidim::ParticipatoryProcesses::Permissions,
+                             ::Decidim::Admin::Permissions)
+
         private
 
         def permissions_context
@@ -14,10 +18,7 @@ module Decidim
         end
 
         def permission_class_chain
-          [
-            Decidim::ParticipatoryProcesses::Permissions,
-            Decidim::Admin::Permissions
-          ]
+          ::Decidim.permissions_registry.chain_for(::Decidim::ParticipatoryProcesses::Admin::ApplicationController)
         end
       end
     end

data/app/controllers/decidim/participatory_processes/admin/concerns/participatory_process_admin.rb

@@ -12,6 +12,11 @@ module Decidim
         module ParticipatoryProcessAdmin
           extend ActiveSupport::Concern
 
+          RegistersPermissions
+            .register_permissions(::Decidim::ParticipatoryProcesses::Admin::Concerns::ParticipatoryProcessAdmin,
+                                  ::Decidim::ParticipatoryProcesses::Permissions,
+                                  ::Decidim::Admin::Permissions)
+
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
             helper_method :current_participatory_process
@@ -33,10 +38,7 @@ module Decidim
             alias_method :current_participatory_process, :current_participatory_space
 
             def permission_class_chain
-              [
-                Decidim::ParticipatoryProcesses::Permissions,
-                Decidim::Admin::Permissions
-              ]
+              PermissionsRegistry.chain_for(ParticipatoryProcessAdmin)
             end
           end
         end

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

@@ -8,10 +8,11 @@ module Decidim
       class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::Admin::ApplicationController
         include Decidim::Admin::ParticipatorySpaceAdminContext
         participatory_space_admin_layout only: [:edit]
+        include Decidim::Paginable
 
         helper ProcessGroupsForSelectHelper
 
-        helper_method :current_participatory_process, :current_participatory_space
+        helper_method :current_participatory_process, :current_participatory_space, :query
 
         layout "decidim/admin/participatory_processes"
 
@@ -74,6 +75,25 @@ module Decidim
 
         private
 
+        def process_group
+          @process_group ||= ParticipatoryProcessGroup.find_by(id: params[:group_id])
+        end
+
+        def participatory_processes
+          @participatory_processes ||= Rectify::Query.merge(
+            ParticipatoryProcessesWithUserRole.for(current_user),
+            ParticipatoryProcessesByGroup.for(process_group)
+          )
+        end
+
+        def query
+          @query ||= participatory_processes.ransack(params[:q])
+        end
+
+        def collection
+          @collection ||= paginate(query.result)
+        end
+
         def current_participatory_process
           @current_participatory_process ||= collection.where(slug: params[:slug]).or(
             collection.where(id: params[:slug])
@@ -82,10 +102,6 @@ module Decidim
 
         alias current_participatory_space current_participatory_process
 
-        def collection
-          @collection ||= Decidim::ParticipatoryProcessesWithUserRole.for(current_user)
-        end
-
         def participatory_process_params
           {
             id: params[:slug],

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

@@ -6,17 +6,18 @@ module Decidim
     # this engine inherit.
     class ApplicationController < Decidim::ApplicationController
       helper Decidim::ParticipatoryProcesses::ApplicationHelper
-
+      helper ParticipatoryProcessHelper
       include NeedsPermission
 
+      register_permissions(Decidim::ParticipatoryProcesses::ApplicationController,
+                           ::Decidim::ParticipatoryProcesses::Permissions,
+                           ::Decidim::Admin::Permissions,
+                           ::Decidim::Permissions)
+
       private
 
       def permission_class_chain
-        [
-          Decidim::ParticipatoryProcesses::Permissions,
-          Decidim::Admin::Permissions,
-          Decidim::Permissions
-        ]
+        ::Decidim.permissions_registry.chain_for(::Decidim::ParticipatoryProcesses::ApplicationController)
       end
 
       def permission_scope

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

@@ -21,7 +21,7 @@ module Decidim
       def participatory_processes
         @participatory_processes ||= if current_user
                                        return group.participatory_processes.published if current_user.admin
-                                       group.participatory_processes.visible_for(current_user.id).published
+                                       group.participatory_processes.visible_for(current_user).published
                                      else
                                        group.participatory_processes.published.public_spaces
                                      end

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

@@ -7,20 +7,12 @@ module Decidim
     class ParticipatoryProcessesController < Decidim::ParticipatoryProcesses::ApplicationController
       include ParticipatorySpaceContext
       participatory_space_layout only: [:show, :statistics]
+      include FilterResource
 
-      helper Decidim::AttachmentsHelper
-      helper Decidim::IconHelper
-      helper Decidim::WidgetUrlsHelper
-      helper Decidim::SanitizeHelper
-      helper Decidim::ResourceReferenceHelper
-
-      helper ParticipatoryProcessHelper
-
-      helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :metrics, :filter
-      helper_method :process_count_by_filter
+      helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :metrics, :default_date_filter
 
       def index
-        redirect_to "/404" if published_processes.none?
+        raise ActionController::RoutingError, "Not Found" if published_processes.none?
 
         enforce_permission_to :list, :process
         enforce_permission_to :list, :process_group
@@ -36,6 +28,18 @@ module Decidim
 
       private
 
+      def search_klass
+        ParticipatoryProcessSearch
+      end
+
+      def default_filter_params
+        {
+          scope_id: nil,
+          area_id: nil,
+          date: default_date_filter
+        }
+      end
+
       def organization_participatory_processes
         @organization_participatory_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
       end
@@ -52,28 +56,25 @@ module Decidim
         @published_processes ||= OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user)
       end
 
-      def collection
-        @collection ||= (participatory_processes.to_a + participatory_process_groups).flatten
-      end
-
-      def filtered_participatory_processes(filter_name = filter)
-        OrganizationPrioritizedParticipatoryProcesses.new(current_organization, filter_name, current_user)
+      def promoted_participatory_processes
+        @promoted_participatory_processes ||= published_processes | PromotedParticipatoryProcesses.new
       end
 
-      def participatory_processes
-        @participatory_processes ||= filtered_participatory_processes(filter).query.where(decidim_participatory_process_group_id: nil)
+      def collection
+        @collection ||= participatory_processes + participatory_process_groups
       end
 
-      def promoted_participatory_processes
-        @promoted_participatory_processes ||= filtered_participatory_processes("all") | PromotedParticipatoryProcesses.new
+      def filtered_processes
+        search.results
       end
 
-      def filtered_participatory_process_groups(filter_name = filter)
-        OrganizationPrioritizedParticipatoryProcessGroups.new(current_organization, filter_name, current_user)
+      def participatory_processes
+        @participatory_processes ||= filtered_processes.groupless
       end
 
       def participatory_process_groups
-        @participatory_process_groups ||= filtered_participatory_process_groups(filter)
+        @participatory_process_groups ||= Decidim::ParticipatoryProcessGroup
+                                          .where(id: filtered_processes.grouped.group_ids)
       end
 
       def stats
@@ -84,28 +85,11 @@ module Decidim
         @metrics ||= ParticipatoryProcessMetricChartsPresenter.new(participatory_process: current_participatory_space)
       end
 
-      def filter
-        return default_filter unless ProcessFiltersCell::ALL_FILTERS.include?(params[:filter])
-        @filter ||= params[:filter] || default_filter
-      end
-
-      def default_filter
-        return "active" if process_count_by_filter["active"].positive?
-        return "upcoming" if process_count_by_filter["upcoming"].positive?
-        return "past" if process_count_by_filter["past"].positive?
-        "active"
-      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|
-          processes = filtered_participatory_processes(filter_name).query.where(decidim_participatory_process_group_id: nil)
-          groups = filtered_participatory_process_groups(filter_name)
-          collection_by_filter.merge(filter_name.to_s => processes.count + groups.count)
-        end
-        @process_count_by_filter["all"] = @process_count_by_filter.values.sum
-        @process_count_by_filter
+      def default_date_filter
+        return "active" if published_processes.any?(&:active?)
+        return "upcoming" if published_processes.any?(&:upcoming?)
+        return "past" if published_processes.any?(&:past?)
+        "all"
       end
     end
   end

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

@@ -9,43 +9,54 @@ module Decidim
       class ParticipatoryProcessForm < Form
         include TranslatableAttributes
 
-        translatable_attribute :title, String
-        translatable_attribute :subtitle, String
+        mimic :participatory_process
+
+        translatable_attribute :announcement, String
         translatable_attribute :description, String
-        translatable_attribute :short_description, String
-        translatable_attribute :meta_scope, String
         translatable_attribute :developer_group, String
         translatable_attribute :local_area, String
-        translatable_attribute :target, String
+        translatable_attribute :meta_scope, String
         translatable_attribute :participatory_scope, String
         translatable_attribute :participatory_structure, String
-        translatable_attribute :announcement, String
-
-        mimic :participatory_process
+        translatable_attribute :subtitle, String
+        translatable_attribute :short_description, String
+        translatable_attribute :title, String
+        translatable_attribute :target, String
 
-        attribute :start_date, Decidim::Attributes::LocalizedDate
-        attribute :end_date, Decidim::Attributes::LocalizedDate
-        attribute :slug, String
         attribute :hashtag, String
+        attribute :slug, String
+
+        attribute :area_id, Integer
+        attribute :participatory_process_group_id, Integer
+        attribute :scope_id, Integer
+
+        attribute :private_space, Boolean
         attribute :promoted, Boolean
         attribute :scopes_enabled, Boolean
-        attribute :scope_id, Integer
-        attribute :hero_image
-        attribute :remove_hero_image
+        attribute :show_statistics, Boolean
+
+        attribute :end_date, Decidim::Attributes::LocalizedDate
+        attribute :start_date, Decidim::Attributes::LocalizedDate
+
         attribute :banner_image
+        attribute :hero_image
         attribute :remove_banner_image
-        attribute :participatory_process_group_id, Integer
-        attribute :show_statistics, Boolean
-        attribute :private_space, Boolean
+        attribute :remove_hero_image
 
-        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
-        validates :title, :subtitle, :description, :short_description, translatable_presence: true
+        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
 
-        validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :banner_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :title, :subtitle, :description, :short_description, translatable_presence: true
+
+        validates :banner_image,
+                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image,
+                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
+                  file_content_type: { allow: ["image/jpeg", "image/png"] }
 
         def map_model(model)
           self.scope_id = model.decidim_scope_id
@@ -56,14 +67,25 @@ module Decidim
           @scope ||= current_organization.scopes.find_by(id: scope_id)
         end
 
+        def area
+          @area ||= current_organization.areas.find_by(id: area_id)
+        end
+
         def participatory_process_group
           Decidim::ParticipatoryProcessGroup.find_by(id: participatory_process_group_id)
         end
 
         private
 
+        def organization_participatory_processes
+          OrganizationParticipatoryProcesses.new(current_organization).query
+        end
+
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: context[:process_id]).any?
+          return unless organization_participatory_processes
+                        .where(slug: slug)
+                        .where.not(id: context[:process_id])
+                        .any?
 
           errors.add(:slug, :taken)
         end