decidim-proposals 0.27.10 → 0.28.0.rc4

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

@@ -20,14 +20,14 @@ 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
         return broadcast(:invalid) if form.invalid?
         return broadcast(:invalid) unless collaborative_draft.editable_by?(current_user)
 
-        transaction do
+        with_events(with_transaction: true) do
           update_collaborative_draft
         end
 
@@ -38,6 +38,16 @@ module Decidim
 
       attr_reader :form, :collaborative_draft, :current_user
 
+      def event_arguments
+        {
+          resource: collaborative_draft,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def update_collaborative_draft
         Decidim.traceability.update!(
           @collaborative_draft,

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

@@ -5,7 +5,6 @@ module Decidim
     # A command with all the business logic when a user updates a proposal.
     class UpdateProposal < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
-      include GalleryMethods
       include HashtagsMethods
 
       # Public: Initializes the command.
@@ -23,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
@@ -34,22 +33,15 @@ module Decidim
           return broadcast(:invalid) if attachments_invalid?
         end
 
-        if process_gallery?
-          build_gallery
-          return broadcast(:invalid) if gallery_invalid?
-        end
-
-        transaction do
+        with_events(with_transaction: true) do
           if @proposal.draft?
             update_draft
           else
             update_proposal
           end
 
-          photo_cleanup!
-          document_cleanup!
+          document_cleanup!(include_all_attachments: true)
 
-          create_gallery if process_gallery?
           create_attachments(first_weight: first_attachment_weight) if process_attachments?
         end
 
@@ -60,6 +52,16 @@ module Decidim
 
       attr_reader :form, :proposal, :current_user, :attachment
 
+      def event_arguments
+        {
+          resource: proposal,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def invalid?
         form.invalid? || !proposal.editable_by?(current_user) || proposal_limit_reached?
       end
@@ -73,7 +75,7 @@ module Decidim
         PaperTrail.request(enabled: false) do
           @proposal.update(attributes)
           @proposal.coauthorships.clear
-          @proposal.add_coauthor(current_user, user_group: user_group)
+          @proposal.add_coauthor(current_user, user_group:)
         end
       end
 
@@ -85,7 +87,7 @@ module Decidim
           visibility: "public-only"
         )
         @proposal.coauthorships.clear
-        @proposal.add_coauthor(current_user, user_group: user_group)
+        @proposal.add_coauthor(current_user, user_group:)
       end
 
       def attributes
@@ -123,7 +125,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/vote_proposal.rb

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid, together with the proposal vote.
-      # - :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
@@ -62,7 +62,7 @@ module Decidim
       def user_votes
         @user_votes ||= ProposalVote.where(
           author: @current_user,
-          proposal: Proposal.where(component: component)
+          proposal: Proposal.where(component:)
         )
       end
 

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

@@ -11,8 +11,6 @@ module Decidim
         included do
           include Decidim::Admin::Filterable
 
-          helper Decidim::Proposals::Admin::FilterableHelper
-
           private
 
           # Comment about participatory_texts_enabled.
@@ -35,8 +33,8 @@ module Decidim
           def filters
             [
               :is_emendation_true,
+              :with_any_state,
               :state_eq,
-              :state_null,
               :scope_id_eq,
               :category_id_eq,
               :valuator_role_ids_has
@@ -46,14 +44,15 @@ module Decidim
           def filters_with_values
             {
               is_emendation_true: %w(true false),
-              state_eq: proposal_states,
+              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
             }
           end
 
-          # Can't user `super` here, because it does not belong to a superclass
+          # 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]
@@ -67,14 +66,6 @@ module Decidim
             user_role = current_participatory_space.user_roles(:valuator).find_by(id: valuator_role_id)
             user_role&.user&.name
           end
-
-          # An Array<Symbol> of possible values for `state_eq` filter.
-          # Excludes the states that cannot be filtered with the ransack predicate.
-          # A link to filter by "Not answered" will be added in:
-          # Decidim::Proposals::Admin::FilterableHelper#extra_dropdown_submenu_options_items
-          def proposal_states
-            Proposal::POSSIBLE_STATES.without("not_answered")
-          end
         end
       end
     end

data/app/controllers/decidim/proposals/admin/proposal_answers_controller.rb

@@ -13,12 +13,12 @@ module Decidim
         helper Decidim::Messaging::ConversationHelper
 
         def edit
-          enforce_permission_to :create, :proposal_answer, proposal: proposal
+          enforce_permission_to(:create, :proposal_answer, proposal:)
           @form = form(Admin::ProposalAnswerForm).from_model(proposal)
         end
 
         def update
-          enforce_permission_to :create, :proposal_answer, proposal: proposal
+          enforce_permission_to(:create, :proposal_answer, proposal:)
           @notes_form = form(ProposalNoteForm).instance
           @answer_form = form(Admin::ProposalAnswerForm).from_params(params)
 

data/app/controllers/decidim/proposals/admin/proposal_notes_controller.rb

@@ -8,7 +8,7 @@ module Decidim
         helper_method :proposal
 
         def create
-          enforce_permission_to :create, :proposal_note, proposal: proposal
+          enforce_permission_to(:create, :proposal_note, proposal:)
           @form = form(ProposalNoteForm).from_params(params)
 
           CreateProposalNote.call(@form, proposal) do

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -122,12 +122,12 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :edit, :proposal, proposal: proposal
+          enforce_permission_to(:edit, :proposal, proposal:)
           @form = form(Admin::ProposalForm).from_model(proposal)
         end
 
         def update
-          enforce_permission_to :edit, :proposal, proposal: proposal
+          enforce_permission_to(:edit, :proposal, proposal:)
 
           @form = form(Admin::ProposalForm).from_params(params)
 

data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb

@@ -4,12 +4,12 @@ module Decidim
   module Proposals
     # Exposes Collaborative Drafts resource so users can view and create them.
     class CollaborativeDraftsController < Decidim::Proposals::ApplicationController
-      helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
       helper TooltipHelper
       helper UserGroupHelper
 
       include Decidim::ApplicationHelper
+      include Decidim::IconHelper
       include FormFactory
       include Flaggable
       include FilterResource
@@ -144,18 +144,12 @@ module Decidim
       def default_filter_params
         {
           search_text_cont: "",
-          with_any_category: default_filter_category_params,
+          with_any_category: nil,
           with_any_state: %w(open),
-          with_any_scope: default_filter_scope_params,
+          with_any_scope: nil,
           related_to: ""
         }
       end
-
-      def default_filter_category_params
-        return unless current_component.participatory_space.categories.any?
-
-        ["without"] + current_component.participatory_space.categories.map { |category| category.id.to_s }
-      end
     end
   end
 end

data/app/controllers/decidim/proposals/proposal_votes_controller.rb

@@ -12,7 +12,7 @@ module Decidim
       before_action :authenticate_user!
 
       def create
-        enforce_permission_to :vote, :proposal, proposal: proposal
+        enforce_permission_to(:vote, :proposal, proposal:)
         @from_proposals_list = params[:from_proposals_list] == "true"
 
         VoteProposal.call(proposal, current_user) do
@@ -24,7 +24,7 @@ module Decidim
               proposal: Proposal.where(component: current_component)
             ).map(&:proposal)
 
-            expose(proposals: proposals)
+            expose(proposals:)
             render :update_buttons_and_counters
           end
 
@@ -35,7 +35,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :unvote, :proposal, proposal: proposal
+        enforce_permission_to(:unvote, :proposal, proposal:)
         @from_proposals_list = params[:from_proposals_list] == "true"
 
         UnvoteProposal.call(proposal, current_user) do

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -4,7 +4,6 @@ module Decidim
   module Proposals
     # Exposes the proposal resource so users can view and create them.
     class ProposalsController < Decidim::Proposals::ApplicationController
-      helper Decidim::WidgetUrlsHelper
       helper ProposalWizardHelper
       helper ParticipatoryTextsHelper
       helper UserGroupHelper
@@ -15,8 +14,9 @@ module Decidim
       include FilterResource
       include Decidim::Proposals::Orderable
       include Paginable
+      include Decidim::AttachmentsHelper
 
-      helper_method :proposal_presenter, :form_presenter
+      helper_method :proposal_presenter, :form_presenter, :tab_panel_items
 
       before_action :authenticate_user!, only: [:new, :create, :complete]
       before_action :ensure_is_draft, only: [:compare, :complete, :preview, :publish, :edit_draft, :update_draft, :destroy_draft]
@@ -225,23 +225,16 @@ module Decidim
       def default_filter_params
         {
           search_text_cont: "",
-          with_any_origin: default_filter_origin_params,
+          with_any_origin: nil,
           activity: "all",
-          with_any_category: default_filter_category_params,
+          with_any_category: nil,
           with_any_state: %w(accepted evaluating state_not_published),
-          with_any_scope: default_filter_scope_params,
+          with_any_scope: nil,
           related_to: "",
           type: "all"
         }
       end
 
-      def default_filter_origin_params
-        filter_origin_params = %w(participants meeting)
-        filter_origin_params << "official" if component_settings.official_proposals_enabled
-        filter_origin_params << "user_group" if current_organization.user_groups_enabled?
-        filter_origin_params
-      end
-
       def proposal_draft
         Proposal.from_all_author_identities(current_user).not_hidden.only_amendables
                 .where(component: current_component).find_by(published_at: nil)
@@ -303,6 +296,43 @@ module Decidim
       def proposal_creation_params
         params[:proposal].merge(body_template: translated_proposal_body_template)
       end
+
+      def tab_panel_items
+        @tab_panel_items ||= [
+          {
+            enabled: @proposal.linked_resources(:projects, "included_proposals").present?,
+            id: "included_projects",
+            text: t("decidim/budgets/project", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Budgets::Project"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @proposal, { type: :projects, link_name: "included_proposals" }]
+          },
+          {
+            enabled: @proposal.linked_resources(:results, "included_proposals").present?,
+            id: "included_results",
+            text: t("decidim/accountability/result", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Accountability::Result"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @proposal, { type: :results, link_name: "included_proposals" }]
+          },
+          {
+            enabled: @proposal.linked_resources(:meetings, "proposals_from_meeting").present?,
+            id: "included_meetings",
+            text: t("decidim/meetings/meeting", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Meetings::Meeting"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @proposal, { type: :meetings, link_name: "proposals_from_meeting" }]
+          },
+          {
+            enabled: @proposal.linked_resources(:proposals, "copied_from_component").present?,
+            id: "included_proposals",
+            text: t("decidim/proposals/proposal", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Proposals::Proposal"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @proposal, { type: :proposals, link_name: "copied_from_component" }]
+          }
+        ] + attachments_tab_panel_items(@proposal)
+      end
     end
   end
 end

data/app/events/decidim/proposals/accepted_proposal_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/admin/proposal_note_created_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/admin/update_proposal_category_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/admin/update_proposal_scope_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_accepted_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_rejected_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_request_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_requested_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_requester_accepted_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_access_requester_rejected_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/collaborative_draft_withdrawn_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/evaluating_proposal_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/proposal_endorsed_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/proposal_mentioned_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/publish_proposal_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/events/decidim/proposals/rejected_proposal_event.rb

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Proposals

data/app/forms/decidim/proposals/admin/import_participatory_text_form.rb

@@ -21,7 +21,7 @@ module Decidim
         validates :document, presence: true, if: :new_participatory_text?
         validate :document_type_must_be_valid, if: :document
 
-        # Assume it's a NEW participatory_text if there are no proposals
+        # Assume it is a NEW participatory_text if there are no proposals
         # Validate document presence while CREATING proposals from document
         # Allow skipping document validation while UPDATING title/description
         def new_participatory_text?

data/app/forms/decidim/proposals/admin/proposal_base_form.rb

@@ -101,7 +101,7 @@ module Decidim
         end
 
         def suggested_hashtags
-          downcased_suggested_hashtags = super.map(&:downcase).to_set
+          downcased_suggested_hashtags = super.to_set(&:downcase)
           component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
         end
 
@@ -119,7 +119,7 @@ module Decidim
 
         private
 
-        # This method will add an error to the `attachment` field only if there's
+        # This method will add an error to the `attachment` field only if there is
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -21,7 +21,7 @@ module Decidim
           presenter = ProposalPresenter.new(model)
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
-          self.body = presenter.body(all_locales: body.is_a?(Hash))
+          self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
           self.attachment = if model.documents.first.present?
                               { file: model.documents.first.file, title: translated_attribute(model.documents.first.title) }
                             else

data/app/forms/decidim/proposals/admin/proposals_fork_form.rb

@@ -53,7 +53,7 @@ module Decidim
 
         # Private: Returns the id of the target component.
         #
-        # We receive this as ["id"] since it's from a select in a form.
+        # We receive this as ["id"] since it is from a select in a form.
         def clean_target_component_id
           target_component_id.first
         end

data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb

@@ -17,7 +17,7 @@ module Decidim
         end
 
         def valuator_role
-          @valuator_role ||= current_component.participatory_space.user_roles(:valuator).find_by(id: id)
+          @valuator_role ||= current_component.participatory_space.user_roles(:valuator).find_by(id:)
         end
 
         def valuator_user

data/app/forms/decidim/proposals/proposal_form.rb

@@ -15,15 +15,12 @@ module Decidim
       attribute :longitude, Float
       attribute :category_id, Integer
       attribute :scope_id, Integer
-      attribute :has_address, Boolean
       attribute :attachment, AttachmentForm
       attribute :suggested_hashtags, Array[String]
 
-      attachments_attribute :photos
       attachments_attribute :documents
 
       validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
-      validates :address, presence: true, if: ->(form) { form.has_address? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
       validates :scope_id, scope_belongs_to_component: true, if: ->(form) { form.scope_id.present? }
@@ -37,17 +34,14 @@ module Decidim
         body = translated_attribute(model.body)
         @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
 
+        presenter = ProposalPresenter.new(model)
+        self.body = presenter.editor_body(all_locales: body.is_a?(Hash))
+
         # The scope attribute is with different key (decidim_scope_id), so it
         # has to be manually mapped.
         self.scope_id = model.scope.id if model.scope
 
-        self.has_address = true if model.address.present?
-
-        # Proposals have the "photos" field reserved for the proposal card image
-        # so we don't want to show all photos there. Instead, only show the
-        # first photo.
-        self.photos = [model.photo].compact.select { |p| p.weight.zero? }
-        self.documents = model.attachments - photos
+        self.documents = model.attachments
       end
 
       # Finds the Category from the category_id.
@@ -75,15 +69,7 @@ module Decidim
         Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
       end
 
-      def address
-        return unless has_address
-
-        super
-      end
-
       def has_address?
-        return unless has_address
-
         geocoding_enabled? && address.present?
       end
 
@@ -96,7 +82,7 @@ module Decidim
       end
 
       def suggested_hashtags
-        downcased_suggested_hashtags = super.map(&:downcase).to_set
+        downcased_suggested_hashtags = super.to_set(&:downcase)
         component_suggested_hashtags.select { |hashtag| downcased_suggested_hashtags.member?(hashtag.downcase) }
       end
 
@@ -114,15 +100,11 @@ module Decidim
 
       private
 
-      # This method will add an error to the `add_photos` and/or "add_documents" fields
-      # only if there's any error in any other field. This is needed because when the
-      # form has an error, the attachment is lost, so we need a way to inform the user of
-      # this problem.
+      # This method will add an error to the "add_documents" field only if there is any error
+      # in any other field. This is needed because when the form has an error, the attachment
+      # is lost, so we need a way to inform the user of this problem.
       def notify_missing_attachment_if_errored
-        if errors.any?
-          errors.add(:add_photos, :needs_to_be_reattached) if add_photos.present?
-          errors.add(:add_documents, :needs_to_be_reattached) if add_documents.present?
-        end
+        errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
       end
 
       def ordered_hashtag_list(string)

data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb

@@ -16,7 +16,7 @@ module Decidim
         # Returns a String.
         def bulk_valuators_select(participatory_space, prompt)
           options_for_select = find_valuators_for_select(participatory_space)
-          select(:valuator_role, :id, options_for_select, prompt: prompt)
+          select(:valuator_role, :id, options_for_select, prompt:)
         end
 
         # Internal: A method to cache to queries to find the valuators for the