decidim-proposals 0.29.2 → 0.29.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f0a793e0fdf54677810a839a8e177a8d3077aee2e25ff1618751d76f03f6401
-  data.tar.gz: 90b7698d7c3560677628165a4ce38c5fdf78b3d1dc5cb00671967a83a9af0d72
+  metadata.gz: 8f083ea9482b31e176975e170eafea966d8bbac7e84a54a0208e13a3e0206678
+  data.tar.gz: 8586468ff6a8b6054710736fedc2c011e698272034d4207c70f2d0d55fe24278
 SHA512:
-  metadata.gz: fd2a28b72d4d22a47f40a4ccbd000421d19c0e014f0788a6888ce36f6665660c5d2d3c862b034280cc4798da73d1137fe4815e773ac48113a89a1baeacee9d2e
-  data.tar.gz: 499ac55e1d39ae1b19c105f69187ef399ee5bb97d110ea7ab6f15cef2aaa08c30456c12dbb45a85ff72041aaf0d38df9fca5b202e895286a7e2731e450eca263
+  metadata.gz: cd1334cc67b7b48abfde38396c4320496ce59f7edea987ddc67f26762585ebb043f4387f3ecbdb6ae4a76b30a85f41908624dcf92dc193c34a7faa4df30d28fa
+  data.tar.gz: be5c0c87019f16e7691ba3f1a8023f1b34bc7e53e7faf13650ab553ef7165a52c20f27254743af1677b2f47b9c92597ce04691d196fe334ecde2cfe3b332b6e3

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

@@ -10,18 +10,6 @@
     <% end %>
   <% end %>
 </div>
-
-<div class="flex items-center justify-between space-x-6">
-  <span class="content-block__span flex-shrink-0">
-    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-  </span>
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
-      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
-</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
     <% proposals_to_render.each do |p| %>

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

@@ -22,7 +22,8 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
-          broadcast(:ok, import_proposals)
+          import_proposals
+          broadcast(:ok)
         end
 
         private
@@ -30,70 +31,11 @@ module Decidim
         attr_reader :form
 
         def import_proposals
-          proposals.map do |original_proposal|
-            next if proposal_already_copied?(original_proposal, target_component)
-
-            Decidim::Proposals::ProposalBuilder.copy(
-              original_proposal,
-              author: proposal_author,
-              action_user: form.current_user,
-              extra_attributes: {
-                "component" => target_component
-              }.merge(proposal_answer_attributes(original_proposal))
-            )
-          end.compact
-        end
-
-        def proposals
-          @proposals = Decidim::Proposals::Proposal
-                       .where(component: origin_component)
-          @proposals = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
-
-          @proposals = if @form.states.include?("not_answered")
-                         @proposals.not_answered.or(@proposals.where(id: @proposals.only_status(@form.states).pluck(:id)))
-                       else
-                         @proposals.only_status(@form.states)
-                       end
-
-          @proposals
-        end
-
-        def proposal_scopes
-          @form.scopes
-        end
-
-        def origin_component
-          @form.origin_component
-        end
-
-        def target_component
-          @form.current_component
-        end
-
-        def proposal_already_copied?(original_proposal, target_component)
-          # Note: we are including also proposals from unpublished components
-          # because otherwise duplicates could be created until the component is
-          # published.
-          original_proposal.linked_resources(:proposals, "copied_from_component", component_published: false).any? do |proposal|
-            proposal.component == target_component
-          end
-        end
-
-        def proposal_author
-          form.keep_authors ? nil : @form.current_organization
-        end
-
-        def proposal_answer_attributes(original_proposal)
-          return {} unless form.keep_answers
-
-          state = Decidim::Proposals::ProposalState.where(component: target_component, token: original_proposal.state).first
-
-          {
-            answer: original_proposal.answer,
-            answered_at: original_proposal.answered_at,
-            proposal_state: state,
-            state_published_at: original_proposal.state_published_at
-          }
+          ImportProposalsJob.perform_later(form.as_json.merge({
+                                                                "current_user_id" => form.current_user.id,
+                                                                "current_organization_id" => form.current_organization.id,
+                                                                "current_component_id" => form.current_component.id
+                                                              }))
         end
       end
     end

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

@@ -5,6 +5,9 @@ module Decidim
     module Admin
       # This controller allows admins to answer proposals in a participatory process.
       class ProposalAnswersController < Admin::ApplicationController
+        include ActionView::Helpers::SanitizeHelper
+        include Decidim::Proposals::Admin::Filterable
+
         helper_method :proposal
 
         helper Proposals::ApplicationHelper
@@ -44,6 +47,10 @@ module Decidim
         def proposal
           @proposal ||= Proposal.where(component: current_component).find(params[:id])
         end
+
+        def collection
+          @collection ||= Proposal.where(component: current_component).not_hidden.published
+        end
       end
     end
   end

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

@@ -16,8 +16,8 @@ module Decidim
           @form = form(Admin::ProposalsImportForm).from_params(params)
 
           Admin::ImportProposals.call(@form) do
-            on(:ok) do |proposals|
-              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin", number: proposals.length)
+            on(:ok) do
+              flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.proposals.admin")
               redirect_to EngineRouter.admin_proxy(current_component).root_path
             end
 

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

@@ -11,7 +11,7 @@ module Decidim
       def versioned_resource
         @versioned_resource ||=
           if params[:proposal_id]
-            present(Proposal.where(component: current_component).find(params[:proposal_id]))
+            present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
           else
             CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
           end

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

@@ -15,20 +15,9 @@ module Decidim
         attribute :internal_state, String
 
         validates :internal_state, presence: true, inclusion: { in: :proposal_states }
-        validates :answer, translatable_presence: true, if: ->(form) { form.state == "rejected" }
-
-        with_options if: :costs_required? do
-          validates :cost, numericality: true, presence: true
-          validates :cost_report, translatable_presence: true
-          validates :execution_period, translatable_presence: true
-        end
 
         alias state internal_state
 
-        def costs_required?
-          costs_enabled? && state == "accepted"
-        end
-
         def publish_answer?
           current_component.current_settings.publish_answers_immediately?
         end
@@ -38,10 +27,6 @@ module Decidim
         def proposal_states
           Decidim::Proposals::ProposalState.where(component: current_component).pluck(:token).map(&:to_s) + ["not_answered"]
         end
-
-        def costs_enabled?
-          current_component.current_settings.answers_with_costs?
-        end
       end
     end
   end

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

@@ -30,6 +30,7 @@ module Decidim
 
       def proposal_state_css_style(proposal)
         return "" if proposal.emendation?
+        return "" if proposal.withdrawn?
 
         proposal.proposal_state&.css_style
       end

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

@@ -12,9 +12,7 @@ module Decidim
       end
 
       def proposal_has_costs?
-        @proposal.cost.present? &&
-          translated_attribute(@proposal.cost_report).present? &&
-          translated_attribute(@proposal.execution_period).present?
+        @proposal.cost.present?
       end
 
       def toggle_view_mode_link(current_mode, target_mode, title, params)

data/app/jobs/decidim/proposals/admin/import_proposals_job.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ImportProposalsJob < ApplicationJob
+        queue_as :default
+
+        def perform(form)
+          @form = form
+          ActiveRecord::Base.transaction do
+            proposals.map do |original_proposal|
+              next if proposal_already_copied?(original_proposal, target_component)
+
+              Decidim::Proposals::ProposalBuilder.copy(
+                original_proposal,
+                author: proposal_author,
+                action_user: current_user,
+                extra_attributes: {
+                  "component" => target_component
+                }.merge(proposal_answer_attributes(original_proposal))
+              )
+            end
+          end
+          ImportProposalsMailer.notify_success(current_user, origin_component, target_component, proposals.count).deliver_later
+        rescue ActiveRecord::RecordNotFound, NoMethodError
+          ImportProposalsMailer.notify_failure(current_user, origin_component, target_component).deliver_later
+        end
+
+        private
+
+        def proposals
+          proposals = Decidim::Proposals::Proposal.where(component: origin_component)
+          proposals = proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
+
+          if @form["states"].include?("not_answered")
+            proposals.not_answered.or(proposals.where(id: proposals.only_status(@form["states"]).pluck(:id)))
+          else
+            proposals.only_status(@form["states"])
+          end
+        end
+
+        def origin_component
+          @origin_component ||= Decidim::Component.find(@form["origin_component_id"])
+        end
+
+        def target_component
+          @target_component ||= Decidim::Component.find(@form["current_component_id"])
+        end
+
+        def current_user
+          @current_user ||= Decidim::User.find(@form["current_user_id"])
+        end
+
+        def current_organization
+          @current_organization ||= Decidim::Organization.find(@form["current_organization_id"])
+        end
+
+        def proposal_already_copied?(original_proposal, target_component)
+          # Note: we are including also proposals from unpublished components
+          # because otherwise duplicates could be created until the component is
+          # published.
+          original_proposal.linked_resources(:proposals, "copied_from_component", component_published: false).any? do |proposal|
+            proposal.component == target_component
+          end
+        end
+
+        def proposal_author
+          @form["keep_authors"] ? nil : current_organization
+        end
+
+        def proposal_scopes
+          @form["scopes"] || []
+        end
+
+        def proposal_answer_attributes(original_proposal)
+          return {} unless @form["keep_answers"]
+
+          state = Decidim::Proposals::ProposalState.where(component: target_component, token: original_proposal.proposal_state&.token).first
+
+          {
+            answer: original_proposal.answer,
+            answered_at: original_proposal.answered_at,
+            proposal_state: state,
+            state_published_at: original_proposal.state_published_at
+          }
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/proposals/admin/import_proposals_mailer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ImportProposalsMailer < Decidim::ApplicationMailer
+        def notify_success(user, origin_component, target_component, count)
+          @organization = user.organization
+          @origin_component = origin_component
+          @target_component = target_component
+          @count = count
+
+          with_user(user) do
+            mail(to: user.email, subject: t(".subject"))
+          end
+        end
+
+        def notify_failure(user, origin_component, target_component)
+          @organization = user.organization
+          @origin_component = origin_component
+          @target_component = target_component
+
+          with_user(user) do
+            mail(to: user.email, subject: t(".subject"))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -45,9 +45,8 @@ module Decidim
         authored_by?(user)
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
+      def presenter
+        Decidim::Proposals::CollaborativeDraftPresenter.new(self)
       end
 
       # Public: Overrides the `reported_attributes` Reportable concern method.

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

@@ -301,11 +301,6 @@ module Decidim
         state == "evaluating"
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
       # Returns the presenter for this author, to be used in the views.
       # Required by ResourceRenderer.
       def presenter

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

@@ -38,7 +38,7 @@ module Decidim
       protected
 
       def generate_token
-        self.token = ensure_unique_token(translated_attribute(title).parameterize(separator: "_"))
+        self.token = ensure_unique_token(token.presence || translated_attribute(title).parameterize(separator: "_"))
       end
 
       def ensure_unique_token(token)

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

@@ -63,6 +63,7 @@ module Decidim
           "created_at",
           "updated_at",
           "state",
+          "decidim_proposals_proposal_state_id",
           "state_published_at",
           "answer",
           "answered_at",

data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_failure.html.erb

@@ -0,0 +1 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>

data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb

@@ -0,0 +1,2 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>
+<p><%= t(".added_proposals", count: @count) %></p>

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

@@ -20,7 +20,7 @@
         </div>
       <% end %>
       <% if @form.component_suggested_hashtags.any? %>
-        <div>
+        <div class="row column">
           <%= form.label :suggested_hashtags %>
           <div class="hashtags">
             <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|

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

@@ -53,20 +53,20 @@
 
         <% presented_endorsers = endorsers_presenters_for(proposal) %>
         <% if presented_endorsers.any? %>
-          <%= render partial: "endorsers", locals: { presented_endorsers:, proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/endorsers", locals: { presented_endorsers:, proposal: } %>
         <% end %>
 
         <% if proposal.documents.any? %>
-          <%= render partial: "documents", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/documents", locals: { proposal: } %>
         <% end %>
 
         <% if proposal.photos.any? %>
-          <%= render partial: "photos", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/photos", locals: { proposal: } %>
         <% end %>
 
         <% proposal_meetings = proposal.linked_resources(:meetings, "proposals_from_meeting") %>
         <% if proposal_meetings.any? %>
-          <%= render partial: "meetings", locals: { proposal_meetings: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/meetings", locals: { proposal_meetings: } %>
         <% end %>
 
         <% if allowed_to?(:create, :proposal_note, proposal: proposal) %>

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

@@ -8,7 +8,7 @@
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
   <div class="flex items-center justify-between">
-    <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+    <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
     <div class="view-layout__links flex view_mode__links">
       <%= toggle_view_mode_link(@view_mode, "list", t("list_mode", scope: "decidim.proposals.proposals.index"), params) %>
       <%= toggle_view_mode_link(@view_mode, "grid", t("grid_mode", scope: "decidim.proposals.proposals.index"), params) %>

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

@@ -1,4 +1,11 @@
-<% add_decidim_page_title(t("name", scope: "decidim.components.proposals")) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_participatory_space.short_description),
+  title: t("decidim.components.pagination.page_title",
+           component_name:,
+           current_page: @proposals.current_page,
+           total_pages: @proposals.total_pages ),
+  url: proposals_url,
+  resource: current_component) %>
 
 <% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <% append_javascript_pack_tag "decidim_proposals" %>

data/config/locales/ar.yml

@@ -12,6 +12,8 @@ ar:
         state: حالة
         title: عنوان
         user_group_id: إنشاء مسودة تعاونية كـ
+      import_participatory_text:
+        document: مستند
       proposal:
         address: عنوان
         answer: إجابة
@@ -21,6 +23,8 @@ ar:
         category_id: الفئة
         decidim_scope_id: النطاق
         has_address: لديه عنوان
+        latitude: خط العرض
+        longitude: خط الطول
         scope_id: نطاق
         state: حالة
         suggested_hashtags: الهاشتاج المقترحة
@@ -33,6 +37,8 @@ ar:
         execution_period: فترة التنفيذ
       proposals_copy:
         origin_component_id: مكون لنسخ المقترحات من
+      proposals_file_import:
+        file: ملف
       proposals_import:
         import_proposals: مقترحات الاستيراد
         keep_answers: الاحتفاظ بالحالة والإجابات
@@ -312,6 +318,7 @@ ar:
         title: اقتراحات
       votes:
         object: أصوات
+        title: الأصوات
     participatory_spaces:
       highlighted_proposals:
         see_all: شاهد الكل
@@ -420,7 +427,6 @@ ar:
           index:
             actions: أفعال
             assign_to_valuator: أسنِده إلى مُقيِّم
-            assign_to_valuator_button: تعيين
             cancel: إلغاء
             change_category: تغيير الفئة
             change_scope: تغيير النطاق
@@ -434,7 +440,6 @@ ar:
             split_button: انشق، مزق
             title: اقتراحات
             unassign_from_valuator: إلغاء الإسناد مِن المُقيِّم
-            unassign_from_valuator_button: إلغاء الإسناد
             update: تحديث
             update_scope_button: تحديث النطاق
           new:
@@ -448,13 +453,6 @@ ar:
             documents: المستندات
             endorsements_count: عد أصوات التأييدات
             endorsers: المؤيدون
-            n_more_endorsers:
-              zero: و%{count} آخرين
-              one: وواحد آخر
-              two: و%{count} آخرين
-              few: و%{count} آخرين
-              many: و%{count} آخرين
-              other: و%{count} آخرين
             photos: الصور
             ranking: "%{ranking} مِن %{total}"
             related_meetings: ملتقيات ذات صلة
@@ -685,7 +683,6 @@ ar:
           text_banner: أنت تتطلع على قائمة الاقتراحات المسحوبة من قبل مؤلفيها. %{go_back_link}.
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها

data/config/locales/bg.yml

@@ -374,7 +374,6 @@ bg:
         title: Гласове
     participatory_spaces:
       highlighted_proposals:
-        last: Позледни предложения
         see_all: Виж всички предложения
     proposals:
       actions:
@@ -512,7 +511,6 @@ bg:
           index:
             actions: Активности
             assign_to_valuator: Възлагане на оценител
-            assign_to_valuator_button: Възлагане
             cancel: Отказ
             change_category: Промяна на категория
             change_scope: Промяна на обхвата
@@ -528,7 +526,6 @@ bg:
             statuses: Статуси
             title: Предложения
             unassign_from_valuator: Отнемане възложеното на оценителя
-            unassign_from_valuator_button: Отнемане на възложеното
             update: Актуализация
             update_scope_button: Актуализиране на обхвата
           new:
@@ -546,9 +543,6 @@ bg:
             endorsements_count: Брой препоръки
             endorsers: Препоръчали
             link: Виж предложението
-            n_more_endorsers:
-              one: и още 1
-              other: и още %{count}
             photos: Снимки
             ranking: "%{ranking} от %{total}"
             related_meetings: Свързани срещи
@@ -569,7 +563,6 @@ bg:
         proposals_imports:
           create:
             invalid: Възникна проблем при импортирането на предложенията.
-            success: "%{number} предложения бяха импортирани успешно."
           new:
             create: Импортиране на предложения
             no_components: Няма други компоненти на предложения в това пространство за участие, от които да се импортират предложенията.
@@ -808,7 +801,6 @@ bg:
           text_banner: Разглеждате списъка с предложения, оттеглени от своите автори. %{go_back_link}.
         new:
           send: Продължи
-          title: Създайте Ваше предложение
         orders:
           label: 'Подреждане на предложенията по:'
           most_commented: Най-коментирани
@@ -841,7 +833,7 @@ bg:
           edit_proposal: Редактиране на предложение
           estimated_cost: Предвидени разходи
           hidden_endorsers_count:
-            one: и още %{count} човек
+            one: и още %{count}
             other: и още %{count} души
           link_to_collaborative_draft_help_text: Това предложение е резултат от съвместна чернова. Прегледайте хронологията
           link_to_collaborative_draft_text: Вижте съвместната чернова

data/config/locales/bs-BA.yml

@@ -51,11 +51,9 @@ bs:
         proposals:
           index:
             assign_to_valuator: Dodeli procenjivaču
-            assign_to_valuator_button: Dodeli
             change_scope: Promeni opseg
             publish_answers: Objavi odgovore
             unassign_from_valuator: Oduzmi od procenjivača
-            unassign_from_valuator_button: Od dodeli
             update_scope_button: Ažuriraj opseg
           show:
             amendments_count: Broj izmena
@@ -64,10 +62,6 @@ bs:
             documents: Dokumenti
             endorsements_count: Broj podržavanja
             endorsers: Podržavaoci
-            n_more_endorsers:
-              one: i još 1
-              few: i još %{count}
-              other: i još %{count}
             photos: Slike
             ranking: "%{ranking} od %{total}"
             related_meetings: Slični sastanci