decidim-proposals 0.21.0 → 0.22.0

data/app/assets/images/decidim/proposals/icon.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35">
-  <path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>

data/app/assets/javascripts/decidim/proposals/admin/proposals_form.js.es6

@@ -20,9 +20,4 @@ $(() => {
     toggleDisabledHiddenFields();
 
   }
-
-  $(document).on("closed.zf.callout", (event) => {
-    $(event.target).remove();
-  });
-
 });

data/app/assets/javascripts/decidim/proposals/admin/proposals_picker.js.es6

@@ -0,0 +1,35 @@
+$(() => {
+  const $content = $(".picker-content"),
+      pickerMore = $content.data("picker-more"),
+      pickerPath = $content.data("picker-path"),
+      toggleNoProposals = () => {
+        const showNoProposals = $("#proposals_list li:visible").length === 0
+        $("#no_proposals").toggle(showNoProposals)
+      }
+
+  let jqxhr = null
+
+  toggleNoProposals()
+
+  $(".data_picker-modal-content").on("change keyup", "#proposals_filter", (event) => {
+    const filter = event.target.value.toLowerCase()
+
+    if (pickerMore) {
+      if (jqxhr !== null) {
+        jqxhr.abort()
+      }
+
+      $content.html("<div class='loading-spinner'></div>")
+      jqxhr = $.get(`${pickerPath}?q=${filter}`, (data) => {
+        $content.html(data)
+        jqxhr = null
+        toggleNoProposals()
+      })
+    } else {
+      $("#proposals_list li").each((index, li) => {
+        $(li).toggle(li.textContent.toLowerCase().indexOf(filter) > -1)
+      })
+      toggleNoProposals()
+    }
+  })
+})

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

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def link_header
-        content_tag :strong, class: "text-large text-uppercase" do
+        content_tag :strong, class: "text-large" do
           t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end

data/app/cells/decidim/proposals/collaborative_draft_m/footer.erb

@@ -1,6 +1,6 @@
 <div class="card__footer">
   <div class="card__support">
     <div class="card__support__data"></div>
-    <%= link_to t("decidim.proposals.collaborative_drafts.collaborative_draft.view_collaborative_draft"), resource_path, class: "card__button button small secondary" %>
+    <%= link_to t("decidim.proposals.collaborative_drafts.collaborative_draft.view_collaborative_draft"), resource_path, class: "card__button button--sc light button small" %>
   </div>
 </div>

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

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

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -1,7 +1,7 @@
 <section class="section row collapse highlighted_proposals">
-  <h4 class="section-heading">
+  <h3 class="section-heading">
     <%= translated_attribute(model.name) %>  <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count) %></a>
-  </h4>
+  </h3>
 
   <%= cell(
     "decidim/collapsible_list",
@@ -14,6 +14,6 @@
   <%= link_to(
     t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count),
     main_component_path(model),
-    class: "button button--sc light secondary button--right"
+    class: "button button--sc hollow button--right"
   ) %>
 </section>

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

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def proposals_to_render
-        @proposals_to_render ||= proposals.limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
+        @proposals_to_render ||= proposals.includes([:amendable, :category, :component, :scope]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
       end
 
       def proposals_count

data/app/cells/decidim/proposals/irreversible_action_modal/show.erb

@@ -1,8 +1,8 @@
 <%= button_reveal_modal %>
 
-<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_title %>" aria-hidden="true" role="dialog">
+<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_id %>-title" aria-hidden="true" role="dialog">
   <div class="reveal__header">
-    <h3 class="reveal__title">
+    <h3 id="<%= modal_id %>-title" class="reveal__title">
       <%= modal_title %>
     </h3>
 

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

@@ -29,7 +29,7 @@ module Decidim
       end
 
       def modal_id
-        "#{action}-irreversible-action-modal"
+        @modal_id ||= "#{SecureRandom.uuid}-#{action}-irreversible-action-modal"
       end
 
       def button_reveal_modal

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -14,7 +14,7 @@
     <% if component_settings.comments_enabled? %>
       <div class="button-group button-group--collapse row collapse comment-buttons">
         <% if current_settings.comments_blocked? %>
-          <%= content_tag :button, class: "column medium-4 button light secondary", title: t("endorse", scope: "decidim.proposals.participatory_text_proposal.buttons") do %>
+          <%= content_tag :button, class: "column medium-4 button light secondary" do %>
             <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %>
             <%= model.comments.count %>
           <% end %>

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

@@ -21,7 +21,7 @@ module Decidim
       def title
         case model.participatory_text_level
         when "section"
-          "<h5><strong class='text-uppercase'>#{section_title}</strong></h5>"
+          "<h5><strong>#{section_title}</strong></h5>"
         else
           "<h6><strong>#{section_title}</strong></h6>"
         end

data/app/cells/decidim/proposals/proposal_m/footer.erb

@@ -16,7 +16,10 @@
         <%= render partial: "decidim/proposals/proposals/vote_button.html", locals: { proposal: model, from_proposals_list: true } %>
       <% elsif has_footer? %>
         <div class="card__support__data"></div>
-        <%= link_to t("decidim.proposals.proposals.proposal.view_proposal"), resource_path, class: "card__button button--sc light button small secondary" %>
+        <%= link_to resource_path, class: "card__button button--sc light button small" do %>
+          <%= t("decidim.proposals.proposals.proposal.view_proposal") %>
+          <span class="show-for-sr"><%= title %></span>
+        <% end %>
       <% end %>
     </div>
   </div>

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

@@ -14,12 +14,16 @@ module Decidim
 
       private
 
+      def preview?
+        options[:preview]
+      end
+
       def title
         decidim_html_escape(present(model).title)
       end
 
       def body
-        present(model).body
+        decidim_sanitize(present(model).body)
       end
 
       def has_state?
@@ -50,28 +54,40 @@ module Decidim
         state_classes.concat(["label", "proposal-status"]).join(" ")
       end
 
+      def base_statuses
+        @base_statuses ||= begin
+          if endorsements_visible?
+            [:endorsements_count, :comments_count]
+          else
+            [:comments_count]
+          end
+        end
+      end
+
       def statuses
-        return [:endorsements_count, :comments_count] if model.draft?
-        return [:creation_date, :endorsements_count, :comments_count] if !has_link_to_resource? || !can_be_followed?
+        return [] if preview?
+        return base_statuses if model.draft?
+        return [:creation_date] + base_statuses if !has_link_to_resource? || !can_be_followed?
 
-        [:creation_date, :follow, :endorsements_count, :comments_count]
+        [:creation_date, :follow] + base_statuses
       end
 
       def creation_date_status
-        l(model.published_at.to_date, format: :decidim_short)
+        explanation = content_tag(:strong, t("activemodel.attributes.common.created_at"))
+        "#{explanation}<br>#{l(model.published_at.to_date, format: :decidim_short)}"
       end
 
       def endorsements_count_status
         return endorsements_count unless has_link_to_resource?
 
-        link_to resource_path do
+        link_to resource_path, "aria-label" => "#{t("decidim.endorsable.endorsements_count")}: #{model.endorsements_count}", title: t("decidim.endorsable.endorsements_count") do
           endorsements_count
         end
       end
 
       def endorsements_count
-        with_tooltip t("decidim.proposals.models.proposal.fields.endorsements") do
-          icon("bullhorn", class: "icon--small") + " " + model.proposal_endorsements_count.to_s
+        with_tooltip t("decidim.endorsable.endorsements") do
+          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
         end
       end
 
@@ -95,6 +111,10 @@ module Decidim
         !model.withdrawn?
       end
 
+      def endorsements_visible?
+        model.component.current_settings.endorsements_enabled?
+      end
+
       def has_image?
         model.attachments.first.present? && model.attachments.first.file.content_type.start_with?("image") && model.component.settings.allow_card_image
       end

data/app/cells/decidim/proposals/proposal_tags/show.erb

@@ -2,7 +2,10 @@
   <ul class="tags tags--proposal tags--list">
     <% if category.present? %>
       <li>
-        <%= link_to translated_attribute(category.name), resource_locator(model).index(filter: { category_id: [category.id.to_s] }) %>
+        <%= link_to resource_locator(model).index(filter: { category_id: [category.id.to_s] }), title: t("decidim.tags.filter_results_for_category", resource: translated_attribute(category.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_category", resource: translated_attribute(category.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(category.name) %></span>
+        <% end %>
         <% if previous_category.present? && show_previous_category? %>
           &nbsp;
           <small class="text-small">
@@ -14,7 +17,10 @@
 
     <% if has_visible_scopes?(model) %>
       <li>
-        <%= link_to translated_attribute(scope.name), resource_locator(model).index(filter: { scope_id: [scope.id] }) %>
+        <%= link_to resource_locator(model).index(filter: { scope_id: [scope.id] }), title: t("decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(scope.name) %></span>
+        <% end %>
         <% if previous_scope.present? && show_previous_scope? %>
           &nbsp;
           <small class="text-small">

data/app/cells/decidim/proposals/proposals_picker/proposals.erb

@@ -0,0 +1,12 @@
+<ul id="proposals_list">
+  <% decorated_proposals do |proposal| %>
+    <li>
+      <label><input type="checkbox" data-picker-text="<%= proposal.id_and_title(html_escape: true) %>" data-picker-url="<%= picker_path %>" value="<%= proposal.id %>" data-picker-choose> <%= proposal.id_and_title(html_escape: true) %> (<%= proposal.reference %>)</label>
+    </li>
+  <% end %>
+  <% if more_proposals? %>
+    <li><div class="callout warning"><%= t("proposals_picker.more_proposals", scope: "decidim.proposals", number: more_proposals_count) %></div>
+    </li>
+  <% end %>
+</ul>
+<div id="no_proposals" class="callout warning"><%= t("proposals_picker.no_proposals", scope: "decidim.proposals") %></div>

data/app/cells/decidim/proposals/proposals_picker/show.erb

@@ -0,0 +1,14 @@
+<div class="picker-header">
+  <h1><%= t("proposals_picker.choose_proposals", scope: "decidim.proposals") %></h1>
+  <input type="text" name="proposals-filter" id="proposals_filter" placeholder="<%= t("decidim.admin.filters.search_placeholder.id_string_or_title_cont", collection: proposals_collection_name) %>">
+</div>
+<div class="picker-content picker-list" data-picker-path="<%= picker_path %>" data-picker-more="<%= more_proposals? %>">
+  <%= render :proposals %>
+</div>
+<div class="picker-footer">
+  <div class="buttons button--double">
+    <a class="button" data-close=""><%= t("proposals_picker.close", scope: "decidim.proposals") %></a>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/proposals/admin/proposals_picker" %>

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders a proposals picker.
+    class ProposalsPickerCell < Decidim::ViewModel
+      MAX_PROPOSALS = 1000
+
+      def show
+        if filtered?
+          render :proposals
+        else
+          render
+        end
+      end
+
+      alias component model
+
+      def filtered?
+        !search_text.nil?
+      end
+
+      def picker_path
+        request.path
+      end
+
+      def search_text
+        params[:q]
+      end
+
+      def more_proposals?
+        @more_proposals ||= more_proposals_count.positive?
+      end
+
+      def more_proposals_count
+        @more_proposals_count ||= proposals_count - MAX_PROPOSALS
+      end
+
+      def proposals_count
+        @proposals_count ||= filtered_proposals.count
+      end
+
+      def decorated_proposals
+        filtered_proposals.limit(MAX_PROPOSALS).each do |proposal|
+          yield Decidim::Proposals::ProposalPresenter.new(proposal)
+        end
+      end
+
+      def filtered_proposals
+        @filtered_proposals ||= if filtered?
+                                  proposals.where("title ILIKE ?", "%#{search_text}%")
+                                           .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
+                                           .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
+                                else
+                                  proposals
+                                end
+      end
+
+      def proposals
+        @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, component)
+                       &.published
+                       &.order(id: :asc)
+      end
+
+      def proposals_collection_name
+        Decidim::Proposals::Proposal.model_name.human(count: 2)
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Rectify::Command
-        include AttachmentMethods
+        include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
 

data/app/commands/decidim/proposals/admin/create_proposal_note.rb

@@ -24,6 +24,7 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           create_proposal_note
+          notify_admins_and_valuators
 
           broadcast(:ok, proposal_note)
         end
@@ -46,6 +47,20 @@ module Decidim
             }
           )
         end
+
+        def notify_admins_and_valuators
+          affected_users = Decidim::User.org_admins_except_me(form.current_user).all
+          affected_users += Decidim::Proposals::ValuationAssignment.includes(valuator_role: :user).where.not(id: form.current_user.id).where(proposal: proposal).map(&:valuator)
+
+          data = {
+            event: "decidim.events.proposals.admin.proposal_note_created",
+            event_class: Decidim::Proposals::Admin::ProposalNoteCreatedEvent,
+            resource: proposal,
+            affected_users: affected_users
+          }
+
+          Decidim::EventsManager.publish(data)
+        end
       end
     end
   end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when a user updates a proposal.
       class UpdateProposal < Rectify::Command
-        include AttachmentMethods
+        include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
 

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new collaborative draft.
     class CreateCollaborativeDraft < Rectify::Command
-      include AttachmentMethods
+      include ::Decidim::AttachmentMethods
       include HashtagsMethods
 
       # Public: Initializes the command.

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

@@ -4,7 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Rectify::Command
-      include AttachmentMethods
+      include ::Decidim::AttachmentMethods
       include HashtagsMethods
 
       # Public: Initializes the command.

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

@@ -6,62 +6,13 @@ module Decidim
     # and collaborative draft commands.
     # Allows to create several image attachments at once
     module GalleryMethods
-      private
-
-      def build_gallery
-        @gallery = []
-        @form.add_photos.each do |photo|
-          next unless image? photo
-
-          @gallery << Attachment.new(
-            title: photo.original_filename,
-            file: photo,
-            attached_to: @attached_to
-          )
-        end
-      end
+      include ::Decidim::GalleryMethods
 
-      def image?(image)
-        return unless image.respond_to? :content_type
-
-        image.content_type.start_with? "image"
-      end
-
-      def gallery_invalid?
-        gallery.each do |photo|
-          if photo.invalid? && photo.errors.has_key?(:file)
-            @form.errors.add(:add_photos, photo.errors[:file])
-            return true
-          end
-        end
-        false
-      end
-
-      def create_gallery
-        @gallery.map! do |photo|
-          photo.attached_to = @attached_to
-          photo.save!
-          @form.photos << photo.id.to_s
-        end
-      end
-
-      def photo_cleanup!
-        @attached_to.photos.each do |photo|
-          photo.destroy! if @form.photos.exclude? photo.id.to_s
-        end
-        # manually reset cached photos
-        @attached_to.reload
-        @attached_to.instance_variable_set(:@photos, nil)
-      end
+      private
 
-      # maybe a custom settings options would be nice
       def gallery_allowed?
         @form.current_component.settings.attachments_allowed?
       end
-
-      def process_gallery?
-        gallery_allowed? && @form.add_photos.any?
-      end
     end
   end
 end