decidim-proposals 0.22.0 → 0.23.0

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

@@ -5,6 +5,8 @@ module Decidim
     # A service to encapsualte all the logic when searching and filtering
     # collaborative drafts in a participatory process.
     class CollaborativeDraftSearch < ResourceSearch
+      text_search_fields :title, :body
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the drafts from.
       # page        - The page number to paginate the results.
@@ -14,6 +16,9 @@ module Decidim
       end
 
       # Handle the search_text filter
+      #
+      # We can't use the search from `ResourceFilter` since these fields aren't
+      # translated.
       def search_search_text
         query
           .where("title ILIKE ?", "%#{search_text}%")
@@ -24,22 +29,7 @@ module Decidim
       def search_state
         return query if state.member?("all")
 
-        open_drafts = state.member?("open") ? query.open : nil
-        withdrawn = state.member?("withdrawn") ? query.withdrawn : nil
-        published = state.member?("published") ? query.published : nil
-
-        query
-          .where(id: open_drafts)
-          .or(query.where(id: withdrawn))
-          .or(query.where(id: published))
-      end
-
-      def search_category_id
-        super
-      end
-
-      def search_scope_id
-        super
+        apply_scopes(%w(open withdrawn published), state)
       end
 
       # Filters drafts by the name of the classes they are linked to. By default,

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

@@ -8,8 +8,8 @@ module Decidim
       # Lists which attributes will be diffable and how they should be rendered.
       def attribute_types
         {
-          title: :string,
-          body: :string,
+          title: :i18n,
+          body: :i18n,
           decidim_category_id: :category,
           decidim_scope_id: :scope,
           address: :string,
@@ -24,13 +24,15 @@ module Decidim
         return parse_scope_changeset(attribute, values, type, diff) if type == :scope
 
         values = parse_values(attribute, values)
+        old_value = values[0]
+        new_value = values[1]
 
         diff.update(
           attribute => {
             type: type,
             label: I18n.t(attribute, scope: i18n_scope),
-            old_value: values[0],
-            new_value: values[1]
+            old_value: old_value,
+            new_value: new_value
           }
         )
       end
@@ -40,7 +42,15 @@ module Decidim
       # Returns and Array of two Strings.
       def parse_values(attribute, values)
         values = [amended_previous_value(attribute), values[1]] if proposal&.emendation?
-        values = values.map { |value| normalize_line_endings(value) } if attribute == :body
+        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
       end
 

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

@@ -102,8 +102,14 @@ module Decidim
 
       def copy_attachments(original_proposal, proposal)
         original_proposal.attachments.each do |attachment|
-          new_attachment = Decidim::Attachment.new(attachment.attributes.slice("content_type", "description", "file", "file_size", "title", "weight"))
-          new_attachment.attached_to = proposal
+          new_attachment = Decidim::Attachment.new(
+            {
+              # Attached to needs to be always defined before the file is set
+              attached_to: proposal
+            }.merge(
+              attachment.attributes.slice("content_type", "description", "file", "file_size", "title", "weight")
+            )
+          )
 
           if File.exist?(attachment.file.file.path)
             new_attachment.file = File.open(attachment.file.file.path)

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

@@ -5,52 +5,30 @@ module Decidim
     # A service to encapsualte all the logic when searching and filtering
     # proposals in a participatory process.
     class ProposalSearch < ResourceSearch
+      text_search_fields :title, :body
+
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the proposals from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})
-        @component = options[:component]
-        @current_user = options[:current_user]
-
         base = options[:state]&.member?("withdrawn") ? Proposal.withdrawn : Proposal.except_withdrawn
         super(base, options)
       end
 
-      # Handle the search_text filter
-      def search_search_text
-        query
-          .where("decidim_proposals_proposals.title ILIKE ?", "%#{search_text}%")
-          .or(query.where("decidim_proposals_proposals.body ILIKE ?", "%#{search_text}%"))
-      end
-
-      # Handle the origin filter
-      def search_origin
-        official = origin.member?("official") ? query.official_origin : nil
-        citizens = origin.member?("citizens") ? query.citizens_origin : nil
-        user_group = origin.member?("user_group") ? query.user_group_origin : nil
-        meeting = origin.member?("meeting") ? query.meeting_origin : nil
-
-        query
-          .where(id: official)
-          .or(query.where(id: citizens))
-          .or(query.where(id: user_group))
-          .or(query.where(id: meeting))
-      end
-
       # Handle the activity filter
       def search_activity
         case activity
         when "voted"
           query
             .includes(:votes)
-            .where(decidim_proposals_proposal_votes: { decidim_author_id: @current_user })
+            .where(decidim_proposals_proposal_votes: { decidim_author_id: user })
         when "my_proposals"
           query
             .where.not(coauthorships_count: 0)
             .joins(:coauthorships)
             .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
-            .where(decidim_coauthorships: { decidim_author_id: @current_user })
+            .where(decidim_coauthorships: { decidim_author_id: user })
         else # Assume 'all'
           query
         end
@@ -60,16 +38,7 @@ module Decidim
       def search_state
         return query if state.member? "withdrawn"
 
-        accepted = state.member?("accepted") ? query.accepted : nil
-        rejected = state.member?("rejected") ? query.rejected : nil
-        evaluating = state.member?("evaluating") ? query.evaluating : nil
-        not_answered = state.member?("not_answered") ? query.state_not_published : nil
-
-        query
-          .where(id: accepted)
-          .or(query.where(id: rejected))
-          .or(query.where(id: evaluating))
-          .or(query.where(id: not_answered))
+        apply_scopes(%w(accepted rejected evaluating state_not_published), state)
       end
 
       # Handle the amendment type filter
@@ -78,20 +47,12 @@ module Decidim
         when "proposals"
           query.only_amendables
         when "amendments"
-          query.only_visible_emendations_for(@current_user, @component)
+          query.only_visible_emendations_for(user, component)
         else # Assume 'all'
-          query.amendables_and_visible_emendations_for(@current_user, @component)
+          query.amendables_and_visible_emendations_for(user, component)
         end
       end
 
-      def search_category_id
-        super
-      end
-
-      def search_scope_id
-        super
-      end
-
       # Filters Proposals by the name of the classes they are linked to. By default,
       # returns all Proposals. When a `related_to` param is given, then it camelcases item
       # to find the real class name and checks the links for the Proposals.
@@ -114,18 +75,6 @@ module Decidim
 
         query.where(id: from).or(query.where(id: to))
       end
-
-      # We overwrite the `results` method to ensure we only return unique
-      # results. We can't use `#uniq` because it returns an Array and we're
-      # adding scopes in the controller, and `#distinct` doesn't work here
-      # because in the later scopes we're ordering by `RANDOM()` in a DB level,
-      # and `SELECT DISTINCT` doesn't work with `RANDOM()` sorting, so we need
-      # to perform two queries.
-      #
-      # The correct behaviour is backed by tests.
-      def results
-        Proposal.where(id: super.pluck(:id))
-      end
     end
   end
 end

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

@@ -21,8 +21,8 @@ module Decidim
       ]
 
       field :id, !types.ID
-      field :title, !types.String, "This proposal's title"
-      field :body, types.String, "This proposal's body"
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this title"
+      field :body, Decidim::Core::TranslatedFieldType, "The description for this body"
       field :address, types.String, "The physical address (location) of this proposal"
       field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this proposal" do
         resolve ->(proposal, _args, _ctx) {

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

@@ -5,11 +5,11 @@
 
   <div class="card-section">
     <div class="row column hashtags__container">
-      <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title(extras: false).strip %>
+      <%= form.translated :text_field, :title, class: "js-hashtags", value: form_presenter.title(extras: false).strip, hashtaggable: true %>
     </div>
 
     <div class="row column hashtags__container">
-      <%= form.editor :body, hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+      <%= form.translated :editor, :body, hashtaggable: true, value: form_presenter.body(extras: false).strip %>
     </div>
 
     <% if @form.component_automatic_hashtags.any? %>
@@ -51,9 +51,9 @@
       </div>
     <% end %>
 
-    <% if component_settings.geocoding_enabled? %>
+    <% if @form.geocoding_enabled? %>
       <div class="row column">
-        <%= form.text_field :address %>
+        <%= form.geocoding_field :address %>
       </div>
     <% end %>
 
@@ -63,9 +63,9 @@
       </div>
     <% end %>
 
-    <% if current_participatory_space.has_subscopes? %>
+    <% if current_component.has_subscopes? %>
       <div class="row column">
-        <%= scopes_picker_field form, :scope_id %>
+        <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
       </div>
     <% end %>
 

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

@@ -16,16 +16,7 @@
       <%= translated_attribute proposal.category.name %>
     <% end %>
   </td>
-  <% if current_participatory_space.scopes_enabled? %>
-    <td>
-      <% if proposal.scope %>
-        <%= translated_attribute proposal.scope.name %>
-      <% else %>
-        <%= t("decidim.scopes.global") %>
-      <% end %>
-    </td>
-  <% end %>
-
+  <%= td_resource_scope_for(proposal.scope) %>
   <td>
     <strong class="<%= proposal_state_css_class proposal.state %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
@@ -51,7 +42,7 @@
 
   <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
     <td>
-      <%= proposal.comments.count %>
+      <%= proposal.comments_count %>
     </td>
   <% end %>
 

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

@@ -27,7 +27,7 @@
               <%= sort_link(query, :category_name, t("models.proposal.fields.category", scope: "decidim.proposals") ) %>
             </th>
 
-            <% if current_participatory_space.scopes_enabled? %>
+            <% if resource_with_scopes_enabled? %>
               <th>
                 <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
               </th>
@@ -51,7 +51,7 @@
 
             <% if current_component.settings.comments_enabled? and !current_settings.comments_blocked? %>
               <th>
-                <%= sort_link(query, :commentable_comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
+                <%= sort_link(query, :comments_count, t("models.proposal.fields.comments", scope: "decidim.proposals") ) %>
               </th>
             <% end %>
 

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

@@ -63,7 +63,7 @@
     </div>
 
     <div class="row column">
-      <strong><%= t ".comments_count" %>:</strong> <%= proposal.comments.count %>
+      <strong><%= t ".comments_count" %>:</strong> <%= proposal.comments_count %>
       <ul id="proposal-comments-alignment-count">
         <li><strong><%= t ".comments_positive_count" %>:</strong> <%= proposal.comments.positive.count %></li>
         <li><strong><%= t ".comments_neutral_count" %>:</strong> <%= proposal.comments.neutral.count %></li>

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

@@ -32,13 +32,13 @@
   </div>
 <% end %>
 
-<% if component_settings.geocoding_enabled? %>
+<% if @form.geocoding_enabled? %>
   <div class="field">
     <%= form.check_box :has_address, checked: form_has_address? %>
   </div>
 
   <div class="field" id="address_input">
-    <%= form.text_field :address %>
+    <%= form.geocoding_field :address %>
   </div>
 <% end %>
 
@@ -48,13 +48,13 @@
   </div>
 <% end %>
 
-<% if current_participatory_space.has_subscopes? %>
+<% if current_component.has_subscopes? %>
   <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
   </div>
 <% end %>
 
-<% if  current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
   <div class="field">
     <%= user_group_select_field form, :user_group_id %>
   </div>

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

@@ -20,7 +20,7 @@
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::CollaborativeDraft), :first, :last, { legend_title: t(".related_to") }, "aria-controls": "collaborative_drafts" %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
+  <% if current_component.has_subscopes? %>
     <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 

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

@@ -104,7 +104,7 @@
           <li class="card-data__item">
             <%= link_to "#comments" do %>
               <%= with_tooltip t("decidim.proposals.models.collaborative_draft.fields.comments") do %>
-                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments.count}" %>
+                <%= icon("comment-square", class: "icon--small", role: "img", "aria-hidden": true) + " " + "#{@collaborative_draft.comments_count}" %>
               <% end %>
             <% end %>
           </li>

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

@@ -32,13 +32,13 @@
   </div>
 <% end %>
 
-<% if component_settings.geocoding_enabled? %>
+<% if @form.geocoding_enabled? %>
   <div class="field">
     <%= form.check_box :has_address, checked: form_has_address? %>
   </div>
 
   <div class="field" id="address_input">
-    <%= form.text_field :address %>
+    <%= form.geocoding_field :address %>
   </div>
 <% end %>
 
@@ -48,9 +48,9 @@
   </div>
 <% end %>
 
-<% if current_participatory_space.has_subscopes? %>
+<% if current_component.has_subscopes? %>
   <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
+    <%= scopes_picker_field form, :scope_id, root: current_component.scope %>
   </div>
 <% end %>
 
@@ -61,23 +61,51 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? && @proposal %>
+  <fieldset>
+    <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>
+          <%= 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="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
+                  title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
+                  type="button"
+                  data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_photos, multiple: false, label: t("add_images", scope: "decidim.proposals.proposals.edit") %>
+    </div>
+  </fieldset>
+
   <fieldset>
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
-      <div class="field">
-        <%= nested_form.text_field :title %>
-      </div>
 
-      <div class="field">
-        <%= nested_form.upload :file, optional: false %>
-        <% if @form.errors[:attachment].present? %>
-          <% @form.errors[:attachment].each do |message| %>
-            <small class="form-error is-visible">
-              <%= message %>
-            </small>
-          <% end %>
-        <% end %>
-      </div>
+    <% if @form.documents.any? %>
+      <% @form.documents.each do |document| %>
+        <div class="callout" 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}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
+                  title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
+                  type="button" data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
     <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
+    </div>
   </fieldset>
 <% end %>