decidim-proposals 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb9355480e7b5f78b9eb01ede6e1e51362cf77f991b45d43944fbe3b52eece1
-  data.tar.gz: c44373543399ee2bd9c95d5d47ba89d209cd9033c899ef7cb614166a531e4b4d
+  metadata.gz: f545c292413c69159509938ffa3e0a7a442eaec96770e465b405d709ab0db976
+  data.tar.gz: 90b940f6ce3c968772548d40a04a7c47d7491c340c2a407b78a6013ccdf903c8
 SHA512:
-  metadata.gz: 5e4582447ccb88226799caaa32bedcf851e81af9ed927c1a7a4adabc9dedd8341438d45ce735cc471998e018119f597c7cb577b7e938d575f3b96de6a34bc1a9
-  data.tar.gz: 985e3a9309033dbceed04819a85796c8faaf379c6e845420ca9884a2b545464025c5d195dd03659ed6fc571622b751462bda1b9f9de519c99ac887eb8d9844d6
+  metadata.gz: e12c387014c567aee0ca73e133357c74621e49dcd49b305ecda4bac2e231e215273d15b30a7d3e0e61772ba6dea2163b3baaf459781aa4a595ba100dcefcf086
+  data.tar.gz: 7dde2bc4a1920813acf8fee2bde644f1d7b80b58c056bab12f720ff2df246e376b401e83418d6a51475ba4190e1147f3beadb651a6be12bf90216fc38e5b5c3c

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

@@ -10,6 +10,7 @@ module Decidim
       include ProposalCellsHelper
       include Cell::ViewModel::Partial
       include Messaging::ConversationHelper
+      include Decidim::SanitizeHelper
 
       delegate :current_organization, to: :controller
 
@@ -30,7 +31,8 @@ module Decidim
 
       def body
         return unless model.participatory_text_level == "article"
-        present(model).body
+        formatted = simple_format(present(model).body)
+        decidim_sanitize(strip_links(formatted))
       end
 
       def current_user

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

@@ -12,7 +12,15 @@ module Decidim
       end
 
       def resource_link_text
-        Decidim::Proposals::ProposalPresenter.new(resource).title
+        presenter.title
+      end
+
+      def description
+        presenter.body(links: true)
+      end
+
+      def presenter
+        @presenter ||= Decidim::Proposals::ProposalPresenter.new(resource)
       end
     end
   end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic related with an admin discarding participatory text proposals.
+      class DiscardParticipatoryText < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A PreviewParticipatoryTextForm form object with the params.
+        def initialize(component)
+          @component = component
+        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
+            discard_drafts
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form
+
+        def discard_drafts
+          proposals = Decidim::Proposals::Proposal.drafts.where(component: @component)
+          proposals.destroy_all
+        end
+      end
+    end
+  end
+end

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

@@ -39,7 +39,11 @@ module Decidim
         end
 
         def parse_participatory_text_doc(form)
-          markdown = DocToMarkdown.new(form.document_text, form.document_type).to_md
+          return if form.document.blank?
+
+          document = form.document_text
+          document = Decidim::IoEncoder.to_standard_encoding(document)
+          markdown = DocToMarkdown.new(document, form.document_type).to_md
           parser = MarkdownToProposals.new(form.current_component, form.current_user)
           parser.parse(markdown)
         end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # a participatory text.
-      class PublishParticipatoryText < Rectify::Command
+      class PublishParticipatoryText < UpdateParticipatoryText
         # Public: Initializes the command.
         #
         # form - A PreviewParticipatoryTextForm form object with the params.
@@ -21,13 +21,13 @@ module Decidim
         # Returns nothing.
         def call
           transaction do
-            @publish_failures = {}
+            @failures = {}
             update_contents_and_resort_proposals(form)
             publish_drafts
           end
 
-          if @publish_failures.any?
-            broadcast(:invalid, @publish_failures)
+          if @failures.any?
+            broadcast(:invalid, @failures)
           else
             broadcast(:ok)
           end
@@ -37,27 +37,15 @@ module Decidim
 
         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?
+          raise ActiveRecord::Rollback if @failures.any?
         end
 
         def add_failure(proposal)
-          @publish_failures[proposal.id] = proposal.errors.full_messages
+          @failures[proposal.id] = proposal.errors.full_messages
         end
       end
     end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic when an admin updates participatory text proposals.
+      class UpdateParticipatoryText < 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
+            @failures = {}
+            update_contents_and_resort_proposals(form)
+          end
+
+          if @failures.any?
+            broadcast(:invalid, @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 @failures.any?
+        end
+
+        def add_failure(proposal)
+          @failures[proposal.id] = proposal.errors.full_messages
+        end
+      end
+    end
+  end
+end

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

@@ -43,29 +43,28 @@ module Decidim
 
       attr_reader :form, :proposal, :attachment
 
-      def proposal_attributes
-        fields = {}
-
-        fields[:title] = title_with_hashtags
-        fields[:body] = body_with_hashtags
-        fields[:component] = form.component
-
-        fields
-      end
-
-      # This will be the PaperTrail version that is
-      # shown in the version control feature (1 of 1)
+      # Prevent PaperTrail from creating an additional version
+      # in the proposal multi-step creation process (step 1: create)
+      #
+      # A first version will be created in step 4: publish
+      # for diff rendering in the proposal version control
       def create_proposal
-        @proposal = Decidim.traceability.perform_action!(
-          :create,
-          Decidim::Proposals::Proposal,
-          @current_user,
-          visibility: "public-only"
-        ) do
-          proposal = Proposal.new(proposal_attributes)
-          proposal.add_coauthor(@current_user, user_group: user_group)
-          proposal.save!
-          proposal
+        PaperTrail.request(enabled: false) do
+          @proposal = Decidim.traceability.perform_action!(
+            :create,
+            Decidim::Proposals::Proposal,
+            @current_user,
+            visibility: "public-only"
+          ) do
+            proposal = Proposal.new(
+              title: title_with_hashtags,
+              body: body_with_hashtags,
+              component: form.component
+            )
+            proposal.add_coauthor(@current_user, user_group: user_group)
+            proposal.save!
+            proposal
+          end
         end
       end
 

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

@@ -79,6 +79,7 @@ module Decidim
           new_proposal = Proposal.new(proposal_attributes)
           new_proposal.coauthorships = @collaborative_draft.coauthorships
           new_proposal.category = @collaborative_draft.category
+          new_proposal.attachments = @collaborative_draft.attachments
           new_proposal.save!
           new_proposal
         end

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

@@ -34,12 +34,34 @@ module Decidim
 
       private
 
-      # Prevent PaperTrail from creating an additional version
-      # in the proposal multi-step creation process (step 4: publish)
+      # This will be the PaperTrail version that is
+      # shown in the version control feature (1 of 1)
+      #
+      # For an attribute to appear in the new version it has to be reset
+      # and reassigned, as PaperTrail only keeps track of object CHANGES.
       def publish_proposal
+        title = reset(:title)
+        body = reset(:body)
+
+        Decidim.traceability.perform_action!(
+          "publish",
+          @proposal,
+          @current_user,
+          visibility: "public-only"
+        ) do
+          @proposal.update title: title, body: body, published_at: Time.current
+        end
+      end
+
+      # Reset the attribute to an empty string and return the old value
+      def reset(attribute)
+        attribute_value = @proposal[attribute]
         PaperTrail.request(enabled: false) do
-          @proposal.update published_at: Time.current
+          # rubocop:disable Rails/SkipsModelValidations
+          @proposal.update_attribute attribute, ""
+          # rubocop:enable Rails/SkipsModelValidations
         end
+        attribute_value
       end
 
       def send_notification

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

@@ -53,41 +53,37 @@ module Decidim
 
       attr_reader :form, :proposal, :current_user, :attachment
 
-      def proposal_attributes
-        fields = {}
-
-        fields[:title] = title_with_hashtags
-        fields[:body] = body_with_hashtags
-        fields[:category] = form.category
-        fields[:scope] = form.scope
-        fields[:address] = form.address
-        fields[:latitude] = form.latitude
-        fields[:longitude] = form.longitude
-
-        fields
-      end
-
       # Prevent PaperTrail from creating an additional version
       # in the proposal multi-step creation process (step 3: complete)
+      #
+      # A first version will be created in step 4: publish
+      # for diff rendering in the proposal control version
       def update_draft
         PaperTrail.request(enabled: false) do
-          @proposal.update(proposal_attributes)
+          @proposal.update(attributes)
           @proposal.coauthorships.clear
           @proposal.add_coauthor(current_user, user_group: user_group)
         end
       end
 
       def update_proposal
-        @proposal = Decidim.traceability.update!(
-          @proposal,
-          current_user,
-          proposal_attributes,
-          visibility: "public-only"
-        )
+        @proposal.update!(attributes)
         @proposal.coauthorships.clear
         @proposal.add_coauthor(current_user, user_group: user_group)
       end
 
+      def attributes
+        {
+          title: title_with_hashtags,
+          body: body_with_hashtags,
+          category: form.category,
+          scope: form.scope,
+          address: form.address,
+          latitude: form.latitude,
+          longitude: form.longitude
+        }
+      end
+
       def proposal_limit_reached?
         proposal_limit = form.current_component.settings.proposal_limit
 
@@ -109,11 +105,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.from_author(current_user).where(component: form.current_component).published.where.not(id: proposal.id)
+        Proposal.from_author(current_user).where(component: form.current_component).published.where.not(id: proposal.id).except_withdrawn
       end
 
       def user_group_proposals
-        Proposal.from_user_group(user_group).where(component: form.current_component).published.where.not(id: proposal.id)
+        Proposal.from_user_group(user_group).where(component: form.current_component).published.where.not(id: proposal.id).except_withdrawn
       end
     end
   end

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -59,7 +59,7 @@ module Decidim
           when "most_voted"
             proposals.order(proposal_votes_count: :desc)
           when "recent"
-            proposals.order(created_at: :desc)
+            proposals.order(published_at: :desc)
           end
         end
       end

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

@@ -15,13 +15,13 @@ module Decidim
         end
 
         def new_import
-          enforce_permission_to :import, :participatory_texts
+          enforce_permission_to :manage, :participatory_texts
           participatory_text = Decidim::Proposals::ParticipatoryText.find_by(component: current_component)
           @import = form(Admin::ImportParticipatoryTextForm).from_model(participatory_text)
         end
 
         def import
-          enforce_permission_to :import, :participatory_texts
+          enforce_permission_to :manage, :participatory_texts
           @import = form(Admin::ImportParticipatoryTextForm).from_params(params)
 
           Admin::ImportParticipatoryText.call(@import) do
@@ -37,23 +37,55 @@ module Decidim
           end
         end
 
-        def publish
-          enforce_permission_to :publish, :participatory_texts
+        # When `save_draft` param exists, proposals are only saved.
+        # When no `save_draft` param is set, proposals are saved and published.
+        def update
+          enforce_permission_to :manage, :participatory_texts
+
           form_params = params.require(:preview_participatory_text).permit!
           @preview_form = form(Admin::PreviewParticipatoryTextForm).from_params(proposals: form_params[:proposals_attributes]&.values)
 
-          PublishParticipatoryText.call(@preview_form) do
-            on(:ok) do
-              flash[:notice] = I18n.t("participatory_texts.publish.success", scope: "decidim.proposals.admin")
-              redirect_to proposals_path
+          if params.has_key?("save_draft")
+            UpdateParticipatoryText.call(@preview_form) do
+              on(:ok) do
+                flash[:notice] = I18n.t("participatory_texts.update.success", scope: "decidim.proposals.admin")
+                redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
+              end
+
+              on(:invalid) do |failures|
+                alert_msg = [I18n.t("participatory_texts.publish.invalid", scope: "decidim.proposals.admin")]
+                failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
+                flash.now[:alert] = alert_msg.join("<br/>").html_safe
+                index
+                render action: "index"
+              end
+            end
+          else
+            PublishParticipatoryText.call(@preview_form) do
+              on(:ok) do
+                flash[:notice] = I18n.t("participatory_texts.publish.success", scope: "decidim.proposals.admin")
+                redirect_to proposals_path
+              end
+
+              on(:invalid) do |failures|
+                alert_msg = [I18n.t("participatory_texts.publish.invalid", scope: "decidim.proposals.admin")]
+                failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
+                flash.now[:alert] = alert_msg.join("<br/>").html_safe
+                index
+                render action: "index"
+              end
             end
+          end
+        end
+
+        # Removes all the unpublished proposals (drafts).
+        def discard
+          enforce_permission_to :manage, :participatory_texts
 
-            on(:invalid) do |failures|
-              alert_msg = [I18n.t("participatory_texts.publish.invalid", scope: "decidim.proposals.admin")]
-              failures.each_pair { |id, msg| alert_msg << "ID:[#{id}] #{msg}" }
-              flash.now[:alert] = alert_msg.join("<br/>").html_safe
-              index
-              render action: "index"
+          DiscardParticipatoryText.call(current_component) do
+            on(:ok) do
+              flash[:notice] = I18n.t("participatory_texts.discard.success", scope: "decidim.proposals.admin")
+              redirect_to participatory_texts_path(component_id: current_component.id, initiative_slug: "asdf")
             end
           end
         end