decidim-proposals 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3178ec190b652c6edf575777f6a911d1961735f277b7be19688270eeac06a975
-  data.tar.gz: 82b8bd589fe391cea20cf6bd3bb90d068bf12a2630d62667f7cb36107893345d
+  metadata.gz: 1eb9355480e7b5f78b9eb01ede6e1e51362cf77f991b45d43944fbe3b52eece1
+  data.tar.gz: c44373543399ee2bd9c95d5d47ba89d209cd9033c899ef7cb614166a531e4b4d
 SHA512:
-  metadata.gz: 669d98ba3e10844143fed41db59bf8275be07ffb880ac0df685d0fb45a0a8c4cb8897a866e7bdb20916cdbe64650c84c1cf8f0007b136212fe631ea99a2611c8
-  data.tar.gz: fa7407ac02421a6950106755aef55b5208465b58e4e2df48311977fd55eb414503c9fdeceda99f015c9c7d1a31c9aa12192e448ccd5f7e0283c75736cc4ed634
+  metadata.gz: 5e4582447ccb88226799caaa32bedcf851e81af9ed927c1a7a4adabc9dedd8341438d45ce735cc471998e018119f597c7cb577b7e938d575f3b96de6a34bc1a9
+  data.tar.gz: 985e3a9309033dbceed04819a85796c8faaf379c6e845420ca9884a2b545464025c5d195dd03659ed6fc571622b751462bda1b9f9de519c99ac887eb8d9844d6

data/README.md

@@ -43,6 +43,18 @@ This module includes the following models to Decidim's Global Search:
 
 - `Proposals`
 
+## Participatory Texts
+
+Participatory texts persist each section of the document in a Proposal.
+
+When importing participatory texts all formats are first transformed into Markdown and is the markdown that is parsed and processed to generate the corresponding Proposals.
+
+When processing participatory text documents three kinds of secions are taken into account.
+
+- Section: each "Title 1" in the document becomes a section.
+- Subsection: the rest of the titles become subsections.
+- Article: paragraphs become articles.
+
 ## Contributing
 
 See [Decidim](https://github.com/decidim/decidim).

data/app/assets/config/decidim_proposals_manifest.js

@@ -1,3 +1,4 @@
 //= link decidim/proposals/social_share.js
 //= link decidim/proposals/add_proposal.js
+//= link decidim/proposals/admin/proposals_form.js
 //= link_tree ../images/decidim

data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6

@@ -2,7 +2,7 @@ $(() => {
   window.DecidimProposals = window.DecidimProposals || {};
 
   window.DecidimProposals.bindProposalAddress = () => {
-    const $checkbox = $("input:checkbox.has_address");
+    const $checkbox = $("input:checkbox[name$='[has_address]']");
     const $addressInput = $("#address_input");
 
     if ($checkbox.length > 0) {

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

@@ -0,0 +1,23 @@
+$(() => {
+  const $form = $(".proposal_form_admin");
+
+  if ($form.length > 0) {
+    const $proposalCreatedInMeeting = $form.find("#proposal_created_in_meeting");
+    const $proposalMeeting = $form.find("#proposal_meeting");
+
+    const toggleDisabledHiddenFields = () => {
+      const enabledMeeting = $proposalCreatedInMeeting.prop("checked");
+      $proposalMeeting.find("select").attr("disabled", "disabled");
+      $proposalMeeting.hide();
+
+      if (enabledMeeting) {
+        $proposalMeeting.find("select").attr("disabled", !enabledMeeting);
+        $proposalMeeting.show();
+      }
+    };
+
+    $proposalCreatedInMeeting.on("change", toggleDisabledHiddenFields);
+    toggleDisabledHiddenFields();
+
+  }
+});

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

@@ -11,8 +11,6 @@ module Decidim
       include Cell::ViewModel::Partial
       include Messaging::ConversationHelper
 
-      delegate :user_signed_in?, to: :parent_controller
-
       def show
         cell card_size, model, @options
       end

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

@@ -18,8 +18,12 @@ module Decidim
         true
       end
 
+      def title
+        present(model).title
+      end
+
       def description
-        truncate(model.body, length: 100)
+        truncate(present(model).body, length: 100)
       end
 
       def has_badge?

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

@@ -0,0 +1,3 @@
+<% published_components.each do |component| %>
+  <%= cell "decidim/proposals/highlighted_proposals_for_component", component %>
+<% end %>

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the highlighted proposals for a given participatory
+    # space. It is intended to be used in the `participatory_space_highlighted_elements`
+    # view hook.
+    class HighlightedProposalsCell < Decidim::ViewModel
+      include ProposalCellsHelper
+
+      private
+
+      def published_components
+        Decidim::Component
+          .where(
+            participatory_space: model,
+            manifest_name: :proposals
+          )
+          .published
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+<section class="section row collapse highlighted_proposals">
+  <h4 class="section-heading">
+    <%= translated_attribute(model.name) %>  <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count) %></a>
+  </h4>
+
+  <%= cell(
+    "decidim/collapsible_list",
+    proposals_to_render,
+    cell_options: {},
+    list_class: "row small-up-1 medium-up-2 card-grid",
+    size: proposals_count
+    ) %>
+
+  <%= link_to(
+    t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count),
+    main_component_path(model),
+    class: "button button--sc light secondary button--right"
+  ) %>
+</section>

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the highlighted proposals for a given component.
+    # It is intended to be used in the `participatory_space_highlighted_elements`
+    # view hook.
+    class HighlightedProposalsForComponentCell < Decidim::ViewModel
+      include Decidim::ComponentPathHelper
+
+      def show
+        render unless proposals_count.zero?
+      end
+
+      private
+
+      def proposals
+        @proposals ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
+                                                   .where(component: model)
+                                                   .order_randomly(rand * 2 - 1)
+      end
+
+      def proposals_to_render
+        @proposals_to_render ||= proposals.limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
+      end
+
+      def proposals_count
+        @proposals_count ||= proposals.count
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/participatory_text_proposal/buttons.erb

@@ -0,0 +1,33 @@
+<div class="columns mediumlarge-4 hidden-section p-sm">
+  <div class="medium-8">
+    <%= follow_button_for(model, true) %>
+    <% if amendments_enabled? %>
+      <div class="button-group button-group--collapse mb-s row collapse">
+        <%= link_to resource_amendments_path, class: "column medium-4 button light secondary" do %>
+        <%= model.emendations.count %>
+          <% end %>
+          <%= link_to amend_resource_path, class: "column button hollow secondary button--sc" do %>
+            <%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
+          <% end %>
+      </div>
+    <% end %>
+    <% if component_settings.comments_enabled? %>
+      <div class="button-group button-group--collapse row collapse">
+        <% if current_settings.comments_blocked? %>
+          <%= content_tag :button, class: "column medium-4 button light secondary", title: t("endorse", scope: "decidim.proposals.participatory_text_proposal.buttons") do %>
+            <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %>
+            <%= model.comments.count %>
+          <% end %>
+          <%= content_tag :button, t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons"), class: "column button hollow secondary button--sc disabled", disabled: true, title: t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
+        <% else %>
+          <%= link_to resource_comments_path, class: "column medium-4 button light secondary" do %>
+            <%= icon "comment-square", class: "icon--small", aria_label: t("comments", scope: "decidim.proposals.participatory_text_proposal.buttons"), role: "img" %> <%= model.comments.count %>
+          <% end %>
+          <%= link_to resource_comments_path, class: "column button hollow secondary button--sc" do %>
+            <%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<div class="row hover-section">
+  <div class="columns mediumlarge-8">
+    <%= link_to resource_path, class: "card__link--block pt-s pb-s" do %>
+      <%= title %>
+      <%= body %>
+    <% end %>
+  </div>
+  <%= render :buttons %>
+</div>

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the participatory text proposal card for an instance of a Proposal
+    # the default size is the Medium Card (:m)
+    class ParticipatoryTextProposalCell < Decidim::ViewModel
+      include ProposalCellsHelper
+      include Cell::ViewModel::Partial
+      include Messaging::ConversationHelper
+
+      delegate :current_organization, to: :controller
+
+      def show
+        render
+      end
+
+      private
+
+      def title
+        case model.participatory_text_level
+        when "section"
+          "<h5><strong class='text-uppercase'>#{present(model).title}</strong></h5>"
+        else
+          "<h6><strong>#{present(model).title}</strong></h6>"
+        end
+      end
+
+      def body
+        return unless model.participatory_text_level == "article"
+        present(model).body
+      end
+
+      def current_user
+        context[:current_user]
+      end
+
+      def resource_path
+        resource_locator(model).path
+      end
+
+      def amend_resource_path
+        decidim.new_amend_path(amendable_gid: model.to_sgid.to_s)
+      end
+
+      def resource_comments_path
+        resource_locator(model).path(anchor: "comments")
+      end
+
+      def resource_amendments_path
+        resource_locator(model).path(anchor: "amendments")
+      end
+
+      def current_participatory_space
+        model.component.participatory_space
+      end
+
+      def component_name
+        translated_attribute current_component.name
+      end
+
+      def component_type_name
+        model.class.model_name.human
+      end
+
+      def participatory_space_name
+        translated_attribute current_participatory_space.title
+      end
+
+      def participatory_space_type_name
+        translated_attribute current_participatory_space.model_name.human
+      end
+    end
+  end
+end

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

@@ -11,8 +11,6 @@ module Decidim
       include Cell::ViewModel::Partial
       include Messaging::ConversationHelper
 
-      delegate :user_signed_in?, to: :parent_controller
-
       def show
         cell card_size, model, options
       end

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

@@ -14,7 +14,7 @@
           ) %>
         <% end %>
         <%= render partial: "decidim/proposals/proposals/vote_button.html", locals: { proposal: model, from_proposals_list: true } %>
-      <% else %>
+      <% elsif has_footer? %>
         <div class="card__support__data"></div>
         <%= link_to t("decidim.proposals.proposals.proposal.view_proposal"), resource_path, class: "card__button button--sc light button small secondary" %>
       <% end %>

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

@@ -27,13 +27,18 @@ module Decidim
       end
 
       def has_badge?
-        answered? || withdrawn?
+        answered? || withdrawn? || emendation?
       end
 
       def has_link_to_resource?
         model.published?
       end
 
+      def has_footer?
+        return false if model.emendation?
+        true
+      end
+
       def description
         truncate(present(model).body, length: 100)
       end

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

@@ -45,12 +45,12 @@ module Decidim
       private
 
       def notify_collaborative_draft_authors
-        recipient_ids = @collaborative_draft.authors.pluck(:id) - [@requester_user.id]
+        affected_users = @collaborative_draft.notifiable_identities - [@requester_user]
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.collaborative_draft_access_accepted",
           event_class: Decidim::Proposals::CollaborativeDraftAccessAcceptedEvent,
           resource: @collaborative_draft,
-          recipient_ids: recipient_ids.uniq,
+          affected_users: affected_users.uniq,
           extra: {
             requester_id: @requester_user.id
           }
@@ -62,7 +62,7 @@ module Decidim
           event: "decidim.events.proposals.collaborative_draft_access_requester_accepted",
           event_class: Decidim::Proposals::CollaborativeDraftAccessRequesterAcceptedEvent,
           resource: @collaborative_draft,
-          recipient_ids: [@requester_user.id]
+          affected_users: [@requester_user]
         )
       end
     end

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

@@ -74,7 +74,8 @@ module Decidim
             event: event,
             event_class: event_class,
             resource: proposal,
-            recipient_ids: proposal.followers.pluck(:id)
+            affected_users: proposal.notifiable_identities,
+            followers: proposal.followers - proposal.notifiable_identities
           )
         end
 

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

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Rectify::Command
+        include HashtagsMethods
+
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -42,24 +44,22 @@ module Decidim
         def create_proposal
           @proposal = Decidim::Proposals::ProposalBuilder.create(
             attributes: attributes,
-            author: form.current_organization,
+            author: form.author,
             action_user: form.current_user
           )
         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: parsed_title,
-            body: parsed_body,
+            title: title_with_hashtags,
+            body: body_with_hashtags,
             category: form.category,
             scope: form.scope,
             component: form.component,
             address: form.address,
             latitude: form.latitude,
             longitude: form.longitude,
+            created_in_meeting: form.created_in_meeting,
             published_at: Time.current
           }
         end
@@ -101,7 +101,7 @@ module Decidim
             event: "decidim.events.proposals.proposal_published",
             event_class: Decidim::Proposals::PublishProposalEvent,
             resource: proposal,
-            recipient_ids: @proposal.participatory_space.followers.pluck(:id),
+            followers: @proposal.participatory_space.followers,
             extra: {
               participatory_space: true
             }

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

@@ -20,11 +20,11 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) unless form.valid?
+          return broadcast(:invalid) unless @form.valid?
 
           transaction do
-            save_participatory_text(form)
-            parse_participatory_text_doc(form.document_text)
+            save_participatory_text_meta(@form)
+            parse_participatory_text_doc(@form)
           end
 
           broadcast(:ok)
@@ -32,16 +32,16 @@ module Decidim
 
         private
 
-        attr_reader :form
-
-        def save_participatory_text(form)
+        # Persist ParticipatoryText related meta information.
+        def save_participatory_text_meta(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)
+        def parse_participatory_text_doc(form)
+          markdown = DocToMarkdown.new(form.document_text, form.document_type).to_md
           parser = MarkdownToProposals.new(form.current_component, form.current_user)
-          parser.parse(document)
+          parser.parse(markdown)
         end
       end
     end