decidim-proposals 0.23.6 → 0.24.0.rc1

data/app/helpers/decidim/proposals/proposal_wizard_helper.rb

@@ -32,7 +32,7 @@ module Decidim
       #
       # step - A symbol of the target step
       def proposal_wizard_step_name(step)
-        t("decidim.proposals.#{type_of}.wizard_steps.#{step}")
+        t("decidim.proposals.proposals.wizard_steps.#{step}")
       end
 
       # Returns the page title of the given step, translated
@@ -48,7 +48,7 @@ module Decidim
                        action_name
                      end
 
-        t("decidim.proposals.#{type_of}.#{step_title}.title")
+        t("decidim.proposals.proposals.#{step_title}.title")
       end
 
       # Returns the list item of the given step, in html
@@ -56,8 +56,6 @@ module Decidim
       # step - A symbol of the target step
       # current_step - A symbol of the current step
       def proposal_wizard_stepper_step(step, current_step)
-        return if step == :step_4 && type_of == :collaborative_drafts
-
         attributes = { class: proposal_wizard_step_classes(step, current_step).to_s }
         step_title = proposal_wizard_step_name(step)
         if step.to_s.split("_").last.to_i == proposal_wizard_step_number(current_step)
@@ -99,7 +97,7 @@ module Decidim
       end
 
       def proposal_wizard_steps_title
-        t("title", scope: "decidim.proposals.#{type_of}.wizard_steps")
+        t("title", scope: "decidim.proposals.proposals.wizard_steps")
       end
 
       # Returns a boolean if the step has a help text defined
@@ -128,58 +126,30 @@ module Decidim
       private
 
       def total_steps
-        case type_of
-        when :collaborative_drafts
-          3
-        when :proposals
-          4
-        else
-          4
-        end
+        4
       end
 
       def wizard_aside_info_text
-        case type_of
-        when :collaborative_drafts
-          t("info", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
-        else
-          t("info", scope: "decidim.proposals.proposals.wizard_aside").html_safe
-        end
+        t("info", scope: "decidim.proposals.proposals.wizard_aside").html_safe
       end
 
       # Renders the back link except for step_2: compare
       def proposal_wizard_aside_link_to_back(step)
-        url = case step
-              when :step_1
-                proposals_path
-              when :step_3
-                compare_proposal_path
-              when :step_4
-                edit_draft_proposal_path
-              end
-        url
+        case step
+        when :step_1
+          proposals_path
+        when :step_3
+          compare_proposal_path
+        when :step_4
+          edit_draft_proposal_path
+        end
       end
 
       def wizard_aside_back_text(from = nil)
         key = "back"
         key = "back_from_#{from}" if from
 
-        case type_of
-        when :collaborative_drafts
-          t(key, scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe
-        else
-          t(key, scope: "decidim.proposals.proposals.wizard_aside").html_safe
-        end
-      end
-
-      def type_of
-        if ["Decidim::Proposals::CollaborativeDraftForm"].include? @form.class.name
-          :collaborative_drafts
-        elsif @collaborative_draft.present?
-          :collaborative_drafts
-        else
-          :proposals
-        end
+        t(key, scope: "decidim.proposals.proposals.wizard_aside").html_safe
       end
     end
   end

data/app/helpers/decidim/proposals/proposals_helper.rb

@@ -4,13 +4,10 @@ module Decidim
   module Proposals
     # Simple helpers to handle markup variations for proposals
     module ProposalsHelper
-      def proposal_reason_callout_args
+      def proposal_reason_callout_announcement
         {
-          announcement: {
-            title: proposal_reason_callout_title,
-            body: decidim_sanitize(translated_attribute(@proposal.answer))
-          },
-          callout_class: proposal_reason_callout_class
+          title: proposal_reason_callout_title,
+          body: decidim_sanitize(translated_attribute(@proposal.answer))
         }
       end
 

data/app/models/decidim/proposals/collaborative_draft.rb

@@ -58,6 +58,16 @@ module Decidim
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
       end
+
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:body]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [authors.map(&:name).join("\n")]
+      end
     end
   end
 end

data/app/models/decidim/proposals/proposal.rb

@@ -69,12 +69,13 @@ module Decidim
       scope :drafts, -> { where(published_at: nil) }
       scope :except_drafts, -> { where.not(published_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
+      scope :order_by_most_recent, -> { order(created_at: :desc) }
       scope :sort_by_valuation_assignments_count_asc, lambda {
-        order(sort_by_valuation_assignments_count_nulls_last_query + "ASC NULLS FIRST")
+        order("#{sort_by_valuation_assignments_count_nulls_last_query}ASC NULLS FIRST")
       }
 
       scope :sort_by_valuation_assignments_count_desc, lambda {
-        order(sort_by_valuation_assignments_count_nulls_last_query + "DESC NULLS LAST")
+        order("#{sort_by_valuation_assignments_count_nulls_last_query}DESC NULLS LAST")
       }
 
       def self.with_valuation_assigned_to(user, space)
@@ -106,7 +107,7 @@ module Decidim
         return unless author.is_a?(Decidim::User)
 
         joins(:coauthorships)
-          .where("decidim_coauthorships.coauthorable_type = ?", name)
+          .where(decidim_coauthorships: { coauthorable_type: name })
           .where("decidim_coauthorships.decidim_author_id = ? AND decidim_coauthorships.decidim_author_type = ? ", author.id, author.class.base_class.name)
       end
 
@@ -227,6 +228,16 @@ module Decidim
         ResourceLocatorPresenter.new(self).url
       end
 
+      # Public: Overrides the `reported_attributes` Reportable concern method.
+      def reported_attributes
+        [:title, :body]
+      end
+
+      # Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
+      def reported_searchable_content_extras
+        [authors.map(&:name).join("\n")]
+      end
+
       # Public: Whether the proposal is official or not.
       def official?
         authors.first.is_a?(Decidim::Organization)
@@ -286,7 +297,7 @@ module Decidim
 
       # Defines the base query so that ransack can actually sort by this value
       def self.sort_by_valuation_assignments_count_nulls_last_query
-        <<-SQL
+        <<-SQL.squish
         (
           SELECT COUNT(decidim_proposals_valuation_assignments.id)
           FROM decidim_proposals_valuation_assignments
@@ -298,7 +309,7 @@ module Decidim
 
       # method to filter by assigned valuator role ID
       def self.valuator_role_ids_has(value)
-        query = <<-SQL
+        query = <<-SQL.squish
         :value = any(
           (SELECT decidim_proposals_valuation_assignments.valuator_role_id
           FROM decidim_proposals_valuation_assignments
@@ -326,10 +337,6 @@ module Decidim
         ")
       end
 
-      ransacker :state do
-        Arel.sql("CASE WHEN state = 'withdrawn' THEN 'withdrawn' WHEN state_published_at IS NULL THEN NULL ELSE state END")
-      end
-
       ransacker :title do
         Arel.sql(%{("decidim_proposals_proposals"."title")::text})
       end
@@ -339,7 +346,7 @@ module Decidim
       end
 
       ransacker :is_emendation do |_parent|
-        query = <<-SQL
+        query = <<-SQL.squish
         (
           SELECT EXISTS (
             SELECT 1 FROM decidim_amendments
@@ -367,6 +374,7 @@ module Decidim
       # Checks whether the proposal is inside the time window to be editable or not once published.
       def within_edit_time_limit?
         return true if draft?
+        return true if component.settings.proposal_edit_time == "infinite"
 
         limit = updated_at + component.settings.proposal_edit_before_minutes.minutes
         Time.current < limit

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -57,9 +57,9 @@ module Decidim
           # Only admin users can publish many answers at once
           toggle_allow(user.admin?) if permission_action.subject == :proposals && permission_action.action == :publish_answers
 
-          if permission_action.subject == :participatory_texts && participatory_texts_are_enabled?
+          if permission_action.subject == :participatory_texts && participatory_texts_are_enabled? && permission_action.action == :manage
             # Every user allowed by the space can manage (import, update and publish) participatory texts to proposals
-            allow! if permission_action.action == :manage
+            allow!
           end
 
           permission_action

data/app/permissions/decidim/proposals/permissions.rb

@@ -10,9 +10,10 @@ module Decidim
         return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
-        if permission_action.subject == :proposal
+        case permission_action.subject
+        when :proposal
           apply_proposal_permissions(permission_action)
-        elsif permission_action.subject == :collaborative_draft
+        when :collaborative_draft
           apply_collaborative_draft_permissions(permission_action)
         else
           permission_action

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

@@ -100,13 +100,13 @@ module Decidim
       private
 
       def sanitize_unordered_lists(text)
-        text.gsub(%r{(?=.*<\/ul>)(?!.*?<li>.*?<\/ol>.*?<\/ul>)<li>}) { |li| li + "• " }
+        text.gsub(%r{(?=.*</ul>)(?!.*?<li>.*?</ol>.*?</ul>)<li>}) { |li| "#{li}• " }
       end
 
       def sanitize_ordered_lists(text)
         i = 0
 
-        text.gsub(%r{(?=.*<\/ol>)(?!.*?<li>.*?<\/ul>.*?<\/ol>)<li>}) do |li|
+        text.gsub(%r{(?=.*</ol>)(?!.*?<li>.*?</ul>.*?</ol>)<li>}) do |li|
           i += 1
 
           li + "#{i}. "
@@ -114,11 +114,11 @@ module Decidim
       end
 
       def add_line_feeds_to_paragraphs(text)
-        text.gsub("</p>") { |p| p + "\n\n" }
+        text.gsub("</p>") { |p| "#{p}\n\n" }
       end
 
       def add_line_feeds_to_list_items(text)
-        text.gsub("</li>") { |li| li + "\n" }
+        text.gsub("</li>") { |li| "#{li}\n" }
       end
 
       # Adds line feeds after the paragraph and list item closing tags.

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

@@ -17,8 +17,8 @@ module Decidim
           cumulative_users |= retrieve_drafts_followers.pluck(:decidim_user_id)
 
           quantity_users = []
-          quantity_users |= retrieve_proposals_followers(true).pluck(:decidim_user_id)
-          quantity_users |= retrieve_drafts_followers(true).pluck(:decidim_user_id)
+          quantity_users |= retrieve_proposals_followers(from_start: true).pluck(:decidim_user_id)
+          quantity_users |= retrieve_drafts_followers(from_start: true).pluck(:decidim_user_id)
 
           {
             cumulative_users: cumulative_users.uniq,
@@ -28,7 +28,7 @@ module Decidim
 
         private
 
-        def retrieve_proposals_followers(from_start = false)
+        def retrieve_proposals_followers(from_start: false)
           @proposals_followers ||= Decidim::Follow.where(followable: retrieve_proposals).joins(:user)
                                                   .where("decidim_follows.created_at <= ?", end_time)
 
@@ -37,7 +37,7 @@ module Decidim
           @proposals_followers
         end
 
-        def retrieve_drafts_followers(from_start = false)
+        def retrieve_drafts_followers(from_start: false)
           @drafts_followers ||= Decidim::Follow.where(followable: retrieve_collaborative_drafts).joins(:user)
                                                .where("decidim_follows.created_at <= ?", end_time)
           return @drafts_followers.where("decidim_follows.created_at >= ?", start_time) if from_start

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

@@ -19,9 +19,9 @@ module Decidim
           cumulative_users |= retrieve_proposals.pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
 
           quantity_users = []
-          quantity_users |= retrieve_votes(true).pluck(:decidim_author_id)
-          quantity_users |= retrieve_endorsements(true).pluck(:decidim_author_id)
-          quantity_users |= retrieve_proposals(true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+          quantity_users |= retrieve_votes(from_start: true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_endorsements(from_start: true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_proposals(from_start: true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
 
           {
             cumulative_users: cumulative_users.uniq,
@@ -31,7 +31,7 @@ module Decidim
 
         private
 
-        def retrieve_proposals(from_start = false)
+        def retrieve_proposals(from_start: false)
           @proposals ||= Decidim::Proposals::Proposal.where(component: @resource).joins(:coauthorships)
                                                      .includes(:votes, :endorsements)
                                                      .where(decidim_coauthorships: {
@@ -49,7 +49,7 @@ module Decidim
           @proposals
         end
 
-        def retrieve_votes(from_start = false)
+        def retrieve_votes(from_start: false)
           @votes ||= Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: retrieve_proposals).joins(:author)
                                                      .where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
 
@@ -58,7 +58,7 @@ module Decidim
           @votes
         end
 
-        def retrieve_endorsements(from_start = false)
+        def retrieve_endorsements(from_start: false)
           @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)

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

@@ -21,7 +21,7 @@ module Decidim
       # translated.
       def search_search_text
         query
-          .where("title::text ILIKE ?", "%#{search_text}%")
+          .where("title ILIKE ?", "%#{search_text}%")
           .or(query.where("body ILIKE ?", "%#{search_text}%"))
       end
 

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

@@ -42,15 +42,7 @@ module Decidim
       # Returns and Array of two Strings.
       def parse_values(attribute, values)
         values = [amended_previous_value(attribute), values[1]] if proposal&.emendation?
-        if attribute == :body
-          values = values.map do |value|
-            if value.is_a?(Hash)
-              value.values.map { |subvalue| normalize_line_endings(subvalue) }
-            else
-              normalize_line_endings(value)
-            end
-          end
-        end
+        values = values.map { |value| normalize_line_endings(value) } if attribute == :body
         values
       end
 
@@ -66,8 +58,12 @@ module Decidim
       end
 
       # Returns a String with the newline escape sequences normalized.
-      def normalize_line_endings(string)
-        Decidim::ContentParsers::NewlineParser.new(string, context: {}).rewrite
+      def normalize_line_endings(value)
+        if value.is_a?(Hash)
+          value.values.map { |subvalue| normalize_line_endings(subvalue) }
+        else
+          Decidim::ContentParsers::NewlineParser.new(value, context: {}).rewrite
+        end
       end
 
       def proposal

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

@@ -68,10 +68,9 @@ module Decidim
           "answered_at",
           "decidim_component_id",
           "reference",
-          "comments_count",
+          "proposal_votes_count",
           "endorsements_count",
-          "proposal_notes_count",
-          "proposal_votes_count"
+          "proposal_notes_count"
         ).merge(
           "category" => original_proposal.category
         ).merge(

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -5,12 +5,19 @@
     <% if component_settings.participatory_texts_enabled? %>
       <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button tiny button--simple" %>
     <% end %>
-    <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
     <% if allowed_to? :export, :proposals %>
       <%= export_dropdown %>
     <% end %>
 
+    <% if allowed_to? :import, :proposals %>
+      <%= import_dropdown do %>
+        <% content_tag :li do %>
+          <% link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+        <% end %>
+      <% end %>
+    <% end %>
+
     <% if allowed_to? :create, :proposal %>
       <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
     <% end %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -16,9 +16,11 @@
       <%= translated_attribute proposal.category.name %>
     <% end %>
   </td>
+
   <%= td_resource_scope_for(proposal.scope) %>
+
   <td>
-    <strong class="<%= proposal_state_css_class proposal.state %>">
+    <strong class="<%= proposal_state_css_class proposal %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
       <%= proposal_complete_state proposal %>
     </strong>
@@ -61,6 +63,8 @@
   <td class="table-list__actions">
     <% if allowed_to? :edit, :proposal, proposal: proposal %>
       <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+    <% else %>
+      <span class="action-space icon"></span>
     <% end %>
 
     <%= icon_with_link_to_proposal(proposal) %>

data/app/views/decidim/proposals/admin/proposals_imports/new.html.erb

@@ -2,7 +2,7 @@
   <% if @form.origin_components.any? %>
     <div class="card">
       <div class="card-divider">
-        <h2 class="card-title"><%= title %></h2>
+        <h2 class="card-title"><%= t(".title") %></h2>
       </div>
 
       <div class="card-section">

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

@@ -2,17 +2,12 @@
   <div class="m-bottom">
     <%= link_to :back do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= wizard_aside_back_text("collaborative_draft") %>
+      <%= t("back_from_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     <% end %>
   </div>
   <div class="section">
     <p>
-      <%= wizard_aside_info_text %>
+      <%= t("info", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     </p>
   </div>
-  <div class="show-for-large">
-    <div><%= proposal_wizard_steps_title %></div>
-    <div><%= proposal_wizard_current_step_of(@step) %></div>
-    <%= proposal_wizard_stepper(@step) %>
-  </div>
 </div>

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

@@ -0,0 +1,14 @@
+<% if translated_attribute(component_settings.new_proposal_help_text).present? %>
+  <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
+<% end %>
+
+<% if proposal_wizard_step_help_text?(@step) %>
+  <div class="proposal_wizard_help_text">
+    <% callout_step_help_text_class ||= nil %>
+    <%= cell("decidim/announcement", component_settings.try("proposal_wizard_#{@step}_help_text"), callout_class: callout_step_help_text_class) %>
+  </div>
+<% end %>
+
+<h2 class="section-heading">
+  <%= t(".title") %>
+</h2>

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

@@ -13,9 +13,7 @@
 <div class="row">
   <div class="columns large-6 medium-centered">
     <div class="card">
-      <% if translated_attribute(component_settings.new_proposal_help_text).present? %>
-        <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
-      <% end %>
+      <%= cell("decidim/announcement", component_settings.new_proposal_help_text) %>
 
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>

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

@@ -1,26 +1,18 @@
-<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+<% add_decidim_page_title(t("decidim.proposals.collaborative_drafts.wizard_header.title")) %>
 
 <div class="row">
   <%= render partial: "wizard_aside" %>
 
   <div class="columns large-6">
-    <%= render partial: "decidim/proposals/proposals/wizard_header" %>
+    <%= render partial: "wizard_header" %>
 
     <div class="card">
       <div class="card__content">
-        <%= decidim_form_for(@form, url: compare_collaborative_drafts_path, method: :get) do |form| %>
-          <%= form_required_explanation %>
-
-          <div class="field">
-            <%= form.text_field :title %>
-          </div>
-
-          <div class="field">
-            <%= form.text_area :body, rows: 10 %>
-          </div>
+        <%= decidim_form_for(@form) do |form| %>
+          <%= render partial: "edit_form_fields", locals: { form: form } %>
 
           <div class="actions">
-            <%= form.submit t("decidim.proposals.collaborative_drafts.new.send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
+            <%= form.submit t(".send"), class: "button expanded mt-s mb-none", data: { disable: true } %>
           </div>
         <% end %>
       </div>

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

@@ -125,10 +125,4 @@
 <%= attachments_for @collaborative_draft %>
 <%= comments_for @collaborative_draft %>
 
-<%=
-  render partial: "decidim/shared/flag_modal", locals: {
-    reportable: @collaborative_draft,
-    form: @report_form,
-    url: decidim.report_path(sgid: @collaborative_draft.to_sgid.to_s)
-  }
-%>
+<%= cell("decidim/flag_modal", @collaborative_draft) %>

data/app/views/decidim/proposals/proposals/_dynamic_map_instructions.html.erb

@@ -0,0 +1,3 @@
+<div class="column dynamic-map-instructions">
+  <%== t(".instructions") %>
+</div>

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

@@ -25,7 +25,7 @@
   <div class="field">
     <%= 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|
+      <%= 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 }
       end %>
     </div>
@@ -38,7 +38,7 @@
   </div>
 
   <div class="field" id="address_input">
-    <%= form.geocoding_field :address %>
+    <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
   </div>
 <% end %>