decidim-participatory_processes 0.24.2 → 0.25.0.rc3

data/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
-    class ParticipatoryProcessStatsPresenter < Rectify::Presenter
+    class ParticipatoryProcessStatsPresenter < Decidim::StatsPresenter
       attribute :participatory_process, Decidim::ParticipatoryProcess
       include Decidim::IconHelper
 
@@ -13,22 +13,12 @@ module Decidim
         highlighted_stats.concat(process_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
         highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
         highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+        highlighted_stats.concat(comments_stats(:participatory_processes))
         highlighted_stats = highlighted_stats.reject(&:empty?)
         highlighted_stats = highlighted_stats.reject { |_stat_manifest, _stat_title, stat_number| stat_number.zero? }
         grouped_highlighted_stats = highlighted_stats.group_by(&:first)
 
-        statistics = []
-        grouped_highlighted_stats.each do |_manifest_name, stats|
-          stats.each_with_index.each do |stat, _index|
-            stat.each_with_index.map do |_item, subindex|
-              next unless (subindex % 3).zero?
-              next if stat[subindex + 2].zero?
-
-              statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
-            end
-          end
-        end
-        statistics
+        statistics(grouped_highlighted_stats)
       end
 
       private

data/app/queries/decidim/participatory_processes/admin/admin_users.rb

@@ -13,33 +13,46 @@ module Decidim
           new(process).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its process admins
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
         # process - a process that needs to find its process admins
-        def initialize(process)
+        # organization - an organization that needs to find its process admins
+        def initialize(process, organization = nil)
           @process = process
+          @organization = process&.organization || organization
         end
 
         # Finds organization admins and the users with role admin for the given process.
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins).or(process_user_admins)
+          organization.admins.or(processes_user_admins)
         end
 
         private
 
-        attr_reader :process
+        attr_reader :process, :organization
 
-        def organization_admins
-          process.organization.admins
+        def processes_user_admins
+          Decidim::User.where(
+            id: Decidim::ParticipatoryProcessUserRole.where(participatory_process: processes, role: :admin)
+                                                     .select(:decidim_user_id)
+          )
         end
 
-        def process_user_admins
-          process_user_admin_ids = Decidim::ParticipatoryProcessUserRole
-                                   .where(participatory_process: process, role: :admin)
-                                   .pluck(:decidim_user_id)
-          Decidim::User.where(id: process_user_admin_ids)
+        def processes
+          if process
+            [process]
+          else
+            Decidim::ParticipatoryProcess.where(organization: organization)
+          end
         end
       end
     end

data/app/queries/decidim/participatory_processes/admin/moderators.rb

@@ -13,11 +13,20 @@ module Decidim
           new(process).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its moderators
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
         # process - a process that needs to find its process admins
-        def initialize(process)
+        # organization - an organization that needs to find its process admins
+        def initialize(process, organization = nil)
           @process = process
+          @organization = process&.organization || organization
         end
 
         # Finds organization admins and the users with role admin for the given
@@ -25,23 +34,27 @@ module Decidim
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins + process_users)
+          organization.admins.or(processes_user_admins)
         end
 
         private
 
-        attr_reader :process
+        attr_reader :process, :organization
 
-        def organization_admins
-          process.organization.admins
+        def processes_user_admins
+          Decidim::User.where(
+            id: Decidim::ParticipatoryProcessUserRole.where(participatory_process: processes)
+                                                     .where.not(role: :collaborator)
+                                                     .select(:decidim_user_id)
+          )
         end
 
-        def process_users
-          Decidim::ParticipatoryProcessUserRole
-            .where(participatory_process: process)
-            .where.not(role: :collaborator)
-            .pluck(:decidim_user_id)
-            .uniq
+        def processes
+          if process
+            [process]
+          else
+            Decidim::ParticipatoryProcess.where(organization: organization)
+          end
         end
       end
     end

data/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -20,6 +20,7 @@ module Decidim
         [
           comments_query,
           debates_query,
+          meetings_query,
           endorsements_query,
           project_supports_query,
           proposals_query,
@@ -42,7 +43,8 @@ module Decidim
 
       def comments_query
         Decidim::Comments::Comment
-          .where(decidim_root_commentable_id: participatory_space_ids)
+          .where(decidim_participatory_space_type: Decidim::ParticipatoryProcess.class.name)
+          .where(decidim_participatory_space_id: participatory_space_ids)
           .pluck(:decidim_author_id)
           .uniq
       end
@@ -58,6 +60,14 @@ module Decidim
           .uniq
       end
 
+      def meetings_query
+        meetings = Decidim::Meetings::Meeting.where(component: space_components).not_hidden
+        registrations = Decidim::Meetings::Registration.where(decidim_meeting_id: meetings).distinct.pluck(:decidim_user_id)
+        organizers = meetings.where(decidim_author_type: Decidim::UserBaseEntity.name).distinct.pluck(:decidim_author_id)
+
+        [registrations, organizers].flatten.uniq
+      end
+
       def endorsements_query
         Decidim::Endorsement
           .where(resource: space_components)

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

@@ -67,6 +67,7 @@ module Decidim
       private
 
       attr_reader :participatory_process
+      alias resource participatory_process
 
       def serialize_participatory_process_steps
         return unless participatory_process.steps.any?
@@ -147,7 +148,7 @@ module Decidim
 
       def serialize_components
         serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(@participatory_process)
-        serializer.serialize
+        serializer.run
       end
     end
   end

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card" id="processes">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>

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

@@ -1,4 +1,6 @@
-<%= render partial: "decidim/participatory_processes/admin/shared/secondary_nav" %>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_participatory_processes_menu).render %>
+<% end %>
 
 <div class="process-title">
   <div class="process-title-content">

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

@@ -23,8 +23,8 @@
   <% end %>
   <dt><%= display_label(participatory_process_group, :hero_image) %></dt>
   <dd>
-    <% if participatory_process_group.hero_image? %>
-      <%= image_tag participatory_process_group.hero_image.url.to_s %>
+    <% if participatory_process_group.hero_image.attached? %>
+      <%= image_tag participatory_process_group.attached_uploader(:hero_image).path %>
     <% end %>
   </dd>
 </dl>

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card" id="processes">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t(".title") %></h2>
@@ -193,4 +191,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/participatory_processes/admin/participatory_processes" %>
+<%= javascript_pack_tag "decidim_participatory_processes_admin" %>

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

@@ -1,6 +1,8 @@
 <% add_decidim_page_title(t("participatory_processes", scope: "decidim.admin.titles")) %>
 
-<%= render partial: "decidim/participatory_processes/admin/shared/secondary_nav" %>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_participatory_processes_menu).render %>
+<% end %>
 
 <div class="card with-overflow" id="processes">
   <div class="card-divider">

data/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb

@@ -18,5 +18,5 @@
     <% end %>
   </div>
 </div>
-<%= javascript_include_tag "decidim/participatory_processes/filters" %>
-<%= javascript_include_tag "decidim/filters" %>
+
+<%= javascript_pack_tag "decidim_participatory_processes" %>

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb

@@ -14,7 +14,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_process.hero_image.url %>)">
+           style="background-image:url(<%= promoted_process.attached_uploader(:hero_image).path %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to participatory_process_cta_path(promoted_process), class: "button expanded button--sc" do %>

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process_group.html.erb

@@ -14,7 +14,7 @@
       </div>
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
-      <div class="card--full__image" style="background-image:url(<%= cta_settings&.image_url || promoted_process_group.hero_image&.url %>)">
+      <div class="card--full__image" style="background-image:url(<%= cta_settings&.image_url || promoted_process_group.attached_uploader(:hero_image).path %>)">
         <% if cta_settings.present? %>
           <div class="card__content row collapse">
             <div class="large-6 large-offset-6 columns">

data/app/views/decidim/participatory_processes/participatory_processes/index.html.erb

@@ -29,5 +29,5 @@ edit_link(
     </div>
   </section>
 <% end %>
-<%= javascript_include_tag "decidim/participatory_processes/filters" %>
-<%= javascript_include_tag "decidim/filters" %>
+
+<%= javascript_pack_tag "decidim_participatory_processes" %>

data/app/views/decidim/participatory_processes/participatory_processes/show.html.erb

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-                           image_url: current_participatory_space.hero_image.url,
+                           image_url: current_participatory_space.attached_uploader(:hero_image).path,
                            description: translated_attribute(current_participatory_space.short_description),
                            url: participatory_process_url(current_participatory_space),
                            twitter_handler: current_organization.twitter_handler
@@ -143,7 +143,7 @@
   </div>
 
   <% if current_participatory_space.show_statistics? %>
-    <%= cell "decidim/participatory_processes/statistics", stats.collection %>
+         <%= cell "decidim/statistics", stats.collection %>
   <% end %>
 
   <% if current_participatory_space.show_metrics? %>

data/app/views/layouts/decidim/_process_header.html.erb

@@ -1,7 +1,7 @@
 <div class="process-header">
   <div class="process-header__inner">
     <div class="row column process-header__main"
-        style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
+        style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
     </div>
     <div class="process-header__container row collapse column">
       <div class="columns mediumlarge-8 process-header__info">

data/app/views/layouts/decidim/_process_header_steps.html.erb

@@ -23,7 +23,7 @@
       </div>
       <% cta_text = translated_attribute(participatory_process.active_step.cta_text) %>
       <% if participatory_process.active_step.cta_path.present? && cta_text.present? %>
-        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space) %>
+        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "clear button secondary tiny show-for-medium" %>
         <%= link_to(
           cta_text,
           step_cta_url(participatory_process),

data/app/views/layouts/decidim/admin/participatory_process.html.erb

@@ -1,82 +1,8 @@
 <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-
-<% content_for :secondary_nav do %>
-  <%#= participatory_process_menu.render do
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_participatory_process_menu).render do
     public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space)
   end %>
-
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <%= public_page_link decidim_participatory_processes.participatory_process_path(current_participatory_space) %>
-      <% if allowed_to? :update, :process, process: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.edit_participatory_process_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :process_step %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("steps", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_steps_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :component %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.components_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.components_path(current_participatory_space) %>
-          <ul id="components-list">
-            <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
-                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_participatory_processes.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_participatory_processes.edit_component_permissions_path(current_participatory_space, component)) || participatory_space_active_link?(component) %> class="is-active" <% end %>>
-                  <%= link_to manage_component_path(component) do %>
-                    <%= translated_attribute component.name %>
-                    <% if component.primary_stat.present? %>
-                      <span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>"><%= component.primary_stat %></span>
-                    <% end %>
-                  <% end %>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :category %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.categories_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:read, :attachment_collection) || allowed_to?(:read, :attachment) %>
-        <li>
-          <span class="secondary-nav__subtitle"><%= t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu") %></span>
-          <ul>
-            <% if allowed_to? :read, :attachment_collection %>
-              <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachment_collections_path(current_participatory_space)) %> class="is-active" <% end %>>
-                <%= aria_selected_link_to t("attachment_collections", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachment_collections_path(current_participatory_space) %>
-              </li>
-            <% end %>
-            <% if allowed_to? :read, :attachment %>
-              <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
-                <%= aria_selected_link_to t("attachment_files", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_space) %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :process_user_role %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("process_admins", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_user_roles_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :space_private_user %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("private_users", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_space_private_users_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :moderation %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <%= Decidim::Admin.view_hooks.render(:admin_secondary_nav, deep_dup) %>
-    </ul>
-  </div>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/app/views/layouts/decidim/admin/participatory_process_group.html.erb

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= participatory_process_group_menu.render do
+  <%= sidebar_menu(:admin_participatory_process_group_menu).render do
     public_page_link decidim_participatory_processes.participatory_process_group_path(participatory_process_group)
   end %>
 <% end %>

data/app/views/layouts/decidim/participatory_process.html.erb

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
 <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 <% add_decidim_meta_tags(
-  image_url: current_participatory_space.banner_image.url,
+  image_url: current_participatory_space.attached_uploader(:banner_image).path,
   description: translated_attribute(current_participatory_space.short_description),
 ) %>
 
@@ -22,4 +22,4 @@
   <% end %>
 <% end %>
 
-<% provide :meta_image_url, current_participatory_space.banner_image.url %>
+<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>