decidim-proposals 0.14.4 → 0.15.0

data/app/assets/javascripts/decidim/proposals/admin/proposals.es6

@@ -6,9 +6,15 @@ $(document).ready(function () {
 
   window.selectedProposalsCountUpdate = function() {
     if(selectedProposalsCount() == 0){
-      $("#js-recategorize-proposals-count").text("")
+      $("#js-selected-proposals-count").text("")
     } else {
-      $("#js-recategorize-proposals-count").text(selectedProposalsCount());
+      $("#js-selected-proposals-count").text(selectedProposalsCount());
+    }
+
+    if(selectedProposalsCount() >= 2) {
+      $('button[data-action="merge-proposals"]').parent().show();
+    } else {
+      $('button[data-action="merge-proposals"]').parent().hide();
     }
   }
 
@@ -33,28 +39,27 @@ $(document).ready(function () {
     $("#js-other-actions-wrapper").addClass('hide');
   }
 
-  let showRecategorizeProposalActions = function() {
-    $("#js-recategorize-proposals-actions").removeClass('hide');
+  window.hideBulkActionForms = function() {
+    return $(".js-bulk-action-form").addClass('hide');
   }
 
-  window.hideRecategorizeProposalActions = function() {
-    return $("#js-recategorize-proposals-actions").addClass('hide');
-  }
-
-  if ($('#js-form-recategorize-proposals').length) {
-    window.hideRecategorizeProposalActions();
+  if ($('.js-bulk-action-form').length) {
+    window.hideBulkActionForms();
     $("#js-bulk-actions-button").addClass('hide');
 
-    $("#js-bulk-actions-recategorize").click(function(e){
+    $("#js-bulk-actions-dropdown ul li button").click(function(e){
       e.preventDefault();
+      let action = $(e.target).data("action");
 
-      $('#js-form-recategorize-proposals').submit(function(){
-        $('.layout-content > .callout-wrapper').html("");
-      })
+      if(action) {
+        $(`#js-form-${action}`).submit(function(){
+          $('.layout-content > .callout-wrapper').html("");
+        })
 
-      showRecategorizeProposalActions();
-      hideBulkActionsButton(true);
-      hideOtherActionsButtons();
+        $(`#js-${action}-actions`).removeClass('hide');
+        hideBulkActionsButton(true);
+        hideOtherActionsButtons();
+      }
     })
 
     // select all checkboxes
@@ -99,12 +104,12 @@ $(document).ready(function () {
         hideBulkActionsButton();
       }
 
-      $('#js-form-recategorize-proposals').find(".js-proposal-id-"+proposal_id).prop('checked', checked);
+      $('.js-bulk-action-form').find(".js-proposal-id-"+proposal_id).prop('checked', checked);
       selectedProposalsCountUpdate();
     });
 
-    $('#js-cancel-edit-category').on('click', function (e) {
-      window.hideRecategorizeProposalActions()
+    $('.js-cancel-bulk-action').on('click', function (e) {
+      window.hideBulkActionForms()
       showBulkActionsButton();
       showOtherActionsButtons();
     });

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A cell to display when a proposal has been published.
+    class ProposalActivityCell < ActivityCell
+      def title
+        I18n.t(
+          "decidim.proposals.last_activity.new_proposal_at_html",
+          link: participatory_space_link
+        )
+      end
+
+      def resource_link_text
+        Decidim::Proposals::ProposalPresenter.new(resource).title
+      end
+    end
+  end
+end

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

@@ -81,8 +81,12 @@ module Decidim
         def increment_score
           return unless proposal.accepted?
 
-          proposal.authors.find_each do |author|
-            Decidim::Gamification.increment_score(author, :accepted_proposals)
+          proposal.coauthorships.find_each do |coauthorship|
+            if coauthorship.user_group
+              Decidim::Gamification.increment_score(coauthorship.user_group, :accepted_proposals)
+            else
+              Decidim::Gamification.increment_score(coauthorship.author, :accepted_proposals)
+            end
           end
         end
       end

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

@@ -40,10 +40,10 @@ module Decidim
         attr_reader :form, :proposal, :attachment
 
         def create_proposal
-          @proposal = Decidim.traceability.create!(
-            Proposal,
-            form.current_user,
-            attributes
+          @proposal = Decidim::Proposals::ProposalBuilder.create(
+            attributes: attributes,
+            author: form.current_organization,
+            action_user: form.current_user
           )
         end
 

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when an admin imports proposals from
+      # a participatory text.
+      class ImportParticipatoryText < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          transaction do
+            save_participatory_text(form)
+            parse_participatory_text_doc(form.document_text)
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def save_participatory_text(form)
+          document = ParticipatoryText.find_or_initialize_by(component: form.current_component)
+          document.update!(title: form.title, description: form.description)
+        end
+
+        def parse_participatory_text_doc(document)
+          parser = MarkdownToProposals.new(form.current_component, form.current_user)
+          parser.parse(document)
+        end
+      end
+    end
+  end
+end

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

@@ -33,28 +33,14 @@ module Decidim
           proposals.map do |original_proposal|
             next if proposal_already_copied?(original_proposal, target_component)
 
-            origin_attributes = original_proposal.attributes.except(
-              "id",
-              "created_at",
-              "updated_at",
-              "state",
-              "answer",
-              "answered_at",
-              "decidim_component_id",
-              "reference",
-              "proposal_votes_count",
-              "proposal_notes_count"
+            Decidim::Proposals::ProposalBuilder.copy(
+              original_proposal,
+              author: form.current_organization,
+              action_user: form.current_user,
+              extra_attributes: {
+                "component" => target_component
+              }
             )
-
-            proposal = Decidim::Proposals::Proposal.new(origin_attributes)
-            proposal.category = original_proposal.category
-            proposal.component = target_component
-            proposal.save!
-
-            proposal.link_resources([original_proposal], "copied_from_component")
-            original_proposal.coauthorships.each do |coauthorship|
-              Decidim::Coauthorship.create(author: coauthorship.author, user_group: coauthorship.user_group, coauthorable: proposal)
-            end
           end.compact
         end
 

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when an admin merges proposals from
+      # one component to another.
+      class MergeProposals < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          broadcast(:ok, merge_proposals)
+        end
+
+        private
+
+        attr_reader :form
+
+        def merge_proposals
+          transaction do
+            merged_proposal = create_new_proposal
+            merged_proposal.link_resources(proposals_to_link, "copied_from_component")
+            form.proposals.each(&:destroy!) if form.same_component?
+            merged_proposal
+          end
+        end
+
+        def proposals_to_link
+          return previous_links if form.same_component?
+          form.proposals
+        end
+
+        def previous_links
+          @previous_links ||= form.proposals.flat_map do |proposal|
+            proposal.linked_resources(:proposals, "copied_from_component")
+          end
+        end
+
+        def create_new_proposal
+          original_proposal = form.proposals.first
+
+          Decidim::Proposals::ProposalBuilder.copy(
+            original_proposal,
+            author: form.current_organization,
+            action_user: form.current_user,
+            extra_attributes: {
+              component: form.target_component
+            },
+            skip_link: true
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when an admin imports proposals from
+      # a participatory text.
+      class PublishParticipatoryText < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A PreviewParticipatoryTextForm form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          transaction do
+            @publish_failures = {}
+            update_contents_and_resort_proposals(form)
+            publish_drafts
+          end
+
+          if @publish_failures.any?
+            broadcast(:invalid, @publish_failures)
+          else
+            broadcast(:ok)
+          end
+        end
+
+        private
+
+        attr_reader :form
+
+        def update_contents_and_resort_proposals(form)
+          form.proposals.each do |prop_form|
+            proposal = Decidim::Proposals::Proposal.where(component: form.current_component).find(prop_form.id)
+            proposal.set_list_position(prop_form.position) if proposal.position != prop_form.position
+            proposal.title = prop_form.title
+            proposal.body = prop_form.body if proposal.participatory_text_level == Decidim::Proposals::ParticipatoryTextSection::LEVELS[:article]
+
+            add_failure(proposal) unless proposal.save
+          end
+          raise ActiveRecord::Rollback if @publish_failures.any?
+        end
+
+        def publish_drafts
+          Decidim::Proposals::Proposal.where(component: form.current_component).drafts.find_each do |proposal|
+            add_failure(proposal) unless proposal.update(published_at: Time.current)
+          end
+          raise ActiveRecord::Rollback if @publish_failures.any?
+        end
+
+        def add_failure(proposal)
+          @publish_failures[proposal.id] = proposal.errors.full_messages
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when an admin splits proposals from
+      # one component to another.
+      class SplitProposals < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          broadcast(:ok, split_proposals)
+        end
+
+        private
+
+        attr_reader :form
+
+        def split_proposals
+          transaction do
+            form.proposals.flat_map do |original_proposal|
+              # If copying to the same component we only need one copy
+              # but linking to the original proposal links, not the
+              # original proposal.
+              create_proposal(original_proposal)
+              create_proposal(original_proposal) unless form.same_component?
+            end
+          end
+        end
+
+        def create_proposal(original_proposal)
+          split_proposal = Decidim::Proposals::ProposalBuilder.copy(
+            original_proposal,
+            author: form.current_organization,
+            action_user: form.current_user,
+            extra_attributes: {
+              component: form.target_component
+            },
+            skip_link: true
+          )
+
+          proposals_to_link = links_for(original_proposal)
+          split_proposal.link_resources(proposals_to_link, "copied_from_component")
+        end
+
+        def links_for(proposal)
+          return proposal unless form.same_component?
+
+          proposal.linked_resources(:proposals, "copied_from_component")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when a user updates a proposal.
+      class UpdateProposal < Rectify::Command
+        include AttachmentMethods
+
+        # Public: Initializes the command.
+        #
+        # form         - A form object with the params.
+        # proposal - the proposal to update.
+        def initialize(form, proposal)
+          @form = form
+          @proposal = proposal
+          @attached_to = proposal
+        end
+
+        # 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.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          if process_attachments?
+            @proposal.attachments.destroy_all
+
+            build_attachment
+            return broadcast(:invalid) if attachment_invalid?
+          end
+
+          transaction do
+            update_proposal
+            create_attachment if process_attachments?
+          end
+
+          broadcast(:ok, proposal)
+        end
+
+        private
+
+        attr_reader :form, :proposal, :attachment
+
+        def update_proposal
+          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
+
+          Decidim.traceability.update!(
+            proposal,
+            form.current_user,
+            title: parsed_title,
+            body: parsed_body,
+            category: form.category,
+            scope: form.scope,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
+          )
+        end
+      end
+    end
+  end
+end