decidim-proposals 0.23.5 → 0.24.2

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 ILIKE ?", "%#{search_text}%")
+          .where("title::text 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

@@ -70,6 +70,7 @@ module Decidim
           "reference",
           "comments_count",
           "endorsements_count",
+          "follows_count",
           "proposal_notes_count",
           "proposal_votes_count"
         ).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/_filters_small_view.html.erb

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>

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 %>
 
@@ -61,12 +61,12 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? && @proposal %>
-  <fieldset>
+  <fieldset class="gallery__container">
     <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
 
     <% if @form.photos.any? %>
       <% @form.photos.each do |photo| %>
-        <div class="callout gallery__item" data-closable>
+        <div class="callout gallery__item" id="attachment_<%= photo.id %>" 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"
@@ -85,12 +85,12 @@
     </div>
   </fieldset>
 
-  <fieldset>
+  <fieldset class="gallery__container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
 
     <% if @form.documents.any? %>
       <% @form.documents.each do |document| %>
-        <div class="callout" data-closable>
+        <div class="callout" id="attachment_<%= document.id %>" data-closable>
           <%= link_to translated_attribute(document.title), document.url %>
           <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
           <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>

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

@@ -1,46 +1,48 @@
 <%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "proposals" } %>
 
-<%= filter_form_for filter do |form| %>
-  <div class="filters__section">
-    <div class="filters__search">
-      <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
-        <div class="input-group-button">
-          <button type="submit" class="button" aria-controls="proposals">
-            <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
-          </button>
+<% cache filter_cache_hash(filter, defined?(type) ? type : nil) do %>
+  <%= filter_form_for filter do |form| %>
+    <div class="filters__section">
+      <div class="filters__search">
+        <div class="input-group">
+          <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), data: { disable_dynamic_change: true } %>
+          <div class="input-group-button">
+            <button type="submit" class="button" aria-controls="proposals">
+              <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
+            </button>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 
-  <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
-    <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
-  <% end %>
+    <% if component_settings.proposal_answering_enabled && current_settings.proposal_answering_enabled %>
+      <%= form.check_boxes_tree :state, filter_proposals_state_values, legend_title: t(".state"), "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if current_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
-  <% end %>
+    <% if current_component.has_subscopes? %>
+      <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
-  <% end %>
+    <% if current_component.categories.any? %>
+      <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if component_settings.official_proposals_enabled %>
-    <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
-  <% end %>
+    <% if component_settings.official_proposals_enabled %>
+      <%= form.check_boxes_tree :origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if current_user %>
-    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "proposals" %>
-  <% end %>
+    <% if current_user %>
+      <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t(".activity") }, "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if @proposals.only_emendations.any? %>
-    <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, { legend_title: t(".amendment_type") }, "aria-controls": "proposals" %>
-  <% end %>
+    <% if @proposals.only_emendations.any? %>
+      <%= form.collection_radio_buttons :type, filter_type_values, :first, :last, { legend_title: t(".amendment_type") }, "aria-controls": "proposals" %>
+    <% end %>
 
-  <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
-    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "proposals" %>
-  <% end %>
+    <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
+      <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "proposals" %>
+    <% end %>
 
-  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+    <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
+  <% end %>
 <% end %>

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

@@ -13,6 +13,6 @@
     </button>
   </div>
   <div class="filters">
-    <%= render partial: "filters" %>
+    <%= render partial: "filters", locals: { type: :small } %>
   </div>
 </div>

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

@@ -1,19 +1,29 @@
-<% if translated_attribute(component_settings.new_proposal_help_text).present? && @step != :step_4 %>
-  <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.new_proposal_help_text } %>
-<% elsif @step == :step_4 %>
-  <%
-    locals = {
-      callout_class: "warning",
-      announcement: t("decidim.proposals.proposals.preview.proposal_edit_before_minutes", count: component_settings.proposal_edit_before_minutes)
-    }
-  %>
-  <%= render partial: "decidim/shared/announcement", locals: locals %>
+<% if @step == :step_4 %>
+    <% body_messages = [t("decidim.proposals.proposals.preview.announcement_body")]
+    if component_settings.proposal_edit_time == "limited"
+      body_messages << t("decidim.proposals.proposals.preview.proposal_edit_before_minutes", count: component_settings.proposal_edit_before_minutes)
+    end %>
+
+  <%= cell(
+    "decidim/announcement",
+    {
+      title: t("decidim.proposals.proposals.preview.announcement_title"),
+      body: body_messages
+    },
+    callout_class: "warning"
+  ) %>
+<% else %>
+  <%= 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 %>
-    <%= render partial: "decidim/shared/announcement", locals: { announcement: component_settings.try("proposal_wizard_#{@step}_help_text"), callout_class: callout_step_help_text_class } %>
+    <%= cell(
+      "decidim/announcement",
+      component_settings.try("proposal_wizard_#{@step}_help_text"),
+      callout_class: callout_step_help_text_class
+    ) %>
   </div>
 <% end %>
 

data/app/views/decidim/proposals/proposals/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", translated_attribute(component_settings.new_proposal_help_text)) %>
 
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>