decidim-reporting_proposals 0.6.0 → 0.7.1

data/README.md

@@ -64,6 +64,7 @@ Depending on your Decidim version, you can choose the corresponding version to e
 
 | Version | Compatible Decidim versions |
 |---------|-----------------------------|
+| 0.7.x   | 0.29.x                      |
 | 0.6.x   | 0.28.x                      |
 | 0.5.x   | 0.27.x                      |
 | 0.4.x   | 0.26.x                      |

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

@@ -12,10 +12,10 @@ module Decidim
             proposals_query = Decidim.find_resource_manifest(:proposals).try(:resource_scope, component)
             reporting_proposals_query = Decidim.find_resource_manifest(:reporting_proposals).try(:resource_scope, component)
             (reporting_proposals_query ? proposals_query.or(reporting_proposals_query) : proposals_query)
-             &.includes(:component)
-             &.published
-             &.not_hidden
-             &.order(id: :asc)
+              &.includes(:component)
+              &.published
+              &.not_hidden
+              &.order(id: :asc)
           end
         end
       end

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

@@ -21,7 +21,9 @@ module Decidim
           private
 
           def send_email
-            ProposalsValuatorMailer.notify_proposals_valuator(form.valuator_role.user, form.current_user, form.proposals).deliver_later
+            form.valuator_roles.each do |role|
+              ProposalsValuatorMailer.notify_proposals_valuator(role.user, form.current_user, form.proposals).deliver_later
+            end
           end
         end
       end

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

@@ -7,22 +7,16 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          def call
-            return broadcast(:invalid) if form.invalid?
-
-            transaction do
-              @category = create_category
-              update_valuators
-            end
-
-            broadcast(:ok)
+          def run_after_hooks
+            super
+            update_valuators if resource.present? && form.valuator_ids.present?
           end
 
           private
 
           def update_valuators
-            @category.participatory_space.user_roles.where(id: form.valuator_ids).each do |valuator|
-              Decidim::ReportingProposals::CategoryValuator.create!(category: @category, valuator_role: valuator)
+            resource.participatory_space.user_roles.where(id: form.valuator_ids).each do |valuator|
+              Decidim::ReportingProposals::CategoryValuator.create!(category: resource, valuator_role: valuator)
             end
           end
         end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module CreateProposalAnswerTemplateOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def identify_templateable_resource
+            resource = @form.current_organization
+            if @form.component_constraint.present?
+              found_component = Decidim::Component.where(id: @form.component_constraint, manifest_name: %w(proposals reporting_proposals)).first
+              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/reporting_proposals/admin/has_result_command_override.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module HasResultCommandOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def proposals
+            @proposals ||= resource.sibling_scope(:proposals).where(id: form.proposal_ids) + resource.sibling_scope(:reporting_proposals).where(id: form.proposal_ids)
+          end
+
+          def link_proposals
+            resource.link_resources(proposals, "included_proposals")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,22 +7,19 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          def call
-            return broadcast(:invalid) if form.invalid?
-
-            transaction do
-              update_category
-              update_valuators
-            end
-            broadcast(:ok)
+          def run_after_hooks
+            super
+            update_valuators
           end
 
           private
 
           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:, valuator_role: valuator)
+            resource.category_valuators.destroy_all
+            return unless form.valuator_ids.any?
+
+            resource.participatory_space.user_roles.where(id: form.valuator_ids).each do |valuator|
+              Decidim::ReportingProposals::CategoryValuator.create!(category: resource, valuator_role: valuator)
             end
           end
         end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module UpdateImportedResultOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def send_notifications
+            all = result.linked_resources(:proposals, "included_proposals") + result.linked_resources(:reporting_proposals, "included_proposals")
+            all.each do |proposal|
+              Decidim::EventsManager.publish(
+                event: "decidim.events.accountability.result_progress_updated",
+                event_class: Decidim::Accountability::ResultProgressUpdatedEvent,
+                resource: result,
+                affected_users: proposal.notifiable_identities,
+                followers: proposal.followers - proposal.notifiable_identities,
+                extra: {
+                  progress: result.progress,
+                  proposal_id: proposal.id
+                }
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -7,10 +7,6 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          def proposals
-            @proposals ||= result.sibling_scope(:proposals).where(id: form.proposal_ids) + result.sibling_scope(:reporting_proposals).where(id: form.proposal_ids)
-          end
-
           def send_notifications
             all = result.linked_resources(:proposals, "included_proposals") + result.linked_resources(:reporting_proposals, "included_proposals")
             all.each do |proposal|

data/app/commands/concerns/decidim/reporting_proposals/create_project_override.rb

@@ -7,7 +7,7 @@ module Decidim
 
       included do
         def proposals
-          @proposals ||= project.sibling_scope(:proposals).where(id: @form.proposal_ids) + project.sibling_scope(:reporting_proposals).where(id: form.proposal_ids)
+          @proposals ||= resource.sibling_scope(:proposals).where(id: @form.proposal_ids) + resource.sibling_scope(:reporting_proposals).where(id: form.proposal_ids)
         end
       end
     end

data/app/commands/concerns/decidim/reporting_proposals/create_report_override.rb

@@ -10,7 +10,7 @@ module Decidim
           participatory_space_moderators.each do |moderator|
             next unless moderator.email_on_moderations
 
-            ReportedMailer.hide(moderator, @report).deliver_later unless @current_user == moderator
+            ReportedMailer.hide(moderator, @report).deliver_later unless form.current_user == moderator
           end
         end
       end

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

@@ -8,33 +8,15 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          def avaliablity_options
-            @avaliablity_options = []
+          def availability_options
+            @availability_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]
+              @availability_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
+            @availability_options.sort_by!(&:first)
           end
 
           private

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

@@ -8,8 +8,12 @@ module Decidim
 
         included do
           def create
-            enforce_permission_to :assign_to_valuator, :proposals
             @form = form(Decidim::Proposals::Admin::ValuationAssignmentForm).from_params(params)
+
+            @form.proposals.each do |proposal|
+              enforce_permission_to :assign_to_valuator, :proposals, proposal:
+            end
+
             Decidim::Proposals::Admin::AssignProposalsToValuator.call(@form) do
               on(:ok) do |_proposal|
                 flash[:notice] = I18n.t("valuation_assignments.create.success", scope: "decidim.proposals.admin")
@@ -24,14 +28,16 @@ module Decidim
           end
 
           def destroy
-            @form = form(Decidim::Proposals::Admin::ValuationAssignmentForm).from_params(destroy_params)
+            @form = form(Decidim::Proposals::Admin::ValuationAssignmentForm).from_params(params)
 
-            enforce_permission_to :unassign_from_valuator, :proposals, valuator: @form.valuator_user
+            @form.valuator_roles.each do |valuator_role|
+              enforce_permission_to :unassign_from_valuator, :proposals, valuator: valuator_role.user
+            end
 
             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
+                if @form.valuator_roles.map(&:user).include?(current_user)
                   redirect_to EngineRouter.admin_proxy(current_component).root_path
                 else
                   redirect_back fallback_location: EngineRouter.admin_proxy(current_component).root_path

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

@@ -10,6 +10,12 @@ module Decidim
       included do
         helper_method :reporting_proposal?, :geocoding_comparison?
 
+        # rubocop:disable Naming/VariableNumber
+        STEP1 = :step_1
+        STEP2 = :step_2
+        STEP_COMPARE = :step_compare
+        # rubocop:enable Naming/VariableNumber
+
         def new
           enforce_permission_to :create, :proposal
           @step = Proposals::ProposalsController::STEP1
@@ -29,7 +35,15 @@ module Decidim
             on(:ok) do |proposal|
               flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
 
-              redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/compare"
+              @proposal = proposal
+
+              path = if geocoding_comparison?
+                       "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/compare"
+                     else
+                       "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/preview"
+                     end
+
+              redirect_to path
             end
 
             on(:invalid) do
@@ -39,40 +53,18 @@ module Decidim
           end
         end
 
-        # change comparison class if geocoding comparison is enabled
         def compare
-          enforce_permission_to :edit, :proposal, proposal: @proposal
-          @step = Proposals::ProposalsController::STEP2
-          klass = if geocoding_comparison?
-                    Decidim::ReportingProposals::NearbyProposals
-                  else
-                    Decidim::Proposals::SimilarProposals
-                  end
-          @similar_proposals ||= klass
-                                 .for(current_component, @proposal)
-                                 .all
-
-          if @similar_proposals.blank?
-            flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
-            redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/complete"
-          end
-        end
+          @step = Proposals::ProposalsController::STEP_COMPARE
+          @proposal = Decidim::Proposals::Proposal.find(params[:id])
 
-        # disable this step for reporting proposals
-        def complete
           enforce_permission_to :edit, :proposal, proposal: @proposal
-          @step = Proposals::ProposalsController::STEP3
 
-          @form = form_proposal_model
+          @similar_proposals ||= Decidim::ReportingProposals::NearbyProposals.for(current_component, @proposal).all
 
-          @form.attachment = form_attachment_new
-
-          redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/preview" if reporting_proposal?
-        end
-
-        def edit_draft
-          @step = reporting_proposal? ? Proposals::ProposalsController::STEP1 : Proposals::ProposalsController::STEP3
-          enforce_permission_to :edit, :proposal, proposal: @proposal
+          if @similar_proposals.blank?
+            flash[:notice] = I18n.t("reporting_proposals.proposals.compare.no_similars_found", scope: "decidim")
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/preview"
+          end
         end
 
         def update_draft
@@ -125,7 +117,7 @@ module Decidim
         end
 
         def new_proposal_form
-          reporting_proposal? ? Decidim::ReportingProposals::ProposalForm : Decidim::Proposals::ProposalWizardCreateStepForm
+          reporting_proposal? ? Decidim::ReportingProposals::ProposalForm : Decidim::Proposals::ProposalForm
         end
 
         def create_proposal_command

data/app/forms/concerns/decidim/reporting_proposals/admin/category_form_override.rb

@@ -7,7 +7,7 @@ module Decidim
         extend ActiveSupport::Concern
 
         included do
-          attribute :valuator_ids, Array[Integer]
+          attribute :valuator_ids, [Integer]
 
           def map_model(model)
             self.valuator_ids = model.category_valuators.pluck(:valuator_role_id)

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

@@ -10,8 +10,11 @@ module Decidim
       delegate :asset_pack_path, to: :@template
 
       included do
+        alias_method :original_file_field, :file_field
+
         def file_field(object_name, options = {})
-          return super(object_name, options) unless Decidim::ReportingProposals.use_camera_button
+          return original_file_field(object_name, options) unless Decidim::ReportingProposals.use_camera_button
+          return original_file_field(object_name, options) unless @template.respond_to?(:snippets)
 
           unless @template.snippets.any?(:reporting_proposals_camera_scripts) || @template.snippets.any?(:reporting_proposals_camera_styles)
             @template.snippets.add(:reporting_proposals_camera_scripts, @template.prepend_javascript_pack_tag("decidim_reporting_proposals_camera"))

data/app/helpers/concerns/decidim/reporting_proposals/admin/proposal_bulk_actions_helper_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ReportingProposals
+    module Admin
+      module ProposalBulkActionsHelperOverride
+        extend ActiveSupport::Concern
+
+        included do
+          def find_valuators_for_select(participatory_space, _current_user)
+            valuator_roles = participatory_space.user_roles(:valuator).order_by_name
+            valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
+
+            valuator_roles.map do |role|
+              valuator = valuators.find { |user| user.id == role.decidim_user_id }
+              [valuator.name, role.id]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/concerns/decidim/reporting_proposals/admin/proposals_helper_override.rb

@@ -11,6 +11,24 @@ module Decidim
           # Helpers for overdue proposals
           include ActionView::Helpers::DateHelper
 
+          def available_valuators_for_proposal(proposal, current_user)
+            participatory_space = proposal.component.participatory_space
+
+            all_roles = participatory_space.user_roles(:valuator).order_by_name
+            assigned_ids = proposal.valuation_assignments.pluck(:valuator_role_id)
+
+            available_roles = all_roles.reject do |role|
+              role.decidim_user_id == current_user.id || assigned_ids.include?(role.id)
+            end
+
+            users_by_id = Decidim::User.where(id: available_roles.map(&:decidim_user_id)).index_by(&:id)
+
+            available_roles.map do |role|
+              user = users_by_id[role.decidim_user_id]
+              [user.name, role.id]
+            end
+          end
+
           def unanswered_proposals_overdue?(proposal)
             grace_period = days_unanswered(proposal)
             !grace_period.zero? &&

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

@@ -8,11 +8,12 @@ module Decidim
 
       included do
         def proposal_wizard_steps
-          steps = [Proposals::ProposalsController::STEP1, Proposals::ProposalsController::STEP2]
-          steps << Proposals::ProposalsController::STEP3 unless reporting_proposals_component?
-          steps << Proposals::ProposalsController::STEP4
+          steps = [Proposals::ProposalsController::STEP1]
+          steps << Proposals::ProposalsController::STEP_COMPARE if reporting_proposals_component?
+          steps << Proposals::ProposalsController::STEP2
         end
 
+        # rubocop:disable Rails/HelperInstanceVariable
         def distance(meters = nil)
           meters = @proposal.component.settings.geocoding_comparison_radius.to_f if meters.nil?
 
@@ -20,9 +21,22 @@ module Decidim
 
           "#{(meters / 1000).round}Km"
         end
+        # rubocop:enable Rails/HelperInstanceVariable
 
         private
 
+        def proposal_wizard_aside_link_to_back(step)
+          # byebug
+          case step
+          when Decidim::Proposals::ProposalsController::STEP1
+            proposals_path
+          when Decidim::Proposals::ProposalsController::STEP_COMPARE
+            compare_proposal_path
+          when Decidim::Proposals::ProposalsController::STEP2
+            preview_proposal_path
+          end
+        end
+
         def total_steps
           proposal_wizard_steps.count
         end

data/app/jobs/decidim/reporting_proposals/assign_proposal_valuators_job.rb

@@ -30,7 +30,7 @@ module Decidim
 
       def form(valuator_role)
         Decidim::Proposals::Admin::ValuationAssignmentForm.from_params(
-          id: valuator_role.id,
+          valuator_role_ids: valuator_role.id,
           proposal_ids: [resource.id]
         ).with_context(
           current_component: resource.component,

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

@@ -1,9 +1,9 @@
-<!-- replace "erb[loud]:contains('proposal.valuation_assignments.count')" -->
+<!-- replace "erb[loud]:contains('proposal.valuation_assignments_count')" -->
 
-<% count = proposal.valuation_assignments.count %>
-<% if count.zero? %>
+<% assignments = proposal.valuation_assignments.order(:created_at) %>
+<% if assignments.empty? %>
   0
 <% else %>
-  <%= proposal.valuation_assignments.first&.valuator_role&.user&.name %>
-  <%= "(+#{(count - 1)})" if count > 1 %>
+  <%= assignments.first&.valuator_role&.user&.name %>
+  <%= "(+#{assignments.size - 1})" if assignments.size > 1 %>
 <% end %>

data/app/overrides/decidim/proposals/admin/proposals/index/add_form_default_class.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_after "erb[loud]:contains('append_javascript_pack_tag')" -->
+
+<script>
+document.body.classList.add("form-defaults");
+</script>

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

@@ -1,25 +1,2 @@
 <!-- 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 my-4"
-       style="max-width:400px">
-    <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposal-to-valuator",
-                 class: "form form-defaults") do %>
-      <div class="form__wrapper">
-        <div class="card">
-          <div class="flex items-center">
-            <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 button__sm button__secondary ml-2") %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+<%= render partial: "decidim/proposals/admin/proposals/assign_to_valuator", locals: { current_participatory_space: current_participatory_space, proposal: proposal } %>

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

@@ -2,7 +2,6 @@
 
 <% if reporting_proposal? %>
   <%= render "decidim/reporting_proposals/proposals/reporting_proposal_fields", form: form %>
-  <%= render "decidim/reporting_proposals/proposals/user_group", form: form %>
 <% else %>
   <%= render "decidim/proposals/proposals/edit_form_fields", form: form %>
 <% end %>

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

@@ -0,0 +1,3 @@
+<!-- replace "erb[loud]:contains('edit_form_fields')" -->
+
+<%= render (reporting_proposal? ? "decidim/reporting_proposals/proposals/reporting_proposal_fields" : "decidim/proposals/proposals/edit_form_fields"), form: form, new_proposal: true %>

data/app/packs/entrypoints/decidim_reporting_proposals.js

@@ -1,6 +1,7 @@
 import "src/decidim/proposals/utils"
 import "src/decidim/reporting_proposals/proposals/add_proposal"
 import "src/decidim/reporting_proposals/proposal_extra_validations"
+import "src/decidim/reporting_proposals/assign_valuators_select.js"
 import "stylesheets/decidim/reporting_proposals/proposals/add_proposal.scss";
 
 // Images

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

@@ -0,0 +1,25 @@
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
+
+document.addEventListener("DOMContentLoaded", () => {
+  const select = document.querySelector("#assign_valuator_role_ids");
+
+  if (!select) {
+    return;
+  }
+
+  const { noResults } = select.dataset;
+
+  const config = {
+    plugins: ["remove_button"],
+    render: {
+      item: (data, escape) =>
+        `<div>${escape(data.text)}<input type="hidden" name="valuator_role_ids[]" value="${data.value}" /></div>`,
+      // eslint-disable-next-line camelcase
+      ...(noResults && {
+        no_results: () => `<div class="no-results">${noResults}</div>`
+      })
+    }
+  };
+
+  return new TomSelect(select, config);
+});

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

@@ -1,5 +1,5 @@
 $(() => {
-  const $input = $("#proposal_add_photos");
+  const $input = $("#proposal_add_photos_button");
   const $button = $(".camera-container .user-device-camera");
   const $checkbox = $("#proposal_has_no_image");
   const $formError = $(".camera-container .form-error")

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

@@ -25,3 +25,9 @@
   font-size: 0.8125rem;
   text-align: start;
 }
+
+button[data-dialog-open^="flagModal"] {
+  > span {
+    display: none;
+  }
+}

data/app/permissions/concerns/decidim/reporting_proposals/admin/permissions_override.rb

@@ -17,12 +17,14 @@ module Decidim
               if valuator_assigned_to_proposal?
                 can_create_proposal_note?
                 can_create_proposal_answer?
+                can_assign_valuator_to_proposal?
                 allow! if action_is_show_on_proposal?
               elsif action_is_show_on_proposal?
                 disallow!
               end
-              can_export_proposals?
+
               valuator_can_unassign_valuator_from_proposals?
+              can_export_proposals?
 
               return permission_action
             end
@@ -59,7 +61,7 @@ module Decidim
             allow! if permission_action.subject == :proposals && permission_action.action == :split
 
             # Every user allowed by the space can assign proposals to a valuator
-            allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_valuator
+            can_assign_valuator_to_proposal?
 
             # Every user allowed by the space can unassign a valuator from proposals
             can_unassign_valuator_from_proposals?
@@ -72,6 +74,14 @@ module Decidim
               allow!
             end
 
+            if permission_action.subject == :proposal_state
+              if permission_action.action == :destroy
+                toggle_allow(proposal_state.proposals.empty?)
+              else
+                allow!
+              end
+            end
+
             permission_action
           end
           # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity