decidim-participatory_processes 0.20.1 → 0.21.0

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

@@ -44,6 +44,7 @@ module Decidim
 
         moderator_action?
         collaborator_action?
+        valuator_action?
         process_admin_action?
 
         permission_action
@@ -205,6 +206,14 @@ module Decidim
         allow! if permission_action.action == :preview
       end
 
+      # Valuators can only read the components of a process.
+      def valuator_action?
+        return unless can_manage_process?(role: :valuator)
+
+        allow! if permission_action.action == :read && permission_action.subject == :component
+        allow! if permission_action.action == :export && permission_action.subject == :component_data
+      end
+
       # Process admins can eprform everything *inside* that process. They cannot
       # create a process or perform actions on process groups or other
       # processes.

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

@@ -7,41 +7,51 @@ module Decidim
       attribute :participatory_process, Decidim::ParticipatoryProcess
       include Decidim::IconHelper
 
-      # Public: Render a collection of primary stats.
-      def highlighted
-        highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
+      # Public: returns a collection of stats (Hash) for the Process Home.
+      def collection
+        highlighted_stats = process_participants_stats
+        highlighted_stats = highlighted_stats.concat(process_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
         highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
         highlighted_stats = highlighted_stats.reject(&:empty?)
-        highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
-        grouped_highlighted_stats = highlighted_stats.group_by { |stats| stats.first.name }
-
-        safe_join(
-          grouped_highlighted_stats.map do |_manifest_name, stats|
-            content_tag :div, class: "process_stats-item" do
-              safe_join(
-                stats.each_with_index.map do |stat, index|
-                  render_stats_data(stat[0], stat[1], stat[2], index)
-                end
-              )
+        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
       end
 
       private
 
+      def process_participants_stats
+        Decidim.stats.only([:participants_count]).with_context(participatory_process)
+               .map { |stat_title, stat_number| [participatory_process.manifest.name, stat_title, stat_number] }
+      end
+
       def component_stats(conditions)
         Decidim.component_manifests.map do |component_manifest|
-          component_manifest.stats.filter(conditions).with_context(published_components).map { |name, data| [component_manifest, name, data] }.flatten
+          component_manifest.stats.except([:proposals_accepted])
+                            .filter(conditions)
+                            .with_context(published_components)
+                            .map { |stat_title, stat_number| [component_manifest.name, stat_title, stat_number] }.flatten
         end
       end
 
-      def render_stats_data(component_manifest, name, data, index)
-        safe_join([
-                    index.zero? ? manifest_icon(component_manifest) : " /&nbsp".html_safe,
-                    content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.participatory_processes.statistics"),
-                                class: "#{name} process_stats-text")
-                  ])
+      def process_followers_stats(conditions)
+        Decidim.stats.only([:followers_count])
+               .filter(conditions)
+               .with_context(participatory_process)
+               .map { |stat_title, stat_number| [participatory_process.manifest.name, stat_title, stat_number] }
       end
 
       def published_components

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This class counts all Followers of a participatory processes
+    class StatsFollowersCount < Rectify::Query
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a? Decidim::ParticipatoryProcess
+
+        new(participatory_space).query
+      end
+
+      def initialize(participatory_space)
+        @participatory_space = participatory_space
+      end
+
+      def query
+        space_query + components_query
+      end
+
+      private
+
+      attr_reader :participatory_space
+
+      def components_query
+        Decidim.component_manifests.sum do |component|
+          component.stats
+                   .filter(tag: :followers)
+                   .with_context(participatory_space.components.published)
+                   .map { |_name, value| value }
+                   .sum
+        end
+      end
+
+      def space_query
+        Decidim.participatory_space_manifests.sum do |space|
+          space.stats
+               .filter(tag: :followers)
+               .with_context(participatory_space)
+               .map { |_name, value| value }
+               .sum
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This class counts unique Participants on a participatory processes
+    class StatsParticipantsCount < Rectify::Query
+      def self.for(participatory_space)
+        return 0 unless participatory_space.is_a? Decidim::ParticipatoryProcess
+
+        new(participatory_space).query
+      end
+
+      def initialize(participatory_space)
+        @participatory_space = participatory_space
+      end
+
+      def query
+        [
+          comments_query,
+          debates_query,
+          endorsements_query,
+          project_supports_query,
+          proposals_query,
+          proposal_supports_query,
+          survey_answer_query
+        ].flatten.uniq.count
+      end
+
+      private
+
+      attr_reader :participatory_space
+
+      def comments_query
+        Decidim::Comments::Comment
+          .where(decidim_root_commentable_id: participatory_space.id)
+          .pluck(:decidim_author_id)
+          .uniq
+      end
+
+      def debates_query
+        Decidim::Debates::Debate
+          .where(
+            component: space_components,
+            decidim_author_type: Decidim::UserBaseEntity.name
+          )
+          .not_hidden
+          .pluck(:decidim_author_id)
+          .uniq
+      end
+
+      def endorsements_query
+        Decidim::Proposals::ProposalEndorsement
+          .where(proposal: proposals_components)
+          .pluck(:decidim_author_id)
+          .uniq
+      end
+
+      def proposals_query
+        Decidim::Coauthorship
+          .where(
+            coauthorable: proposals_components,
+            decidim_author_type: Decidim::UserBaseEntity.name
+          )
+          .pluck(:decidim_author_id)
+          .uniq
+      end
+
+      def proposal_supports_query
+        Decidim::Proposals::ProposalVote
+          .where(
+            proposal: proposals_components
+          )
+          .final
+          .pluck(:decidim_author_id)
+          .uniq
+      end
+
+      def project_supports_query
+        Decidim::Budgets::Order
+          .where(component: space_components)
+          .pluck(:decidim_user_id)
+          .uniq
+      end
+
+      def survey_answer_query
+        Decidim::Forms::Answer.newsletter_participant_ids(space_components)
+      end
+
+      def space_components
+        @space_components ||= participatory_space.components
+      end
+
+      def proposals_components
+        @proposals_components ||= Decidim::Proposals::FilteredProposals.for(space_components).published.not_hidden
+      end
+    end
+  end
+end

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

@@ -39,7 +39,9 @@ module Decidim
             meta_scope: attributes["meta_scope"],
             start_date: attributes["start_date"],
             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"])
           )
           @imported_process.remote_hero_image_url = attributes["remote_hero_image_url"] if remote_file_exists?(attributes["remote_hero_image_url"])

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

@@ -52,6 +52,7 @@ module Decidim
           private_space: participatory_process.private_space,
           promoted: participatory_process.promoted,
           scopes_enabled: participatory_process.scopes_enabled,
+          show_metrics: participatory_process.show_metrics,
           show_statistics: participatory_process.show_statistics,
           participatory_process_steps: serialize_participatory_process_steps,
           participatory_process_categories: serialize_categories,

data/app/types/decidim/participatory_processes/participatory_process_group_type.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    # This type represents a ParticipatoryProcess.
+    ParticipatoryProcessGroupType = GraphQL::ObjectType.define do
+      name "ParticipatoryProcessGroup"
+      description "A participatory process group"
+
+      field :id, !types.ID, "ID of this participatory process group"
+      field :name, Decidim::Core::TranslatedFieldType, "The name of this participatory process group"
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this participatory process group", property: :description
+      field :participatoryProcesses, !types[ParticipatoryProcessType] do
+        description "Lists all the participatory processes belonging to this group"
+        property :participatory_processes
+      end
+      field :heroImage, types.String, "The hero image for this participatory process group", property: :hero_image
+    end
+  end
+end

data/app/types/decidim/participatory_processes/participatory_process_input_filter.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ParticipatoryProcessInputFilter < Decidim::Core::BaseInputFilter
+      include Decidim::Core::HasPublishableInputFilter
+      include Decidim::Core::HasHastaggableInputFilter
+
+      graphql_name "ParticipatoryProcessFilter"
+      description "A type used for filtering participatory processes"
+    end
+  end
+end

data/app/types/decidim/participatory_processes/participatory_process_input_sort.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ParticipatoryProcessInputSort < Decidim::Core::BaseInputSort
+      include Decidim::Core::HasPublishableInputSort
+
+      graphql_name "ParticipatoryProcessSort"
+      description "A type used for sorting participatory processess"
+
+      argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
+      argument :start_date, String, "Sort by participatory process starting date, valid values are ASC or DESC", required: false
+    end
+  end
+end

data/app/types/decidim/participatory_processes/participatory_process_step_type.rb

@@ -16,10 +16,13 @@ module Decidim
       end
 
       field :title, !Decidim::Core::TranslatedFieldType, "The title of this step"
-
-      field :startDate, Decidim::Core::DateType, "This step's start date.", property: :start_date
-
-      field :endDate, Decidim::Core::DateType, "This step's end date.", property: :end_date
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this step"
+      field :startDate, Decidim::Core::DateType, "This step's start date", property: :start_date
+      field :endDate, Decidim::Core::DateType, "This step's end date", property: :end_date
+      field :callToActionPath, types.String, "A call to action URL for this step", property: :cta_path
+      field :callToActionText, Decidim::Core::TranslatedFieldType, "The call to action text for this step", property: :cta_text
+      field :active, types.Boolean, "If this step is the active one"
+      field :position, types.Int, "Ordering position among all the steps"
     end
   end
 end

data/app/types/decidim/participatory_processes/participatory_process_type.rb

@@ -6,6 +6,7 @@ module Decidim
     ParticipatoryProcessType = GraphQL::ObjectType.define do
       interfaces [
         -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::ParticipatorySpaceResourceableInterface },
         -> { Decidim::Core::ScopableInterface },
         -> { Decidim::Core::AttachableInterface }
       ]
@@ -13,6 +14,7 @@ module Decidim
       name "ParticipatoryProcess"
       description "A participatory process"
 
+      field :id, !types.ID, "The internal ID for this participatory process"
       field :slug, !types.String
       field :hashtag, types.String, "The hashtag for this participatory process"
       field :createdAt, !Decidim::Core::DateTimeType, "The time this page was created", property: :created_at
@@ -33,6 +35,7 @@ module Decidim
       field :target, Decidim::Core::TranslatedFieldType, "Who participates in this participatory process."
       field :participatoryScope, Decidim::Core::TranslatedFieldType, "What is decided on this participatory process.", property: :participatory_scope
       field :participatoryStructure, Decidim::Core::TranslatedFieldType, "How it is decided on this participatory process.", property: :participatory_structure
+      field :showMetrics, types.Boolean, "If this participatory process should show metrics", property: :show_metrics
       field :showStatistics, types.Boolean, "If this participatory process should show statistics", property: :show_statistics
       field :scopesEnabled, types.Boolean, "If this participatory process has scopes enabled", property: :scopes_enabled
 
@@ -40,11 +43,12 @@ module Decidim
 
       field :reference, types.String, "Reference prefix for this participatory process"
       field :steps, !types[ParticipatoryProcessStepType], "All the steps of this process."
+      field :categories, !types[Decidim::Core::CategoryType], "Categories for this participatory process"
 
-      # These fields may be private:
-      # decidim_participatory_process_group_id
-      # decidim_organization_id
-      # private_space
+      field :participatoryProcessGroup, ParticipatoryProcessGroupType do
+        description "The participatory process group in which this process belong to"
+        property :participatory_process_group
+      end
     end
   end
 end

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

@@ -116,6 +116,18 @@
 
     <div class="row column">
       <%= scopes_picker_field form, :scope_id, root: nil %>
+
+      <div class="row" 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 %>
+        <p class="help-text">
+          <%== t(".scope_type_max_depth_help") %>
+        </p>
+      </div>
     </div>
 
     <div class="row column">
@@ -147,6 +159,21 @@
     </div>
   </div>
 
+  <div class="card-divider">
+    <h2 class="card-title"><%= t(".related_processes") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.select(
+        :related_process_ids,
+        @form.processes.order(title: :asc).map{|process| [translated_attribute(process.title), process.id]},
+        { include_blank: true },
+        { multiple: true, class: "chosen-select" }
+      ) %>
+    </div>
+  </div>
+
   <div class="card-divider">
     <h2 class="card-title"><%= t(".other") %></h2>
   </div>
@@ -155,6 +182,10 @@
     <div class="row column">
       <%= form.check_box :show_statistics %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :show_metrics %>
+    </div>
   </div>
 </div>
 

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

@@ -1,14 +1,20 @@
 <%= render partial: "decidim/participatory_processes/admin/shared/secondary_nav" %>
 
-<div class="card" id="processes">
+<div class="card with-overflow" id="processes">
   <div class="card-divider">
     <h2 class="card-title">
       <%= t("participatory_processes", scope: "decidim.admin.titles") %>
 
-      <% if @process_group %>
+      <% if allowed_to? :create, :process %>
+        <%= link_to t("actions.new_process", scope: "decidim.admin"),
+                    ["new", "participatory_process"],
+                    class: "button tiny button--title" %>
+      <% end %>
+
+      <% if process_group %>
         <span>&lt;</span>
-        <%= link_to translated_attribute(@process_group.name),
-                    edit_participatory_process_group_path(@process_group) %>
+        <%= link_to translated_attribute(process_group.name),
+                    edit_participatory_process_group_path(process_group) %>
       <% end %>
 
       <% if allowed_to? :import, :process %>
@@ -17,28 +23,23 @@
                     class: "button tiny button--title" %>
       <% end %>
 
-      <% if allowed_to? :create, :process %>
-        <%= link_to t("actions.new_process", scope: "decidim.admin"),
-                    ["new", "participatory_process"],
-                    class: "button tiny button--title" %>
-      <% end %>
-
       <button data-toggle="process_groups" class="dropdown button tiny button--title">
           <%= t("actions.filter.process_groups", scope: "decidim.admin") %>
       </button>
       <div id="process_groups" class="dropdown-pane" data-position="bottom" data-dropdown data-auto-focus="true">
         <ul class="list-reset">
-          <%= link_to url_for(group_id: nil) do %>
-            <li><%= t("actions.filter.all", scope: "decidim.admin") %></li>
+          <%= link_to query_params_with(decidim_participatory_process_group_id_eq: nil) do %>
+            <li><%= t("actions.filter.all_processes", scope: "decidim.admin") %></li>
           <% end %>
-          <% Decidim::ParticipatoryProcessGroup.all.each do |group| %>
-            <%= link_to url_for(group_id: group.id) do %>
-              <li><%= translated_attribute(group.name) %></li>
+          <% process_groups_for_select.each do |group_name, group_id| %>
+            <%= link_to query_params_with(decidim_participatory_process_group_id_eq: group_id) do %>
+              <li><%= group_name %></li>
             <% end %>
           <% end %>
         </ul>
       </div>
   </div>
+  <%= admin_filter_selector %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -70,6 +71,8 @@
                 <% 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>
                 <% elsif allowed_to? :preview, :process, process: process %>
                   <%= link_to translated_attribute(process.title), decidim_participatory_processes.participatory_process_path(process) %><br>
                 <% elsif allowed_to? :read, :moderation, process: process %>