decidim-proposals 0.27.8 → 0.28.0.rc4

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cell renders metadata for an instance of a Proposal
+    class ProposalMetadataCell < Decidim::CardMetadataCell
+      include Decidim::Proposals::ApplicationHelper
+
+      delegate :state, to: :model
+
+      def initialize(*)
+        super
+
+        @items.prepend(*proposal_items)
+      end
+
+      def state_item
+        return if state.blank?
+
+        { text: content_tag(:span, humanize_proposal_state(state), class: "label #{state_class}") }
+      end
+
+      private
+
+      def proposal_items
+        [coauthors_item, comments_count_item, endorsements_count_item, state_item, emendation_item]
+      end
+
+      def proposal_items_for_map
+        [coauthors_item_for_map, comments_count_item, endorsements_count_item, state_item, emendation_item].compact_blank.map do |item|
+          {
+            text: item[:text].to_s.html_safe,
+            icon: item[:icon].present? ? icon(item[:icon]).html_safe : nil
+          }
+        end
+      end
+
+      def coauthors_item_for_map
+        presented_author = official? ? Decidim::Proposals::OfficialAuthorPresenter.new : present(resource.identities.first)
+
+        {
+          text: presented_author.name,
+          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/cells/decidim/proposals/proposal_s_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the Search (:s) proposal card
+    # for an instance of a Proposal
+    class ProposalSCell < Decidim::CardSCell
+      private
+
+      def title
+        present(model).title(html_escape: true)
+      end
+
+      def metadata_cell
+        "decidim/proposals/proposal_metadata"
+      end
+    end
+  end
+end

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

@@ -1,14 +1,14 @@
-<div class="picker-header">
-  <h1><%= t("proposals_picker.choose_proposals", scope: "decidim.proposals") %></h1>
-  <input type="text" name="proposals-filter" id="proposals_filter" placeholder="<%= t("decidim.admin.filters.search_placeholder.id_string_or_title_cont", collection: proposals_collection_name) %>">
-</div>
-<div class="picker-content picker-list" data-picker-path="<%= picker_path %>" data-picker-more="<%= more_proposals? %>">
-  <%= render :proposals %>
-</div>
-<div class="picker-footer">
-  <div class="buttons button--double">
-    <a class="button" data-close=""><%= t("proposals_picker.close", scope: "decidim.proposals") %></a>
-  </div>
-</div>
+<label for="proposals_list">
+  <%= t("name", scope: "decidim.components.proposals") %>
 
-<%= javascript_pack_tag "decidim_proposals_admin" %>
+  <select id="proposals_list"
+          placeholder="<%= t("proposals_picker.choose_proposals", scope: "decidim.proposals") %>"
+          data-tm-name="<%= form_name %>"
+          data-tm-items="<%= selected_ids.to_json %>"
+          data-tm-no-results="<%= t("proposals_picker.no_proposals", scope: "decidim.proposals") %>"
+          class="mt-4" multiple>
+    <% decorated_proposals do |proposal| %>
+      <option value="<%= proposal.id %>"><%= proposal.id_and_title(html_escape: true) %> (<%= proposal.reference %>)</option>
+    <% end %>
+  </select>
+</label>

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

@@ -9,54 +9,29 @@ module Decidim
       MAX_PROPOSALS = 1000
 
       def show
-        if filtered?
-          render :proposals
-        else
-          render
-        end
+        render
       end
 
       alias component model
 
-      def filtered?
-        !search_text.nil?
-      end
-
-      def picker_path
-        request.path
+      def form
+        options[:form]
       end
 
-      def search_text
-        params[:q]
+      def field
+        options[:field]
       end
 
-      def more_proposals?
-        @more_proposals ||= more_proposals_count.positive?
+      def form_name
+        "#{form.object_name}[#{method_name}]"
       end
 
-      def more_proposals_count
-        @more_proposals_count ||= proposals_count - MAX_PROPOSALS
+      def method_name
+        field.to_s.sub(/s$/, "_ids")
       end
 
-      def proposals_count
-        @proposals_count ||= filtered_proposals.count
-      end
-
-      def decorated_proposals
-        filtered_proposals.limit(MAX_PROPOSALS).each do |proposal|
-          yield Decidim::Proposals::ProposalPresenter.new(proposal)
-        end
-      end
-
-      def filtered_proposals
-        @filtered_proposals ||= if filtered?
-                                  table_name = Decidim::Proposals::Proposal.table_name
-                                  proposals.where(%("#{table_name}"."title"::text ILIKE ?), "%#{search_text}%")
-                                           .or(proposals.where(%("#{table_name}"."reference" ILIKE ?), "%#{search_text}%"))
-                                           .or(proposals.where(%("#{table_name}"."id"::text ILIKE ?), "%#{search_text}%"))
-                                else
-                                  proposals
-                                end
+      def selected_ids
+        form.object.send(method_name)
       end
 
       def proposals
@@ -67,8 +42,10 @@ module Decidim
                          &.order(id: :asc)
       end
 
-      def proposals_collection_name
-        Decidim::Proposals::Proposal.model_name.human(count: 2)
+      def decorated_proposals
+        proposals.limit(MAX_PROPOSALS).each do |proposal|
+          yield Decidim::Proposals::ProposalPresenter.new(proposal)
+        end
       end
     end
   end

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

@@ -21,7 +21,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if it wasn't valid and we couldn't proceed.
+      # - :invalid if it was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -42,7 +42,7 @@ module Decidim
 
         def find_assignment(proposal)
           Decidim::Proposals::ValuationAssignment.find_by(
-            proposal: proposal,
+            proposal:,
             valuator_role: form.valuator_role
           )
         end
@@ -51,7 +51,7 @@ module Decidim
           Decidim.traceability.create!(
             Decidim::Proposals::ValuationAssignment,
             form.current_user,
-            proposal: proposal,
+            proposal:,
             valuator_role: form.valuator_role
           )
         end

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

@@ -19,7 +19,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid, together with the proposal.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -53,7 +53,7 @@ module Decidim
 
         def create_proposal
           @proposal = Decidim::Proposals::ProposalBuilder.create(
-            attributes: attributes,
+            attributes:,
             author: form.author,
             action_user: form.current_user
           )

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

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid, together with the note proposal.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -39,7 +39,7 @@ module Decidim
             form.current_user,
             {
               body: form.body,
-              proposal: proposal,
+              proposal:,
               author: form.current_user
             },
             resource: {
@@ -50,13 +50,13 @@ module Decidim
 
         def notify_admins_and_valuators
           affected_users = Decidim::User.org_admins_except_me(form.current_user).all
-          affected_users += Decidim::Proposals::ValuationAssignment.includes(valuator_role: :user).where.not(id: form.current_user.id).where(proposal: proposal).map(&:valuator)
+          affected_users += Decidim::Proposals::ValuationAssignment.includes(valuator_role: :user).where.not(id: form.current_user.id).where(proposal:).map(&:valuator)
 
           data = {
             event: "decidim.events.proposals.admin.proposal_note_created",
             event_class: Decidim::Proposals::Admin::ProposalNoteCreatedEvent,
             resource: proposal,
-            affected_users: affected_users
+            affected_users:
           }
 
           Decidim::EventsManager.publish(**data)

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

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -47,22 +47,11 @@ module Decidim
         def proposals
           @proposals = Decidim::Proposals::Proposal
                        .where(component: origin_component)
-                       .where(state: proposal_states)
+                       .where(state: @form.states)
           @proposals = @proposals.where(scope: proposal_scopes) unless proposal_scopes.empty?
           @proposals
         end
 
-        def proposal_states
-          @proposal_states = @form.states
-
-          if @form.states.include?("not_answered")
-            @proposal_states.delete("not_answered")
-            @proposal_states.push(nil)
-          end
-
-          @proposal_states
-        end
-
         def proposal_scopes
           @form.scopes
         end

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -16,7 +16,7 @@ module Decidim
 
         # Executes the command. Broadcasts these events:
         #
-        # - :noop when the answer is not published or the state didn't changed.
+        # - :noop when the answer is not published or the state did not changed.
         # - :ok when everything is valid.
         #
         # Returns nothing.
@@ -62,8 +62,8 @@ module Decidim
 
         def publish_event(event, event_class)
           Decidim::EventsManager.publish(
-            event: event,
-            event_class: event_class,
+            event:,
+            event_class:,
             resource: proposal,
             affected_users: proposal.notifiable_identities,
             followers: proposal.followers - proposal.notifiable_identities

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

@@ -44,7 +44,7 @@ module Decidim
                          .published
                          .answered
                          .state_not_published
-                         .where(component: component)
+                         .where(component:)
                          .where(id: proposal_ids)
         end
 

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -55,7 +55,7 @@ module Decidim
           title, body = reset_proposal_title_and_body(proposal)
 
           Decidim.traceability.perform_action!(:create, proposal, form.current_user, visibility: "all") do
-            proposal.update(title: title, body: body, published_at: Time.current)
+            proposal.update(title:, body:, published_at: Time.current)
           end
         end
 

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -41,7 +41,7 @@ module Decidim
 
         def find_assignment(proposal)
           Decidim::Proposals::ValuationAssignment.find_by(
-            proposal: proposal,
+            proposal:,
             valuator_role: form.valuator_role
           )
         end

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

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -22,7 +22,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid, together with the proposal.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -57,6 +57,10 @@ module Decidim
 
         attr_reader :form, :proposal, :attachment, :gallery
 
+        def delete_attachment(attachment)
+          Attachment.find(attachment.id).delete if attachment.id.to_i == proposal.documents.first.id
+        end
+
         def update_proposal
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
           parsed_body = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite

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

@@ -57,7 +57,7 @@ module Decidim
 
         def update_proposal_scope(proposal)
           proposal.update!(
-            scope: scope
+            scope:
           )
         end
 

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

@@ -20,7 +20,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the collaborative draft.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -31,7 +31,7 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        transaction do
+        with_events(with_transaction: true) do
           create_collaborative_draft
           create_attachments if process_attachments?
         end
@@ -43,6 +43,16 @@ module Decidim
 
       attr_reader :form, :collaborative_draft, :attachment
 
+      def event_arguments
+        {
+          resource: collaborative_draft,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def create_collaborative_draft
         @collaborative_draft = Decidim.traceability.perform_action!(
           :create,
@@ -70,7 +80,7 @@ module Decidim
       end
 
       def user_group
-        @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
+        @user_group ||= Decidim::UserGroup.find_by(organization:, id: form.user_group_id)
       end
 
       def organization

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

@@ -4,7 +4,6 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Decidim::Command
-      include ::Decidim::AttachmentMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -21,7 +20,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -32,7 +31,7 @@ module Decidim
           return broadcast(:invalid)
         end
 
-        transaction do
+        with_events(with_transaction: true) do
           create_proposal
         end
 
@@ -43,6 +42,16 @@ module Decidim
 
       attr_reader :form, :proposal, :attachment
 
+      def event_arguments
+        {
+          resource: proposal,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       # Prevent PaperTrail from creating an additional version
       # in the proposal multi-step creation process (step 1: create)
       #
@@ -65,7 +74,7 @@ module Decidim
               },
               component: form.component
             )
-            proposal.add_coauthor(@current_user, user_group: user_group)
+            proposal.add_coauthor(@current_user, user_group:)
             proposal.save!
             proposal
           end
@@ -87,7 +96,7 @@ module Decidim
       end
 
       def user_group
-        @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
+        @user_group ||= Decidim::UserGroup.find_by(organization:, id: form.user_group_id)
       end
 
       def organization

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

@@ -14,7 +14,7 @@ module Decidim
       def body_with_hashtags
         @body_with_hashtags ||= begin
           ret = Decidim::ContentProcessor.parse(form.body, current_organization: form.current_organization).rewrite.strip
-          ret += "\n#{body_extra_hashtags.strip}" unless body_extra_hashtags.empty?
+          ret += "\n\n#{body_extra_hashtags.strip}" unless body_extra_hashtags.empty?
           ret
         end
       end

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

@@ -49,7 +49,7 @@ module Decidim
           @current_user,
           visibility: "public-only"
         ) do
-          @proposal.update title: title, body: body, published_at: Time.current
+          @proposal.update title:, body:, published_at: Time.current
         end
       end
 

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

@@ -21,7 +21,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if it wasn't valid and we couldn't proceed.
+      # - :invalid if it was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -19,7 +19,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if it wasn't valid and we couldn't proceed.
+      # - :invalid if it was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

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

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
@@ -57,7 +57,7 @@ module Decidim
       def user_votes
         @user_votes ||= ProposalVote.where(
           author: @current_user,
-          proposal: Proposal.where(component: component)
+          proposal: Proposal.where(component:)
         )
       end
     end