decidim-participatory_processes 0.27.7 → 0.28.0.rc4

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

@@ -19,7 +19,6 @@ module Decidim
           public_list_process_groups_action?
           public_read_process_group_action?
           public_read_process_action?
-          public_embed_process_action?
           return permission_action
         end
 
@@ -43,6 +42,8 @@ module Decidim
 
         return permission_action unless process
 
+        user_can_read_private_users?
+
         moderator_action?
         collaborator_action?
         valuator_action?
@@ -53,7 +54,14 @@ module Decidim
 
       private
 
-      # It's an admin user if it's an organization admin or is a space admin
+      def user_can_read_private_users?
+        return unless permission_action.subject == :space_private_user
+        return unless process.private_space?
+
+        toggle_allow(user.admin? || can_manage_process?(role: :admin) || can_manage_process?(role: :collaborator))
+      end
+
+      # It is an admin user if it is an organization admin or is a space admin
       # for the current `process`.
       def admin_user?
         user.admin? || (process ? can_manage_process?(role: :admin) : has_manageable_processes?)
@@ -113,17 +121,6 @@ module Decidim
         toggle_allow(can_manage_process?)
       end
 
-      def public_embed_process_action?
-        return unless permission_action.action == :embed &&
-                      [:process, :participatory_space].include?(permission_action.subject) &&
-                      process
-
-        return disallow! unless process.published?
-        return disallow! if process.private_space
-
-        allow!
-      end
-
       def can_view_private_space?
         return true unless process.private_space
         return false unless user
@@ -207,6 +204,7 @@ module Decidim
       # Collaborators can only preview their own processes.
       def collaborator_action?
         return unless can_manage_process?(role: :collaborator)
+        return if permission_action.subject == :space_private_user
 
         allow! if permission_action.action == :preview
       end
@@ -238,7 +236,6 @@ module Decidim
           :process,
           :process_step,
           :process_user_role,
-          :space_private_user,
           :export_space,
           :import
         ].include?(permission_action.subject)
@@ -258,7 +255,6 @@ module Decidim
           :process,
           :process_step,
           :process_user_role,
-          :space_private_user,
           :export_space,
           :import
         ].include?(permission_action.subject)

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::ParticipatoryProcess`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::ParticipatoryProcess`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -7,8 +7,8 @@ module Decidim
       # `Decidim::ParticipatoryProcessType`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::ParticipatoryProcessUserRole`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Step`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -2,54 +2,18 @@
 
 module Decidim
   module ParticipatoryProcesses
-    # A presenter to render statistics in the homepage.
+    # A presenter to render statistics in a Participatory Process Group
     class ParticipatoryProcessGroupStatsPresenter < Decidim::StatsPresenter
       include Decidim::IconHelper
 
-      def participatory_process_group
-        __getobj__.fetch(:participatory_process_group)
-      end
-
-      # Public: returns a collection of stats (Hash) for the participatory
-      # process group landing page.
-      def collection
-        highlighted_stats = process_participants_stats
-        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)
-      end
-
       private
 
-      def process_participants_stats
-        Decidim.stats.only([:participants_count]).with_context(participatory_process_group)
-               .map { |stat_title, stat_number| [:participatory_process_group, stat_title, stat_number] }
-      end
-
-      def component_stats(conditions)
-        Decidim.component_manifests.map do |component_manifest|
-          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 participatory_space = __getobj__.fetch(:participatory_process_group)
 
-      def process_followers_stats(conditions)
-        Decidim.stats.only([:followers_count])
-               .filter(conditions)
-               .with_context(participatory_process_group)
-               .map { |stat_title, stat_number| [:participatory_process_group, stat_title, stat_number] }
-      end
+      def participatory_space_sym = :participatory_process_group
 
       def participatory_processes
-        @participatory_processes ||= participatory_process_group.participatory_processes
+        @participatory_processes ||= participatory_space.participatory_processes
       end
 
       def published_components

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

@@ -16,74 +16,6 @@ module Decidim
           concat(hidden_field_tag(:metrics_space_id, participatory_process.id, id: :"metrics-space_id"))
         end
       end
-
-      def highlighted
-        render_highlighted(Decidim.metrics_registry.filtered(highlight: true, scope: "participatory_process"))
-      end
-
-      def not_highlighted
-        render_not_highlighted(Decidim.metrics_registry.filtered(highlight: false, scope: "participatory_process"))
-      end
-
-      def big_stats
-        safe_join(
-          Decidim.metrics_registry.filtered(scope: "participatory_process", block: "big", sort: true).map do |metric_manifest|
-            content_tag :div, class: "row" do
-              render_metrics_descriptive(metric_manifest.metric_name,
-                                         klass: "column",
-                                         graph_klass: "small",
-                                         title: I18n.t("decidim.metrics.#{metric_manifest.metric_name}.title"),
-                                         description: I18n.t("decidim.metrics.#{metric_manifest.metric_name}.description"),
-                                         download: true,
-                                         data: { ratio: "11:4", axis: true })
-            end
-          end
-        )
-      end
-
-      def medium_stats
-        safe_join(
-          Decidim.metrics_registry.filtered(scope: "participatory_process", block: "medium", sort: true).in_groups_of(2).map do |metrics_group|
-            content_tag :div, class: "row" do
-              safe_join(
-                metrics_group.map do |metric_manifest|
-                  next "" if metric_manifest.blank?
-
-                  render_metrics_descriptive(metric_manifest.metric_name,
-                                             klass: "column medium-6",
-                                             graph_klass: "small",
-                                             title: I18n.t("decidim.metrics.#{metric_manifest.metric_name}.title"),
-                                             description: I18n.t("decidim.metrics.#{metric_manifest.metric_name}.description"),
-                                             download: true,
-                                             data: { ratio: "16:9", axis: true })
-                end
-              )
-            end
-          end
-        )
-      end
-
-      def small_stats
-        safe_join(
-          Decidim.metrics_registry.filtered(scope: "participatory_process", block: "small", sort: true).in_groups_of(3).map do |metrics_group|
-            content_tag :div, class: "row" do
-              safe_join(
-                metrics_group.map do |metric_manifest|
-                  next "" if metric_manifest.blank?
-
-                  render_metrics_data(metric_manifest.metric_name,
-                                      klass: "column medium-4",
-                                      ratio: "16:9",
-                                      margin: "margin-top: 30px",
-                                      graph_klass: "small",
-                                      download: true,
-                                      data: { ratio: "16:9" })
-                end
-              )
-            end
-          end
-        )
-      end
     end
   end
 end

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

@@ -11,6 +11,12 @@ module Decidim
         process.attached_uploader(:banner_image).url(host: process.organization.host)
       end
 
+      def area_name
+        return if process.area.blank?
+
+        Decidim::AreaPresenter.new(process.area).translated_name_with_type
+      end
+
       def process
         __getobj__
       end

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

@@ -2,54 +2,15 @@
 
 module Decidim
   module ParticipatoryProcesses
-    # A presenter to render statistics in the homepage.
+    # A presenter to render statistics in a Participatory Process.
     class ParticipatoryProcessStatsPresenter < Decidim::StatsPresenter
       include Decidim::IconHelper
 
-      def participatory_process
-        __getobj__.fetch(:participatory_process)
-      end
-
-      # Public: returns a collection of stats (Hash) for the Process Home.
-      def collection
-        highlighted_stats = process_participants_stats
-        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)
-      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.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 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 participatory_space = __getobj__.fetch(:participatory_process)
 
-      def published_components
-        @published_components ||= Component.where(participatory_space: participatory_process).published
-      end
+      def participatory_space_sym = :participatory_processes
     end
   end
 end

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

@@ -51,7 +51,7 @@ module Decidim
           if process
             [process]
           else
-            Decidim::ParticipatoryProcess.where(organization: organization)
+            Decidim::ParticipatoryProcess.where(organization:)
           end
         end
       end

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

@@ -53,7 +53,7 @@ module Decidim
           if process
             [process]
           else
-            Decidim::ParticipatoryProcess.where(organization: organization)
+            Decidim::ParticipatoryProcess.where(organization:)
           end
         end
       end

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

@@ -24,8 +24,8 @@ module Decidim
         Decidim.traceability.perform_action!(:create, ParticipatoryProcess, @user, visibility: "all") do
           @imported_process = ParticipatoryProcess.new(
             organization: @organization,
-            title: title,
-            slug: slug,
+            title:,
+            slug:,
             subtitle: attributes["subtitle"],
             hashtag: attributes["hashtag"],
             description: attributes["description"],
@@ -174,8 +174,8 @@ module Decidim
       private
 
       def compact_translation(translation)
-        translation["machine_translations"] = translation["machine_translations"].reject { |_k, v| v.blank? } if translation["machine_translations"].present?
-        translation.reject { |_k, v| v.blank? }
+        translation["machine_translations"] = translation["machine_translations"].compact_blank if translation["machine_translations"].present?
+        translation.compact_blank
       end
 
       def create_attachment_collection(attributes)

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

@@ -1,35 +1,30 @@
-<div class="card" id="processes">
-  <div class="card-divider">
-    <h2 class="card-title"><%= title %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <div class="row">
-        <div class="column xlarge-8">
-          <%= form.translated :text_field, :title, autofocus: true %>
-        </div>
-        <div class="column xlarge-4 slug">
-          <%= form.text_field :slug %>
-          <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:processes, form.object.slug)) %></p>
-        </div>
+<div class="form__wrapper">
+  <div class="card pt-4" id="processes">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
-      <div class="card">
-        <div class="card-divider">
-          <legend><%= select %></legend>
-        </div>
-        <div class="card-section">
-          <div class="row">
-            <div class="columns xlarge-3">
-              <%= form.check_box :copy_steps %>
-            </div>
+      <div class="row column">
+        <%= form.text_field :slug, help_text: t(".slug_help_html", url: decidim_form_slug_url(:processes, form.object.slug)) %>
+      </div>
+      <div class="row column">
+        <div class="card">
+          <div class="card-divider">
+            <legend><%= t("participatory_process_copies.new.select", scope: "decidim.admin") %></legend>
+          </div>
+          <div class="card-section">
+            <div class="row">
+              <div class="columns">
+                <%= form.check_box :copy_steps %>
+              </div>
 
-            <div class="columns xlarge-3">
-              <%= form.check_box :copy_categories %>
-            </div>
+              <div class="columns">
+                <%= form.check_box :copy_categories %>
+              </div>
 
-            <div class="columns xlarge-6">
-              <%= form.check_box :copy_components %>
+              <div class="columns">
+                <%= form.check_box :copy_components %>
+              </div>
             </div>
           </div>
         </div>

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

@@ -1,8 +1,19 @@
 <% add_decidim_page_title(t("participatory_process_copies.new.title", scope: "decidim.admin")) %>
-<%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("participatory_process_copies.new.title", scope: "decidim.admin"), select: t("participatory_process_copies.new.select", scope: "decidim.admin") } %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t("participatory_process_copies.new.title", scope: "decidim.admin") %>
+  </h2>
+</div>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t("participatory_process_copies.new.copy", scope: "decidim.admin") %>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form form-defaults copy_participatory_process" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("participatory_process_copies.new.copy", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>

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

@@ -1,72 +1,94 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t(".title") %></h2>
-  </div>
-  <div class="card-section">
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true %>
+<div class="form__wrapper">
+  <div class="card" data-component="accordion" id="accordion-title">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-title" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="title">
+          <%= t("title", scope: "decidim.participatory_processes.admin.participatory_process_groups.form") %>
+        </h2>
+      </button>
     </div>
+    <div id="panel-title" class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :editor, :description %>
-    </div>
+      <div class="row column">
+        <%= form.translated :editor, :description, aria: { label: :description } %>
+      </div>
 
-    <div class="row column">
-      <% if processes_for_select %>
-        <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
-      <% end %>
-    </div>
+      <div class="row column">
+        <% if processes_for_select %>
+          <%= form.select :participatory_process_ids, processes_for_select, {}, { multiple: true, class: "chosen-select" } %>
+        <% end %>
+      </div>
 
-    <div class="row column">
-      <%= form.upload :hero_image %>
+      <div class="row column">
+        <%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
+      </div>
     </div>
   </div>
 
-  <div class="card-divider">
-    <h2 class="card-title"><%= t(".metadata") %></h2>
-  </div>
-
-  <div class="card-section">
-    <div class="row column">
-      <%= form.text_field :hashtag %>
+  <div class="card" data-component="accordion" id="accordion-metadata">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-metadata" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="metadata">
+          <%= t("metadata", scope: "decidim.participatory_processes.admin.participatory_process_groups.form") %>
+        </h2>
+      </button>
     </div>
 
-    <div class="row column">
-      <%= form.text_field :group_url %>
-    </div>
+    <div id="panel-metadata" class="card-section">
+      <div class="row column">
+        <%= form.text_field :hashtag %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :developer_group %>
-    </div>
+      <div class="row column">
+        <%= form.text_field :group_url %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :local_area %>
-    </div>
+      <div class="row column">
+        <%= form.translated :text_field, :developer_group, aria: { label: :developer_group } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :meta_scope %>
-    </div>
+      <div class="row column">
+        <%= form.translated :text_field, :local_area, aria: { label: :local_area } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :target %>
-    </div>
+      <div class="row column">
+        <%= form.translated :text_field, :meta_scope, aria: { label: :meta_scope } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :participatory_scope %>
-    </div>
+      <div class="row column">
+        <%= form.translated :text_field, :target, aria: { label: :target } %>
+      </div>
+
+      <div class="row column">
+        <%= form.translated :text_field, :participatory_scope, aria: { label: :participatory_scope } %>
+      </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :participatory_structure %>
+      <div class="row column">
+        <%= form.translated :text_field, :participatory_structure, aria: { label: :participatory_structure } %>
+      </div>
     </div>
   </div>
 
-  <div class="card-divider">
-    <h2 class="card-title"><%= t(".visibility") %></h2>
-  </div>
+  <div class="card" data-component="accordion" id="accordion-visibility">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="visibility">
+          <%= t("visibility", scope: "decidim.participatory_processes.admin.participatory_process_groups.form") %>
+        </h2>
+      </button>
+    </div>
 
-  <div class="card-section">
-    <div class="row column">
-      <%= form.check_box :promoted %>
+    <div id="panel-visibility" class="card-section">
+      <div class="row column">
+        <%= form.check_box :promoted %>
+      </div>
     </div>
   </div>
+
 </div>

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

@@ -1,13 +1,19 @@
 <% add_decidim_page_title t("participatory_process_groups.edit.title", scope: "decidim.admin") %>
-<%= decidim_form_for(@form, html: { class: "form edit_participatory_process_group" }) do |f| %>
-  <h2 class="process-title-summary">
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
     <%= t "participatory_process_groups.edit.title", scope: "decidim.admin" %>
-    <% if allowed_to? :destroy, :process_group, process_group: participatory_process_group %>
-      <%= link_to t("decidim.admin.actions.destroy"), participatory_process_group, method: :delete, class: "button alert tiny button--title destroy", data: { confirm: t("decidim.admin.actions.confirm_destroy") } %>
-    <% end %>
   </h2>
-  <%= render partial: "form", object: f %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t("participatory_process_groups.edit.update", scope: "decidim.admin") %>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_participatory_process_group" }) do |f| %>
+      <%= render partial: "form", object: f %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t("participatory_process_groups.edit.update", scope: "decidim.admin"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
   </div>
-<% end %>
+</div>