decidim-reporting_proposals 0.2.0 → 0.5.0

data/app/helpers/concerns/decidim/reporting_proposals/resource_helper_override.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module ResourceHelperOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def linked_resources_for(resource, type, link_name)
+          linked_resources = resource.linked_resources(type, link_name).group_by { |linked_resource| linked_resource.class.name }
+          linked_resources.merge!(resource.linked_resources(:reporting_proposals, link_name).group_by { |linked_resource| linked_resource.class.name }) if type == :proposals
+
+          safe_join(linked_resources.map do |klass, resources|
+            resource_manifest = klass.constantize.resource_manifest
+            content_tag(:div, class: "section") do
+              i18n_name = "#{resource.class.name.demodulize.underscore}_#{resource_manifest.name}"
+              content_tag(:h3, I18n.t(i18n_name, scope: "decidim.resource_links.#{link_name}"), class: "section-heading") +
+                render(partial: resource_manifest.template, locals: { resources: resources })
+            end
+          end)
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/admin/hidden_resource_mailer.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A custom mailer to mail Decidim users
+    # that they have been hidden
+    class HiddenResourceMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+      include Decidim::ApplicationHelper
+      include Decidim::TranslatableAttributes
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
+
+      def notify_mail(resource, resource_authors, reason)
+        @resource_authors = resource_authors
+        @organization = resource.organization
+        @resource = resource
+        @reason = reason
+
+        mail(to: resource_authors.pluck(:email).uniq,
+             subject: I18n.t("decidim.admin.hidden_resource_mailer.notify_mail.subject"))
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/admin/notification_answer_proposal_mailer.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class NotificationAnswerProposalMailer < Decidim::ApplicationMailer
+        include Decidim::TranslationsHelper
+        include Decidim::SanitizeHelper
+
+        helper Decidim::ResourceHelper
+        helper Decidim::TranslationsHelper
+
+        def notify_proposal_author(proposal, recipient)
+          @proposal = proposal
+          @organization = proposal.organization
+          @recipient = recipient
+
+          with_user(recipient) do
+            mail(to: recipient.email, subject: t("subject", scope: "decidim.reporting_proposals.admin.notification_answer_proposal_mailer.notify_proposal_author"))
+          end
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/admin/proposals_valuator_mailer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalsValuatorMailer < Decidim::ApplicationMailer
+        include Decidim::TranslationsHelper
+        include Decidim::SanitizeHelper
+        include Decidim::ApplicationHelper
+        include Decidim::TranslatableAttributes
+
+        helper Decidim::ResourceHelper
+        helper Decidim::TranslationsHelper
+        helper Decidim::ApplicationHelper
+
+        def notify_proposals_valuator(user, admin, proposals)
+          @valuator_user = user
+          @admin = admin
+          @proposals = proposals
+          @organization = user.organization
+
+          with_user(user) do
+            mail to: "#{user.name} <#{user.email}>",
+                 subject: t("subject", scope: "decidim.proposals.admin.proposals_valuator_mailer.notify_proposals_valuator")
+          end
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/proposals/notification_publish_proposal_mailer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class NotificationPublishProposalMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include Decidim::SanitizeHelper
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+
+      def notify_proposal_author(proposal, recipient)
+        @proposal = proposal
+        @organization = proposal.organization
+        @recipient = recipient
+
+        with_user(recipient) do
+          mail(to: recipient.email, subject: t("subject", scope: "decidim.reporting_proposals.notification_publish_proposal_mailer.notify_proposal_author"))
+        end
+      end
+    end
+  end
+end

data/app/mailers/concerns/decidim/reported_mailer_override.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportedMailerOverride
+    extend ActiveSupport::Concern
+
+    included do
+      helper Decidim::ComponentPathHelper
+      helper_method :resource_admin_url
+
+      def resource_admin_url
+        @resource_admin_url ||= Decidim::ResourceLocatorPresenter.new(@reportable).admin_url
+      end
+    end
+  end
+end

data/app/models/concerns/decidim/reporting_proposals/participatory_space_role_config/valuator_override.rb

@@ -7,8 +7,11 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
+          # it is important to ensure that the aliased method name is unique in case of other modules are doing the same
+          alias_method :decidim_reporting_proposals_original_accepted_components, :accepted_components
+
           def accepted_components
-            [:proposals, :reporting_proposals]
+            decidim_reporting_proposals_original_accepted_components + [:reporting_proposals]
           end
         end
       end

data/app/overrides/decidim/proposals/admin/proposal_answers/_form/add_template_chooser.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_top ".card-section" -->
+
+<% if defined?(Decidim::Templates) %>
+  <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/_proposal-tr/add_valuators_name.html.erb.deface

@@ -4,6 +4,6 @@
 <% if count.zero? %>
   0
 <% else %>
-	<%= proposal.valuation_assignments.first&.valuator_role&.user&.name %>
-	<%= "(+#{(count - 1)})" if count > 1 %>
-<% end %>
+  <%= proposal.valuation_assignments.first&.valuator_role&.user&.name %>
+  <%= "(+#{(count - 1)})" if count > 1 %>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_address.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after ".row.column[3]" -->
+
+<%= render partial: "decidim/proposals/admin/proposals/address", locals: { component_settings: component_settings, proposal: proposal } %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_send_email_btn.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- insert_after "erb[loud]:contains('current_or_new_conversation_path_with(presented_author)')" -->
 
-<%= render partial: "decidim/proposals/admin/proposals/send_email_button", locals: { presented_author: presented_author }%>
+<%= render partial: "decidim/proposals/admin/proposals/send_email_button", locals: { presented_author: presented_author } %>

data/app/overrides/decidim/proposals/admin/proposals/show/add_valuators_form.html.erb.deface

@@ -0,0 +1,19 @@
+<!-- insert_after "#valuators" -->
+
+<% if allowed_to? :assign_to_valuator, :proposals %>
+  <div id="js-assign-proposal-to-valuator-actions" class="js-bulk-action-form form-single-proposal"
+       style="max-width:400px">
+    <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposal-to-valuator",
+                 class: "flex--lc flex-gap--1") do %>
+      <div class="checkboxes hide">
+        <%= check_box_tag "proposal_ids[]", proposal.id, true,
+                          class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+      </div>
+
+      <%= bulk_valuators_select(current_participatory_space, t("decidim.proposals.admin.proposals.index.assign_to_valuator")) %>
+      <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"),
+                     id: "js-submit-assign-proposal-to-valuator",
+                     class: "button small button--simple float-left") %>
+    <% end %>
+  </div>
+<% end %>

data/app/overrides/decidim/proposals/admin/proposals/show/remove_photos.html.erb.deface

@@ -1,4 +1,3 @@
 <!-- replace "erb[silent]:contains('if proposal.photos.any?')" -->
 
 <% if nil %>
-	

data/app/overrides/decidim/proposals/proposals/_edit_form_fields/replace_add_photos.html.erb.deface

@@ -0,0 +1,37 @@
+<!-- replace '.gallery__container.photos_container' -->
+
+<% if Decidim::ReportingProposals.use_camera_button.include?(current_component.manifest_name.to_sym) %>
+  <fieldset class="gallery__container photos_container">
+  <% 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.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.reporting_proposals.proposals.edit") %>"
+                title="<%= t("delete_image", scope: "decidim.reporting_proposals.proposals.edit") %>"
+                type="button"
+                data-close>
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+    <% end %>
+  <% end %>
+    <div class="field row column">
+      <%= form.file_field :add_photos, multiple: false, label: t("image", scope: "decidim.reporting_proposals.proposals.form") %>
+    </div>
+  </fieldset>
+<% else %>
+  <fieldset class="gallery__container photos_container">
+    <legend><%= t("gallery_legend", scope: "decidim.proposals.proposals.edit") %></legend>
+    <div class="row column">
+      <%= form.attachment :photos,
+        multiple: false,
+        label: t("decidim.proposals.proposals.edit.add_image"),
+        button_label: t("decidim.proposals.proposals.edit.add_image"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_image"),
+        help_i18n_scope: "decidim.forms.file_help.image",
+        extension_allowlist: Decidim::OrganizationSettings.for(current_organization).upload_allowed_file_extensions_image %>
+    </div>
+  </fieldset>
+<% end %>

data/app/overrides/decidim/proposals/proposals/_proposal_similar/add_distance_badge.html.erb.deface

@@ -1,5 +1,5 @@
 <!-- insert_before ".card__header" -->
 
 <% if geocoding_comparison? %>
-	<span class="label secondary float-right"><%= icon("location") %> <%= t("away", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance(1000 * @proposal.distance_from([proposal.latitude, proposal.longitude], :km))) %></span>
+  <span class="label secondary float-right"><%= icon("location") %> <%= t("away", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance(1000 * @proposal.distance_from([proposal.latitude, proposal.longitude], :km))) %></span>
 <% end %>

data/app/overrides/decidim/proposals/proposals/_wizard_header/replace_title.html.erb.deface

@@ -1,14 +1,14 @@
 <!-- replace ".section-heading" -->
 
 <% if geocoding_comparison? && action_name == "compare" %>
-	<h2 class="section-heading">
-	  <%= t("title", scope: "decidim.reporting_proposals.proposals.compare.geocoding") %>
-	  <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
-	</h2>
-	<p><%= t("description", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance) %></p>
+  <h2 class="section-heading">
+    <%= t("title", scope: "decidim.reporting_proposals.proposals.compare.geocoding") %>
+    <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
+  </h2>
+  <p><%= t("description", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance) %></p>
 <% else %>
-	<h2 class="section-heading">
-	  <%= proposal_wizard_step_title action_name %>
-	  <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
-	</h2>
+  <h2 class="section-heading">
+    <%= proposal_wizard_step_title action_name %>
+    <%= "(#{@similar_proposals.count})" if @similar_proposals.present? %>
+  </h2>
 <% end %>

data/app/overrides/decidim/proposals/proposals/edit/add_css.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "erb[silent]:contains(':js_content')" -->
+
+<% if reporting_proposal? %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/edit/replace_javascript.html.erb.deface

@@ -2,7 +2,6 @@
 
 <% if reporting_proposal? %>
   <%= javascript_pack_tag "decidim_reporting_proposals" %>
-  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
 <% else %>
   <%= javascript_pack_tag "decidim_proposals" %>
 <% end %>

data/app/overrides/decidim/proposals/proposals/edit_draft/add_css.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "erb[silent]:contains(':js_content')" -->
+
+<% if reporting_proposal? %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/new/add_css.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_before "erb[silent]:contains(':js_content')" -->
+
+<% if reporting_proposal? %>
+  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% end %>

data/app/overrides/decidim/proposals/proposals/new/replace_javascript.html.erb.deface

@@ -2,7 +2,6 @@
 
 <% if reporting_proposal? %>
   <%= javascript_pack_tag "decidim_reporting_proposals" %>
-  <%= stylesheet_pack_tag "decidim_reporting_proposals" %>
 <% else %>
   <%= javascript_pack_tag "decidim_proposals" %>
 <% end %>

data/app/overrides/decidim/reported_mailer/report/add_link_to_admin.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_after ".email-instructions" -->
+
+<% if resource_admin_url.present? %>
+  <p><%= link_to t("admin_resource", scope: "decidim.reported_mailer.report"), resource_admin_url, target: "_blank" %></p>
+<% end %>

data/app/overrides/layouts/decidim/_process_header_steps/always_show_new_proposals.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- replace "erb[loud]:contains('button small button--sc show-for-medium')" -->
 
-<%= link_to(cta_text, step_cta_url(participatory_process), class: "button small button--sc") %>
+<%= link_to(cta_text, step_cta_url(participatory_process), class: "button small button--sc") %>

data/app/packs/entrypoints/decidim_templates_admin.js

@@ -0,0 +1 @@
+import "src/decidim/templates/admin/proposal_answer_template_chooser";

data/app/packs/src/decidim/reporting_proposals/user_camera_inputs.js

@@ -1,49 +1,47 @@
 $(() => {
-  $('input[type="file"]').each((_i, el) => {
-    const $input = $(el);
-    const $inputField = $input.closest(".row.column");
-    const $button = $inputField.find("button:first");
-    const $checkbox = $inputField.find("input:checkbox[name$='[has_no_image]']");
-    const $formError = $inputField.find("span.form-error")
-    const $labelInput = $("label[for='proposal_add_photos']")
+  const $input = $("#proposal_add_photos");
+  const $inputField = $input.closest(".row.column");
+  const $button = $inputField.find("button:first");
+  const $checkbox = $inputField.find("input:checkbox[name$='[has_no_image]']");
+  const $formError = $inputField.find("span.form-error")
+  const $labelInput = $("label[for='proposal_add_photos']")
 
-    const removeErrors = () => {
-      $input.removeClass("is-invalid-input");
-      $formError.removeClass("is-visible");
-      $labelInput.removeClass("is-invalid-label");
-    };
+  const removeErrors = () => {
+    $input.removeClass("is-invalid-input");
+    $formError.removeClass("is-visible");
+    $labelInput.removeClass("is-invalid-label");
+  };
 
-    const toggleInput = () => {
-      if ($checkbox[0].checked) {
-        removeErrors();
-        $input.prop("disabled", true);
-        $button.prop("disabled", true);
-      } else {
-        $input.prop("disabled", false);
-        $button.prop("disabled", false);
-      }
+  const toggleInput = () => {
+    if ($checkbox[0].checked) {
+      removeErrors();
+      $input.prop("disabled", true);
+      $button.prop("disabled", true);
+    } else {
+      $input.prop("disabled", false);
+      $button.prop("disabled", false);
     }
+  }
 
-    $input.attr("accept", "image/*");
+  $input.attr("accept", "image/*");
 
-    $button.on("click", () => {
-      console.log("click button")
-      $input.attr("capture", "camera");
-      $input.click();
-      $input.removeAttr("capture", "camera");
-    });
+  $button.on("click", () => {
+    console.log("click button")
+    $input.attr("capture", "camera");
+    $input.click();
+    $input.removeAttr("capture", "camera");
+  });
 
-    $input.on("click", () => {
-      console.log("click", $input);
-      $input.one("blur", () => {
-        console.log("blur", $input);
-        removeErrors();
-      });
+  $input.on("click", () => {
+    console.log("click", $input);
+    $input.one("blur", () => {
+      console.log("blur", $input);
+      removeErrors();
     });
-
-    if ($checkbox.length > 0) {
-      $checkbox.on("change", toggleInput);
-      toggleInput();
-    }
   });
+
+  if ($checkbox.length > 0) {
+    $checkbox.on("change", toggleInput);
+    toggleInput();
+  }
 }); 

data/app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js

@@ -0,0 +1,27 @@
+$(() => {
+  $("#proposal_answer_template_chooser").change(() => {
+    const $dropDown =  $("#proposal_answer_template_chooser");
+    $dropDown.next("#template-error").remove();
+    if ($dropDown.val() === "") {
+      return;
+    }
+    $.getJSON($dropDown.data("url"), {
+      id: $dropDown.val(),
+      /* eslint camelcase: [0] */
+      proposal_id: $dropDown.data("proposal")
+    }).done((data) => {
+      $(`#proposal_answer_internal_state_${data.state}`).trigger("click");
+
+      const $editors = $dropDown.parent().parent().find(".editor-container");
+      $editors.each((index, element) => {
+        const localElement = $(element);
+        const $locale = localElement.siblings("input[type=hidden]").attr("id").replace("proposal_answer_answer_", "");
+        const editor = Quill.find(element);
+        const delta = editor.clipboard.convert(data.template[$locale]);
+        editor.setContents(delta);
+      });
+    }).fail((err) => {
+      $dropDown.after(`<p id="template-error" class="text-alert">${err.responseJSON.msg || err.responseJSON.error || err.responseJSON}</p>`);
+    });
+  });
+});

data/app/packs/stylesheets/decidim/reporting_proposals/geocoding_addons.scss

@@ -1,20 +1,20 @@
-.input-group.has-tribute {
+.input-group.has-tribute{
   position: relative;
 
-  .tribute-container {
+  .tribute-container{
     margin-top: 2.3rem;
   }
 }
 
-.user-device-location {
-  button {
+.user-device-location{
+  button{
     max-height: 3rem;
 
-    &.loading-spinner {
+    &.loading-spinner{
       position: relative;
       margin: 0 !important;
 
-      &::before {
+      &::before{
         position: absolute;
         top: 6px;
         left: 12px;
@@ -22,12 +22,12 @@
     }
   }
 
-  @media only screen and (max-width: 596px) {
+  @media only screen and (max-width: 596px){
     display: block !important;
     margin-top: 1rem;
     margin-bottom: -.5rem;
 
-    button {
+    button{
       border-radius: 4px !important;
     }
   }

data/app/packs/stylesheets/decidim/reporting_proposals/list_component_admin.scss

@@ -1,26 +1,26 @@
-.table__title-block {
+.table__title-block{
   display: flex;
   align-items: flex-start;
 }
 
-.table__title-icon {
+.table__title-icon{
   width: 20px;
   padding: 3px;
   margin-right: 5px;
   float: left;
 }
 
-.table__list-title {
+.table__list-title{
   display: flex;
   flex-direction: column;
   align-items: start;
 }
 
-.table__list-title a {
+.table__list-title a{
   text-align: start;
 }
 
-.help-text-overdue {
+.help-text-overdue{
   font-style: italic;
   font-size: .8125rem;
   text-align: start;

data/app/packs/stylesheets/decidim/reporting_proposals/manage_component_admin.scss

@@ -1,11 +1,11 @@
 .global-settings,
-.step-settings {
-  .readonly_container {
+.step-settings{
+  .readonly_container{
     display: none;
   }
 }
 
-.proposal-photo.gallery__item {
+.proposal-photo.gallery__item{
   position: relative;
   margin: 0 0 1rem;
   border: 1px solid rgba(0, 0, 0, .2);
@@ -14,11 +14,11 @@
   color: #202734;
 }
 
-.proposal-photo .thumbnail {
+.proposal-photo .thumbnail{
   margin-bottom: 0;
 }
 
-.delete-proposal__button {
+.delete-proposal__button{
   position: absolute;
   right: 0;
   top: 7px;
@@ -29,3 +29,34 @@
   border-radius: 50%;
   text-align: center;
 }
+
+//Variables
+
+/* Card address */
+.address{
+  display: flex;
+  padding: 1rem;
+}
+
+.address--alone{
+  flex-grow: 1;
+}
+
+.address__info{
+  display: flex;
+  flex-grow: 1;
+}
+
+.address__icon{
+  float: left;
+  display: flex;
+  align-self: center;
+  fill: var(--primary);
+}
+
+.address__details{
+  float: left;
+  max-width: 100%; //IE10 bug fix
+  padding-left: .5em;
+  align-self: center;
+}

data/app/packs/stylesheets/decidim/reporting_proposals/proposals/add_proposal.scss

@@ -1,9 +1,9 @@
-.has_no_address {
+.has_no_address{
   text-align: right;
 }
 
-.editor {
-  .form-error {
+.editor{
+  .form-error{
     margin: -1rem 0 1rem;
     font-size: .75rem;
     font-weight: 600;

data/app/packs/stylesheets/decidim/reporting_proposals/user_camera_inputs.scss

@@ -1,19 +1,19 @@
-button.user-device-camera {
+button.user-device-camera{
   border-radius: 4px !important;
   max-height: 3rem;
 }
 
-.has_no_image {
+.has_no_image{
   margin-top: -1rem;
   text-align: right;
 }
 
-@media only screen and (max-width: 596px) {
-  .gallery__container .input-group .input-group-button {
+@media only screen and (max-width: 596px){
+  .gallery__container .input-group .input-group-button{
     display: block;
   }
 
-  .has_no_image {
+  .has_no_image{
     margin-top: -.5rem;
   }
 }