decidim-proposals 0.13.1 → 0.14.1

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

@@ -10,8 +10,7 @@
         endorsers,
         cell_name: "decidim/author",
         cell_options: { extra_classes: ["author-data--small"] },
-        hidden_elements_count_i18n_key: "decidim.proposals.proposals.show.hidden_endorsers_count",
-        size: :small
+        hidden_elements_count_i18n_key: "decidim.proposals.proposals.show.hidden_endorsers_count"
       ) %>
     </div>
   </div>

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

@@ -0,0 +1,27 @@
+<%= button_reveal_modal %>
+
+<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_title %>" aria-hidden="true" role="dialog">
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= modal_title %>
+    </h3>
+
+    <button class="close-button" data-close aria-label="<%= close_label %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="row">
+    <div>
+      <p>
+        <%= modal_body %>
+      </p>
+    </div>
+  </div>
+
+  <div class="row">
+    <%= button_cancel %>
+
+    <%= button_continue %>
+  </div>
+</div>

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cell renders the button and modal for the publish/withdraw
+    # actions in the details of a collaborative draft
+    # the `cell` should be called with an :action argument, to show relative info:
+    # - :publish
+    # - :withdraw
+    class IrreversibleActionModalCell < Decidim::ViewModel
+      def show
+        return unless action.presence
+        render :show
+      end
+
+      private
+
+      def action
+        options[:action]
+      end
+
+      def publish?
+        action == :publish
+      end
+
+      def withdraw?
+        action == :withdraw
+      end
+
+      def modal_id
+        "#{action}-irreversible-action-modal"
+      end
+
+      def button_reveal_modal
+        data = { open: modal_id }
+        label = t(action, scope: "decidim.proposals.collaborative_drafts.show")
+        css = publish? ? "button expanded button--sc" : "secondary"
+
+        button_tag label, type: "button", class: css, data: data
+      end
+
+      def modal_title
+        t("title", scope: "decidim.proposals.collaborative_drafts.collaborative_draft.#{action}.irreversible_action_modal")
+      end
+
+      def modal_body
+        t("body", scope: "decidim.proposals.collaborative_drafts.collaborative_draft.#{action}.irreversible_action_modal")
+      end
+
+      def button_continue
+        label = t("ok", scope: "decidim.proposals.collaborative_drafts.collaborative_draft.#{action}.irreversible_action_modal")
+        path = resource_path action
+        css = "button expanded"
+        button_to label, path, class: css, form_class: "columns medium-6"
+      end
+
+      def close_label
+        t("cancel", scope: "decidim.proposals.collaborative_drafts.collaborative_draft.#{action}.irreversible_action_modal")
+      end
+
+      def button_cancel
+        content_tag :div, class: "columns medium-6" do
+          button_tag type: "button", class: "clear button secondary expanded", "data-close": "" do
+            close_label
+          end
+        end
+      end
+
+      def resource_path(action)
+        @resource_path ||= decidim_proposals.send("#{action}_collaborative_draft_path",
+                                                  id: model.id)
+      end
+
+      def decidim_proposals
+        Decidim::EngineRouter.main_proxy(model.component)
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Decidim
       delegate :user_signed_in?, to: :parent_controller
 
       def show
-        cell card_size, model, @options
+        cell card_size, model, options
       end
 
       private

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

@@ -0,0 +1,9 @@
+<div class="text-center mt-sm">
+  <%= link_to_resource %>
+
+  <div class="text-center">
+    <small>
+      <%= link_help_text %>
+    </small>
+  </div>
+</div>

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the link to the source collaborative draft of a proposal.
+    class ProposalLinkToCollaborativeDraftCell < Decidim::ViewModel
+      def show
+        render if collaborative_draft
+      end
+
+      private
+
+      def collaborative_draft
+        @collaborative_draft ||= model.linked_resources(:collaborative_draft, "created_from_collaborative_draft").first
+      end
+
+      def link_to_resource
+        link_to resource_locator(collaborative_draft).path, class: "link" do
+          t("link_to_collaborative_draft_text", scope: "decidim.proposals.proposals.show")
+        end
+      end
+
+      def link_help_text
+        t("link_to_collaborative_draft_help_text", scope: "decidim.proposals.proposals.show")
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/proposal_m/footer.erb

@@ -1,7 +1,7 @@
 <% if has_link_to_resource? %>
   <div class="card__footer">
     <div class="card__support">
-      <% if actionable? %>
+      <% if has_actions? %>
         <% if !current_settings.votes_hidden? %>
           <%= cell(
             "decidim/progress_bar",

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

@@ -14,6 +14,14 @@ module Decidim
 
       private
 
+      def title
+        present(model).title
+      end
+
+      def body
+        present(model).body
+      end
+
       def has_state?
         model.published?
       end
@@ -27,7 +35,7 @@ module Decidim
       end
 
       def description
-        truncate(model.body, length: 100)
+        truncate(present(model).body, length: 100)
       end
 
       def badge_classes

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

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic to accept a user request to
+    # contribute to a collaborative draft.
+    class AcceptAccessToCollaborativeDraft < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      # collaborative_draft     - A Decidim::Proposals::CollaborativeDraft object.
+      # current_user - The current user.
+      # requester_user - The user that requested to collaborate.
+      def initialize(form, current_user)
+        @form = form
+        @collaborative_draft = form.collaborative_draft
+        @current_user = current_user
+        @requester_user = form.requester_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      # - :invalid if it wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if @form.invalid?
+        return broadcast(:invalid) if @current_user.nil?
+
+        transaction do
+          @collaborative_draft.requesters.delete @requester_user
+
+          Decidim::Coauthorship.create(
+            coauthorable: @collaborative_draft,
+            author: @requester_user
+          )
+        end
+
+        notify_collaborative_draft_requester
+        notify_collaborative_draft_authors
+        broadcast(:ok, @requester_user)
+      end
+
+      private
+
+      def notify_collaborative_draft_authors
+        recipient_ids = @collaborative_draft.authors.pluck(:id) - [@requester_user.id]
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.collaborative_draft_access_accepted",
+          event_class: Decidim::Proposals::CollaborativeDraftAccessAcceptedEvent,
+          resource: @collaborative_draft,
+          recipient_ids: recipient_ids.uniq,
+          extra: {
+            requester_id: @requester_user.id
+          }
+        )
+      end
+
+      def notify_collaborative_draft_requester
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.collaborative_draft_access_requester_accepted",
+          event_class: Decidim::Proposals::CollaborativeDraftAccessRequesterAcceptedEvent,
+          resource: @collaborative_draft,
+          recipient_ids: [@requester_user.id]
+        )
+      end
+    end
+  end
+end

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

@@ -25,6 +25,7 @@ module Decidim
 
           answer_proposal
           notify_followers
+          increment_score
 
           broadcast(:ok)
         end
@@ -76,6 +77,14 @@ module Decidim
             recipient_ids: proposal.followers.pluck(:id)
           )
         end
+
+        def increment_score
+          return unless proposal.accepted?
+
+          proposal.authors.find_each do |author|
+            Decidim::Gamification.increment_score(author, :accepted_proposals)
+          end
+        end
       end
     end
   end

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

@@ -48,9 +48,12 @@ module Decidim
         end
 
         def attributes
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
+
           {
-            title: form.title,
-            body: form.body,
+            title: parsed_title,
+            body: parsed_body,
             category: form.category,
             scope: form.scope,
             component: form.component,

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A module with all the attachment common methods for proposals
+    # and collaborative draft commands.
+    module AttachmentMethods
+      private
+
+      def build_attachment
+        @attachment = Attachment.new(
+          title: @form.attachment.title,
+          file: @form.attachment.file,
+          attached_to: @attached_to
+        )
+      end
+
+      def attachment_invalid?
+        if attachment.invalid? && attachment.errors.has_key?(:file)
+          @form.attachment.errors.add :file, attachment.errors[:file]
+          true
+        end
+      end
+
+      def attachment_present?
+        @form.attachment.file.present?
+      end
+
+      def create_attachment
+        attachment.attached_to = @attached_to
+        attachment.save!
+      end
+
+      def attachments_allowed?
+        @form.current_component.settings.attachments_allowed?
+      end
+
+      def process_attachments?
+        attachments_allowed? && attachment_present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user creates a new collaborative draft.
+    class CreateCollaborativeDraft < Rectify::Command
+      include AttachmentMethods
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      # current_user - The current user.
+      def initialize(form, current_user)
+        @form = form
+        @current_user = current_user
+        @attached_to = nil
+      end
+
+      # 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.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        if process_attachments?
+          build_attachment
+          return broadcast(:invalid) if attachment_invalid?
+        end
+
+        transaction do
+          create_collaborative_draft
+          create_attachment if process_attachments?
+        end
+
+        broadcast(:ok, collaborative_draft)
+      end
+
+      private
+
+      attr_reader :form, :collaborative_draft, :attachment
+
+      def create_collaborative_draft
+        @collaborative_draft = Decidim.traceability.create!(
+          CollaborativeDraft,
+          @form.current_user,
+          title: form.title,
+          body: form.body,
+          category: form.category,
+          scope: form.scope,
+          component: form.component,
+          address: form.address,
+          latitude: form.latitude,
+          longitude: form.longitude,
+          state: "open"
+        )
+
+        @attached_to = @collaborative_draft
+
+        @collaborative_draft.add_coauthor(@current_user, user_group: @form.user_group)
+      end
+
+      def user_group
+        @user_group ||= Decidim::UserGroup.find_by(organization: organization, id: form.user_group_id)
+      end
+
+      def organization
+        @organization ||= @current_user.organization
+      end
+    end
+  end
+end

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

@@ -4,13 +4,16 @@ module Decidim
   module Proposals
     # A command with all the business logic when a user creates a new proposal.
     class CreateProposal < Rectify::Command
+      include AttachmentMethods
       # Public: Initializes the command.
       #
       # form         - A form object with the params.
       # current_user - The current user.
-      def initialize(form, current_user)
+      # coauthorships - The coauthorships of the proposal.
+      def initialize(form, current_user, coauthorships = nil)
         @form = form
         @current_user = current_user
+        @coauthorships = coauthorships
       end
 
       # Executes the command. Broadcasts these events:
@@ -27,14 +30,8 @@ module Decidim
           return broadcast(:invalid)
         end
 
-        if process_attachments?
-          build_attachment
-          return broadcast(:invalid) if attachment_invalid?
-        end
-
         transaction do
           create_proposal
-          create_attachment if process_attachments?
         end
 
         broadcast(:ok, proposal)
@@ -45,52 +42,20 @@ module Decidim
       attr_reader :form, :proposal, :attachment
 
       def create_proposal
-        @proposal = Proposal.create!(
-          title: form.title,
-          body: form.body,
-          category: form.category,
-          scope: form.scope,
-          component: form.component,
-          address: form.address,
-          latitude: form.latitude,
-          longitude: form.longitude
-        )
-        proposal.add_coauthor(@current_user, decidim_user_group_id: form.user_group_id)
-      end
+        parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+        parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
 
-      def build_attachment
-        @attachment = Attachment.new(
-          title: form.attachment.title,
-          file: form.attachment.file,
-          attached_to: @proposal
+        @proposal = Proposal.create!(
+          title: parsed_title,
+          body: parsed_body,
+          component: form.component
         )
-      end
-
-      def attachment_invalid?
-        if attachment.invalid? && attachment.errors.has_key?(:file)
-          form.attachment.errors.add :file, attachment.errors[:file]
-          true
-        end
-      end
-
-      def attachment_present?
-        form.attachment.file.present?
-      end
-
-      def create_attachment
-        attachment.attached_to = proposal
-        attachment.save!
-      end
-
-      def attachments_allowed?
-        form.current_component.settings.attachments_allowed?
-      end
-
-      def process_attachments?
-        attachments_allowed? && attachment_present?
+        proposal.add_coauthor(@current_user, user_group: user_group)
       end
 
       def proposal_limit_reached?
+        return false if @coauthorships.present?
+
         proposal_limit = form.current_component.settings.proposal_limit
 
         return false if proposal_limit.zero?

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

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user publishes a collaborative_draft.
+    class PublishCollaborativeDraft < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # collaborative_draft - The collaborative_draft to publish.
+      # current_user - The current user.
+      # proposal_form - the form object of the new proposal
+      def initialize(collaborative_draft, current_user)
+        @collaborative_draft = collaborative_draft
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid and the collaborative_draft is published.
+      # - :invalid if the collaborative_draft's author is not the current user.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @collaborative_draft.open?
+        return broadcast(:invalid) unless @collaborative_draft.authored_by? @current_user
+
+        transaction do
+          @collaborative_draft.requesters.each do |requester_user|
+            RejectAccessToCollaborativeDraft.call(@collaborative_draft, current_user, requester_user)
+          end
+
+          @new_proposal = publish_collaborative_draft
+          broadcast(:invalid) unless @new_proposal
+        end
+
+        broadcast(:ok, @new_proposal)
+      end
+
+      attr_accessor :new_proposal
+
+      private
+
+      def publish_collaborative_draft
+        Decidim.traceability.update!(
+          @collaborative_draft,
+          @current_user,
+          state: "published",
+          published_at: Time.current
+        )
+        create_proposal
+      end
+
+      def create_proposal
+        proposal_form_params = ActionController::Parameters.new(
+          proposal: @collaborative_draft.as_json
+        )
+        proposal_form_params[:proposal][:category_id] = @collaborative_draft.category.id if @collaborative_draft.category
+        proposal_form_params[:proposal][:scope_id] = @collaborative_draft.scope.id if @collaborative_draft.scope
+        proposal_form = Decidim::Proposals::ProposalForm.from_params(
+          proposal_form_params
+        ).with_context(
+          current_user: @current_user,
+          current_organization: @current_user.organization,
+          current_component: @collaborative_draft.component,
+          current_participatory_space: @collaborative_draft.participatory_space
+        )
+
+        result = CreateProposal.call(proposal_form, @current_user, @collaborative_draft.coauthorships)
+        return publish_proposal(result[:ok]) if result[:ok]
+
+        false
+      end
+
+      def publish_proposal(new_proposal)
+        result = PublishProposal.call(new_proposal, @current_user)
+        return link_collaborative_draft_and_proposal(result[:ok]) if result[:ok]
+
+        false
+      end
+
+      def link_collaborative_draft_and_proposal(new_proposal)
+        @collaborative_draft.link_resources(new_proposal, "created_from_collaborative_draft")
+        new_proposal
+      end
+    end
+  end
+end

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

@@ -24,6 +24,7 @@ module Decidim
 
         transaction do
           @proposal.update published_at: Time.current
+          increment_scores
           send_notification
           send_notification_to_participatory_space
         end
@@ -63,6 +64,12 @@ module Decidim
         end
         followers_ids
       end
+
+      def increment_scores
+        @proposal.authors.each do |author|
+          Decidim::Gamification.increment_score(author, :proposals)
+        end
+      end
     end
   end
 end