decidim-participatory_processes 0.24.0 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f3c5be019f2186794d0c03bae4e1ae273431571f85bcec52ba02dd399a0fe3
-  data.tar.gz: a4089191dff56d586744d2a3c500cdfc563122cbb8f7e9c5cfc49078d33a1829
+  metadata.gz: 32a235fc3b9a09586d67a35be3873650559f90c93909805b4b7e647519301a64
+  data.tar.gz: '096b8db9366702022964db30a212d3171a174ae00ffd941f2a5ffdafa798128f'
 SHA512:
-  metadata.gz: 39177dcce20960ab4200223ab550b3128349b26e2f278d377136051bba7051ca2dc29eeb43a77470d93ea9c1e7b6093cd474f1c1e14c605aed18183166995bf1
-  data.tar.gz: b460198d40452496509af6e6b538ba70a8231275cc65350acdb56ca3d863fe38cbd777d3ad5423961e73e301147c07c8076ec89ecdf9112659891a53a0c3b0ea
+  metadata.gz: fec3daeb712921a3f5a295ad10ae0bb9ba28015bf10c60a6772ab64aefc945ae72956a08c6d89fcb38144cbd51b7b275f1113162fd92b5a976a7baafb12d08e6
+  data.tar.gz: 8a006bf54e63d8ab2f6a7ca4dfc84ee440518d2ab11db4a19a7577add53d7b104bb4036d6d956f236da3c91dd2bf8e261d8badfea216c3952407550ccf52374d

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

@@ -19,4 +19,3 @@
                           include_blank: t("decidim.shared.participatory_space_filters.filters.select_an_area") %>
   </div>
 <% end %>
-<%= javascript_include_tag "decidim/filters" %>

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcessGroups
+    module ContentBlocks
+      class StatisticsCell < Decidim::StatisticsCell
+        def stats
+          @stats ||= begin
+            participatory_process_group = Decidim::ParticipatoryProcessGroup.find(model.scoped_resource_id)
+            Decidim::ParticipatoryProcesses::ParticipatoryProcessGroupStatsPresenter.new(participatory_process_group: participatory_process_group).collection
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@
       <%= decidim_sanitize translated_attribute(participatory_process_group.description) %>
       <div class="row">
         <div class="column medium-2 text-muted">
-          <%= icon "grid-three-up", role: "img", class: "mr-xs" %>
+          <%= icon "grid-three-up", role: "img", "aria-hidden": true, class: "mr-xs" %>
           <%= t("decidim.participatory_process_groups.content_blocks.title.participatory_processes", count: participatory_processes_count) %>
         </div>
         <% if has_meta_scope? %>

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

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

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

@@ -12,7 +12,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
 
       def title

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

@@ -8,7 +8,7 @@ module Decidim
       private
 
       def has_image?
-        model.hero_image.url.present?
+        model.hero_image.attached?
       end
 
       def resource_path
@@ -16,7 +16,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
 
       def step_cta_text

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

@@ -8,7 +8,7 @@ module Decidim
       private
 
       def has_image?
-        model.hero_image.url.present?
+        model.hero_image.attached?
       end
 
       def has_step?
@@ -20,7 +20,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.hero_image.url
+        model.attached_uploader(:hero_image).path
       end
 
       def step_title

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

@@ -26,6 +26,7 @@ module Decidim
 
           ParticipatoryProcess.transaction do
             copy_participatory_process
+            copy_participatory_process_attachments
             copy_participatory_process_steps if @form.copy_steps?
             copy_participatory_process_categories if @form.copy_categories?
             copy_participatory_process_components if @form.copy_components?
@@ -47,8 +48,6 @@ module Decidim
             hashtag: @participatory_process.hashtag,
             description: @participatory_process.description,
             short_description: @participatory_process.short_description,
-            hero_image: @participatory_process.hero_image,
-            banner_image: @participatory_process.banner_image,
             promoted: @participatory_process.promoted,
             scope: @participatory_process.scope,
             developer_group: @participatory_process.developer_group,
@@ -65,6 +64,14 @@ module Decidim
           )
         end
 
+        def copy_participatory_process_attachments
+          [:hero_image, :banner_image].each do |attribute|
+            next unless @participatory_process.attached_uploader(attribute).attached?
+
+            @copied_process.send(attribute).attach(@participatory_process.send(attribute).blob)
+          end
+        end
+
         def copy_participatory_process_steps
           @steps_relationship = {}
 

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

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new participatory
       # process in the system.
       class UpdateParticipatoryProcess < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # participatory_process - the ParticipatoryProcess to update
@@ -78,16 +80,9 @@ module Decidim
             show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement
-          }.merge(uploader_attributes)
-        end
-
-        def uploader_attributes
-          {
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image
-          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
+          }.merge(
+            attachment_attributes(:hero_image, :banner_image)
+          )
         end
 
         def related_processes

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

@@ -6,6 +6,8 @@ module Decidim
       # A command with all the business logic when creating a new participatory
       # process group in the system.
       class UpdateParticipatoryProcessGroup < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # participatory_process_group - the ParticipatoryProcessGroup to update
@@ -52,8 +54,6 @@ module Decidim
         def attributes
           {
             title: form.title,
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
             description: form.description,
             hashtag: form.hashtag,
             group_url: form.group_url,
@@ -65,7 +65,7 @@ module Decidim
             participatory_structure: form.participatory_structure,
             target: form.target,
             promoted: form.promoted
-          }
+          }.merge(attachment_attributes(:hero_image))
         end
 
         def participatory_processes

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

@@ -42,9 +42,9 @@ module Decidim
         end
 
         def edit
-          @participatory_process_group = collection.find(params[:id])
-          enforce_permission_to :update, :process_group, process_group: @participatory_process_group
-          @form = form(ParticipatoryProcessGroupForm).from_model(@participatory_process_group)
+          @item = collection.find(params[:id])
+          enforce_permission_to :update, :process_group, process_group: @item
+          @form = form(ParticipatoryProcessGroupForm).from_model(@item)
           render layout: "decidim/admin/participatory_process_group"
         end
 

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

@@ -93,11 +93,7 @@ module Decidim
         alias current_participatory_space current_participatory_process
 
         def participatory_process_params
-          {
-            id: params[:slug],
-            hero_image: current_participatory_process.hero_image,
-            banner_image: current_participatory_process.banner_image
-          }.merge(params[:participatory_process].to_unsafe_h)
+          { id: params[:slug] }.merge(params[:participatory_process].to_unsafe_h)
         end
       end
     end

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

@@ -45,8 +45,8 @@ module Decidim
 
         attribute :banner_image
         attribute :hero_image
-        attribute :remove_banner_image
-        attribute :remove_hero_image
+        attribute :remove_banner_image, Boolean, default: false
+        attribute :remove_hero_image, Boolean, default: false
 
         validates :area, presence: true, if: proc { |object| object.area_id.present? }
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }

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

@@ -28,7 +28,7 @@ module Decidim
         mimic :participatory_process_group
 
         attribute :hero_image
-        attribute :remove_hero_image
+        attribute :remove_hero_image, Boolean, default: false
 
         validates :title, :description, translatable_presence: true
 

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

@@ -8,6 +8,7 @@ module Decidim
       #
       class ParticipatoryProcessImportForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         JSON_MIME_TYPE = "application/json"
         # Accepted mime types

data/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -53,7 +53,7 @@ module Decidim
         OpenStruct.new(
           text: translated_attribute(cta_settings.button_text),
           path: cta_settings.button_url,
-          image_url: block.images_container.background_image.big.url
+          image_url: block.images_container.attached_uploader(:background_image).path(variant: :big)
         )
       end
 

data/app/models/decidim/participatory_process.rb

@@ -66,11 +66,11 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
 
-    validates_upload :hero_image
-    mount_uploader :hero_image, Decidim::HeroImageUploader
+    has_one_attached :hero_image
+    validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-    validates_upload :banner_image
-    mount_uploader :banner_image, Decidim::BannerImageUploader
+    has_one_attached :banner_image
+    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
     scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
@@ -156,11 +156,15 @@ module Decidim
       slug
     end
 
-    # Overrides the method from `Participable`.
+    # Overrides the moderators methods from `Participable`.
     def moderators
       "#{admin_module_name}::Moderators".constantize.for(self)
     end
 
+    def self.moderators(organization)
+      "#{admin_module_name}::Moderators".constantize.for_organization(organization)
+    end
+
     def user_roles(role_name = nil)
       roles = Decidim::ParticipatoryProcessUserRole.where(participatory_process: self)
       return roles if role_name.blank?

data/app/models/decidim/participatory_process_group.rb

@@ -20,8 +20,8 @@ module Decidim
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
 
-    validates_upload :hero_image
-    mount_uploader :hero_image, Decidim::HeroImageUploader
+    has_one_attached :hero_image
+    validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
     # Scope to return only the promoted groups.
     #

data/app/packs/entrypoints/decidim_participatory_processes.js

@@ -0,0 +1,4 @@
+import "src/decidim/participatory_processes/filters"
+
+// Images
+require.context("../images", true)

data/app/packs/entrypoints/decidim_participatory_processes_admin.js

@@ -0,0 +1 @@
+import "src/decidim/participatory_processes/admin/participatory_processes"

data/app/packs/src/decidim/participatory_processes/admin/participatory_processes.js

@@ -0,0 +1,18 @@
+$(() => {
+  const $participatoryProcessScopeEnabled = $("#participatory_process_scopes_enabled");
+  const $participatoryProcessScopeId = $("#participatory_process_scope_id");
+  const $participatoryProcessScopeTypeId = $("#participatory_process_scope_type_max_depth_id");
+
+  if ($(".edit_participatory_process, .new_participatory_process").length > 0) {
+    $participatoryProcessScopeEnabled.on("change", (event) => {
+      const checked = event.target.checked;
+      window.theDataPicker.enabled($participatoryProcessScopeId, checked);
+      if (checked === true) {
+        $participatoryProcessScopeTypeId.removeAttr("disabled");
+      } else {
+        $participatoryProcessScopeTypeId.attr("disabled", true)
+      }
+    })
+    window.theDataPicker.enabled($participatoryProcessScopeId, $participatoryProcessScopeEnabled.prop("checked"));
+  }
+});

data/app/packs/src/decidim/participatory_processes/filters.js

@@ -0,0 +1,28 @@
+$(() => {
+  const $processesGrid = $("#processes-grid");
+  const $loading = $processesGrid.find(".loading");
+  const filterLinksSelector = ".order-by__tabs a"
+
+  $loading.hide();
+
+  $processesGrid.on("click", filterLinksSelector, (event) => {
+    const $processesGridCards = $processesGrid.find(".card-grid .column");
+    let $target = $(event.target);
+
+    // IE11 matches the <strong> element inside the filtering anchor element
+    // as the `event.target` breaking the functionality below.
+    if (!$target.is("a")) {
+      $target = $target.parents("a");
+    }
+
+    $(filterLinksSelector).removeClass("is-active");
+    $target.addClass("is-active");
+
+    $processesGridCards.hide();
+    $loading.show();
+
+    if (window.history) {
+      window.history.pushState(null, null, $target.attr("href"));
+    }
+  });
+});

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

@@ -3,15 +3,10 @@
 module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessGroupPresenter < SimpleDelegator
-      include Rails.application.routes.mounted_helpers
-      include ActionView::Helpers::UrlHelper
-
-      delegate :url, to: :hero_image, prefix: true
-
       def hero_image_url
         return if process_group.blank?
 
-        URI.join(decidim.root_url(host: process_group.organization.host), process_group.try(:hero_image_url)).to_s
+        process_group.attached_uploader(:hero_image).url(host: process_group.organization.host)
       end
 
       def process_group

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
-    class ParticipatoryProcessGroupStatsPresenter < Rectify::Presenter
+    class ParticipatoryProcessGroupStatsPresenter < Decidim::StatsPresenter
       attribute :participatory_process_group, Decidim::ParticipatoryProcessGroup
       include Decidim::IconHelper
 
@@ -14,22 +14,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/presenters/decidim/participatory_processes/participatory_process_presenter.rb

@@ -3,19 +3,12 @@
 module Decidim
   module ParticipatoryProcesses
     class ParticipatoryProcessPresenter < SimpleDelegator
-      include Rails.application.routes.mounted_helpers
-      include ActionView::Helpers::UrlHelper
-
       def hero_image_url
-        return unless process.hero_image_url
-
-        URI.join(decidim.root_url(host: process.organization.host), process.hero_image_url).to_s
+        process.attached_uploader(:hero_image).url(host: process.organization.host)
       end
 
       def banner_image_url
-        return unless process.banner_image_url
-
-        URI.join(decidim.root_url(host: process.organization.host), process.banner_image_url).to_s
+        process.attached_uploader(:banner_image).url(host: process.organization.host)
       end
 
       def process