decidim-proposals 0.24.3 → 0.25.0.rc1

data/app/{assets/javascripts/decidim/proposals/admin/proposals_form.js.es6 → packs/src/decidim/proposals/admin/proposals_form.js}

@@ -1,6 +1,6 @@
-$(() => {
-  const { attachGeocoding } = window.Decidim;
+import attachGeocoding from "src/decidim/geocoding/attach_input"
 
+$(() => {
   const $form = $(".proposal_form_admin");
 
   if ($form.length > 0) {

data/app/{assets/javascripts/decidim/proposals/utils.js.es6 → packs/src/decidim/proposals/utils.js}

@@ -1,6 +1,6 @@
 /* eslint-disable no-invalid-this */
 
-(() => {
+$(() => {
   $("#vote_button").mouseover(function () {
     $(this).text($(this).data("replace"));
   });
@@ -8,4 +8,4 @@
   $("#vote_button").mouseout(function () {
     $(this).text($(this).data("original"));
   });
-})(this);
+});

data/app/packs/stylesheets/decidim/proposals/_proposals.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/proposals/proposals/preview";

data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb

@@ -16,7 +16,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.created_at <= ?", end_time).accepted
           @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -30,7 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization)
           end
-          @query = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
+          @query = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
           @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn.not_hidden
           @query = @query.group("decidim_categorizations.decidim_category_id",

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -31,7 +31,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_component_ids_from_spaces(spaces.pluck(:id))).except_withdrawn.not_hidden.pluck(:id)
+          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).except_withdrawn.not_hidden.pluck(:id)
           @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
                                                    .left_outer_joins(proposal: :category)
                                                    .where(proposal: proposal_ids)

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

@@ -28,6 +28,7 @@ module Decidim
         Decidim::Proposals::Proposal
           .where(component: @components)
           .published
+          .not_hidden
           .where(
             "GREATEST(#{title_similarity}, #{body_similarity}) >= ?",
             translated_attribute(@proposal.title),

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

@@ -110,14 +110,14 @@ module Decidim
               # 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")
+              attachment.attributes.slice("content_type", "description", "file_size", "title", "weight")
             )
           )
 
-          if File.exist?(attachment.file.file.path)
-            new_attachment.file = File.open(attachment.file.file.path)
+          if attachment.file.attached?
+            new_attachment.file = attachment.file.blob
           else
-            new_attachment.remote_file_url = attachment.url
+            new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file).url(host: original_proposal.organization.host)
           end
 
           new_attachment.save!

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

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

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

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

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

@@ -16,6 +16,12 @@
         <div class="row column">
           <%= f.check_box :keep_authors %>
         </div>
+        <div class="row column">
+          <%= f.check_box :keep_answers %>
+        </div>
+        <div class="row column">
+          <%= scopes_picker_filter f, :scope_ids %>
+        </div>
         <div class="row column">
           <%= f.check_box :import_proposals %>
         </div>

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"), data: { disable_dynamic_change: true } %>
+        <%= 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 } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="collaborative_drafts">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>

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

@@ -28,4 +28,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -21,5 +21,3 @@
     <%= render partial: "collaborative_drafts" %>
   </div>
 </div>
-<%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/results_listing" %>

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

@@ -21,4 +21,4 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -1,3 +1,4 @@
 <div class="column dynamic-map-instructions">
-  <%== t(".instructions") %>
+  <h3><%= t(".instructions") %></h3>
+  <p><%= t(".description") %></p>
 </div>

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

@@ -39,6 +39,10 @@
 
   <div class="field" id="address_input">
     <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address") %>
+    <div class="map" id="address_map">
+      <%= render partial: "dynamic_map_instructions" %>
+      <%= dynamic_map_for proposal_preview_data_for_map(@proposal) %>
+    </div>
   </div>
 <% end %>
 
@@ -67,7 +71,7 @@
     <% 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.file.filename %>
+          <%= 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") %>"

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"), data: { disable_dynamic_change: true } %>
+        <%= 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 } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="proposals">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>

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

@@ -21,4 +21,4 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -28,4 +28,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -23,4 +23,4 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -7,7 +7,7 @@
         <h3>${title}</h3>
         <div id="bodyContent">
           <p>{{html body}}</p>
-          <div class="map__date-adress">
+          <div class="map__date-address">
             <div class="address card__extra">
               <div class="address__icon">{{html icon}}</div>
               <div class="address__details">
@@ -55,9 +55,7 @@
   </div>
 </div>
 <div class="row">
-<div class="text-right">
-  <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state][]" => "withdrawn") %>
-</div>
+  <div class="text-right">
+    <%= link_to t(".see_all_withdrawn"), proposals_path("filter[state][]" => "withdrawn") %>
+  </div>
 </div>
-<%= javascript_include_tag("decidim/filters") %>
-<%= javascript_include_tag "decidim/results_listing" %>

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

@@ -35,4 +35,4 @@
   <div class="columns large-3"></div>
 </div>
 
-<%= javascript_include_tag "decidim/proposals/add_proposal" %>
+<%= javascript_pack_tag "decidim_proposals" %>

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

@@ -13,46 +13,22 @@
         <% end %>
 
         <%= render_proposal_body(@proposal) %>
-
       </div>
       <div class="row column">
         <%= cell "decidim/proposals/proposal_tags", @proposal %>
       </div>
     </div>
-    <div class="row column">
-      <%= attachments_for @proposal %>
-    </div>
-
     <% if component_settings.geocoding_enabled? %>
       <% if has_position?(@proposal) %>
-        <%= render partial: "dynamic_map_instructions" %>
-        <%= dynamic_map_for proposal_preview_data_for_map(@proposal) do %>
-          <%= stylesheet_link_tag "decidim/map" %>
-          <%= javascript_include_tag "decidim/map" %>
-        <% end %>
-        <%= decidim_form_for(@form, url: update_draft_proposal_path(@form), html: { method: :patch }) do |form| %>
-          <%= form.hidden_field :title, value: form_presenter.title %>
-          <%= form.hidden_field :body, value: form_presenter.body %>
-          <%= form.hidden_field :address %>
-          <%= form.hidden_field :latitude, data: { type: "latitude" } %>
-          <%= form.hidden_field :longitude, data: { type: "longitude" } %>
-          <div class="preview--form__hidden">
-            <% if @form.categories&.any? %>
-              <%= form.categories_select :category_id, @form.categories %>
-            <% end %>
-            <% if current_participatory_space.has_subscopes? %>
-              <%= scopes_picker_field form, :scope_id %>
-            <% end %>
-            <% if current_user.user_groups.verified.any? %>
-              <%= form.select :user_group_id, current_user.user_groups.verified.map { |g| [g.name, g.id] }, prompt: current_user.name %>
-            <% end %>
-          </div>
-          <div class="actions">
-            <%= form.submit t(".update_position"), class: "button expanded", data: { disable: true } %>
-          </div>
-        <% end %>
+      <div class="row column">
+        <h3 class="section-heading"><%= t("decidim.application.geocoding.geocoded_address") %></h3>
+            <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
+      </div>
       <% end %>
     <% end %>
+    <div class="row column">
+      <%= attachments_for @proposal %>
+    </div>
 
     <div class="p-l">
       <div class="row column flex-center">

data/config/assets.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_proposals: "#{base_path}/app/packs/entrypoints/decidim_proposals.js",
+  decidim_proposals_admin: "#{base_path}/app/packs/entrypoints/decidim_proposals_admin.js"
+)
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/proposals/proposals")

data/config/locales/ar.yml

@@ -42,7 +42,9 @@ ar:
               invalid_document_type: 'نوع المستند غير صالح. التنسيقات المقبولة هي: %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: يحتاج إلى إعادة ربط
+            add_photos:
               needs_to_be_reattached: يحتاج إلى إعادة ربط
             body:
               identical: لا يمكن أن يكون العنوان متطابقًا

data/config/locales/bg.yml

@@ -42,7 +42,9 @@ bg:
               invalid_document_type: 'Невалиден тип документ. Допустимите формати са: %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: Необходимо е да се прикачи отново
+            add_photos:
               needs_to_be_reattached: Необходимо е да се прикачи отново
             body:
               cant_be_equal_to_template: не може да е еднакво с шаблона

data/config/locales/ca.yml

@@ -35,6 +35,7 @@ ca:
         origin_component_id: Component des d'on importar les propostes
       proposals_import:
         import_proposals: Importar propostes
+        keep_answers: Manté l'estat i les respostes
         keep_authors: Mantenir l'autoria original
       valuation_assignment:
         admin_log:
@@ -47,7 +48,9 @@ ca:
               invalid_document_type: 'Tipus de document no vàlid. Els formats acceptats són: %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
+            add_photos:
               needs_to_be_reattached: És necessari tornar a adjuntar l'arxiu
             body:
               cant_be_equal_to_template: No pot ser igual a la plantilla
@@ -113,9 +116,11 @@ ca:
       proposals:
         actions:
           amend: Esmena
+          comment: Comentar
           create: Crear
           endorse: Adherir-se
           vote: Donar suport
+          vote_comment: Votar el comentari
           withdraw: Retirar
         name: Propostes
         settings:
@@ -710,8 +715,6 @@ ca:
           proposals_count:
             one: "%{count} proposta"
             other: "%{count} propostes"
-        dynamic_map_instructions:
-          instructions: <h3>Pots moure el punt al mapa. </h3><p>No oblidis fer clic al botó "Actualitzar posició" abans de publicar la teva proposta.</p>
         edit:
           add_documents: Documents
           add_images: Arxiu
@@ -783,7 +786,6 @@ ca:
             other: Podràs editar aquesta proposta durant els primers %{count} minuts després de la publicació de la proposta. Un cop passada aquesta finestra de temps, no podràs editar la proposta.
           publish: Publica
           title: Publica la teva proposta
-          update_position: Actualitzar posició
         proposal:
           creation_date: 'Data de creació: %{date}'
           view_proposal: Veure proposta
@@ -900,3 +902,7 @@ ca:
       included_proposals:
         proposal_project: 'Proposta vinculada a aquests projectes:'
         proposal_result: 'Proposta vinculada a aquests resultats:'
+    statistics:
+      proposals_accepted: Propostes acceptades
+      proposals_count: Propostes
+      supports_count: Suports

data/config/locales/cs.yml

@@ -35,6 +35,7 @@ cs:
         origin_component_id: Komponenta pro kopírování návrhů z
       proposals_import:
         import_proposals: Návrhy na dovoz
+        keep_answers: Zachovat stav a odpovědi
         keep_authors: Uchovávejte původní autory
       valuation_assignment:
         admin_log:
@@ -47,7 +48,9 @@ cs:
               invalid_document_type: 'Neplatný typ dokumentu. Přijaté formáty jsou: %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: Potřebuje být znovu připojen
+            add_photos:
               needs_to_be_reattached: Potřebuje být znovu připojen
             body:
               cant_be_equal_to_template: nelze se rovnat šabloně
@@ -121,9 +124,11 @@ cs:
       proposals:
         actions:
           amend: Pozměnit
+          comment: Komentář
           create: Vytvořit
           endorse: Schválit
           vote: Hlasování
+          vote_comment: Komentář hlasování
           withdraw: Ustoupit
         name: Návrhy
         settings:
@@ -727,7 +732,8 @@ cs:
             many: "%{count} návrhů"
             other: "%{count} návrhů"
         dynamic_map_instructions:
-          instructions: <h3>Můžete přesunout bod na mapě. </h3><p>Nezapomeňte kliknout na tlačítko "Aktualizovat pozici" před zveřejněním vašeho návrhu.</p>
+          description: Souřadnice budou aktualizovány po kliknutí na tlačítko 'náhled'. Adresa se však nemění.
+          instructions: Můžete přesunout bod na mapě.
         edit:
           add_documents: Dokumenty
           add_images: Soubor
@@ -803,7 +809,6 @@ cs:
             other: Budete mít možnost upravit tento návrh během prvních %{count} minut po návrh zveřejněn. Po uplynutí tohoto časového okna nebudete moci návrh upravit.
           publish: Publikovat
           title: Publikujte svůj návrh
-          update_position: Aktualizovat pozici
         proposal:
           creation_date: 'Tvorba: %{date}'
           view_proposal: Zobrazit návrh
@@ -924,3 +929,7 @@ cs:
       included_proposals:
         proposal_project: 'Návrh se objevuje v těchto projektech:'
         proposal_result: 'Návrh se objeví v těchto výsledcích:'
+    statistics:
+      proposals_accepted: Přijaté návrhy
+      proposals_count: Návrhy
+      supports_count: Podpory

data/config/locales/de.yml

@@ -35,6 +35,7 @@ de:
         origin_component_id: Komponente zum Kopieren der Vorschläge aus
       proposals_import:
         import_proposals: Vorschläge importieren
+        keep_answers: Status und Antworten behalten
         keep_authors: Behalten Sie die ursprünglichen Autoren
       valuation_assignment:
         admin_log:
@@ -47,7 +48,9 @@ de:
               invalid_document_type: 'Ungültiger Dokumenttyp Zulässige Formate sind: %{valid_mime_types}'
         proposal:
           attributes:
-            attachment:
+            add_documents:
+              needs_to_be_reattached: Der Anhang muss erneut angehängt werden
+            add_photos:
               needs_to_be_reattached: Der Anhang muss erneut angehängt werden
             body:
               cant_be_equal_to_template: kann nicht gleich der Vorlage sein
@@ -113,9 +116,11 @@ de:
       proposals:
         actions:
           amend: Änderungsvorschlag
+          comment: Kommentieren
           create: Erstellen
           endorse: Unterstützung
           vote: Abstimmung
+          vote_comment: Kommentar bewerten
           withdraw: Zurückziehen
         name: Vorschläge
         settings:
@@ -710,8 +715,6 @@ de:
           proposals_count:
             one: "%{count} Vorschlag"
             other: "%{count} Vorschläge"
-        dynamic_map_instructions:
-          instructions: <h3>Sie können den Punkt auf der Karte verschieben.</h3><p>Vergessen Sie nicht, vor der Veröffentlichung Ihres Vorschlags auf die Schaltfläche "Position aktualisieren" zu klicken.</p>
         edit:
           add_documents: Dokumente
           add_images: Datei
@@ -783,7 +786,6 @@ de:
             other: Sie können diesen Vorschlag in den ersten %{count} Minute nach seiner Veröffentlichung bearbeiten. Nach Ablauf dieses Zeitfensters können Sie diesen nicht mehr bearbeiten.
           publish: Veröffentlichen
           title: Vorschlag veröffentlichen
-          update_position: Position aktualisieren
         proposal:
           creation_date: 'Erstellt am %{date}'
           view_proposal: Vorschlag anzeigen
@@ -900,3 +902,7 @@ de:
       included_proposals:
         proposal_project: 'Vorschlag, der in diesen Projekten erscheint:'
         proposal_result: 'Vorschlag erscheint in diesen Ergebnissen:'
+    statistics:
+      proposals_accepted: Akzeptierte Vorschläge
+      proposals_count: Vorschläge
+      supports_count: Unterstützungen