decidim-proposals 0.28.3 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e4bd14ec5e23a0ba39c81c825c919ceaadbba6c9a2f47498a8f1a2d0bf59dd6
-  data.tar.gz: 757238cf1ff370f483d05ce6a569f4cd41aa5f06191342b374a583babc10d570
+  metadata.gz: 22cc3e857b344169fadf51778fef41a0ea95d814e8855a90eb354d5b2bda88fe
+  data.tar.gz: 48d87bd26f7856a756da54a174edddc30c17a9330a7e5af07c808cdfac7adf36
 SHA512:
-  metadata.gz: a08f20046706481335121d31d830f25e2255b76cec1b93aa4bc38e63145498aa8111995505a8f4ac007cbf245d252466b90f744d5bd51b80fc9e74bc2db82af3
-  data.tar.gz: 3ae92e1d44a2c9bdbce252029947d91dca471f9a00d3f932980ce55f2b796e4ecd7abf83c394f746dd4651dcb736f7c2bc88abc566cd72127b4fa4ca7dfc4066
+  metadata.gz: be95b2675428571df7ad89af801ad8a988c7f616272386c9cd213644cf285596379079da03c178ccf83d867d1ee70ebff706fc3ce35632c3ced1feeeaef3cd94
+  data.tar.gz: 940ea09bddab76eeacc28e581e3f02ccc79a85a230226aa34dcbbaf3e414f38361f35851557d0c86025a4ab9380230edf79e738fac02054d1c0a5fcc3f2782c2

data/README.md

@@ -20,23 +20,6 @@ And then execute:
 bundle
 ```
 
-### Configuring Similarity
-
-`pg_trgm` is a PostgreSQL extension providing simple fuzzy string matching used in the Proposal wizard to find similar published proposals (title and the body).
-
-Create config variables in your app's `/config/initializers/decidim-proposals.rb`:
-
-```ruby
-Decidim::Proposals.configure do |config|
-  config.similarity_threshold = 0.25 # default value
-  config.similarity_limit = 10 # default value
-end
-```
-
-`similarity_threshold`(real): Sets the current similarity threshold that is used by the % operator. The threshold must be between 0 and 1 (default is 0.3).
-
-`similarity_limit`: number of maximum results.
-
 ## Global Search
 
 This module includes the following models to Decidim's Global Search:
@@ -49,7 +32,7 @@ Participatory texts persist each section of the document in a Proposal.
 
 When importing participatory texts all formats are first transformed into Markdown and is the markdown that is parsed and processed to generate the corresponding Proposals.
 
-When processing participatory text documents three kinds of secions are taken into account.
+When processing participatory text documents three kinds of sections are taken into account.
 
 - Section: each "Title 1" in the document becomes a section.
 - Subsection: the rest of the titles become subsections.

data/app/cells/decidim/proposals/cost_report_cell.rb

@@ -6,9 +6,6 @@ module Decidim
   module Proposals
     # This cell renders the cost report for a proposal.
     class CostReportCell < Decidim::ViewModel
-      include ActionView::Helpers::NumberHelper
-      include Decidim::SanitizeHelper
-      include Decidim::LayoutHelper
       include ProposalCellsHelper
 
       private

data/app/cells/decidim/proposals/highlighted_proposals_for_component_cell.rb

@@ -35,7 +35,7 @@ module Decidim
       end
 
       def base_relation
-        Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn.where(component: model)
+        Decidim::Proposals::Proposal.published.not_hidden.not_withdrawn.where(component: model)
       end
 
       def decidim_proposals

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -1,4 +1,4 @@
-<% if amendmendment_creation_enabled? || visible_emendations.any? %>
+<% if amendment_creation_enabled? || visible_emendations.any? %>
   <%= action_authorized_link_to :amend, amend_resource_path, resource: model, disabled: amend_button_disabled?, class: "proposal-participatory__button" do %>
     <%= icon "chat-1-line" %>
     <span><%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>

data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb

@@ -10,7 +10,6 @@ module Decidim
       include ProposalCellsHelper
       include Cell::ViewModel::Partial
       include Messaging::ConversationHelper
-      include Decidim::SanitizeHelper
 
       def show
         render
@@ -69,12 +68,12 @@ module Decidim
         @visible_emendations ||= model.visible_emendations_for(current_user)
       end
 
-      def amendmendment_creation_enabled?
+      def amendment_creation_enabled?
         (current_component.settings.amendments_enabled? && current_settings.amendment_creation_enabled?)
       end
 
       def amend_button_disabled?
-        !amendmendment_creation_enabled?
+        !amendment_creation_enabled?
       end
     end
   end

data/app/cells/decidim/proposals/proposal_cell.rb

@@ -21,6 +21,8 @@ module Decidim
         case @options[:size]
         when :s
           "decidim/proposals/proposal_s"
+        when :g
+          "decidim/proposals/proposal_g"
         else
           "decidim/proposals/proposal_l"
         end

data/app/cells/decidim/proposals/proposal_g/show.erb

@@ -0,0 +1,23 @@
+<%= link_to resource_path, class: classes[:default], id: resource_id do %>
+  <div class="<%= classes[:img] %>">
+    <% if has_image? %>
+      <%= image_tag resource_image_path, alt: alt_title %>
+    <% else %>
+      <%= external_icon "media/images/proposal-placeholder-card-g.svg", class: "card__proposal-placeholder-g" %>
+    <% end %>
+  </div>
+  <div class="<%= classes[:text] %>">
+    <div class="card__grid-text-title">
+      <%= content_tag title_tag, title, class: title_class %>
+      <%= proposal_state_item[:text] if proposal_state_item.present? %>
+    </div>
+
+    <%= description if show_description? %>
+
+    <% if metadata_cell.present? %>
+      <div class="<%= classes[:metadata] %>">
+        <%= cell metadata_cell, resource, links: false, skip_state: true, **options %>
+      </div>
+    <% end %>
+  </div>
+<% end %>

data/app/cells/decidim/proposals/proposal_g_cell.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the proposal card for an instance of a Proposal
+    # the default size is the Grid Card (:g)
+    class ProposalGCell < Decidim::CardGCell
+      include Decidim::Proposals::ApplicationHelper
+      include Decidim::LayoutHelper
+
+      delegate :state_class, to: :metadata_cell_instance
+
+      def show
+        render
+      end
+
+      def title
+        present(model).title(html_escape: true)
+      end
+
+      def metadata_cell
+        "decidim/proposals/proposal_metadata"
+      end
+
+      def metadata_cell_instance
+        @metadata_cell_instance ||= cell("decidim/proposals/proposal_metadata", model)
+      end
+
+      def resource_image_path
+        model.attachments.first&.url
+      end
+
+      def proposal_state_item
+        return if model.state.blank?
+
+        @proposal_state_item ||= { text: content_tag(:span, humanize_proposal_state(model.state), class: "label #{state_class}") }
+      end
+
+      private
+
+      def classes
+        super.merge(metadata: "card__list-metadata")
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/proposal_l_cell.rb

@@ -7,8 +7,6 @@ module Decidim
     # This cell renders the List (:l) proposal card
     # for an instance of a Proposal
     class ProposalLCell < Decidim::CardLCell
-      delegate :component_settings, to: :controller
-
       alias proposal model
 
       def title
@@ -29,7 +27,7 @@ module Decidim
         hash << model.endorsements_count
         hash << model.comments_count
         hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-        hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
         hash << render_space? ? 1 : 0
         if current_user
           hash << current_user.cache_key_with_version

data/app/cells/decidim/proposals/proposal_metadata_cell.rb

@@ -15,9 +15,30 @@ module Decidim
       end
 
       def state_item
-        return if state.blank?
+        return if state.blank? || @options.fetch(:skip_state, false)
 
-        { text: content_tag(:span, humanize_proposal_state(state), class: "label #{state_class}") }
+        if model.withdrawn?
+          { text: content_tag(:span, humanize_proposal_state(:withdrawn), class: "label alert") }
+        elsif model.emendation?
+          { text: content_tag(:span, humanize_proposal_state(state), class: "label #{state_class}") }
+        else
+          { text: content_tag(:span, translated_attribute(model.proposal_state&.title), class: "label", style: model.proposal_state.css_style) }
+        end
+      end
+
+      def state_class
+        return "alert" if model.withdrawn?
+
+        case state
+        when "accepted"
+          "success"
+        when "rejected"
+          "alert"
+        when "evaluating"
+          "warning"
+        else
+          "muted"
+        end
       end
 
       private
@@ -43,19 +64,6 @@ module Decidim
           icon: "account-circle-line"
         }
       end
-
-      def state_class
-        case state
-        when "accepted"
-          "success"
-        when "rejected", "withdrawn"
-          "alert"
-        when "evaluating"
-          "warning"
-        else
-          "muted"
-        end
-      end
     end
   end
 end

data/app/commands/decidim/proposals/admin/answer_proposal.rb

@@ -44,7 +44,6 @@ module Decidim
             form.current_user
           ) do
             attributes = {
-              state: form.state,
               answer: form.answer,
               cost: form.cost,
               cost_report: form.cost_report,
@@ -54,7 +53,9 @@ module Decidim
             if form.state == "not_answered"
               attributes[:answered_at] = nil
               attributes[:state_published_at] = nil
+              proposal.proposal_state = nil
             else
+              proposal.assign_state(form.state)
               attributes[:answered_at] = Time.current
               attributes[:state_published_at] = Time.current if !initial_has_state_published && form.publish_answer?
             end

data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb

@@ -35,24 +35,26 @@ module Decidim
         def assign_proposals
           transaction do
             form.proposals.flat_map do |proposal|
-              find_assignment(proposal) || assign_proposal(proposal)
+              form.valuator_roles.each do |valuator_role|
+                find_assignment(proposal, valuator_role) || assign_proposal(proposal, valuator_role)
+              end
             end
           end
         end
 
-        def find_assignment(proposal)
+        def find_assignment(proposal, valuator_role)
           Decidim::Proposals::ValuationAssignment.find_by(
             proposal:,
-            valuator_role: form.valuator_role
+            valuator_role:
           )
         end
 
-        def assign_proposal(proposal)
+        def assign_proposal(proposal, valuator_role)
           Decidim.traceability.create!(
             Decidim::Proposals::ValuationAssignment,
             form.current_user,
             proposal:,
-            valuator_role: form.valuator_role
+            valuator_role:
           )
         end
       end

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -39,7 +39,7 @@ module Decidim
             create_proposal
             create_gallery if process_gallery?
             create_attachment(weight: first_attachment_weight) if process_attachments?
-            link_author_meeeting if form.created_in_meeting?
+            link_author_meeting if form.created_in_meeting?
           end
 
           send_notification
@@ -77,7 +77,7 @@ module Decidim
           }
         end
 
-        def link_author_meeeting
+        def link_author_meeting
           proposal.link_resources(form.author, "proposals_from_meeting")
         end
 

data/app/commands/decidim/proposals/admin/create_proposal_state.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class CreateProposalState < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :text_color, :bg_color, :announcement_title, :component
+
+        def resource_class
+          Decidim::Proposals::ProposalState
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/destroy_proposal_state.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class DestroyProposalState < Decidim::Commands::DestroyResource
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/import_proposals.rb

@@ -47,8 +47,14 @@ module Decidim
         def proposals
           @proposals = Decidim::Proposals::Proposal
                        .where(component: origin_component)
-                       .where(state: @form.states)
           @proposals = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
+
+          @proposals = if @form.states.include?("not_answered")
+                         @proposals.not_answered.or(@proposals.where(id: @proposals.only_status(@form.states).pluck(:id)))
+                       else
+                         @proposals.only_status(@form.states)
+                       end
+
           @proposals
         end
 
@@ -80,10 +86,12 @@ module Decidim
         def proposal_answer_attributes(original_proposal)
           return {} unless form.keep_answers
 
+          state = Decidim::Proposals::ProposalState.where(component: target_component, token: original_proposal.state).first
+
           {
             answer: original_proposal.answer,
             answered_at: original_proposal.answered_at,
-            state: original_proposal.state,
+            proposal_state: state,
             state_published_at: original_proposal.state_published_at
           }
         end

data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb

@@ -11,7 +11,7 @@ module Decidim
         # initial_state - The proposal state before the current process.
         def initialize(proposal, initial_state)
           @proposal = proposal
-          @initial_state = initial_state.to_s
+          @initial_state = initial_state
         end
 
         # Executes the command. Broadcasts these events:
@@ -42,28 +42,11 @@ module Decidim
         end
 
         def notify_followers
-          if proposal.accepted?
-            publish_event(
-              "decidim.events.proposals.proposal_accepted",
-              Decidim::Proposals::AcceptedProposalEvent
-            )
-          elsif proposal.rejected?
-            publish_event(
-              "decidim.events.proposals.proposal_rejected",
-              Decidim::Proposals::RejectedProposalEvent
-            )
-          elsif proposal.evaluating?
-            publish_event(
-              "decidim.events.proposals.proposal_evaluating",
-              Decidim::Proposals::EvaluatingProposalEvent
-            )
-          end
-        end
+          return if proposal.state == "not_answered"
 
-        def publish_event(event, event_class)
           Decidim::EventsManager.publish(
-            event:,
-            event_class:,
+            event: "decidim.events.proposals.proposal_state_changed",
+            event_class: Decidim::Proposals::ProposalStateChangedEvent,
             resource: proposal,
             affected_users: proposal.notifiable_identities,
             followers: proposal.followers - proposal.notifiable_identities

data/app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb

@@ -33,16 +33,18 @@ module Decidim
         def unassign_proposals
           transaction do
             form.proposals.flat_map do |proposal|
-              assignment = find_assignment(proposal)
-              unassign(assignment) if assignment
+              form.valuator_roles.each do |valuator_role|
+                assignment = find_assignment(proposal, valuator_role)
+                unassign(assignment) if assignment
+              end
             end
           end
         end
 
-        def find_assignment(proposal)
+        def find_assignment(proposal, valuator_role)
           Decidim::Proposals::ValuationAssignment.find_by(
             proposal:,
-            valuator_role: form.valuator_role
+            valuator_role:
           )
         end
 

data/app/commands/decidim/proposals/admin/update_proposal_state.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class UpdateProposalState < Decidim::Commands::UpdateResource
+        include TranslatableAttributes
+
+        fetch_form_attributes :title, :text_color, :bg_color, :announcement_title, :component
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/create_proposal.rb

@@ -4,6 +4,7 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Decidim::Command
+      include ::Decidim::MultipleAttachmentsMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -31,8 +32,14 @@ module Decidim
           return broadcast(:invalid)
         end
 
+        if process_attachments?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+
         with_events(with_transaction: true) do
           create_proposal
+          create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end
 
         broadcast(:ok, proposal)
@@ -74,8 +81,14 @@ module Decidim
               },
               component: form.component
             )
+
+            proposal.category = form.category if form.category_id.present?
+            proposal.scope = form.scope if form.scope_id.present?
+            proposal.documents = form.documents if form.documents.present?
+            proposal.address = form.address if form.has_address? && !form.geocoded?
             proposal.add_coauthor(@current_user, user_group:)
             proposal.save!
+            @attached_to = proposal
             proposal
           end
         end
@@ -104,11 +117,17 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.from_author(@current_user).where(component: form.current_component).except_withdrawn
+        Proposal.not_withdrawn.from_author(@current_user).where(component: form.current_component)
       end
 
       def user_group_proposals
-        Proposal.from_user_group(@user_group).where(component: form.current_component).except_withdrawn
+        Proposal.not_withdrawn.from_user_group(@user_group).where(component: form.current_component)
+      end
+
+      def first_attachment_weight
+        return 1 if proposal.photos.count.zero?
+
+        proposal.photos.count
       end
     end
   end

data/app/commands/decidim/proposals/update_proposal.rb

@@ -133,11 +133,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.from_author(current_user).where(component: form.current_component).published.where.not(id: proposal.id).except_withdrawn
+        Proposal.from_author(current_user).where(component: form.current_component).published.where.not(id: proposal.id).not_withdrawn
       end
 
       def user_group_proposals
-        Proposal.from_user_group(user_group).where(component: form.current_component).published.where.not(id: proposal.id).except_withdrawn
+        Proposal.from_user_group(user_group).where(component: form.current_component).published.where.not(id: proposal.id).not_withdrawn
       end
     end
   end

data/app/commands/decidim/proposals/vote_proposal.rb

@@ -20,7 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if @proposal.maximum_votes_reached? && !@proposal.can_accumulate_supports_beyond_threshold
+        return broadcast(:invalid) if @proposal.maximum_votes_reached? && !@proposal.can_accumulate_votes_beyond_threshold
 
         build_proposal_vote
         return broadcast(:invalid) unless vote.valid?

data/app/commands/decidim/proposals/withdraw_proposal.rb

@@ -16,14 +16,14 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :has_supports if the proposal already has supports or does not belong to current user.
+      # - :has_votes if the proposal already has votes or does not belong to current user.
       #
       # Returns nothing.
       def call
-        return broadcast(:has_supports) if @proposal.votes.any?
+        return broadcast(:has_votes) if @proposal.votes.any?
 
         transaction do
-          change_proposal_state_to_withdrawn
+          @proposal.withdraw!
           reject_emendations_if_any
         end
 
@@ -32,10 +32,6 @@ module Decidim
 
       private
 
-      def change_proposal_state_to_withdrawn
-        @proposal.update state: "withdrawn"
-      end
-
       def reject_emendations_if_any
         return if @proposal.emendations.empty?
 

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -13,6 +13,8 @@ module Decidim
 
           private
 
+          delegate :filters, :dynamically_translated_filters, :filters_with_values, to: :filter_config
+
           # Comment about participatory_texts_enabled.
           def base_query
             return collection.order(:position) if current_component.settings.participatory_texts_enabled?
@@ -30,32 +32,18 @@ module Decidim
             :id_string_or_title_cont
           end
 
-          def filters
-            [
-              :is_emendation_true,
-              :with_any_state,
-              :state_eq,
-              :scope_id_eq,
-              :category_id_eq,
-              :valuator_role_ids_has
-            ]
+          def filter_config
+            @filter_config ||= Decidim::AdminFilter.new(:proposals).build_for(self)
           end
 
-          def filters_with_values
-            {
-              is_emendation_true: %w(true false),
-              state_eq: Proposal::STATES,
-              with_any_state: %w(state_published state_not_published),
-              scope_id_eq: scope_ids_hash(scopes.top_level),
-              category_id_eq: category_ids_hash(categories.first_class),
-              valuator_role_ids_has: valuator_role_ids
-            }
+          def translated_state_eq(state)
+            return t("decidim.admin.filters.proposals.state_eq.values.withdrawn") if state == "withdrawn"
+
+            translated_attribute(ProposalState.where(component: current_component, token: state).first&.title)
           end
 
-          # Cannot user `super` here, because it does not belong to a superclass
-          # but to a concern.
-          def dynamically_translated_filters
-            [:scope_id_eq, :category_id_eq, :valuator_role_ids_has]
+          def state_eq_values
+            ProposalState.where(component: current_component).pluck(:token) + ["withdrawn"]
           end
 
           def valuator_role_ids