decidim-proposals 0.25.0 → 0.26.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcbc05060c74a0d2a571bc0bf918d9fd299b0dcec051c37363232b215aa93a1a
-  data.tar.gz: 0445507b0557f9bfda5930f2962890379f3f04682a9dd954afd8cf26ebf87ae8
+  metadata.gz: 6de6e1aba63e22b53acd81b90dba35747c450fd0896f02a09b7e2ed4e0f4c399
+  data.tar.gz: f12f55b08a0b73b9be1551c5ddb9a19c6660a05bcb7e91566cd8473ec345e643
 SHA512:
-  metadata.gz: f64ef4865607f8e874a23733387f06d0715e32e38f86cf5f88da12aa76ce6fe859ea01fdba242a49b79105c23260a818ae396c5dc514fffee63c1da4a8b262b8
-  data.tar.gz: 51af55d39551b937a5209b1704a3bfec9d1706057f032d9f6ab5d0e9c558b66491ca0edf2c62f3e6407102cef7d5fbd5a8b3ded4f6c3026599e365a1f48e6c1b
+  metadata.gz: 33765293150b20320f7af104930f1a7253e54779728d8bd20eb4297899c290ffe5d946339870bf5536c5d9fe73f1632f97768c0a15a3359dcbbaee70f83a5a71
+  data.tar.gz: 79e1c45b96cb97a895b205830181c866b77bcb0ca7dbf3996ccc0463605615bf480ccc4dd9dc4ee3dad1d7280eb7a62d9a19da42facd0c693dd9ee1fea1a7b0d

data/app/cells/decidim/proposals/collaborative_draft_m_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def description
-        decidim_sanitize(present(model).body.truncate(100, separator: /\s/))
+        decidim_sanitize_editor(present(model).body.truncate(100, separator: /\s/))
       end
 
       def has_badge?

data/app/cells/decidim/proposals/cost_report_cell.rb

@@ -18,7 +18,7 @@ module Decidim
       end
 
       def cost_report
-        decidim_sanitize(translated_attribute(model.cost_report).html_safe)
+        decidim_sanitize_editor(translated_attribute(model.cost_report).html_safe)
       end
 
       def needs_text_toggle?
@@ -26,7 +26,7 @@ module Decidim
       end
 
       def cost_report_short
-        decidim_sanitize(
+        decidim_sanitize_editor(
           html_truncate(
             translated_attribute(model.cost_report).html_safe,
             length: 200
@@ -35,7 +35,7 @@ module Decidim
       end
 
       def execution_period
-        decidim_sanitize(translated_attribute(model.execution_period).html_safe)
+        decidim_sanitize_editor(translated_attribute(model.execution_period).html_safe)
       end
     end
   end

data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb

@@ -35,7 +35,7 @@ module Decidim
         return unless model.participatory_text_level == "article"
 
         formatted = simple_format(present(model).body)
-        decidim_sanitize(strip_links(formatted))
+        decidim_sanitize_editor(strip_links(formatted))
       end
 
       def resource_path

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -25,7 +25,7 @@ module Decidim
       end
 
       def body
-        decidim_sanitize(present(model).body)
+        decidim_sanitize_editor(present(model).body)
       end
 
       def has_state?
@@ -118,7 +118,7 @@ module Decidim
       end
 
       def has_image?
-        @has_image ||= model.component.settings.allow_card_image && model.attachments.find_by("content_type like '%image%'").present?
+        @has_image ||= model.attachments.map(&:image?).any?
       end
 
       def resource_image_path
@@ -127,7 +127,6 @@ module Decidim
 
       def cache_hash
         hash = []
-        hash << "decidim/proposals/proposal_m"
         hash << I18n.locale.to_s
         hash << model.cache_key_with_version
         hash << model.proposal_votes_count
@@ -143,9 +142,9 @@ module Decidim
         hash << model.follows_count
         hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
         hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
-        hash << model.component.participatory_space.active_step.id if model.component.participatory_space.has_steps?
+        hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
 
-        hash.join("/")
+        hash.join(Decidim.cache_key_separator)
       end
     end
   end

data/app/cells/decidim/proposals/proposals_picker_cell.rb

@@ -50,9 +50,10 @@ module Decidim
 
       def filtered_proposals
         @filtered_proposals ||= if filtered?
-                                  proposals.where("title::text ILIKE ?", "%#{search_text}%")
-                                           .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
-                                           .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
+                                  table_name = Decidim::Proposals::Proposal.table_name
+                                  proposals.where(%("#{table_name}"."title"::text ILIKE ?), "%#{search_text}%")
+                                           .or(proposals.where(%("#{table_name}"."reference" ILIKE ?), "%#{search_text}%"))
+                                           .or(proposals.where(%("#{table_name}"."id"::text ILIKE ?), "%#{search_text}%"))
                                 else
                                   proposals
                                 end
@@ -60,8 +61,9 @@ module Decidim
 
       def proposals
         @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, component)
-                       &.published
-                       &.order(id: :asc)
+                         &.includes(:component)
+                         &.published
+                         &.order(id: :asc)
       end
 
       def proposals_collection_name

data/app/commands/decidim/proposals/update_proposal.rb

@@ -45,11 +45,12 @@ module Decidim
           else
             update_proposal
           end
-          create_gallery if process_gallery?
-          create_attachments if process_attachments?
 
           photo_cleanup!
           document_cleanup!
+
+          create_gallery if process_gallery?
+          create_attachments if process_attachments?
         end
 
         broadcast(:ok, proposal)

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -15,19 +15,32 @@ module Decidim
 
         # Available orders based on enabled settings
         def available_orders
-          @available_orders ||= begin
-            available_orders = %w(random recent)
-            available_orders << "most_voted" if most_voted_order_available?
-            available_orders << "most_endorsed" if current_settings.endorsements_enabled?
-            available_orders << "most_commented" if component_settings.comments_enabled?
-            available_orders << "most_followed" << "with_more_authors"
-            available_orders
+          @available_orders ||= [default_order] + possible_orders.excluding(default_order)
+        end
+
+        def possible_orders
+          @possible_orders ||= begin
+            possible_orders = %w(random recent)
+            possible_orders << "most_voted" if most_voted_order_available?
+            possible_orders << "most_endorsed" if current_settings.endorsements_enabled?
+            possible_orders << "most_commented" if component_settings.comments_enabled?
+            possible_orders << "most_followed" << "with_more_authors"
+            possible_orders
           end
         end
 
         def default_order
+          @default_order ||= begin
+            default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
+            return order_by_default if default_order == "default"
+
+            possible_orders.include?(default_order) ? default_order : order_by_default
+          end
+        end
+
+        def order_by_default
           if order_by_votes?
-            detect_order("most_voted")
+            "most_voted"
           else
             "random"
           end

data/app/controllers/decidim/proposals/admin/proposals_merges_controller.rb

@@ -16,7 +16,10 @@ module Decidim
             end
 
             on(:invalid) do
-              flash[:alert] = I18n.t("proposals_merges.create.invalid", scope: "decidim.proposals.admin")
+              flash[:alert_html] = Decidim::ValidationErrorsPresenter.new(
+                I18n.t("proposals_merges.create.invalid", scope: "decidim.proposals.admin"),
+                @form
+              ).message
               redirect_to EngineRouter.admin_proxy(current_component).root_path
             end
           end

data/app/controllers/decidim/proposals/admin/proposals_splits_controller.rb

@@ -16,7 +16,10 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("proposals_splits.create.invalid", scope: "decidim.proposals.admin")
+              flash[:alert_html] = Decidim::ValidationErrorsPresenter.new(
+                I18n.t("proposals_splits.create.invalid", scope: "decidim.proposals.admin"),
+                @form
+              ).message
               redirect_to EngineRouter.admin_proxy(current_component).root_path
             end
           end

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -32,7 +32,7 @@ module Decidim
                        .published
                        .not_hidden
                        .only_amendables
-                       .includes(:category, :scope)
+                       .includes(:category, :scope, :attachments, :coauthorships)
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
@@ -41,7 +41,7 @@ module Decidim
                         .published
                         .not_hidden
 
-          @proposals = @base_query.includes(:component, :coauthorships)
+          @proposals = @base_query.includes(:component, :coauthorships, :attachments)
           @all_geocoded_proposals = @base_query.geocoded
 
           @voted_proposals = if current_user
@@ -91,6 +91,7 @@ module Decidim
       end
 
       def compare
+        enforce_permission_to :edit, :proposal, proposal: @proposal
         @step = :step_2
         @similar_proposals ||= Decidim::Proposals::SimilarProposals
                                .for(current_component, @proposal)
@@ -103,7 +104,7 @@ module Decidim
       end
 
       def complete
-        enforce_permission_to :create, :proposal
+        enforce_permission_to :edit, :proposal, proposal: @proposal
         @step = :step_3
 
         @form = form_proposal_model
@@ -112,11 +113,13 @@ module Decidim
       end
 
       def preview
+        enforce_permission_to :edit, :proposal, proposal: @proposal
         @step = :step_4
         @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
+        enforce_permission_to :edit, :proposal, proposal: @proposal
         @step = :step_4
         PublishProposal.call(@proposal, current_user) do
           on(:ok) do

data/app/events/decidim/proposals/proposal_mentioned_event.rb

@@ -7,6 +7,14 @@ module Decidim
 
       i18n_attributes :mentioned_proposal_title
 
+      def safe_resource_translated_text
+        resource_text
+      end
+
+      def perform_translation?
+        false
+      end
+
       private
 
       def mentioned_proposal_title

data/app/events/decidim/proposals/publish_proposal_event.rb

@@ -4,11 +4,37 @@ module Decidim
   module Proposals
     class PublishProposalEvent < Decidim::Events::SimpleEvent
       include Decidim::Events::CoauthorEvent
+      include Decidim::Core::Engine.routes.url_helpers
+      include ActionView::Helpers::UrlHelper
+      include Decidim::Events::MachineTranslatedEvent
 
       def resource_text
         resource.body
       end
 
+      def i18n_options
+        author_path = link_to("@#{author.nickname}", profile_path(author.nickname))
+        author_string = "#{author.name} #{author_path}"
+        super.merge({ author: author_string })
+      end
+
+      def translatable_resource
+        resource
+      end
+
+      def translatable_text
+        resource.body
+      end
+
+      def safe_resource_text
+        locale = resource.respond_to?(:content_original_language) ? resource.content_original_language : I18n.locale
+        I18n.with_locale(locale) { translated_attribute(resource_text).to_s.html_safe }
+      end
+
+      def safe_resource_translated_text
+        I18n.with_locale(I18n.locale) { translated_attribute(resource_text, nil, true).to_s.html_safe }
+      end
+
       private
 
       def i18n_scope

data/app/forms/decidim/proposals/admin/proposals_file_import_form.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A form object to be used when admin users want to import proposals from
+      # a file.
+      class ProposalsFileImportForm < Decidim::Admin::ImportForm
+        attribute :user_group_id, Integer
+
+        def user_groups
+          Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+        end
+
+        protected
+
+        def user_group
+          @user_group ||= Decidim::UserGroup.find_by(
+            organization: current_organization,
+            id: user_group_id.to_i
+          )
+        end
+
+        def importer_context
+          context[:user_group] = user_group
+          context
+        end
+      end
+    end
+  end
+end

data/app/forms/decidim/proposals/admin/proposals_fork_form.rb

@@ -30,14 +30,19 @@ module Decidim
 
         private
 
+        def errors_set
+          @errors_set ||= Set[]
+        end
+
         def mergeable_to_same_component
           return true unless same_component?
 
-          public_proposals = proposals.any? do |proposal|
-            !proposal.official? || proposal.votes.any? || proposal.endorsements.any?
+          proposals.each do |proposal|
+            errors_set << :not_official unless proposal.official?
+            errors_set << :supported if proposal.votes.any? || proposal.endorsements.any?
           end
 
-          errors.add(:proposal_ids, :invalid) if public_proposals
+          errors_set.each { |error| errors.add(:base, error) } if errors_set.any?
         end
 
         def same_participatory_space

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

@@ -102,12 +102,7 @@ module Decidim
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.
       def render_proposal_body(proposal)
-        body = present(proposal).body(links: true, strip_tags: !safe_content?)
-        body = simple_format(body, {}, sanitize: false)
-
-        return body unless safe_content?
-
-        decidim_sanitize(body)
+        render_sanitized_content(proposal, :body)
       end
 
       # Returns :text_area or :editor based on the organization' settings.

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

@@ -19,7 +19,7 @@ module Decidim
           .slice(:latitude, :longitude, :address)
           .merge(
             title: decidim_html_escape(present(proposal).title),
-            body: html_truncate(decidim_sanitize(present(proposal).body), length: 100),
+            body: html_truncate(decidim_sanitize_editor(present(proposal).body), length: 100),
             icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
             link: proposal_path(proposal)
           )

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

@@ -7,7 +7,7 @@ module Decidim
       def proposal_reason_callout_announcement
         {
           title: proposal_reason_callout_title,
-          body: decidim_sanitize(translated_attribute(@proposal.answer))
+          body: decidim_sanitize_editor(translated_attribute(@proposal.answer))
         }
       end
 

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

@@ -70,12 +70,13 @@ module Decidim
       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(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} ASC NULLS FIRST").to_s)
       }
 
       scope :sort_by_valuation_assignments_count_desc, lambda {
-        order("#{sort_by_valuation_assignments_count_nulls_last_query}DESC NULLS LAST")
+        order(Arel.sql("#{sort_by_valuation_assignments_count_nulls_last_query} DESC NULLS LAST").to_s)
       }
 
       def self.with_valuation_assigned_to(user, space)
@@ -278,7 +279,7 @@ module Decidim
       #
       # user - the user to check for authorship
       def editable_by?(user)
-        return true if draft?
+        return true if draft? && created_by?(user)
 
         !published_state? && within_edit_time_limit? && !copied_from_other_component? && created_by?(user)
       end

data/app/packs/src/decidim/proposals/add_proposal.js

@@ -6,8 +6,14 @@ $(() => {
   const $addressInput = $("#address_input");
   const $addressInputField = $("input", $addressInput);
   const $map = $("#address_map");
-  const latFieldName = getCoordinateInputName("latitude", $addressInputField, {})
-  const longFieldName = getCoordinateInputName("longitude", $addressInputField, {})
+  let latFieldName = "latitude";
+  let longFieldName = "longitude";
+
+  if ($addressInputField.length > 0) {
+    latFieldName = getCoordinateInputName("latitude", $addressInputField, {})
+    longFieldName = getCoordinateInputName("longitude", $addressInputField, {})
+  }
+
   $map.hide();
 
   if ($checkbox.length > 0) {

data/app/packs/src/decidim/proposals/admin/proposals_picker.js

@@ -8,6 +8,7 @@ $(() => {
       }
 
   let jqxhr = null
+  let filterBuffer = ""
 
   toggleNoProposals()
 
@@ -15,15 +16,29 @@ $(() => {
     const filter = event.target.value.toLowerCase()
 
     if (pickerMore) {
+      if (filter.length < 3) {
+        return
+      }
+
+      if (filter === filterBuffer) {
+        return
+      }
+
       if (jqxhr !== null) {
         jqxhr.abort()
       }
 
       $content.html("<div class='loading-spinner'></div>")
       jqxhr = $.get(`${pickerPath}?q=${filter}`, (data) => {
+        filterBuffer = filter
         $content.html(data)
         jqxhr = null
         toggleNoProposals()
+
+        if (typeof window.theDataPicker === "object" && window.theDataPicker.current !== null) {
+          window.theDataPicker._handleCheckboxes($content);
+          window.theDataPicker._handleLinks($content);
+        }
       })
     } else {
       $("#proposals_list li").each((index, li) => {

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

@@ -8,6 +8,7 @@ module Decidim
     class ProposalPresenter < Decidim::ResourcePresenter
       include Rails.application.routes.mounted_helpers
       include ActionView::Helpers::UrlHelper
+      include Decidim::SanitizeHelper
 
       def author
         @author ||= if official?
@@ -49,15 +50,7 @@ module Decidim
       def body(links: false, extras: true, strip_tags: false, all_locales: false)
         return unless proposal
 
-        handle_locales(proposal.body, all_locales) do |content|
-          content = strip_tags(sanitize_text(content)) if strip_tags
-
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(content)
-          content = renderer.render(links: links, extras: extras).html_safe
-
-          content = Decidim::ContentRenderers::LinkRenderer.new(content).render if links
-          content
-        end
+        content_handle_locale(proposal.body, all_locales, extras, links, strip_tags)
       end
 
       # Returns the proposal versions, hiding not published answers
@@ -89,45 +82,6 @@ module Decidim
       def resource_manifest
         proposal.class.resource_manifest
       end
-
-      private
-
-      def sanitize_unordered_lists(text)
-        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|
-          i += 1
-
-          li + "#{i}. "
-        end
-      end
-
-      def add_line_feeds_to_paragraphs(text)
-        text.gsub("</p>") { |p| "#{p}\n\n" }
-      end
-
-      def add_line_feeds_to_list_items(text)
-        text.gsub("</li>") { |li| "#{li}\n" }
-      end
-
-      # Adds line feeds after the paragraph and list item closing tags.
-      #
-      # Returns a String.
-      def add_line_feeds(text)
-        add_line_feeds_to_paragraphs(add_line_feeds_to_list_items(text))
-      end
-
-      # Maintains the paragraphs and lists separations with their bullet points and
-      # list numberings where appropriate.
-      #
-      # Returns a String.
-      def sanitize_text(text)
-        add_line_feeds(sanitize_ordered_lists(sanitize_unordered_lists(text)))
-      end
     end
   end
 end

data/app/queries/decidim/proposals/similar_proposals.rb

@@ -31,7 +31,7 @@ module Decidim
           .published
           .not_hidden
           .where(
-            "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
+            Arel.sql("GREATEST(#{title_similarity}, #{body_similarity}) >= ?").to_s,
             *similarity_params,
             Decidim::Proposals.similarity_threshold
           )

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

@@ -12,8 +12,9 @@ module Decidim
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
       def initialize(options = {})
-        base = options[:state]&.member?("withdrawn") ? Proposal.withdrawn : Proposal.except_withdrawn
-        super(base, 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
@@ -34,10 +35,14 @@ module Decidim
         end
       end
 
+      def search_state_withdraw
+        return query if state_withdraw == "withdrawn"
+
+        query.except_withdrawn
+      end
+
       # Handle the state filter
       def search_state
-        return query if state.member? "withdrawn"
-
         apply_scopes(%w(accepted rejected evaluating state_not_published), state)
       end
 

data/app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb

@@ -0,0 +1,11 @@
+<% if current_organization.user_groups_enabled? && form.object.user_groups.any? %>
+  <div class="field">
+    <%= form.select(
+        :user_group_id,
+        form.object.user_groups.map { |g| [g.name, g.id] },
+        selected: form.object.user_group_id.presence,
+        include_blank: current_user.name,
+        label: true
+    ) %>
+  </div>
+<% end %>

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

@@ -12,8 +12,13 @@
 
     <% 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 %>
+        <li class="imports--component imports--proposals">
+          <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+        </li>
+        <% current_component.manifest.import_manifests.each do |import_manifest| %>
+          <li class="imports--file imports--<%= import_manifest.name %>">
+            <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
+          </li>
         <% end %>
       <% end %>
     <% end %>

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

@@ -61,7 +61,7 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? %>
-  <fieldset>
+  <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">

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

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>