decidim-proposals 0.29.2 → 0.30.0.rc2

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

@@ -6,7 +6,9 @@ module Decidim
       # This controller allows admins to manage proposals in a participatory process.
       class ProposalsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
+        include Decidim::Admin::ComponentTaxonomiesHelper
         include Decidim::Proposals::Admin::Filterable
+        include Decidim::Admin::HasTrashableResources
 
         helper Proposals::ApplicationHelper
         helper Decidim::Proposals::Admin::ProposalRankingsHelper
@@ -47,33 +49,45 @@ module Decidim
           end
         end
 
-        def update_category
-          enforce_permission_to :update, :proposal_category
+        def update_taxonomies
+          enforce_permission_to :update, :proposal_taxonomy
 
-          Admin::UpdateProposalCategory.call(params[:category][:id], proposal_ids) do
-            on(:invalid_category) do
-              flash.now[:error] = I18n.t(
-                "proposals.update_category.select_a_category",
+          Admin::UpdateProposalTaxonomies.call(params[:taxonomies], proposal_ids, current_organization) do
+            on(:invalid_taxonomies) do
+              flash[:error] = I18n.t(
+                "proposals.update_taxonomies.select_a_taxonomy",
                 scope: "decidim.proposals.admin"
               )
             end
 
-            on(:invalid_proposal_ids) do
-              flash.now[:alert] = I18n.t(
-                "proposals.update_category.select_a_proposal",
+            on(:invalid_resources) do
+              flash[:alert] = I18n.t(
+                "proposals.update_taxonomies.select_a_proposal",
                 scope: "decidim.proposals.admin"
               )
             end
 
-            on(:update_proposals_category) do
-              flash.now[:notice] = update_proposals_bulk_response_successful(@response, :category)
-              flash.now[:alert] = update_proposals_bulk_response_errored(@response, :category)
+            on(:update_resources_taxonomies) do |response|
+              if response[:successful].any?
+                flash[:notice] = t(
+                  "proposals.update_taxonomies.success",
+                  taxonomies: response[:taxonomies].map { |taxonomy| decidim_escape_translated(taxonomy.name) }.to_sentence,
+                  proposals: response[:successful].map { |resource| decidim_escape_translated(resource.title) }.to_sentence,
+                  scope: "decidim.proposals.admin"
+                )
+              end
+              if response[:errored].any?
+                flash[:alert] = t(
+                  "proposals.update_taxonomies.invalid",
+                  taxonomies: response[:taxonomies].map { |taxonomy| decidim_escape_translated(taxonomy.name) }.to_sentence,
+                  proposals: response[:errored].map { |resource| decidim_escape_translated(resource.title) }.to_sentence,
+                  scope: "decidim.proposals.admin"
+                )
+              end
             end
           end
 
-          respond_to do |format|
-            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
-          end
+          redirect_to proposals_path
         end
 
         def publish_answers
@@ -97,34 +111,6 @@ module Decidim
           end
         end
 
-        def update_scope
-          enforce_permission_to :update, :proposal_scope
-
-          Admin::UpdateProposalScope.call(params[:scope_id], proposal_ids) do
-            on(:invalid_scope) do
-              flash.now[:error] = t(
-                "proposals.update_scope.select_a_scope",
-                scope: "decidim.proposals.admin"
-              )
-            end
-
-            on(:invalid_proposal_ids) do
-              flash.now[:alert] = t(
-                "proposals.update_scope.select_a_proposal",
-                scope: "decidim.proposals.admin"
-              )
-            end
-
-            on(:update_proposals_scope) do
-              flash.now[:notice] = update_proposals_bulk_response_successful(@response, :scope)
-              flash.now[:alert] = update_proposals_bulk_response_errored(@response, :scope)
-            end
-          end
-          respond_to do |format|
-            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
-          end
-        end
-
         def edit
           enforce_permission_to(:edit, :proposal, proposal:)
           @form = form(Admin::ProposalForm).from_model(proposal)
@@ -150,6 +136,18 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :proposal
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= collection.with_deleted.find_by(id: params[:id])
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection = filtered_collection.only_deleted.deleted_at_desc
+        end
+
         def collection
           @collection ||= Proposal.where(component: current_component).not_hidden.published
         end
@@ -166,48 +164,6 @@ module Decidim
           @proposal_ids ||= params[:proposal_ids]
         end
 
-        def update_proposals_bulk_response_successful(response, subject)
-          return if response[:successful].blank?
-
-          case subject
-          when :category
-            t(
-              "proposals.update_category.success",
-              subject_name: response[:subject_name],
-              proposals: response[:successful].to_sentence,
-              scope: "decidim.proposals.admin"
-            )
-          when :scope
-            t(
-              "proposals.update_scope.success",
-              subject_name: response[:subject_name],
-              proposals: response[:successful].to_sentence,
-              scope: "decidim.proposals.admin"
-            )
-          end
-        end
-
-        def update_proposals_bulk_response_errored(response, subject)
-          return if response[:errored].blank?
-
-          case subject
-          when :category
-            t(
-              "proposals.update_category.invalid",
-              subject_name: response[:subject_name],
-              proposals: response[:errored].to_sentence,
-              scope: "decidim.proposals.admin"
-            )
-          when :scope
-            t(
-              "proposals.update_scope.invalid",
-              subject_name: response[:subject_name],
-              proposals: response[:errored].to_sentence,
-              scope: "decidim.proposals.admin"
-            )
-          end
-        end
-
         def form_presenter
           @form_presenter ||= present(@form, presenter_class: Decidim::Proposals::ProposalPresenter)
         end

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

@@ -27,8 +27,7 @@ module Decidim
         @collaborative_drafts = search
                                 .result
                                 .not_hidden
-                                .includes(:category)
-                                .includes(:scope)
+                                .includes(:taxonomies)
 
         @collaborative_drafts = reorder(@collaborative_drafts)
         @collaborative_drafts = paginate(@collaborative_drafts)
@@ -144,9 +143,8 @@ module Decidim
       def default_filter_params
         {
           search_text_cont: "",
-          with_any_category: nil,
+          with_any_taxonomies: nil,
           with_any_state: %w(open),
-          with_any_scope: nil,
           related_to: ""
         }
       end

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class InviteCoauthorsController < Decidim::Proposals::ApplicationController
+      include Decidim::ControllerHelpers
+
+      helper_method :proposal
+
+      before_action :authenticate_user!
+
+      # author invites coauthor
+      def create
+        enforce_permission_to :invite, :proposal_coauthor_invites, { proposal:, coauthor: }
+
+        InviteCoauthor.call(proposal, coauthor) do
+          on(:ok) do
+            flash[:notice] = I18n.t("create.success", scope: "decidim.proposals.invite_coauthors", author_name: coauthor.name)
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("create.error", scope: "decidim.proposals.invite_coauthors")
+          end
+        end
+
+        redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      # author cancels invitation
+      def cancel
+        enforce_permission_to :cancel, :proposal_coauthor_invites, { proposal:, coauthor: }
+
+        CancelCoauthorship.call(proposal, coauthor) do
+          on(:ok) do
+            flash[:notice] = I18n.t("cancel.success", scope: "decidim.proposals.invite_coauthors", author_name: coauthor.name)
+          end
+
+          on(:invalid) do
+            flash[:alert] = I18n.t("cancel.error", scope: "decidim.proposals.invite_coauthors")
+          end
+        end
+
+        redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      # coauthor accepts invitation
+      def update
+        enforce_permission_to :accept, :proposal_coauthor_invites, { proposal:, coauthor: }
+
+        AcceptCoauthorship.call(proposal, current_user) do
+          on(:ok) do
+            render json: { message: I18n.t("update.success", scope: "decidim.proposals.invite_coauthors") }
+          end
+
+          on(:invalid) do
+            render json: { message: I18n.t("update.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_entity
+          end
+        end
+      end
+
+      # coauthor declines invitation
+      def destroy
+        enforce_permission_to :decline, :proposal_coauthor_invites, { proposal:, coauthor: }
+
+        RejectCoauthorship.call(proposal, current_user) do
+          on(:ok) do
+            render json: { message: I18n.t("destroy.success", scope: "decidim.proposals.invite_coauthors") }
+          end
+
+          on(:invalid) do
+            render json: { message: I18n.t("destroy.error", scope: "decidim.proposals.invite_coauthors") }, status: :unprocessable_entity
+          end
+        end
+      end
+
+      private
+
+      def coauthor
+        @coauthor ||= Decidim::User.find(params[:id])
+      end
+
+      def proposal
+        @proposal ||= Proposal.where(component: current_component).find(params[:proposal_id])
+      end
+    end
+  end
+end

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

@@ -39,7 +39,7 @@ module Decidim
                        .published
                        .not_hidden
                        .only_amendables
-                       .includes(:category, :scope, :attachments, :coauthorships)
+                       .includes(:taxonomies, :attachments, :coauthorships)
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
@@ -202,9 +202,8 @@ module Decidim
           search_text_cont: "",
           with_any_origin: nil,
           activity: "all",
-          with_any_category: nil,
+          with_any_taxonomies: nil,
           with_any_state: default_states,
-          with_any_scope: nil,
           related_to: "",
           type: "all"
         }
@@ -282,36 +281,12 @@ module Decidim
       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"),
+            enabled: ProposalHistoryCell.new(@proposal).render?,
+            id: "included_history",
+            text: t("decidim.history", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("history"),
             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" }]
+            args: ["decidim/proposals/proposal_history", @proposal]
           }
         ] + attachments_tab_panel_items(@proposal)
       end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class AcceptedCoauthorshipEvent < CoauthorAcceptedInviteEvent
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      class ProposalAssignedToValuatorEvent < Decidim::Events::SimpleEvent
+        include Rails.application.routes.mounted_helpers
+
+        i18n_attributes :admin_proposal_info_url, :admin_proposal_info_path
+
+        def admin_proposal_info_path
+          ResourceLocatorPresenter.new(resource).show
+        end
+
+        def admin_proposal_info_url
+          send(resource.component.mounted_admin_engine).proposal_url(resource, resource.component.mounted_params)
+        end
+
+        private
+
+        def organization
+          @organization ||= component.participatory_space.organization
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ module Decidim
   module Proposals
     module Admin
       class ProposalNoteCreatedEvent < Decidim::Events::SimpleEvent
+        include Decidim::Events::AuthorEvent
         include Rails.application.routes.mounted_helpers
 
         i18n_attributes :admin_proposal_info_url, :admin_proposal_info_path
@@ -18,6 +19,10 @@ module Decidim
 
         private
 
+        def author
+          Decidim::User.find(extra[:note_author_id])
+        end
+
         def organization
           @organization ||= component.participatory_space.organization
         end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CoauthorAcceptedInviteEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::NotificationEvent
+      include Decidim::Core::Engine.routes.url_helpers
+
+      def notification_title
+        I18n.t("notification_title", **i18n_options).html_safe
+      end
+
+      delegate :name, to: :author, prefix: true
+      delegate :name, to: :coauthor, prefix: true, allow_nil: true
+
+      def author_path
+        profile_path(author.nickname)
+      end
+
+      def coauthor_path
+        profile_path(coauthor.nickname) if coauthor
+      end
+
+      def author
+        resource.creator_author
+      end
+
+      def coauthor
+        @coauthor ||= Decidim::User.find_by(id: extra["coauthor_id"])
+      end
+
+      def i18n_scope
+        event_name
+      end
+
+      def i18n_options
+        {
+          scope: i18n_scope,
+          coauthor_name:,
+          coauthor_path:,
+          author_name:,
+          author_path:,
+          resource_path:,
+          resource_title:
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CoauthorInvitedEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::CoauthorEvent
+      include Decidim::Core::Engine.routes.url_helpers
+
+      def action_cell
+        "decidim/notification_actions/buttons" unless user_is_coauthor?
+      end
+
+      def action_data
+        [
+          {
+            i18n_label: "decidim.events.proposals.coauthor_invited.actions.accept",
+            url: invite_path,
+            icon: "check-line",
+            method: "patch"
+          },
+          {
+            i18n_label: "decidim.events.proposals.coauthor_invited.actions.decline",
+            url: invite_path,
+            icon: "close-circle-line",
+            method: "delete"
+          }
+        ]
+      end
+
+      def resource_url
+        notifications_url(host: component.organization.host)
+      end
+
+      private
+
+      def invite_path
+        @invite_path ||= EngineRouter.main_proxy(component).proposal_invite_coauthor_path(proposal_id: resource, id: user.id)
+      end
+
+      def user_is_coauthor?
+        resource.authors.include?(user)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CoauthorRejectedInviteEvent < CoauthorAcceptedInviteEvent
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class RejectedCoauthorshipEvent < AcceptedCoauthorshipEvent
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class UpdateProposalTaxonomiesEvent < Decidim::Events::SimpleEvent
+      include Decidim::Events::AuthorEvent
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to answer a proposal.
       class ProposalAnswerForm < Decidim::Form
         include TranslatableAttributes
+
         mimic :proposal_answer
 
         translatable_attribute :answer, Decidim::Attributes::RichText

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

@@ -8,14 +8,13 @@ module Decidim
         include Decidim::TranslatableAttributes
         include Decidim::AttachmentAttributes
         include Decidim::ApplicationHelper
+        include Decidim::HasTaxonomyFormAttributes
 
         mimic :proposal
 
         attribute :address, String
         attribute :latitude, Float
         attribute :longitude, Float
-        attribute :category_id, Integer
-        attribute :scope_id, Integer
         attribute :attachment, AttachmentForm
         attribute :position, Integer
         attribute :created_in_meeting, Boolean
@@ -25,46 +24,19 @@ module Decidim
         attachments_attribute :photos
 
         validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
-        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? }
         validates :meeting_as_author, presence: true, if: ->(form) { form.created_in_meeting? }
 
         validate :notify_missing_attachment_if_errored
 
-        delegate :categories, to: :current_component
-
         def map_model(model)
           body = translated_attribute(model.body)
           @suggested_hashtags = Decidim::ContentRenderers::HashtagRenderer.new(body).extra_hashtags.map(&:name).map(&:downcase)
-
-          return unless model.categorization
-
-          self.category_id = model.categorization.decidim_category_id
-          self.scope_id = model.decidim_scope_id
         end
 
         alias component current_component
 
-        # Finds the Category from the category_id.
-        #
-        # Returns a Decidim::Category
-        def category
-          @category ||= categories.find_by(id: category_id)
-        end
-
-        # Finds the Scope from the given decidim_scope_id, uses participatory space scope if missing.
-        #
-        # Returns a Decidim::Scope
-        def scope
-          @scope ||= @attributes["scope_id"].value ? current_component.scopes.find_by(id: @attributes["scope_id"].value) : current_component.scope
-        end
-
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the proposal
-        def scope_id
-          super || scope&.id
+        def participatory_space_manifest
+          @participatory_space_manifest ||= current_component.participatory_space.manifest.name
         end
 
         def geocoding_enabled?

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

@@ -6,27 +6,32 @@ module Decidim
       # A form object to be used when admin users want to create a proposal.
       class ProposalForm < Decidim::Proposals::Admin::ProposalBaseForm
         include Decidim::HasUploadValidations
+        include Decidim::AttachmentAttributes
 
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
         translatable_attribute :body, Decidim::Attributes::RichText
+        attribute :attachment, AttachmentForm
+
+        attachments_attribute :documents
 
         validates :title, :body, translatable_presence: true
+        validates :title, :body, translated_etiquette: true
 
         validate :notify_missing_attachment_if_errored
 
         def map_model(model)
-          super(model)
+          super
           presenter = ProposalPresenter.new(model)
 
           self.title = presenter.title(all_locales: title.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
-                              {}
-                            end
+          self.documents = model.attachments
+        end
+
+        def notify_missing_attachment_if_errored
+          errors.add(:add_documents, :needs_to_be_reattached) if errors.any? && add_documents.present?
         end
       end
     end

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

@@ -14,7 +14,6 @@ module Decidim
         attribute :keep_answers, Boolean
         attribute :keep_authors, Boolean
         attribute :states, Array
-        attribute :scope_ids, Array
 
         validates :origin_component_id, :origin_component, :states, :current_component, presence: true
         validates :import_proposals, allow_nil: false, acceptance: true
@@ -31,10 +30,6 @@ module Decidim
           super.compact_blank
         end
 
-        def scopes
-          Decidim::Scope.where(organization: current_organization, id: scope_ids)
-        end
-
         def origin_component
           @origin_component ||= origin_components.find_by(id: origin_component_id)
         end

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

@@ -4,14 +4,6 @@ module Decidim
   module Proposals
     # A form object to be used when public users want to create a Collaborative Draft.
     class CollaborativeDraftForm < Decidim::Proposals::ProposalForm
-      def map_model(model)
-        super
-
-        return unless model.categorization
-
-        self.category_id = model.categorization.decidim_category_id
-      end
-
       def user_group
         @user_group ||= Decidim::UserGroup.find user_group_id if user_group_id.present?
       end