decidim-proposals 0.21.0 → 0.22.0

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -14,7 +14,7 @@ module Decidim
         @author ||= if official?
                       Decidim::Proposals::OfficialAuthorPresenter.new
                     else
-                      coauthorship = coauthorships.first
+                      coauthorship = coauthorships.includes(:author, :user_group).first
                       coauthorship.user_group&.presenter || coauthorship.author.presenter
                     end
       end
@@ -45,9 +45,17 @@ module Decidim
         renderer.render(links: links, extras: extras).html_safe
       end
 
+      def id_and_title(links: false, extras: true, html_escape: false)
+        "##{proposal.id} - #{title(links: links, extras: extras, html_escape: html_escape)}"
+      end
+
       def body(links: false, extras: true, strip_tags: false)
         text = proposal.body
-        text = strip_tags(text) if strip_tags
+
+        if strip_tags
+          text = text.gsub(%r{<\/p>}, "\n\n")
+          text = strip_tags(text)
+        end
 
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(text)
         text = renderer.render(links: links, extras: extras).html_safe
@@ -81,6 +89,10 @@ module Decidim
       end
 
       delegate :count, to: :versions, prefix: true
+
+      def resource_manifest
+        proposal.class.resource_manifest
+      end
     end
   end
 end

data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb

@@ -16,8 +16,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.created_at <= ?", end_time).accepted
           @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)

data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -22,10 +19,8 @@ module Decidim
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,19 +30,27 @@ module Decidim
 
           components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
           proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn
-          @query = Decidim::Proposals::ProposalEndorsement.joins(proposal: :component)
-                                                          .left_outer_joins(proposal: :category)
-                                                          .where(proposal: proposals)
-          @query = @query.where("decidim_proposals_proposal_endorsements.created_at <= ?", end_time)
+          join_components = "INNER JOIN decidim_components ON decidim_components.manifest_name = 'proposals' AND proposals.decidim_component_id = decidim_components.id"
+          join_categories = <<~EOJOINCATS
+            LEFT OUTER JOIN decidim_categorizations
+            ON (proposals.id = decidim_categorizations.categorizable_id
+            AND decidim_categorizations.categorizable_type = 'Decidim::Proposals::Proposal')
+          EOJOINCATS
+          @query = Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
+                                       .joins(join_components)
+                                       .joins(join_categories)
+                                       .where(resource_id: proposals.pluck(:id))
+                                       .where(resource_type: Decidim::Proposals::Proposal.name)
+          @query = @query.where("decidim_endorsements.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.id",
                                 :participatory_space_type,
                                 :participatory_space_id,
-                                :decidim_proposal_id)
+                                :resource_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time).count
+          @quantity ||= query.where("decidim_endorsements.created_at >= ?", start_time).count
         end
       end
     end

data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb

@@ -59,11 +59,12 @@ module Decidim
         end
 
         def retrieve_endorsements(from_start = false)
-          @endorsements ||= Decidim::Proposals::ProposalEndorsement.joins(:proposal).where(proposal: retrieve_proposals)
-                                                                   .where("decidim_proposals_proposal_endorsements.created_at <= ?", end_time)
-                                                                   .where(decidim_author_type: "Decidim::UserBaseEntity")
+          @endorsements ||= Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
+                                                .where(resource: retrieve_proposals)
+                                                .where("decidim_endorsements.created_at <= ?", end_time)
+                                                .where(decidim_author_type: "Decidim::UserBaseEntity")
 
-          return @endorsements.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time) if from_start
+          return @endorsements.where("decidim_endorsements.created_at >= ?", start_time) if from_start
 
           @endorsements
         end

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -21,10 +18,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -35,8 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization)
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn.not_hidden
           @query = @query.group("decidim_categorizations.decidim_category_id",

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -22,10 +19,8 @@ module Decidim
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -36,11 +31,10 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          components = Decidim::Component.where(participatory_space: spaces).published
-          proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn.not_hidden
+          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces.pluck(:id))).except_withdrawn.not_hidden.pluck(:id)
           @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
                                                    .left_outer_joins(proposal: :category)
-                                                   .where(proposal: proposals)
+                                                   .where(proposal: proposal_ids)
           @query = @query.where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.id",
                                 :participatory_space_type,

data/app/services/decidim/proposals/diff_renderer.rb

@@ -21,6 +21,8 @@ module Decidim
 
       # Parses the values before parsing the changeset.
       def parse_changeset(attribute, values, type, diff)
+        return parse_scope_changeset(attribute, values, type, diff) if type == :scope
+
         values = parse_values(attribute, values)
 
         diff.update(

data/app/services/decidim/proposals/proposal_builder.rb

@@ -68,7 +68,7 @@ module Decidim
           "decidim_component_id",
           "reference",
           "proposal_votes_count",
-          "proposal_endorsements_count",
+          "endorsements_count",
           "proposal_notes_count"
         ).merge(
           "category" => original_proposal.category

data/app/services/decidim/proposals/proposal_search.rb

@@ -20,8 +20,8 @@ module Decidim
       # Handle the search_text filter
       def search_search_text
         query
-          .where("title ILIKE ?", "%#{search_text}%")
-          .or(query.where("body ILIKE ?", "%#{search_text}%"))
+          .where("decidim_proposals_proposals.title ILIKE ?", "%#{search_text}%")
+          .or(query.where("decidim_proposals_proposals.body ILIKE ?", "%#{search_text}%"))
       end
 
       # Handle the origin filter

data/app/types/decidim/proposals/proposal_input_sort.rb

@@ -4,18 +4,12 @@ module Decidim
   module Proposals
     class ProposalInputSort < Decidim::Core::BaseInputSort
       include Decidim::Core::HasPublishableInputSort
+      include Decidim::Core::HasEndorsableInputSort
 
       graphql_name "ProposalSort"
       description "A type used for sorting proposals"
 
       argument :id, String, "Sort by ID, valid values are ASC or DESC", required: false
-      argument :endorsement_count,
-               type: String,
-               description: "Sort by number of endorsements, valid values are ASC or DESC",
-               required: false,
-               prepare: ->(value, _ctx) do
-                          { proposal_endorsements_count: value }
-                        end
       argument :vote_count,
                type: String,
                description: "Sort by number of votes, valid values are ASC or DESC. Will be ignored if votes are hidden",

data/app/types/decidim/proposals/proposal_type.rb

@@ -16,6 +16,7 @@ module Decidim
         -> { Decidim::Core::AmendableInterface },
         -> { Decidim::Core::AmendableEntityInterface },
         -> { Decidim::Core::TraceableInterface },
+        -> { Decidim::Core::EndorsableInterface },
         -> { Decidim::Core::TimestampsInterface }
       ]
 
@@ -57,17 +58,6 @@ module Decidim
         }
       end
 
-      field :endorsements, !types[Decidim::Core::AuthorInterface], "The endorsements of this proposal." do
-        resolve ->(proposal, _, _) {
-          proposal.endorsements.map(&:normalized_author)
-        }
-      end
-
-      field :endorsementsCount, types.Int do
-        description "The total amount of endorsements the proposal has received"
-        property :proposal_endorsements_count
-      end
-
       field :voteCount, types.Int do
         description "The total amount of votes the proposal has received"
         resolve ->(proposal, _args, _ctx) {

data/app/types/decidim/proposals/proposals_type.rb

@@ -22,10 +22,20 @@ module Decidim
     class ProposalListHelper < Decidim::Core::ComponentListBase
       argument :order, ProposalInputSort, "Provides several methods to order the results"
       argument :filter, ProposalInputFilter, "Provides several methods to filter the results"
+
+      # only querying published posts
+      def query_scope
+        super.published
+      end
     end
 
     class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
       argument :id, !types.ID, "The ID of the proposal"
+
+      # only querying published posts
+      def query_scope
+        super.published
+      end
     end
   end
 end

data/app/validators/proposal_length_validator.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# This validator takes care of ensuring the validated attributes are long enough
+# and not too long. The difference to the Rails length validator is that this
+# allows the minimum and maximum values to be lambdas allowing us to fetch the
+# maximum length dynamically for each proposals component.
+class ProposalLengthValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    return if value.blank?
+
+    validate_min_length(record, attribute, value)
+    validate_max_length(record, attribute, value)
+  end
+
+  private
+
+  def validate_min_length(record, attribute, value)
+    min = options[:minimum] || nil
+    min = min.call(record) if min.respond_to?(:call)
+    if min && min.positive? && value.length < min
+      record.errors.add(
+        attribute,
+        options[:message] || :too_short
+      )
+    end
+  end
+
+  def validate_max_length(record, attribute, value)
+    max = options[:maximum] || nil
+    max = max.call(record) if max.respond_to?(:call)
+    if max && max.positive? && value.length > max
+      record.errors.add(
+        attribute,
+        options[:message] || :too_long
+      )
+    end
+  end
+end

data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb

@@ -16,7 +16,7 @@
         <%= form.fields_for(:proposals) do |prop_form| %>
         <% proposal= @drafts[prop_form.index] %>
           <li class="accordion-item <%= proposal.article? ? "is-active" : nil %>" data-accordion-item>
-            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small" %></span></a>
+            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small", role: "img", "aria-hidden": true %></span></a>
             <div class="accordion-content" data-tab-content>
               <%= render "article-preview", { form: prop_form, proposal: proposal } %>
             </div>
@@ -35,6 +35,14 @@
 <% end -%>
 <script>
 $(window).on("load", function() {
+  // Not all browsers submit the buttons as form data.
+  $('button[name="save_draft"]').on("click", function(ev) {
+    ev.preventDefault();
+
+    var $form = $(this).parents("form");
+    $form.append('<input type="hidden" name="save_draft" value="true" />');
+    $form.submit();
+  });
   $( "#participatory-text" ).on( "sortupdate",
     function( event, ui ) {
       $('#participatory-text li').each(function(idx, li) {

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -9,7 +9,7 @@
         <% proposal.notes.each do |note| %>
           <div class="card">
             <div class="card-divider">
-              <article class="comment">
+              <div class="comment">
                 <div class="comment__header">
                   <div class="author-data">
                     <div class="author-data__main">
@@ -23,7 +23,7 @@
                 <div class="comment__content">
                   <%= simple_format note.body %>
                 </div>
-              </article>
+              </div>
             </div>
           </div>
         <% end %>

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

@@ -5,7 +5,7 @@
 
   <div class="card-section">
     <div class="row column hashtags__container">
-      <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title(extras: false).strip %>
+      <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title(extras: false).strip %>
     </div>
 
     <div class="row column hashtags__container">
@@ -59,7 +59,7 @@
 
     <% if @form.categories&.any? %>
       <div class="row column">
-        <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
+        <%= form.categories_select :category_id, @form.categories, include_blank: t(".select_a_category") %>
       </div>
     <% end %>
 
@@ -70,27 +70,7 @@
     <% end %>
 
     <% if component_settings.attachments_allowed? %>
-      <div class="row column gallery__container">
-        <fieldset>
-          <legend><%= t(".gallery_legend") %></legend>
-
-          <% if @form.photos.any? %>
-            <% @form.photos.each do |photo| %>
-              <div class="callout gallery__item" data-closable>
-                <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
-                <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
-                <button class="close-button" aria-label="Close" type="button" data-close>
-                  <span aria-hidden="true">&times;</span>
-                </button>
-              </div>
-            <% end %>
-          <% end %>
-
-          <div class="row column">
-            <%= form.file_field :add_photos, multiple: true, label: t(".add_images") %>
-          </div>
-        </fieldset>
-      </div>
+      <%= render partial: "decidim/admin/shared/gallery", locals: { form: form } %>
     <% end %>
 
     <% if component_settings.attachments_allowed? %>

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

@@ -8,7 +8,7 @@
       <%= render partial: "bulk-actions" %>
     </h2>
   </div>
-  <%= admin_filter_selector %>
+  <%= admin_filter_selector(:proposals) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">

data/app/views/decidim/proposals/admin/proposals/show.html.erb

@@ -51,7 +51,7 @@
     </div>
 
     <div class="row column">
-      <strong><%= t ".endorsements_count" %>:</strong> <%= proposal.proposal_endorsements_count %>
+      <strong><%= t ".endorsements_count" %>:</strong> <%= proposal.endorsements_count %>
     </div>
 
     <div class="row column">

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -1,9 +1,11 @@
+<%= form_required_explanation %>
+
 <div class="field hashtags__container">
-  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
+  <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 </div>
 
 <div class="field hashtags__container">
-  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", value: form_presenter.body(extras: false).strip %>
 </div>
 
 <% if @form.component_automatic_hashtags.any? %>
@@ -21,7 +23,7 @@
 
 <% if @form.component_suggested_hashtags.any? %>
   <div class="field">
-    <%= form.label :suggested_hashtags %>
+    <%= form.label :suggested_hashtags, nil, for: nil %>
     <div class="checkboxes hashtags">
       <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
         option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
@@ -42,7 +44,7 @@
 
 <% if @form.categories&.any? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
+    <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
   </div>
 <% end %>