decidim-reporting_proposals 0.5.1 → 0.6.0

data/README.md

@@ -29,7 +29,7 @@ And then execute (do also this on upgrades):
 
 ```
 bundle
-bundle exec rails decidim_reporting_proposals:install:migrations
+bin/rails decidim:upgrade
 bin/rails db:migrate
 ```
 
@@ -52,12 +52,21 @@ bin/rails db:migrate
 >
 > Alternatively, use any other ENV var to set up the `config.deface.enabled` to `false` during the precompilation phase.
 
+> **EXPERTS ONLY**
+>
+> Under the hood, when running `bundle exec rails decidim:upgrade` the `decidim-reporting_proposals` gem will run the following (that can also be run manually if you consider):
+> 
+> ```bash
+> bin/rails decidim_reporting_proposals:install:migrations
+> ```
+
 Depending on your Decidim version, you can choose the corresponding version to ensure compatibility:
 
 | Version | Compatible Decidim versions |
-|---|---|
-| 0.5.x | 0.27.x |
-| 0.4.x | 0.26.x |
+|---------|-----------------------------|
+| 0.6.x   | 0.28.x                      |
+| 0.5.x   | 0.27.x                      |
+| 0.4.x   | 0.26.x                      |
 
 ## Usage
 
@@ -88,10 +97,6 @@ This module provides the following features:
 
 7. **Hide proposals without reporting**: Administrators can hide proposals directly, without using the reporting process. Also, authors who's content has been hidden receive a notification.
 
-8. **Proposal answers templates**: Administrators can create templates for the answers to proposals. This is useful to provide a standard answer to proposals that are similar. This feature requires to enable the `decidim-templates` official module.
-  ![Templates for proposals answers](features/templates1.png)
-  ![Applying a template](features/templates2.png)
-
 ### Customization
 
 Almost all the features of this module can be customized/disabled through an initializer.
@@ -119,7 +124,7 @@ Decidim::ReportingProposals.configure do |config|
   config.show_my_location_button = [:proposals, :meetings, :reporting_proposals]
 
   # Public Setting that adds a button next to the "add image" input[type=file] to open the camera directly
-  config.use_camera_button = [:proposals, :reporting_proposals]
+  config.use_camera_button = true
 
   # Public setting to prevent valuators or admins to modify the photos attached to a proposal
   # otherwise can be configured at the component level

data/Rakefile

@@ -3,8 +3,6 @@
 require "decidim/dev/common_rake"
 
 def install_module(path)
-  # maintain until https://github.com/decidim/decidim/commit/51b81b37004708ab72e70993fef4634eef18ee6c is in the decidim version used
-  FileUtils.cp("babel.config.json", "#{path}/babel.config.json")
   Dir.chdir(path) do
     system("bundle exec rake decidim_reporting_proposals:install:migrations")
     system("bundle exec rake db:migrate")

data/app/cells/concerns/decidim/reporting_proposals/linked_resources_for_cell_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    # Exposes the proposal resource so users can view and create them.
+    module LinkedResourcesForCellOverride
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        def linked_resources
+          @linked_resources ||= begin
+            query = resource.linked_resources(type, link_name)
+            query = query.or(resource.linked_resources(:reporting_proposals, link_name)) if type == :proposals
+
+            query.group_by { |linked_resource| linked_resource.class.name }
+          end
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/reporting_proposals/edit_note_modal/show.erb

@@ -1,20 +1,23 @@
-<div class="reveal edit-note-modal" id="<%= modal_id %>" data-reveal role="dialog" aria-modal="true"
-     aria-labelledby="<%= modal_id %>-label">
-  <div class="reveal__header">
-    <h3 id="<%= modal_id %>-label" class="reveal__title"><%= t("modal.title", scope: "decidim.reporting_proposals.admin.proposal_notes") %></h3>
-    <button class="close-button" data-close aria-label="Close" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
+<%= decidim_modal id: modal_id do %>
+  <div data-dialog-container>
+    <%= icon "edit-line" %>
+    <h3 id="<%= modal_id %>-label" class="h3" tabindex="-1" data-dialog-title>
+      <%= t("modal.title", scope: "decidim.reporting_proposals.admin.proposal_notes") %>
+    </h3>
   </div>
-  <%= decidim_form_for(notes_form,
-                       url: note_path,
-                       method: :patch,
-                       html: { class: "form edit_proposal_note" }) do |f| %>
-    <div class="row column">
-      <%= f.text_area :body, rows: 10, label: t("modal.body", scope: "decidim.reporting_proposals.admin.proposal_notes"), value: note_body %>
-    </div>
-    <div class="button--double">
-      <%= f.submit t("modal.update", scope: "decidim.reporting_proposals.admin.proposal_notes") %>
-    </div>
-  <% end %>
-</div>
+  <div data-dialog-container>
+    <%= decidim_form_for(notes_form,
+                         url: note_path,
+                         method: :patch,
+                         html: { class: "form form-defaults edit_proposal_note" }) do |f| %>
+      <div class="form__wrapper gap-2">
+        <%= f.text_area :body, rows: 10, label: t("modal.body", scope: "decidim.reporting_proposals.admin.proposal_notes"), value: note_body %>
+      </div>
+      <div data-dialog-actions>
+        <div class="button button__sm button__secondary">
+          <%= f.submit t("modal.update", scope: "decidim.reporting_proposals.admin.proposal_notes") %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/commands/concerns/decidim/{proposals → reporting_proposals}/admin/answer_proposal_override.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module Proposals
+  module ReportingProposals
     module Admin
       module AnswerProposalOverride
         extend ActiveSupport::Concern
@@ -27,7 +27,7 @@ module Decidim
             return unless Decidim::ReportingProposals.notify_authors_on_answering.include?(proposal.component.manifest_name.to_sym)
 
             affected_users.each do |user|
-              Decidim::Proposals::Admin::NotificationAnswerProposalMailer.notify_proposal_author(proposal, user).deliver_later
+              Decidim::ReportingProposals::Admin::NotificationAnswerProposalMailer.notify_proposal_author(proposal, user).deliver_later
             end
           end
 

data/app/commands/concerns/decidim/{proposals → reporting_proposals}/admin/assign_proposals_to_valuator_override.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module Proposals
+  module ReportingProposals
     module Admin
       module AssignProposalsToValuatorOverride
         extend ActiveSupport::Concern

data/app/commands/concerns/decidim/reporting_proposals/admin/update_category_override.rb

@@ -22,7 +22,7 @@ module Decidim
           def update_valuators
             category.category_valuators.destroy_all
             category.participatory_space.user_roles.where(id: form.valuator_ids).each do |valuator|
-              Decidim::ReportingProposals::CategoryValuator.create!(category: category, valuator_role: valuator)
+              Decidim::ReportingProposals::CategoryValuator.create!(category:, valuator_role: valuator)
             end
           end
         end

data/app/commands/concerns/decidim/reporting_proposals/admin/update_proposal_answer_template_override.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module UpdateProposalAnswerTemplateOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          def identify_templateable_resource
+            resource = @form.current_organization
+            if @form.component_constraint.present?
+              found_component = Decidim::Component.find_by(id: @form.component_constraint, manifest_name: %w(proposals reporting_proposals))
+              if found_component.present?
+                resource = found_component&.participatory_space&.decidim_organization_id == @form.current_organization.id ? found_component : nil
+              end
+            end
+            resource
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/{proposals → reporting_proposals}/publish_proposal_override.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module Proposals
+  module ReportingProposals
     module PublishProposalOverride
       extend ActiveSupport::Concern
 
@@ -59,7 +59,7 @@ module Decidim
           return unless Decidim::ReportingProposals.notify_authors_on_publish.include?(@proposal.component.manifest_name.to_sym)
 
           affected_users.each do |user|
-            Decidim::Proposals::NotificationPublishProposalMailer.notify_proposal_author(@proposal, user).deliver_later
+            Decidim::ReportingProposals::NotificationPublishProposalMailer.notify_proposal_author(@proposal, user).deliver_later
           end
         end
 

data/app/commands/decidim/reporting_proposals/create_reporting_proposal.rb

@@ -59,7 +59,7 @@ module Decidim
               longitude: form.longitude,
               component: form.component
             )
-            proposal.add_coauthor(@current_user, user_group: user_group)
+            proposal.add_coauthor(@current_user, user_group:)
             proposal.save!
             proposal
           end

data/app/commands/decidim/reporting_proposals/update_reporting_proposal.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    class UpdateReportingProposal < Decidim::Proposals::UpdateProposal
+      include ::Decidim::Proposals::GalleryMethods
+
+      def call
+        return broadcast(:invalid) if invalid?
+
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
+        if process_gallery?
+          build_gallery
+          return broadcast(:invalid) if gallery_invalid?
+        end
+
+        with_events(with_transaction: true) do
+          if @proposal.draft?
+            update_draft
+          else
+            update_proposal
+          end
+
+          document_cleanup!(include_all_attachments: true)
+
+          create_attachments(first_weight: first_attachment_weight) if process_attachments?
+          create_gallery if process_gallery?
+        end
+
+        broadcast(:ok, proposal)
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answer_templates_controller_override.rb

@@ -8,6 +8,37 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
+          def avaliablity_options
+            @avaliablity_options = []
+
+            Decidim::Component.includes(:participatory_space).where(manifest_name: accepted_components)
+                              .select { |a| a.participatory_space.decidim_organization_id == current_organization.id }.each do |component|
+              @avaliablity_options.push [formatted_name(component), component.id]
+            end
+
+            @avaliablity_options.sort_by!(&:first)
+            @avaliablity_options.prepend [t("global_scope", scope: "decidim.templates.admin.proposal_answer_templates.index"), 0]
+          end
+
+          # This is overriden because a bug in decidim templates that prevents valuators to use templates
+          # This can be removed after https://github.com/decidim/decidim/pull/12765 is merge & backported
+          def fetch
+            enforce_permission_to(:read, :template, template:, proposal:)
+
+            response_object = {
+              state: template.field_values["internal_state"],
+              template: populate_template_interpolations(proposal)
+            }
+
+            respond_to do |format|
+              format.json do
+                render json: response_object.to_json
+              end
+            end
+          end
+
+          private
+
           def accepted_components
             [:proposals, :reporting_proposals]
           end

data/app/controllers/concerns/decidim/reporting_proposals/admin/proposal_answers_controller_override.rb

@@ -10,7 +10,7 @@ module Decidim
         included do
           helper Decidim::Proposals::Admin::ProposalBulkActionsHelper
           def update
-            enforce_permission_to :create, :proposal_answer, proposal: proposal
+            enforce_permission_to(:create, :proposal_answer, proposal:)
 
             @notes_form = form(Decidim::Proposals::Admin::ProposalNoteForm).instance
             @answer_form = form(Decidim::Proposals::Admin::ProposalAnswerForm).from_params(params)

data/app/controllers/concerns/decidim/reporting_proposals/admin/proposals_controller_override.rb

@@ -10,6 +10,8 @@ module Decidim
         included do
           helper_method :reporting_proposal?, :proposals, :query, :form_presenter, :proposal, :proposal_ids
           def show
+            enforce_permission_to(:show, :proposal, proposal:)
+
             @notes_form = form(Decidim::Proposals::Admin::ProposalNoteForm).instance
             @answer_form = form(Decidim::Proposals::Admin::ProposalAnswerForm).from_model(proposal)
             @photo_form = form(Decidim::ReportingProposals::Admin::ProposalPhotoForm).instance
@@ -18,7 +20,7 @@ module Decidim
           private
 
           def reporting_proposal?
-            component = current_component || @photo_form.current_component
+            component = current_component || proposal.current_component
             component.manifest_name == "reporting_proposals"
           end
         end

data/app/controllers/concerns/decidim/reporting_proposals/admin/valuation_assignments_controller_override.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module ValuationAssignmentsControllerOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def create
+            enforce_permission_to :assign_to_valuator, :proposals
+            @form = form(Decidim::Proposals::Admin::ValuationAssignmentForm).from_params(params)
+            Decidim::Proposals::Admin::AssignProposalsToValuator.call(@form) do
+              on(:ok) do |_proposal|
+                flash[:notice] = I18n.t("valuation_assignments.create.success", scope: "decidim.proposals.admin")
+                redirect_to after_add_evaluator_url
+              end
+
+              on(:invalid) do
+                flash.now[:alert] = I18n.t("valuation_assignments.create.invalid", scope: "decidim.proposals.admin")
+                redirect_to after_add_evaluator_url
+              end
+            end
+          end
+
+          def destroy
+            @form = form(Decidim::Proposals::Admin::ValuationAssignmentForm).from_params(destroy_params)
+
+            enforce_permission_to :unassign_from_valuator, :proposals, valuator: @form.valuator_user
+
+            Decidim::Proposals::Admin::UnassignProposalsFromValuator.call(@form) do
+              on(:ok) do |_proposal|
+                flash.keep[:notice] = I18n.t("valuation_assignments.delete.success", scope: "decidim.proposals.admin")
+                if current_user == @form.valuator_user
+                  redirect_to EngineRouter.admin_proxy(current_component).root_path
+                else
+                  redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+                end
+              end
+
+              on(:invalid) do
+                flash.keep[:alert] = I18n.t("valuation_assignments.delete.invalid", scope: "decidim.proposals.admin")
+                redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path
+              end
+            end
+          end
+
+          def after_add_evaluator_url
+            return request.referer if request.referer.present? && request.referer =~ %r{manage/proposals/[0-9]+}
+
+            EngineRouter.admin_proxy(current_component).root_path
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/reporting_proposals/needs_proposal_extra_validations_snippets.rb

@@ -14,7 +14,6 @@ module Decidim
         @snippets ||= Decidim::Snippets.new
 
         unless @snippets.any?(:reporting_proposals_js_validations)
-          @snippets.add(:reporting_proposals_js_validations, ActionController::Base.helpers.javascript_pack_tag("decidim_reporting_proposals_js_validations"))
           @snippets.add(:reporting_proposals_js_validations, rules_tag)
           @snippets.add(:foot, @snippets.for(:reporting_proposals_js_validations))
         end

data/app/controllers/concerns/decidim/reporting_proposals/proposals_controller_override.rb

@@ -75,6 +75,41 @@ module Decidim
           enforce_permission_to :edit, :proposal, proposal: @proposal
         end
 
+        def update_draft
+          @step = Proposals::ProposalsController::STEP1
+          enforce_permission_to :edit, :proposal, proposal: @proposal
+
+          @form = form_proposal_params
+          update_proposal_command.call(@form, current_user, @proposal) do
+            on(:ok) do |proposal|
+              flash[:notice] = I18n.t("proposals.update_draft.success", scope: "decidim")
+              redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/preview"
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposals.update_draft.error", scope: "decidim")
+              render :edit_draft
+            end
+          end
+        end
+
+        def update
+          enforce_permission_to :edit, :proposal, proposal: @proposal
+
+          @form = form_proposal_params
+          update_proposal_command.call(@form, current_user, @proposal) do
+            on(:ok) do |proposal|
+              flash[:notice] = I18n.t("proposals.update.success", scope: "decidim")
+              redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("proposals.update.error", scope: "decidim")
+              render :edit
+            end
+          end
+        end
+
         private
 
         def form_proposal_params
@@ -97,6 +132,10 @@ module Decidim
           reporting_proposal? ? CreateReportingProposal : Decidim::Proposals::CreateProposal
         end
 
+        def update_proposal_command
+          reporting_proposal? ? Decidim::ReportingProposals::UpdateReportingProposal : Decidim::Proposals::UpdateProposal
+        end
+
         def reporting_proposal?
           component = current_component || @form.component
           component.manifest_name == "reporting_proposals"

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       class ProposalsController < Admin::ApplicationController
         def hide_proposal
-          enforce_permission_to :hide_proposal, :proposals, proposal: proposal
+          enforce_permission_to(:hide_proposal, :proposals, proposal:)
 
           Decidim::Admin::HideResource.call(proposal, current_user) do
             on(:ok) do
@@ -20,9 +20,9 @@ module Decidim
         end
 
         def add_photos
-          enforce_permission_to :edit_photos, :proposals, proposal: proposal
+          enforce_permission_to(:edit_photos, :proposals, proposal:)
 
-          @photo_form = form(Decidim::ReportingProposals::Admin::ProposalPhotoForm).from_params(params)
+          @photo_form = form(Decidim::ReportingProposals::Admin::ProposalPhotoForm).from_params(params, current_component: proposal.component)
 
           Decidim::ReportingProposals::Admin::UpdateProposal.call(@photo_form, proposal) do
             on(:ok) do |_proposal|
@@ -37,7 +37,7 @@ module Decidim
         end
 
         def remove_photo
-          enforce_permission_to :edit_photos, :proposals, proposal: proposal
+          enforce_permission_to(:edit_photos, :proposals, proposal:)
 
           attachment = proposal.attachments.find_by(id: params[:photo_id])
           if attachment.try(:photo?)

data/app/controllers/decidim/reporting_proposals/geolocation_controller.rb

@@ -15,7 +15,7 @@ module Decidim
 
         geocoder = Decidim::Map.utility(:geocoding, organization: current_organization)
         address = geocoder.address([params[:latitude], params[:longitude]])
-        render json: { address: address, found: address.present? }
+        render json: { address:, found: address.present? }
       end
 
       private

data/app/events/concerns/decidim/{proposals → reporting_proposals}/publish_proposal_event_override.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  module Proposals
+  module ReportingProposals
     module PublishProposalEventOverride
       extend ActiveSupport::Concern
 

data/app/forms/concerns/decidim/reporting_proposals/form_builder_override.rb

@@ -11,36 +11,29 @@ module Decidim
 
       included do
         def file_field(object_name, options = {})
-          return super(object_name, options) unless use_camera_button?(object_name)
+          return super(object_name, options) unless Decidim::ReportingProposals.use_camera_button
 
           unless @template.snippets.any?(:reporting_proposals_camera_scripts) || @template.snippets.any?(:reporting_proposals_camera_styles)
-            @template.snippets.add(:reporting_proposals_camera_scripts, @template.javascript_pack_tag("decidim_reporting_proposals_camera"))
-            @template.snippets.add(:reporting_proposals_camera_styles, @template.stylesheet_pack_tag("decidim_reporting_proposals_camera"))
+            @template.snippets.add(:reporting_proposals_camera_scripts, @template.prepend_javascript_pack_tag("decidim_reporting_proposals_camera"))
+            @template.snippets.add(:reporting_proposals_camera_styles, @template.append_stylesheet_pack_tag("decidim_reporting_proposals_camera"))
 
             # This will display the snippets in the <head> part of the page.
             @template.snippets.add(:head, @template.snippets.for(:reporting_proposals_camera_styles))
             @template.snippets.add(:foot, @template.snippets.for(:reporting_proposals_camera_scripts))
           end
 
-          content_tag(:div, class: "input-group") do
+          content_tag(:div, class: "camera-container input-group") do
             super(object_name, options) +
               content_tag(:div, class: "input-group-button") do
-                content_tag(:button, class: "button secondary user-device-camera", type: "button", data: { input: object_name }) do
-                  icon("camera-slr", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_camera", scope: "decidim.reporting_proposals.forms")}"
+                content_tag(:button,
+                            class: "button button__secondary user-device-camera",
+                            type: "button",
+                            data: { input: object_name }) do
+                  icon("camera-line", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_camera", scope: "decidim.reporting_proposals.forms")}"
                 end
               end
           end
         end
-
-        private
-
-        def use_camera_button?(object_name)
-          return unless @template.respond_to?(:current_component)
-
-          return unless Decidim::ReportingProposals.use_camera_button.include?(@template.current_component.manifest_name.to_sym)
-
-          object_name == :add_photos
-        end
       end
     end
   end

data/app/forms/concerns/decidim/reporting_proposals/map_builder_override.rb

@@ -15,9 +15,10 @@ module Decidim
         def geocoding_field(object_name, method, options = {})
           return original_geocoding_field(object_name, method, options) unless show_my_location_button?
 
+          append_assets
           unless template.snippets.any?(:reporting_proposals_geocoding_scripts) || template.snippets.any?(:reporting_proposals_geocoding_styles)
-            template.snippets.add(:reporting_proposals_geocoding_scripts, template.javascript_pack_tag("decidim_reporting_proposals_geocoding"))
-            template.snippets.add(:reporting_proposals_geocoding_styles, template.stylesheet_pack_tag("decidim_reporting_proposals_geocoding"))
+            template.snippets.add(:reporting_proposals_geocoding_scripts, template.append_javascript_pack_tag("decidim_reporting_proposals_geocoding"))
+            template.snippets.add(:reporting_proposals_geocoding_styles, template.append_stylesheet_pack_tag("decidim_reporting_proposals_geocoding"))
 
             # This will display the snippets in the <head> part of the page.
             template.snippets.add(:head, template.snippets.for(:reporting_proposals_geocoding_styles))
@@ -28,14 +29,14 @@ module Decidim
           options[:autocomplete] ||= "off"
           options[:class] ||= "input-group-field"
 
-          template.content_tag(:div, class: "input-group") do
+          template.content_tag(:div, class: "geocoding-container") do
             template.text_field(
               object_name,
               method,
               options.merge("data-decidim-geocoding" => view_options.to_json)
             ) +
               template.content_tag(:div, class: "input-group-button user-device-location") do
-                template.content_tag(:button, class: "button secondary", type: "button", data: {
+                template.content_tag(:button, class: "button button__secondary", type: "button", data: {
                                        input: "#{object_name}_#{method}",
                                        latitude: "#{object_name}_latitude",
                                        longitude: "#{object_name}_longitude",
@@ -43,7 +44,7 @@ module Decidim
                                        error_unsupported: I18n.t("errors.device_not_supported", scope: "decidim.reporting_proposals.forms"),
                                        url: Decidim::ReportingProposals::Engine.routes.url_helpers.locate_path
                                      }) do
-                  icon("location", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_location", scope: "decidim.reporting_proposals.forms")}"
+                  icon("map-pin-line", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_location", scope: "decidim.reporting_proposals.forms")}"
                 end
               end
           end

data/app/forms/decidim/reporting_proposals/admin/proposal_photo_form.rb

@@ -10,12 +10,8 @@ module Decidim
 
         validates :add_photos, presence: true
 
-        def proposal
-          @proposal ||= Decidim::Proposals::Proposal.find(id)
-        end
-
         def current_component
-          @current_component ||= proposal&.component
+          @current_component ||= context&.current_component
         end
       end
     end

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

@@ -7,6 +7,8 @@ module Decidim
       attribute :has_no_address, Boolean
       attribute :has_no_image, Boolean
 
+      attachments_attribute :photos
+
       validates :add_photos, presence: true, if: ->(form) { form.has_camera? && form.photos.blank? }
 
       # Set the has no address