decidim-reporting_proposals 0.2.0 → 0.5.0

data/db/migrate/20230404103706_add_target_and_field_values_to_decidim_templates_templates.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddTargetAndFieldValuesToDecidimTemplatesTemplates < ActiveRecord::Migration[6.0]
+  def change
+    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/db/migrate/20230404104741_migrate_templatable.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class MigrateTemplatable < ActiveRecord::Migration[6.0]
+  def self.up
+    Decidim::Templates::Template.find_each do |template|
+      next if template.target.present?
+
+      template.update(target: template.templatable_type.demodulize.tableize.singularize)
+    end
+  end
+
+  def self.down; 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)/})
@@ -27,8 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "decidim-core", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "decidim-participatory_processes", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "decidim-proposals", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
+  spec.add_dependency "decidim-templates", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_dependency "deface", ">= 1.9"
 
+  spec.add_development_dependency "decidim-accountability", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
+  spec.add_development_dependency "decidim-budgets", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
   spec.add_development_dependency "decidim-dev", Decidim::ReportingProposals::COMPAT_DECIDIM_VERSION
+  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/admin_engine.rb

@@ -14,7 +14,22 @@ module Decidim
         put :hide_proposal, to: "proposals#hide_proposal"
         post :add_photos, to: "proposals#add_photos"
         delete :remove_photo, to: "proposals#remove_photo"
-        resources :proposal_notes, only: [:edit, :update]
+        resources :proposal_notes, only: :update
+      end
+
+      initializer "decidim_reporting_proposals.template_routes" do
+        if defined? Decidim::Templates::AdminEngine
+          Decidim::Templates::AdminEngine.routes do
+            resources :proposal_answer_templates do
+              member do
+                post :copy
+              end
+              collection do
+                get :fetch
+              end
+            end
+          end
+        end
       end
 
       initializer "decidim_reporting_proposals.admin_mount_routes" do

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(: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/config.rb

@@ -34,11 +34,6 @@ module Decidim
       [:proposals, :reporting_proposals]
     end
 
-    # Public Setting to prevent adding the camera button on not photo/image input[type=file]
-    config_accessor :camera_button_on_attachments do
-      false
-    end
-
     # Public setting to prevent valuators or admins to modify the photos attached to a proposal
     # otherwise can be configured at the component level
     config_accessor :allow_proposal_photo_editing do
@@ -49,5 +44,15 @@ module Decidim
     config_accessor :valuators_assign_other_valuators do
       true
     end
+
+    # Public setting to to get an e-mail notification when there is a new answer to a proposal
+    config_accessor :notify_authors_on_answering do
+      [:proposals, :reporting_proposals]
+    end
+
+    # Public setting to to get an e-mail notification when the proposal is published
+    config_accessor :notify_authors_on_publish do
+      [:proposals, :reporting_proposals]
+    end
   end
 end

data/lib/decidim/reporting_proposals/engine.rb

@@ -17,15 +17,71 @@ module Decidim
         ComponentValidator.include(Decidim::ReportingProposals::ComponentValidatorOverride)
         Decidim::Category.include(Decidim::ReportingProposals::CategoryOverride)
         Decidim::FormBuilder.include(Decidim::ReportingProposals::FormBuilderOverride)
+        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)
+        Decidim::Proposals::Admin::AnswerProposal.include(Decidim::Proposals::Admin::AnswerProposalOverride)
+        Decidim::Accountability::Admin::ResultForm.include(Decidim::ReportingProposals::MapIncludedProposalsForFormOverride)
+        Decidim::Accountability::Admin::CreateResult.include(Decidim::ReportingProposals::Admin::CreateResultOverride)
+        Decidim::Accountability::Admin::UpdateResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
+        Decidim::Accountability::Admin::UpdateImportedResult.include(Decidim::ReportingProposals::Admin::UpdateResultOverride)
+        Decidim::Meetings::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
+        Decidim::Meetings::Admin::CloseMeetingForm.include(Decidim::ReportingProposals::CloseMeetingFormOverride)
+        Decidim::Meetings::Admin::CloseMeeting.include(Decidim::ReportingProposals::CloseMeetingOverride)
+        Decidim::Meetings::CloseMeeting.include(Decidim::ReportingProposals::CloseMeetingOverride)
+        Decidim::Budgets::Admin::ProjectForm.include(Decidim::ReportingProposals::MapIncludedProposalsForFormOverride)
+        Decidim::Budgets::Admin::CreateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
+        Decidim::Budgets::Admin::UpdateProject.include(Decidim::ReportingProposals::CreateProjectOverride)
+        if defined?(Decidim::Elections::Admin::AnswerForm)
+          Decidim::Elections::Admin::AnswerForm.include(Decidim::ReportingProposals::MapRelatedProposalsForFormOverride)
+          Decidim::Elections::Admin::CreateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
+          Decidim::Elections::Admin::UpdateAnswer.include(Decidim::ReportingProposals::Admin::CreateAnswerOverride)
+        end
         Decidim::Admin::CategoryForm.include(Decidim::ReportingProposals::Admin::CategoryFormOverride)
         Decidim::Admin::CreateCategory.include(Decidim::ReportingProposals::Admin::CreateCategoryOverride)
         Decidim::Admin::UpdateCategory.include(Decidim::ReportingProposals::Admin::UpdateCategoryOverride)
         Decidim::Proposals::Admin::Permissions.include(Decidim::ReportingProposals::Admin::PermissionsOverride)
         Decidim::ParticipatorySpaceRoleConfig::Valuator.include(Decidim::ReportingProposals::ParticipatorySpaceRoleConfig::ValuatorOverride)
 
+        # port of https://github.com/openpoke/decidim/pull/31,23,29,24,43
+        Decidim::ReportedMailer.include(Decidim::ReportedMailerOverride)
+
+        # 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.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)
+        Decidim::Templates::Admin::CopyQuestionnaireTemplate.include(Decidim::Templates::Admin::CopyQuestionnaireTemplateOverride)
+        Decidim::Templates::Admin::CreateQuestionnaireTemplate.include(Decidim::Templates::Admin::CreateQuestionnaireTemplateOverride)
+
         # Search user roles for different participatory spaces and apply override to all of them
         # We'll make sure this does not break rails in situations where database is not installed (ie, creating the test or development apps)
         begin
@@ -41,13 +97,18 @@ module Decidim
       initializer "decidim_reporting_proposals.overrides", after: "decidim.action_controller" do
         config.to_prepare do
           Decidim::Admin::ComponentsController.include(Decidim::ReportingProposals::Admin::NeedsHeaderSnippets)
+          Decidim::Admin::CategoriesController.include(Decidim::ReportingProposals::Admin::CategoriesControllerOverride)
           Decidim::Proposals::ProposalsController.include(Decidim::ReportingProposals::ProposalsControllerOverride)
           Decidim::Proposals::ProposalWizardHelper.include(Decidim::ReportingProposals::ProposalWizardHelperOverride)
           Decidim::Proposals::Admin::ProposalsController.include(Decidim::ReportingProposals::Admin::NeedsHeaderSnippets)
           Decidim::Proposals::Admin::ProposalsController.include(Decidim::ReportingProposals::Admin::ProposalsControllerOverride)
           Decidim::Proposals::Admin::ProposalAnswersController.include(Decidim::ReportingProposals::Admin::ProposalAnswersControllerOverride)
           Decidim::Proposals::Admin::ProposalsHelper.include(Decidim::ReportingProposals::Admin::ProposalsHelperOverride)
-          Decidim::Admin::CategoriesController.include(Decidim::ReportingProposals::Admin::CategoriesControllerOverride)
+          Decidim::Templates::Admin::ApplicationController.include(Decidim::Templates::Admin::ApplicationControllerOverride)
+
+          # port of https://github.com/openpoke/decidim/pull/24
+          Decidim::Proposals::Admin::ValuationAssignmentsController.include(Decidim::Proposals::Admin::ValuationAssignmentsControllerOverride)
+
           begin
             Decidim::Templates::Admin::ProposalAnswerTemplatesController.include(Decidim::ReportingProposals::Admin::ProposalAnswerTemplatesControllerOverride)
           rescue StandardError => e

data/lib/decidim/reporting_proposals/test/factories.rb

@@ -11,3 +11,13 @@ FactoryBot.define do
     valuator_role { create :participatory_process_user_role, role: "valuator" }
   end
 end
+
+FactoryBot.modify do
+  factory :template, class: "Decidim::Templates::Template" do
+    trait :proposal_answer do
+      templatable { organization }
+      target { :proposal_answer }
+      field_values { { internal_state: :accepted } }
+    end
+  end
+end

data/lib/decidim/reporting_proposals/version.rb

@@ -2,14 +2,9 @@
 
 module Decidim
   module ReportingProposals
-    VERSION = "0.2.0"
-    # DECIDIM_VERSION = "0.26.5"
-    # Provisional until
-    #   https://github.com/openpoke/decidim/pull/23
-    #   https://github.com/openpoke/decidim/pull/37
-    # are merged on upstream
-    DECIDIM_VERSION = { github: "openpoke/decidim", branch: "0.26-lucerne" }.freeze
+    VERSION = "0.5.0"
+    DECIDIM_VERSION = "0.27.3"
 
-    COMPAT_DECIDIM_VERSION = [">= 0.25.0", "< 0.27"].freeze
+    COMPAT_DECIDIM_VERSION = [">= 0.27.0", "< 0.28"].freeze
   end
 end