decidim-proposals 0.24.1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '02194ab5bd5ff4f32e43b7d141949c044bae98960f7f80ce5c55cda2316532c5'
-  data.tar.gz: 779755725b80cfa503b7447e30047a1d16285df5bc949e3724b859e1a8648cd1
+  metadata.gz: e16b6a2f3c0fc0264d98b6796a12ffe8c649942655cfd619e556a8b74ad0a95c
+  data.tar.gz: c3dfca41b64c36d074673704639be551e868b4ba17fba64fdc5456ff7a5e5c8d
 SHA512:
-  metadata.gz: 4c44d1cffb56c89fa2b6b8ab3030f14ca1595f6c5f9ac39462fd3ba0e825be2f6420e218b0168dfe2523a2b0f36386f54e28bfbad292ed2b52abea76f33f4511
-  data.tar.gz: 15ee310bb2717917dae8ce02afca52fc553a1754ffec1b4f933adf9d4faffc415b68549cdddbd951470936e0bfd6cdb1c2770fc03e4272f73215b105b34f9c4f
+  metadata.gz: 070b899e677a277f4d24c939e72981528fd17d7081ef00fb3c1be6018b2b24d2a41430fba0dffbbf269dfa56d8c40609751866ea362c55963430b05e10525ba5
+  data.tar.gz: 476af009920cd5ecc7b8f8e8d0cfef086048ec5da2e2fc13982dd24691822657b4cb988bcb699908c3fd7c63c33b740c10aa7cd695da2494047008276266c604

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

@@ -14,7 +14,7 @@ module Decidim
       private
 
       def cost
-        number_to_currency(model.cost)
+        number_to_currency(model.cost, unit: Decidim.currency_unit)
       end
 
       def cost_report

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

@@ -132,14 +132,18 @@ module Decidim
         hash << model.cache_key_with_version
         hash << model.proposal_votes_count
         hash << model.endorsements_count
+        hash << model.comments_count
         hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
         hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        hash << render_space? ? 1 : 0
         if current_user
           hash << current_user.cache_key_with_version
           hash << current_user.follows?(model) ? 1 : 0
         end
         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.join("/")
       end

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

@@ -11,4 +11,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/admin/proposals_picker" %>
+<%= javascript_pack_tag "decidim_proposals_admin" %>

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

@@ -50,7 +50,7 @@ module Decidim
 
       def filtered_proposals
         @filtered_proposals ||= if filtered?
-                                  proposals.where("title ILIKE ?", "%#{search_text}%")
+                                  proposals.where("title::text ILIKE ?", "%#{search_text}%")
                                            .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
                                            .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
                                 else

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

@@ -39,15 +39,17 @@ module Decidim
               action_user: form.current_user,
               extra_attributes: {
                 "component" => target_component
-              }
+              }.merge(proposal_answer_attributes(original_proposal))
             )
           end.compact
         end
 
         def proposals
-          Decidim::Proposals::Proposal
-            .where(component: origin_component)
-            .where(state: proposal_states)
+          @proposals = Decidim::Proposals::Proposal
+                       .where(component: origin_component)
+                       .where(state: proposal_states)
+          @proposals = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
+          @proposals
         end
 
         def proposal_states
@@ -61,6 +63,10 @@ module Decidim
           @proposal_states
         end
 
+        def proposal_scopes
+          @form.scopes
+        end
+
         def origin_component
           @form.origin_component
         end
@@ -78,6 +84,17 @@ module Decidim
         def proposal_author
           form.keep_authors ? nil : @form.current_organization
         end
+
+        def proposal_answer_attributes(original_proposal)
+          return {} unless form.keep_answers
+
+          {
+            answer: original_proposal.answer,
+            answered_at: original_proposal.answered_at,
+            state: original_proposal.state,
+            state_published_at: original_proposal.state_published_at
+          }
+        end
       end
     end
   end

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

@@ -147,7 +147,7 @@ module Decidim
         private
 
         def collection
-          @collection ||= Proposal.where(component: current_component).published
+          @collection ||= Proposal.where(component: current_component).not_hidden.published
         end
 
         def proposals

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

@@ -7,6 +7,7 @@ module Decidim
       helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
       helper TooltipHelper
+      helper UserGroupHelper
 
       include Decidim::ApplicationHelper
       include FormFactory
@@ -133,7 +134,7 @@ module Decidim
       end
 
       def geocoded_collaborative_draft
-        @geocoded_collaborative_draft ||= search.results.not_hidden.select(&:geocoded?)
+        @geocoded_collaborative_draft ||= search.results.not_hidden.select(&:geocoded_and_valid?)
       end
 
       def search_klass

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

@@ -7,6 +7,7 @@ module Decidim
       helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
+      helper UserGroupHelper
       include Decidim::ApplicationHelper
       include Flaggable
       include Withdrawable

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

@@ -7,6 +7,7 @@ module Decidim
       # from a participatory text.
       class ImportParticipatoryTextForm < Decidim::Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         # WARNING: consider adding/removing the relative translation key at
         # decidim.assemblies.admin.new_import.accepted_types when modifying this hash

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

@@ -10,8 +10,10 @@ module Decidim
 
         attribute :origin_component_id, Integer
         attribute :import_proposals, Boolean
+        attribute :keep_answers, Boolean
         attribute :keep_authors, Boolean
         attribute :states, Array
+        attribute :scope_ids, Array
 
         validates :origin_component_id, :origin_component, :states, :current_component, presence: true
         validates :import_proposals, allow_nil: false, acceptance: true
@@ -32,6 +34,10 @@ module Decidim
           super.reject(&:blank?)
         end
 
+        def scopes
+          Decidim::Scope.where(organization: current_organization, id: scope_ids)
+        end
+
         def origin_component
           @origin_component ||= origin_components.find_by(id: origin_component_id)
         end

data/app/forms/decidim/proposals/proposal_form.rb

@@ -107,12 +107,15 @@ module Decidim
 
       private
 
-      # This method will add an error to the `attachment` field only if there's
-      # any error in any other field. This is needed because when the form has
-      # an error, the attachment is lost, so we need a way to inform the user of
+      # This method will add an error to the `add_photos` and/or "add_documents" fields
+      # only if there's any error in any other field. This is needed because when the
+      # form has an error, the attachment is lost, so we need a way to inform the user of
       # this problem.
       def notify_missing_attachment_if_errored
-        errors.add(:attachment, :needs_to_be_reattached) if errors.any? && attachment.present?
+        if errors.any?
+          errors.add(:add_photos, :needs_to_be_reattached) if add_photos.present?
+          errors.add(:add_documents, :needs_to_be_reattached) if add_documents.present?
+        end
       end
 
       def ordered_hashtag_list(string)

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

@@ -26,16 +26,16 @@ module Decidim
       end
 
       def proposal_preview_data_for_map(proposal)
-        [
-          proposal.slice(
+        {
+          type: "drag-marker",
+          marker: proposal.slice(
             :latitude,
             :longitude,
             :address
           ).merge(
-            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
-            draggable: true
+            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true)
           )
-        ]
+        }
       end
 
       def has_position?(proposal)

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

@@ -30,7 +30,7 @@ module Decidim
         accepted_mime_types = Decidim::Proposals::DocToMarkdown::ACCEPTED_MIME_TYPES.keys
         accepted_mime_types.each_with_index do |mime_type, index|
           links += link_to t(".accepted_mime_types.#{mime_type}"),
-                           asset_path("decidim/proposals/participatory_texts/participatory_text.#{mime_type}"),
+                           asset_pack_path("media/documents/participatory_text.#{mime_type}"),
                            download: "participatory_text.#{mime_type}"
           links += ", " unless accepted_mime_types.length == index + 1
         end

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

@@ -107,22 +107,6 @@ module Decidim
         translated_attribute(component_settings.try("proposal_wizard_#{step}_help_text")).present?
       end
 
-      # Renders a user_group select field in a form.
-      # form - FormBuilder object
-      # name - attribute user_group_id
-      #
-      # Returns nothing.
-      def user_group_select_field(form, name)
-        selected = @form.user_group_id.presence
-        user_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
-        form.select(
-          name,
-          user_groups.map { |g| [g.name, g.id] },
-          selected: selected,
-          include_blank: current_user.name
-        )
-      end
-
       private
 
       def total_steps

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

@@ -337,8 +337,18 @@ module Decidim
         ")
       end
 
+      def self.sort_by_translated_title_asc
+        field = Arel::Nodes::InfixOperation.new("->>", arel_table[:title], Arel::Nodes.build_quoted(I18n.locale))
+        order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("ASC")))
+      end
+
+      def self.sort_by_translated_title_desc
+        field = Arel::Nodes::InfixOperation.new("->>", arel_table[:title], Arel::Nodes.build_quoted(I18n.locale))
+        order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("DESC")))
+      end
+
       ransacker :title do
-        Arel.sql(%{("decidim_proposals_proposals"."title")::text})
+        Arel.sql(%{cast("decidim_proposals_proposals"."title" as text)})
       end
 
       ransacker :id_string do

data/app/packs/entrypoints/decidim_proposals.js

@@ -0,0 +1,8 @@
+import "src/decidim/proposals/utils"
+import "src/decidim/proposals/add_proposal"
+
+// Images
+require.context("../images", true)
+
+// Documents
+require.context("../documents", true)

data/app/packs/entrypoints/decidim_proposals_admin.js

@@ -0,0 +1,3 @@
+import "src/decidim/proposals/admin/proposals"
+import "src/decidim/proposals/admin/proposals_form"
+import "src/decidim/proposals/admin/proposals_picker"

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

@@ -0,0 +1,49 @@
+import attachGeocoding from "src/decidim/geocoding/attach_input"
+import getCoordinateInputName from "src/decidim/geocoding/coordinate_input";
+
+$(() => {
+  const $checkbox = $("input:checkbox[name$='[has_address]']");
+  const $addressInput = $("#address_input");
+  const $addressInputField = $("input", $addressInput);
+  const $map = $("#address_map");
+  const latFieldName = getCoordinateInputName("latitude", $addressInputField, {})
+  const longFieldName = getCoordinateInputName("longitude", $addressInputField, {})
+  $map.hide();
+
+  if ($checkbox.length > 0) {
+    const toggleInput = () => {
+      if ($checkbox[0].checked) {
+        $addressInput.show();
+        $addressInputField.prop("disabled", false);
+      } else {
+        $addressInput.hide();
+        $addressInputField.prop("disabled", true);
+      }
+    }
+    toggleInput();
+    $checkbox.on("change", toggleInput);
+  }
+
+  if ($addressInput.length > 0) {
+    if ($checkbox[0].checked) {
+      $map.show();
+    }
+
+    const ctrl = $("[data-decidim-map]").data("map-controller");
+    ctrl.setEventHandler("coordinates", (ev) => {
+      $(`input[name='${latFieldName}']`).val(ev.lat);
+      $(`input[name='${longFieldName}']`).val(ev.lng);
+    });
+
+    attachGeocoding($addressInputField, null, (coordinates) => {
+      $map.show();
+      // Remove previous marker when user updates address in address field
+      ctrl.removeMarker();
+      ctrl.addMarker({
+        latitude: coordinates[0],
+        longitude: coordinates[1],
+        address: $addressInput.val()
+      });
+    });
+  }
+});

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

@@ -0,0 +1,143 @@
+/* eslint-disable no-invalid-this */
+/* eslint no-unused-vars: 0 */
+/* eslint id-length: ["error", { "exceptions": ["e"] }] */
+
+$(() => {
+  const selectedProposalsCount = function() {
+    return $(".table-list .js-check-all-proposal:checked").length
+  }
+
+  const selectedProposalsNotPublishedAnswerCount = function() {
+    return $(".table-list [data-published-state=false] .js-check-all-proposal:checked").length
+  }
+
+  const selectedProposalsCountUpdate = function() {
+    const selectedProposals = selectedProposalsCount();
+    const selectedProposalsNotPublishedAnswer = selectedProposalsNotPublishedAnswerCount();
+    if (selectedProposals === 0) {
+      $("#js-selected-proposals-count").text("")
+    } else {
+      $("#js-selected-proposals-count").text(selectedProposals);
+    }
+
+    if (selectedProposals >= 2) {
+      $('button[data-action="merge-proposals"]').parent().show();
+    } else {
+      $('button[data-action="merge-proposals"]').parent().hide();
+    }
+
+    if (selectedProposalsNotPublishedAnswer > 0) {
+      $('button[data-action="publish-answers"]').parent().show();
+      $("#js-form-publish-answers-number").text(selectedProposalsNotPublishedAnswer);
+    } else {
+      $('button[data-action="publish-answers"]').parent().hide();
+    }
+  }
+
+  const showBulkActionsButton = function() {
+    if (selectedProposalsCount() > 0) {
+      $("#js-bulk-actions-button").removeClass("hide");
+    }
+  }
+
+  const hideBulkActionsButton = function(force = false) {
+    if (selectedProposalsCount() === 0 || force === true) {
+      $("#js-bulk-actions-button").addClass("hide");
+      $("#js-bulk-actions-dropdown").removeClass("is-open");
+    }
+  }
+
+  const showOtherActionsButtons = function() {
+    $("#js-other-actions-wrapper").removeClass("hide");
+  }
+
+  const hideOtherActionsButtons = function() {
+    $("#js-other-actions-wrapper").addClass("hide");
+  }
+
+  const hideBulkActionForms = function() {
+    $(".js-bulk-action-form").addClass("hide");
+  }
+
+  // Expose functions to make them avaialble in .js.erb templates
+  window.selectedProposalsCount = selectedProposalsCount;
+  window.selectedProposalsNotPublishedAnswerCount = selectedProposalsNotPublishedAnswerCount;
+  window.selectedProposalsCountUpdate = selectedProposalsCountUpdate;
+  window.showBulkActionsButton = showBulkActionsButton;
+  window.hideBulkActionsButton = hideBulkActionsButton;
+  window.showOtherActionsButtons = showOtherActionsButtons;
+  window.hideOtherActionsButtons = hideOtherActionsButtons;
+  window.hideBulkActionForms = hideBulkActionForms;
+
+  if ($(".js-bulk-action-form").length) {
+    hideBulkActionForms();
+    $("#js-bulk-actions-button").addClass("hide");
+
+    $("#js-bulk-actions-dropdown ul li button").click(function(e) {
+      e.preventDefault();
+      let action = $(e.target).data("action");
+
+      if (action) {
+        $(`#js-form-${action}`).submit(function() {
+          $(".layout-content > .callout-wrapper").html("");
+        })
+
+        $(`#js-${action}-actions`).removeClass("hide");
+        hideBulkActionsButton(true);
+        hideOtherActionsButtons();
+      }
+    })
+
+    // select all checkboxes
+    $(".js-check-all").change(function() {
+      $(".js-check-all-proposal").prop("checked", $(this).prop("checked"));
+
+      if ($(this).prop("checked")) {
+        $(".js-check-all-proposal").closest("tr").addClass("selected");
+        showBulkActionsButton();
+      } else {
+        $(".js-check-all-proposal").closest("tr").removeClass("selected");
+        hideBulkActionsButton();
+      }
+
+      selectedProposalsCountUpdate();
+    });
+
+    // proposal checkbox change
+    $(".table-list").on("change", ".js-check-all-proposal", function (e) {
+      let proposalId = $(this).val()
+      let checked = $(this).prop("checked")
+
+      // uncheck "select all", if one of the listed checkbox item is unchecked
+      if ($(this).prop("checked") === false) {
+        $(".js-check-all").prop("checked", false);
+      }
+      // check "select all" if all checkbox proposals are checked
+      if ($(".js-check-all-proposal:checked").length === $(".js-check-all-proposal").length) {
+        $(".js-check-all").prop("checked", true);
+        showBulkActionsButton();
+      }
+
+      if ($(this).prop("checked")) {
+        showBulkActionsButton();
+        $(this).closest("tr").addClass("selected");
+      } else {
+        hideBulkActionsButton();
+        $(this).closest("tr").removeClass("selected");
+      }
+
+      if ($(".js-check-all-proposal:checked").length === 0) {
+        hideBulkActionsButton();
+      }
+
+      $(".js-bulk-action-form").find(`.js-proposal-id-${proposalId}`).prop("checked", checked);
+      selectedProposalsCountUpdate();
+    });
+
+    $(".js-cancel-bulk-action").on("click", function (e) {
+      hideBulkActionForms()
+      showBulkActionsButton();
+      showOtherActionsButtons();
+    });
+  }
+});