decidim-proposals 0.28.6 → 0.29.0.rc1

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

@@ -5,6 +5,17 @@ require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 require "decidim/meetings/test/factories"
 
+def generate_state_title(token, skip_injection: false)
+  value = I18n.t(token, scope: "decidim.proposals.answers")
+  Decidim::Faker::Localized.localized do
+    if skip_injection
+      value
+    else
+      "<script>alert(\"proposal_state_title\");</script> #{value}"
+    end
+  end
+end
+
 FactoryBot.define do
   factory :proposal_component, parent: :component do
     transient do
@@ -14,6 +25,10 @@ FactoryBot.define do
     manifest_name { :proposals }
     participatory_space { create(:participatory_process, :with_steps, organization:, skip_injection:) }
 
+    after :create do |proposal_component|
+      Decidim::Proposals.create_default_states!(proposal_component, nil, with_traceability: false)
+    end
+
     trait :with_endorsements_enabled do
       step_settings do
         {
@@ -148,10 +163,10 @@ FactoryBot.define do
       end
     end
 
-    trait :with_can_accumulate_supports_beyond_threshold do
+    trait :with_can_accumulate_votes_beyond_threshold do
       settings do
         {
-          can_accumulate_supports_beyond_threshold: true
+          can_accumulate_votes_beyond_threshold: true
         }
       end
     end
@@ -246,12 +261,45 @@ FactoryBot.define do
     end
   end
 
+  factory :proposal_state, class: "Decidim::Proposals::ProposalState" do
+    transient do
+      skip_injection { false }
+    end
+    token { :not_answered }
+    title { generate_state_title(:not_answered, skip_injection:) }
+    announcement_title { generate_localized_title(:announcement_title, skip_injection:) }
+    component { build(:proposal_component) }
+    bg_color { Faker::Color.hex_color(:light) }
+    text_color { Faker::Color.hex_color(:dark) }
+
+    trait :evaluating do
+      title { generate_state_title(:evaluating, skip_injection:) }
+      token { :evaluating }
+    end
+
+    trait :accepted do
+      title { generate_state_title(:accepted, skip_injection:) }
+      token { :accepted }
+    end
+
+    trait :rejected do
+      title { generate_state_title(:rejected, skip_injection:) }
+      token { :rejected }
+    end
+
+    trait :withdrawn do
+      title { generate_state_title(:withdrawn, skip_injection:) }
+      token { :withdrawn }
+    end
+  end
+
   factory :proposal, class: "Decidim::Proposals::Proposal" do
     transient do
       users { nil }
       # user_groups correspondence to users is by sorting order
       user_groups { [] }
       skip_injection { false }
+      state { :not_answered }
     end
 
     title { generate_localized_title(:proposal_title, skip_injection:) }
@@ -266,6 +314,14 @@ FactoryBot.define do
     execution_period { generate_localized_title(:proposal_execution_period, skip_injection:) }
 
     after(:build) do |proposal, evaluator|
+      if proposal.component
+        existing_states = Decidim::Proposals::ProposalState.where(component: proposal.component)
+
+        Decidim::Proposals.create_default_states!(proposal.component, nil, with_traceability: false) unless existing_states.any?
+      end
+
+      proposal.assign_state(evaluator.state)
+
       proposal.title = if evaluator.title.is_a?(String)
                          { proposal.try(:organization).try(:default_locale) || "en" => evaluator.title }
                        else
@@ -300,7 +356,7 @@ FactoryBot.define do
     trait :participant_author do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        user = build(:user, :confirmed, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
+        user = build(:user, organization: proposal.component.participatory_space.organization, skip_injection: evaluator.skip_injection)
         proposal.coauthorships.build(author: user)
       end
     end
@@ -324,42 +380,42 @@ FactoryBot.define do
     trait :official_meeting do
       after :build do |proposal, evaluator|
         proposal.coauthorships.clear
-        component = build(:meeting_component, :published, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
-        proposal.coauthorships.build(author: build(:meeting, :published, component:, skip_injection: evaluator.skip_injection))
+        component = build(:meeting_component, participatory_space: proposal.component.participatory_space, skip_injection: evaluator.skip_injection)
+        proposal.coauthorships.build(author: build(:meeting, component:, skip_injection: evaluator.skip_injection))
       end
     end
 
     trait :evaluating do
-      state { "evaluating" }
+      state { :evaluating }
       answered_at { Time.current }
       state_published_at { Time.current }
     end
 
     trait :accepted do
-      state { "accepted" }
+      state { :accepted }
       answered_at { Time.current }
       state_published_at { Time.current }
     end
 
     trait :rejected do
-      state { "rejected" }
+      state { :rejected }
       answered_at { Time.current }
       state_published_at { Time.current }
     end
 
     trait :withdrawn do
-      state { "withdrawn" }
+      withdrawn_at { Time.current }
     end
 
     trait :accepted_not_published do
-      state { "accepted" }
+      state { :accepted }
       answered_at { Time.current }
       state_published_at { nil }
       answer { generate_localized_title }
     end
 
     trait :with_answer do
-      state { "accepted" }
+      state { :accepted }
       answer { generate_localized_title }
       answered_at { Time.current }
       state_published_at { Time.current }
@@ -388,8 +444,7 @@ FactoryBot.define do
     trait :with_endorsements do
       after :create do |proposal, evaluator|
         5.times.collect do
-          create(:endorsement, resource: proposal,
-                               author: build(:user, :confirmed, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
+          create(:endorsement, resource: proposal, author: build(:user, organization: proposal.participatory_space.organization, skip_injection: evaluator.skip_injection),
                                skip_injection: evaluator.skip_injection)
         end
       end
@@ -434,7 +489,7 @@ FactoryBot.define do
     end
     amendable { build(:proposal, skip_injection:) }
     emendation { build(:proposal, component: amendable.component, skip_injection:) }
-    amender { build(:user, :confirmed, organization: amendable.component.participatory_space.organization, skip_injection:) }
+    amender { build(:user, organization: amendable.component.participatory_space.organization, skip_injection:) }
     state { Decidim::Amendment::STATES.keys.sample }
   end
 

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.28.6"
+      "0.29.0.rc1"
     end
   end
 end

data/lib/decidim/proposals.rb

@@ -22,18 +22,6 @@ module Decidim
 
     include ActiveSupport::Configurable
 
-    # Public Setting that defines the similarity minimum value to consider two
-    # proposals similar. Defaults to 0.25.
-    config_accessor :similarity_threshold do
-      0.25
-    end
-
-    # Public Setting that defines how many similar proposals will be shown.
-    # Defaults to 10.
-    config_accessor :similarity_limit do
-      10
-    end
-
     # Public Setting that defines how many proposals will be shown in the
     # participatory_space_highlighted_elements view hook
     config_accessor :participatory_space_highlighted_proposals_limit do
@@ -45,6 +33,90 @@ module Decidim
     config_accessor :process_group_highlighted_proposals_limit do
       3
     end
+
+    def self.proposal_states_colors
+      {
+        gray: {
+          background: "#F6F8FA",
+          foreground: "#4B5058",
+          name: I18n.t("gray", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        blue: {
+          background: "#EBF9FF",
+          foreground: "#0851A6",
+          name: I18n.t("blue", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        green: {
+          background: "#E3FCE9",
+          foreground: "#15602C",
+          name: I18n.t("green", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        yellow: {
+          background: "#FFFCE5",
+          foreground: "#9A6700",
+          name: I18n.t("yellow", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        orange: {
+          background: "#FFF1E5",
+          foreground: "#BC4C00",
+          name: I18n.t("orange", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        red: {
+          background: "#FFEBE9",
+          foreground: "#D1242F",
+          name: I18n.t("red", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        pink: {
+          background: "#FFEFF7",
+          foreground: "#BF3989",
+          name: I18n.t("pink", scope: "activemodel.attributes.proposal_state.colors")
+        },
+        purple: {
+          background: "#FBEFFF",
+          foreground: "#8250DF",
+          name: I18n.t("purple", scope: "activemodel.attributes.proposal_state.colors")
+        }
+      }
+    end
+
+    def self.create_default_states!(component, admin_user, with_traceability: true)
+      colors = Decidim::Proposals.proposal_states_colors
+
+      locale = Decidim.default_locale
+      default_states = {
+        evaluating: {
+          token: :evaluating,
+          bg_color: colors[:orange][:background],
+          text_color: colors[:orange][:foreground],
+          announcement_title: { locale => I18n.with_locale(locale) { I18n.t("proposal_in_evaluation_reason", scope: "decidim.proposals.proposals.show") } },
+          title: { locale => I18n.with_locale(locale) { I18n.t(:evaluating, scope: "decidim.proposals.answers") } }
+        },
+        accepted: {
+          token: :accepted,
+          bg_color: colors[:green][:background],
+          text_color: colors[:green][:foreground],
+          announcement_title: { locale => I18n.with_locale(locale) { I18n.t("proposal_accepted_reason", scope: "decidim.proposals.proposals.show") } },
+          title: { locale => I18n.with_locale(locale) { I18n.t(:accepted, scope: "decidim.proposals.answers") } }
+        },
+        rejected: {
+          token: :rejected,
+          bg_color: colors[:red][:background],
+          text_color: colors[:red][:foreground],
+          announcement_title: { locale => I18n.with_locale(locale) { I18n.t("proposal_rejected_reason", scope: "decidim.proposals.proposals.show") } },
+          title: { locale => I18n.with_locale(locale) { I18n.t(:rejected, scope: "decidim.proposals.answers") } }
+        }
+      }
+      default_states.each_key do |key|
+        default_states[key][:object] = if with_traceability
+                                         Decidim.traceability.create(
+                                           Decidim::Proposals::ProposalState, admin_user, component:, **default_states[key]
+                                         )
+                                       else
+                                         Decidim::Proposals::ProposalState.create(component:, **default_states[key])
+                                       end
+      end
+      default_states
+    end
   end
 
   module ContentParsers

data/lib/tasks/proposals/upgrade/{decdim_proposals_upgrade_tasks.rake → decidim_proposals_upgrade_tasks.rake}

@@ -2,19 +2,6 @@
 
 namespace :decidim_proposals do
   namespace :upgrade do
-    desc "Assigns category to emendations based on amendable category"
-    task set_categories: :environment do
-      Decidim::Proposals::Proposal.includes(:category).find_each do |proposal|
-        next if proposal.category.blank?
-        next unless proposal.amendable?
-
-        proposal.emendations.each do |emendation|
-          emendation.category = proposal.category
-          emendation.save(validate: false)
-        end
-      end
-    end
-
     desc "Removes all proposal valuator records of which the role assignment does not exists"
     task remove_valuator_orphan_records: :environment do
       if Decidim.module_installed?("participatory_processes")