decidim-reporting_proposals 0.4.2 → 0.5.1

data/app/permissions/decidim/templates/admin/extra_permissions.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    module Admin
+      class ExtraPermissions < Decidim::DefaultPermissions
+        # this should go to the standard templates/permissions class but to avoid hacking it we put it here
+        # to be removed when proposal templates is accepted into core
+        def permissions
+          return permission_action if permission_action.scope != :admin
+          return permission_action unless user
+          return permission_action if context[:current_organization] != user.organization
+
+          allow! if user_has_a_role? && (permission_action.subject == :template && permission_action.action == :read)
+
+          super
+        end
+
+        private
+
+        def participatory_space
+          @participatory_space ||= context[:proposal].try(:participatory_space)
+        end
+
+        def user_roles
+          @user_roles ||= participatory_space.try(:user_roles)
+        end
+
+        def user_has_a_role?
+          return unless user_roles
+
+          user_roles.exists?(user: user)
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/reporting_proposals/nearby_proposals.rb

@@ -3,7 +3,7 @@
 module Decidim
   module ReportingProposals
     # Class used to retrieve similar proposals.
-    class NearbyProposals < Rectify::Query
+    class NearbyProposals < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - Decidim::CurrentComponent

data/app/validators/concerns/decidim/reporting_proposals/component_validator_override.rb

@@ -11,13 +11,13 @@ module Decidim
         # over all the validators.
         def validate_each(record, attribute, component)
           unless component
-            record.errors[attribute] << :blank
+            record.errors.add(attribute, :blank)
             return
           end
           manifests = [options[:manifest].to_s]
           manifests << "reporting_proposals" if manifests.first == "proposals"
 
-          record.errors[attribute] << :invalid unless component.manifest_name.to_s.in?(manifests)
+          record.errors.add(attribute, :invalid) unless component.manifest_name.to_s.in?(manifests)
         end
       end
     end

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

@@ -8,7 +8,7 @@ $orderFilterInput.val('<%= order %>');
 var $dropdownMenu = $('.dropdown.menu', $proposals);
 $dropdownMenu.foundation();
 
-var markerData = JSON.parse('<%= escape_javascript proposals_data_for_map(search.results.select(&:geocoded_and_valid?))
+var markerData = JSON.parse('<%= escape_javascript proposals_data_for_map(search.result.select(&:geocoded_and_valid?))
 .to_json.html_safe %>');
 
 var $map = $("#map");

data/app/views/decidim/reporting_proposals/proposals/_reporting_proposal_fields.html.erb

@@ -12,8 +12,8 @@
         <%= 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") %>"
-                title="<%= t("delete_image", scope: "decidim.proposals.proposals.edit") %>"
+                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>
@@ -87,27 +87,15 @@
 <% end %>
 
 <% if component_settings.attachments_allowed? && !component_settings.only_photo_attachments? %>
-  <fieldset class="attachments_container gallery__container documents_container">
+    <fieldset class="attachments_container gallery__container documents_container">
     <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-
-    <% if @form.documents.any? %>
-      <% @form.documents.each do |document| %>
-        <div class="callout" id="attachment_<%= document.id %>" data-closable>
-          <%= link_to translated_attribute(document.title), document.url %>
-          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
-          <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
-          <button class="close-button"
-                  aria-label="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  title="<%= t("delete_document", scope: "decidim.proposals.proposals.edit") %>"
-                  type="button" data-close>
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-      <% end %>
-    <% end %>
-
     <div class="row column">
-      <%= form.file_field :add_documents, multiple: true, label: t("add_documents", scope: "decidim.proposals.proposals.edit") %>
+      <%= form.attachment :documents,
+        multiple: true,
+        label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_label: t("decidim.proposals.proposals.edit.add_documents"),
+        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+        help_i18n_scope: "decidim.forms.file_help.file" %>
     </div>
   </fieldset>
 <% end %>

data/babel.config.json

@@ -0,0 +1,25 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env", {
+        "forceAllTransforms": true,
+        "useBuiltIns": "entry",
+        "corejs": 3,
+        "modules": false
+      }
+    ],
+    ["@babel/preset-react"]
+  ],
+  "plugins": [
+    "@babel/plugin-transform-classes",
+    [
+      "@babel/plugin-transform-runtime",
+      {
+        "helpers": false,
+        "regenerator": true,
+        "corejs": false
+      }
+    ],
+    ["@babel/plugin-transform-regenerator", { "async": false }]
+  ]
+}

data/config/locales/ca.yml

@@ -414,6 +414,8 @@ ca:
             away: "%{meters} de distància"
             description: Aquestes són propostes que es troben en un radi de %{meters} respecte a la que esteu creant. En cas que trobeu un altra proposta d'informe en la mateixa situació, podeu optar per donar-li una adhesió en comptes de crear-ne un de nou.
             title: Propostes properes
+        edit:
+          delete_image: Esborra la imatge
         form:
           image: Imatge/fotografia
     templates:

data/config/locales/de.yml

@@ -414,6 +414,8 @@ de:
             away: "%{meters} entfernt"
             description: Dies sind Vorschläge, die in einem Radius von %{meters} zu dem von Ihnen erstellten sind. Allenfalls hat eine andere Person die die gleiche Situation gemeldet. In diesem Fall können Sie die bestehende Meldung Unterstützen, anstatt eine neue zu erstellen.
             title: Bestehende Meldungen in der Umgebung
+        edit:
+          delete_image: Bild löschen
         form:
           image: Foto
     templates:

data/config/locales/en.yml

@@ -483,6 +483,8 @@ en:
               same situation, you can choose to support it instead of creating a new
               one.
             title: Nearby proposals
+        edit:
+          delete_image: Delete image
         form:
           image: Image/photo
     templates:

data/config/locales/es.yml

@@ -414,6 +414,8 @@ es:
             away: "A %{meters} de distancia"
             description: Estas son propuestas que están en un radio de %{meters} a la que estás creando. En caso de que encuentres otra reportando la misma situación, puedes elegir apoyarla en lugar de crear una nueva.
             title: Propuestas cercanas
+        edit:
+          delete_image: Eliminar imagen
         form:
           image: Imágen/foto
     templates:

data/db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb

@@ -2,11 +2,7 @@
 
 class AddTargetAndFieldValuesToDecidimTemplatesTemplates < ActiveRecord::Migration[6.0]
   def change
-    unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :field_values)
-      add_column :decidim_templates_templates, :field_values, :json, default: {}
-    end
-    unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :target)
-      add_column :decidim_templates_templates, :target, :string
-    end
+    add_column :decidim_templates_templates, :field_values, :json, default: {} unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :field_values)
+    add_column :decidim_templates_templates, :target, :string unless ActiveRecord::Base.connection.column_exists?(:decidim_templates_templates, :target)
   end
 end

data/decidim-reporting_proposals.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description = "A module for Decidim that facilitates the creation of proposals related to geolocated issues in a city"
   spec.license = "AGPL-3.0"
   spec.homepage = "https://github.com/openpoke/decidim-module-reporting_proposals"
-  spec.required_ruby_version = ">= 2.7"
+  spec.required_ruby_version = ">= 3.0"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "decidim-elections", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-meetings", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/decidim/reporting_proposals/component.rb

@@ -96,15 +96,6 @@ Decidim.register_component(:reporting_proposals) do |component|
     settings.attribute :suggested_hashtags, type: :text, editor: false, required: false
   end
 
-  component.register_resource(:reporting_proposal) do |resource|
-    resource.model_class_name = "Decidim::Proposals::Proposal"
-    resource.template = "decidim/proposals/proposals/linked_proposals"
-    resource.card = "decidim/proposals/proposal"
-    resource.reported_content_cell = "decidim/proposals/reported_content"
-    resource.actions = %w(endorse vote amend comment vote_comment)
-    resource.searchable = true
-  end
-
   component.register_resource(:collaborative_draft) do |resource|
     resource.model_class_name = "Decidim::Proposals::CollaborativeDraft"
     resource.card = "decidim/proposals/collaborative_draft"

data/lib/decidim/reporting_proposals/engine.rb

@@ -20,6 +20,7 @@ module Decidim
         Decidim::ResourceHelper.include(Decidim::ReportingProposals::ResourceHelperOverride)
         Decidim::Map::Autocomplete::Builder.include(Decidim::ReportingProposals::MapBuilderOverride)
         Decidim::CreateReport.include(Decidim::ReportingProposals::CreateReportOverride)
+        Decidim::GalleryMethods.include(Decidim::ReportingProposals::GalleryMethodsOverride)
         Decidim::Proposals::ProposalSerializer.include(Decidim::ReportingProposals::ProposalSerializerOverride)
         Decidim::Proposals::ProposalsPickerCell.include(Decidim::ReportingProposals::ProposalsPickerCellOverride)
         Decidim::Proposals::PublishProposal.include(Decidim::Proposals::PublishProposalOverride)
@@ -48,10 +49,33 @@ module Decidim
 
         # port of https://github.com/openpoke/decidim/pull/31,23,29,24,43
         Decidim::ReportedMailer.include(Decidim::ReportedMailerOverride)
-        Decidim::ResourceLocatorPresenter.include(Decidim::ResourceLocatorPresenterOverride)
+
+        # since version 0.27 Decidim uses its own version of attribute validation (used to be Rectify::Forms)
+        # To patch the ResourceManifest directly does not work now as the class is initialized by the proposals module on requiring the file component.rb
+        # So we remove the manifest and create it again after patching the class ResourceManifest
         Decidim::ResourceManifest.include(Decidim::ResourceManifestOverride)
-        Decidim::Proposals::PublishProposal.include(Decidim::Proposals::PublishProposalOverride)
-        Decidim.find_resource_manifest(:proposal).admin_route_name = "proposal"
+        Decidim.resource_manifests.delete(Decidim.find_resource_manifest(:proposal))
+        component = Decidim.find_component_manifest(:proposals)
+        component.register_resource(:proposal) do |resource|
+          resource.model_class_name = "Decidim::Proposals::Proposal"
+          resource.template = "decidim/proposals/proposals/linked_proposals"
+          resource.card = "decidim/proposals/proposal"
+          resource.reported_content_cell = "decidim/proposals/reported_content"
+          resource.actions = %w(endorse vote amend comment vote_comment)
+          resource.searchable = true
+          resource.admin_route_name = "proposal"
+        end
+        component = Decidim.find_component_manifest(:reporting_proposals)
+        component.register_resource(:reporting_proposal) do |resource|
+          resource.model_class_name = "Decidim::Proposals::Proposal"
+          resource.template = "decidim/proposals/proposals/linked_proposals"
+          resource.card = "decidim/proposals/proposal"
+          resource.reported_content_cell = "decidim/proposals/reported_content"
+          resource.actions = %w(endorse vote amend comment vote_comment)
+          resource.searchable = true
+          resource.admin_route_name = "proposal"
+        end
+        Decidim::ResourceLocatorPresenter.include(Decidim::ResourceLocatorPresenterOverride)
         Decidim::Proposals::PublishProposalEvent.include(Decidim::Proposals::PublishProposalEventOverride)
         Decidim::Proposals::Admin::AssignProposalsToValuator.include(Decidim::Proposals::Admin::AssignProposalsToValuatorOverride)
         Decidim::Admin::HideResource.include(Decidim::Admin::HideResourceOverride)

data/lib/decidim/reporting_proposals/version.rb

@@ -2,9 +2,9 @@
 
 module Decidim
   module ReportingProposals
-    VERSION = "0.4.2"
-    DECIDIM_VERSION = "0.26.5"
+    VERSION = "0.5.1"
+    DECIDIM_VERSION = "0.27.4"
 
-    COMPAT_DECIDIM_VERSION = [">= 0.25.0", "< 0.27"].freeze
+    COMPAT_DECIDIM_VERSION = [">= 0.27.0", "< 0.28"].freeze
   end
 end