decidim-proposals 0.26.9 → 0.27.0.rc1

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

@@ -2,83 +2,28 @@
 
 module Decidim
   module Proposals
-    # A service to encapsualte all the logic when searching and filtering
-    # proposals in a participatory process.
+    # This service scopes the proposal searches with parameters that cannot be
+    # passed from the user interface.
     class ProposalSearch < ResourceSearch
-      text_search_fields :title, :body
+      attr_reader :type, :activity
 
-      # 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 = {})
-        options[:scope] = options.fetch(:scope, Proposal)
-        options[:scope] = options[:state_withdraw] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
-        super(options[:scope], options)
-      end
-
-      # Handle the activity filter
-      def search_activity
-        case activity
-        when "voted"
-          query
-            .includes(:votes)
-            .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: user })
-        else # Assume 'all'
-          query
-        end
-      end
-
-      def search_state_withdraw
-        return query if state_withdraw == "withdrawn"
+      def build(params)
+        return super if search_context == :admin
 
-        query.except_withdrawn
-      end
+        @type = params[:type]
+        @activity = params[:activity]
 
-      # Handle the state filter
-      def search_state
-        apply_scopes(%w(accepted rejected evaluating state_not_published), state)
-      end
-
-      # Handle the amendment type filter
-      def search_type
-        case type
-        when "proposals"
-          query.only_amendables
-        when "amendments"
-          query.only_visible_emendations_for(user, component)
-        else # Assume 'all'
-          query.amendables_and_visible_emendations_for(user, component)
+        if params[:activity] && user
+          case params[:activity]
+          when "voted"
+            add_scope(:voted_by, user)
+          when "my_proposals"
+            add_scope(:coauthored_by, user)
+          end
         end
-      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.
-      #
-      # The `related_to` param is expected to be in this form:
-      #
-      #   "decidim/meetings/meeting"
-      #
-      # This can be achieved by performing `klass.name.underscore`.
-      #
-      # Returns only those proposals that are linked to the given class name.
-      def search_related_to
-        from = query
-               .joins(:resource_links_from)
-               .where(decidim_resource_links: { to_type: related_to.camelcase })
-
-        to = query
-             .joins(:resource_links_to)
-             .where(decidim_resource_links: { from_type: related_to.camelcase })
+        add_scope(:with_type, [params[:type], user, component]) if params[:type]
 
-        query.where(id: from).or(query.where(id: to))
+        super
       end
     end
   end

data/app/validators/proposal_length_validator.rb

@@ -5,14 +5,11 @@
 # 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
-  include ActionView::Helpers::SanitizeHelper
-
   def validate_each(record, attribute, value)
     return if value.blank?
 
-    text_value = strip_tags(value)
-    validate_min_length(record, attribute, text_value)
-    validate_max_length(record, attribute, text_value)
+    validate_min_length(record, attribute, value)
+    validate_max_length(record, attribute, value)
   end
 
   private

data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb

@@ -1,13 +1,13 @@
 <div class="grid-x">
   <div class="cell">
     <%= form.hidden_field :position, class: "position" %>
-    <%= form.text_field :title, required: true %>
+    <%= form.text_field :title, optional: false %>
   </div>
 </div>
 <% if proposal.article? %>
 <div class="grid-x">
   <div class="cell">
-    <%= form.text_area :body, required: true, rows: 5 %>
+    <%= form.text_area :body, optional: false, rows: 5 %>
   </div>
 </div>
 <% end %>

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

@@ -83,7 +83,7 @@
             </div>
 
             <div class="row column">
-              <%= form.upload :file, optional: false %>
+              <%= form.upload :file %>
               <% if params[:id].present? %>
                 <% if proposal.documents.present? %>
                   <%= form.hidden_field :id, value: proposal.documents.first.id %>

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

@@ -7,8 +7,8 @@
   </td>
   <td>
     <%= link_to(
-      present(proposal).title(html_escape: true),
-      proposal_path(proposal)
+     decidim_html_escape(present(proposal).title).html_safe,
+     proposal_path(proposal)
     ) %><br>
   </td>
   <td>

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_proposal proposal_form_admin" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <div class="card with-overflow">
   <div class="card-divider">
     <h2 class="card-title flex--sbc">

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_proposal proposal_form_admin" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/proposals/admin/proposals/publish_answers.js.erb

@@ -1,4 +1,4 @@
-$("<%= escape_javascript(render partial: %q{js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+$("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
 
 <% proposal_ids.each do |id| %>
   $(".table-list [data-id='<%= id %>']")

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

@@ -1,4 +1,3 @@
-<% add_decidim_page_title(translated_attribute(proposal.title)) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/proposals/admin/proposals/update_attribute.js.erb

@@ -0,0 +1,26 @@
+<% if flash.now[:error].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").addClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{alert}, text: flash.now[:error] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:alert].present? %>
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{warning}, text: flash.now[:alert] }) %>").appendTo(".callout-wrapper");
+<% end %>
+
+<% if flash.now[:notice].present? %>
+  $("<%= escape_javascript(render partial: %q{decidim/admin/shared/js-callout}, locals: { css: %q{success}, text: flash.now[:notice] }) %>").appendTo(".callout-wrapper");
+
+  <% proposal_ids.each do |id| %>
+    $(".table-list [data-id='<%= id %>']")
+      .replaceWith("<%= escape_javascript(render partial: %q{proposal-tr}, locals: { proposal: proposal_find(id) }) %>");
+  <% end %>
+
+  $("<%= form_selector %> <%= attribute_selector %>").removeClass("is-invalid-input")
+  $(".js-check-all").prop('checked', false);
+  $(".js-check-all-resources").prop('checked', false);
+  window.hideBulkActionsButton();
+  window.hideBulkActionForms();
+  window.showOtherActionsButtons();
+  window.selectedResourcesCountUpdate();
+<% end %>

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

@@ -5,7 +5,7 @@
 </div>
 
 <div class="field hashtags__container">
-  <%= text_editor_for_proposal_body(form) %>
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", value: form_presenter.body(extras: false).strip %>
 </div>
 
 <% if @form.component_automatic_hashtags.any? %>
@@ -63,21 +63,13 @@
 <% if component_settings.attachments_allowed? %>
   <fieldset class="attachments_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.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>
-    <% end %>
+    <div class="row column">
+      <%= form.attachment :documents,
+        multiple: false,
+        label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_label: t("decidim.proposals.collaborative_drafts.new.add_file"),
+        button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
+    </div>
   </fieldset>
 <% end %>

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

@@ -4,7 +4,7 @@
   <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"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="collaborative_drafts">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
@@ -14,18 +14,18 @@
     </div>
   </div>
 
-  <%= form.check_boxes_tree :state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
+  <%= form.check_boxes_tree :with_any_state, filter_collaborative_drafts_state_values, legend_title: t(".state"), "aria-controls": "collaborative_drafts" %>
 
   <% if linked_classes_for(Decidim::Proposals::CollaborativeDraft).any? %>
     <%= 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_component.has_subscopes? %>
-    <%= form.check_boxes_tree :scope_id, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_scope, filter_scopes_values, legend_title: t(".scope"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <% if current_component.categories.any? %>
-    <%= form.check_boxes_tree :category_id, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
+    <%= form.check_boxes_tree :with_any_category, filter_categories_values, legend_title: t(".category"), "aria-controls": "collaborative_drafts" %>
   <% end %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

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

@@ -1,6 +1,6 @@
 <div class="columns large-3">
   <div class="m-bottom">
-    <%= link_to collaborative_drafts_path do %>
+    <%= link_to :back do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t("back_from_collaborative_draft", scope: "decidim.proposals.collaborative_drafts.wizard_aside").html_safe %>
     <% end %>

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

@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

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

@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

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

@@ -33,7 +33,7 @@
     <div class="section">
       <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
 
-      <%= decidim_sanitize_editor present(@collaborative_draft).body(links: true) %>
+      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
 
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>

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

@@ -67,49 +67,26 @@
 <% if component_settings.attachments_allowed? && @proposal %>
   <fieldset class="gallery__container photos_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" id="attachment_<%= photo.id %>" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.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") %>
+      <%= form.attachment :photos,
+        multiple: false,
+        label: t("decidim.proposals.proposals.edit.add_image"),
+        button_label: t("decidim.proposals.proposals.edit.add_image"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
+        help_i18n_scope: "decidim.forms.file_help.image",
+        extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
     </div>
   </fieldset>
 
   <fieldset class="attachments_container gallery__container documents_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.documents.any? %>
-      <% @form.documents.each do |document| %>
-        <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}" %>
-          <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") %>
+      <%= form.attachment :documents,
+        multiple: true,
+        label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
     </div>
   </fieldset>
 <% end %>

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

@@ -4,7 +4,7 @@
   <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"), "aria-label": t(".search"), data: { disable_dynamic_change: true } %>
+        <%= form.search_field :search_text_cont, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": 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" %>
@@ -17,19 +17,19 @@
   <%= form.hidden_field "state_withdraw", value: params.dig("filter", "state_withdraw") %>
 
   <% 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" %>
+    <%= form.check_boxes_tree :with_any_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" %>
+    <%= form.check_boxes_tree :with_any_scope, 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" %>
+    <%= form.check_boxes_tree :with_any_category, 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" %>
+    <%= form.check_boxes_tree :with_any_origin, filter_origin_values, legend_title: t(".origin"), "aria-controls": "proposals" %>
   <% end %>
 
   <% if current_user %>

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

@@ -22,8 +22,7 @@
           <% end %>
         </div>
       </div>
-      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? &&
-      proposal.component.current_settings.votes_enabled? %>
+      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? %>
         <div class="card--list__data">
           <span class="card--list__data__number">
             <%= proposal.votes.size %>

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

@@ -1,7 +1,7 @@
-<% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
+<% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
   <div class="callout warning">
     <%= t("decidim.proposals.proposals.index.text_banner",
-          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[state_withdraw]" => nil)),
+          go_back_link: link_to(t("decidim.proposals.proposals.index.click_here"), proposals_path("filter[with_availability]" => nil)),
           ).html_safe %>
   </div>
 <% end %>
@@ -37,10 +37,10 @@
 
 <div class="row">
   <div class="text-right">
-    <% if params.dig("filter", "state_withdraw").present? && params["filter"]["state_withdraw"] == "withdrawn" %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[state_withdraw]" => nil) %>
+    <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
     <% else %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { state_withdraw: "withdrawn", state: [""] }) %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", state: [""] }) %>
     <% end %>
   </div>
 </div>

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

@@ -21,4 +21,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

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

@@ -28,4 +28,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

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

@@ -23,4 +23,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

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

@@ -35,4 +35,6 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_pack_tag "decidim_proposals" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_proposals" %>
+<% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am: