decidim-proposals 0.12.2 → 0.13.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff102e880b0f9c12cbf9aabbb8ae01fecfb4554371386ae32c1d782775a63830
-  data.tar.gz: 383e5a0b5d15ffea8200e300b78c37cdb8f5f169a12ab1852bc38e0c452e9bdf
+  metadata.gz: 2609298045f639a58aa4261912edf5bed42edd6f5f6565af65d277c829c3986a
+  data.tar.gz: add5696156559e7a28bb893977788628459f788c132f6c8b4ea2856c726978d5
 SHA512:
-  metadata.gz: 9b5576522d8ec8815d3ab711d70ed9aba96d37eab93e14eeeccc9af5ce76870fd87570721361ef2ae5529893e8139921269034bdbc1e8a3b2e06f96a1047100d
-  data.tar.gz: dc62e6eb64f171108d9082a0f3ec79828db38d63be1fbff5563a2d9421b1df6997f97247fedeff65fa6fd3591151ad239e8014f0b932918a9262701b57c7f494
+  metadata.gz: 80c6b74ae952eefbb30a6abe00d13a37d50b8143fd00d0ed9b9b4f9d8dfcadb8a360852bc2a616e41bb27e79d172e18bf8333fca462e2345e0cd93eccd8ca977
+  data.tar.gz: de47a3b699f8c2e3e549e60f330e0cacf79e6ebf8bd47cc2d37013b4c9d436b0ce3751250948ac64ae29be17334e36485291767884e955d97909f8b5b66a5ddf

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cell renders a collapsible list of the proposal coauthors.
+    #
+    # Available sizes:
+    #  - `:small` => collapses after 3 elements.
+    #  - `:default` => collapses after 7 elements. If not specified, this one is
+    #    used.
+    #
+    # Example:
+    #
+    #    cell("decidim/proposals/coauthorships", @proposal)
+    class CoauthorshipsCell < Decidim::ViewModel
+      include Decidim::ApplicationHelper
+
+      def show
+        if model.official?
+          cell "decidim/author", present(model).author, from: model
+        else
+          cell(
+            "decidim/collapsible_authors",
+            authors_for(model),
+            cell_name: "decidim/author",
+            cell_options: { extra_classes: ["author-data--small"] },
+            size: :small,
+            from: model
+          )
+        end
+      end
+
+      private
+
+      def authors_for(coauthorable)
+        coauthorable.identities.map { |identity| present(identity) }
+      end
+    end
+  end
+end

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

@@ -36,10 +36,15 @@ module Decidim
       end
 
       def statuses
+        return [:endorsements_count, :comments_count] if model.draft?
         return [:creation_date, :endorsements_count, :comments_count] unless has_link_to_resource?
         [:creation_date, :follow, :endorsements_count, :comments_count]
       end
 
+      def creation_date_status
+        l(model.published_at.to_date, format: :decidim_short)
+      end
+
       def endorsements_count_status
         return endorsements_count unless has_link_to_resource?
 

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

@@ -52,6 +52,9 @@ module Decidim
             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/update_proposal_category.rb

@@ -37,7 +37,7 @@ module Decidim
             else
               transaction do
                 update_proposal_category proposal
-                notify_author proposal if proposal.author.present?
+                notify_author proposal if proposal.coauthorships.any?
               end
               @response[:successful] << proposal.title
             end
@@ -59,7 +59,7 @@ module Decidim
             event: "decidim.events.proposals.proposal_update_category",
             event_class: Decidim::Proposals::Admin::UpdateProposalCategoryEvent,
             resource: proposal,
-            recipient_ids: [proposal.decidim_author_id]
+            recipient_ids: proposal.coauthorships.pluck(:decidim_author_id)
           )
         end
       end

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

@@ -50,13 +50,12 @@ module Decidim
           body: form.body,
           category: form.category,
           scope: form.scope,
-          author: @current_user,
-          decidim_user_group_id: form.user_group_id,
           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
 
       def build_attachment
@@ -112,11 +111,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.where(author: @current_user, component: form.current_component).except_withdrawn
+        Proposal.from_author(@current_user).where(component: form.current_component).except_withdrawn
       end
 
       def user_group_proposals
-        Proposal.where(user_group: @user_group, component: form.current_component).except_withdrawn
+        Proposal.from_user_group(@user_group).where(component: form.current_component).except_withdrawn
       end
     end
   end

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

@@ -22,7 +22,7 @@ module Decidim
       # Returns nothing.
       def call
         return broadcast(:invalid) unless @proposal.draft?
-        return broadcast(:invalid) if @proposal.author != @current_user
+        return broadcast(:invalid) unless @proposal.authored_by?(@current_user)
 
         @proposal.destroy!
 

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

@@ -20,7 +20,7 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid) if @proposal.author != @current_user
+        return broadcast(:invalid) unless @proposal.authored_by?(@current_user)
 
         transaction do
           @proposal.update published_at: Time.current
@@ -34,13 +34,13 @@ module Decidim
       private
 
       def send_notification
-        return if @proposal.author.blank?
+        return if @proposal.coauthorships.empty?
 
         Decidim::EventsManager.publish(
           event: "decidim.events.proposals.proposal_published",
           event_class: Decidim::Proposals::PublishProposalEvent,
           resource: @proposal,
-          recipient_ids: @proposal.author.followers.pluck(:id)
+          recipient_ids: coauthors_followers(@proposal)
         )
       end
 
@@ -49,12 +49,20 @@ module Decidim
           event: "decidim.events.proposals.proposal_published",
           event_class: Decidim::Proposals::PublishProposalEvent,
           resource: @proposal,
-          recipient_ids: @proposal.participatory_space.followers.pluck(:id) - @proposal.author.followers.pluck(:id),
+          recipient_ids: @proposal.participatory_space.followers.pluck(:id) - coauthors_followers(@proposal),
           extra: {
             participatory_space: true
           }
         )
       end
+
+      def coauthors_followers(_proposal)
+        followers_ids = []
+        @proposal.authors.each do |author|
+          followers_ids += author.followers.pluck(:id)
+        end
+        followers_ids
+      end
     end
   end
 end

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

@@ -43,12 +43,12 @@ module Decidim
           body: form.body,
           category: form.category,
           scope: form.scope,
-          author: current_user,
-          decidim_user_group_id: user_group.try(:id),
           address: form.address,
           latitude: form.latitude,
           longitude: form.longitude
         )
+        @proposal.coauthorships.clear
+        @proposal.add_coauthor(current_user, decidim_user_group_id: user_group&.id)
       end
 
       def proposal_limit_reached?
@@ -72,11 +72,11 @@ module Decidim
       end
 
       def current_user_proposals
-        Proposal.where(author: current_user, 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)
       end
 
       def user_group_proposals
-        Proposal.where(user_group: user_group, 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)
       end
     end
   end

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

@@ -20,7 +20,6 @@ module Decidim
                      .results
                      .published
                      .not_hidden
-                     .includes(:author)
                      .includes(:category)
                      .includes(:scope)
 
@@ -222,7 +221,7 @@ module Decidim
       end
 
       def proposal_draft
-        Proposal.not_hidden.where(component: current_component, author: current_user).find_by(published_at: nil)
+        Proposal.from_all_user_identities(current_user).not_hidden.where(component: current_component).find_by(published_at: nil)
       end
 
       def ensure_is_draft

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

@@ -3,7 +3,7 @@
 module Decidim
   module Proposals
     class PublishProposalEvent < Decidim::Events::SimpleEvent
-      include Decidim::Events::AuthorEvent
+      include Decidim::Events::CoauthorEvent
 
       private
 

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

@@ -31,7 +31,7 @@ module Decidim
       delegate :categories, to: :current_component
 
       def map_model(model)
-        self.user_group_id = model.decidim_user_group_id
+        self.user_group_id = model.user_groups.first&.id
         return unless model.categorization
 
         self.category_id = model.categorization.decidim_category_id

data/app/helpers/decidim/proposals/application_helper.rb

@@ -83,6 +83,10 @@ module Decidim
           end
         end
       end
+
+      def endorsers_for(proposal)
+        proposal.endorsements.for_listing.map { |identity| present(identity.normalized_author) }
+      end
     end
   end
 end

data/app/helpers/decidim/proposals/proposal_endorsements_helper.rb

@@ -4,16 +4,6 @@ module Decidim
   module Proposals
     # Simple helper to handle markup variations for proposal endorsements partials
     module ProposalEndorsementsHelper
-      # Returns the css classes used for proposal endorsements count in both proposals list and show pages
-      #
-      # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
-      #
-      # Returns a hash with the css classes for the count number and label
-      def endorsements_count_classes(from_proposals_list)
-        return { number: "card__support__number", label: "" } if from_proposals_list
-        { number: "extra__suport-number", label: "extra__suport-text" }
-      end
-
       # Returns the css classes used for proposal endorsement button in both proposals list and show pages
       #
       # from_proposals_list - A boolean to indicate if the template is rendered from the proposals list page
@@ -116,6 +106,22 @@ module Decidim
         render partial: "decidim/proposals/proposal_endorsements/identity", locals:
         { identity: presenter, selected: selected, current_endorsement_url: current_endorsement_url, http_method: http_method }
       end
+
+      # Renders the counter of endorsements that appears in card at show Propoal.
+      def render_endorsements_count_card_part(proposal, fully_endorsed)
+        content = icon("bullhorn", class: "icon--small", aria_label: "Endorsements", role: "img")
+        content += proposal.proposal_endorsements_count.to_s
+        tag_params = { id: "proposal-#{proposal.id}-endorsements-count", class: "button small compact light button--sc button--shadow #{fully_endorsed ? "success" : "secondary"}" }
+        if proposal.proposal_endorsements_count.positive?
+          link_to "#list-of-endorsements", tag_params do
+            content
+          end
+        else
+          content_tag("div", tag_params) do
+            content
+          end
+        end
+      end
     end
   end
 end

data/app/jobs/decidim/proposals/notify_proposals_mentioned_job.rb

@@ -8,9 +8,9 @@ module Decidim
         linked_proposals = proposal_metadata.linked_proposals
         linked_proposals.each do |proposal_id|
           proposal = Proposal.find(proposal_id)
-          next if proposal.decidim_author_id.blank?
+          next if proposal.official?
 
-          recipient_ids = [proposal.decidim_author_id]
+          recipient_ids = proposal.authors.pluck(:decidim_author_id)
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_mentioned",
             event_class: Decidim::Proposals::ProposalMentionedEvent,

data/app/models/decidim/proposals/proposal.rb

@@ -5,7 +5,7 @@ module Decidim
     # The data store for a Proposal in the Decidim::Proposals component.
     class Proposal < Proposals::ApplicationRecord
       include Decidim::Resourceable
-      include Decidim::Authorable
+      include Decidim::Coauthorable
       include Decidim::HasComponent
       include Decidim::ScopableComponent
       include Decidim::HasReference
@@ -18,6 +18,7 @@ module Decidim
       include Decidim::Traceable
       include Decidim::Loggable
       include Decidim::Fingerprintable
+      include Decidim::DataPortability
 
       fingerprint fields: [:title, :body]
 
@@ -60,6 +61,14 @@ module Decidim
         Decidim::Proposals::AdminLog::ProposalPresenter
       end
 
+      # Returns a collection scoped by user.
+      # Overrides this method in DataPortability to support Coauthorable.
+      def self.user_collection(user)
+        joins(:coauthorships)
+          .where("decidim_coauthorships.coauthorable_type = ?", name)
+          .where("decidim_coauthorships.decidim_author_id = ?", user.id)
+      end
+
       # Public: Check if the user has voted the proposal.
       #
       # Returns Boolean.
@@ -124,7 +133,7 @@ module Decidim
 
       # Public: Whether the proposal is official or not.
       def official?
-        author.nil?
+        authors.empty?
       end
 
       # Public: The maximum amount of votes allowed for this proposal.
@@ -186,6 +195,14 @@ module Decidim
         Arel.sql(query)
       end
 
+      def self.export_serializer
+        Decidim::Proposals::ProposalSerializer
+      end
+
+      def self.data_portability_images(user)
+        user_collection(user).map { |p| p.attachments.collect(&:file_url) }
+      end
+
       private
 
       # Checks whether the proposal is inside the time window to be editable or not once published.

data/app/permissions/decidim/proposals/permissions.rb

@@ -67,7 +67,7 @@ module Decidim
       end
 
       def can_withdraw_proposal?
-        toggle_allow(proposal && proposal.author == user)
+        toggle_allow(proposal && proposal.authored_by?(user))
       end
 
       def can_endorse_proposal?

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -12,10 +12,13 @@ module Decidim
       def author
         @author ||= if official?
                       Decidim::Proposals::OfficialAuthorPresenter.new
-                    elsif user_group
-                      Decidim::UserGroupPresenter.new(user_group)
                     else
-                      Decidim::UserPresenter.new(super)
+                      coauthorship = coauthorships.first
+                      if coauthorship.user_group
+                        Decidim::UserGroupPresenter.new(coauthorship.user_group)
+                      else
+                        Decidim::UserPresenter.new(coauthorship.author)
+                      end
                     end
       end
 

data/app/services/decidim/proposals/proposal_search.rb

@@ -24,9 +24,9 @@ module Decidim
       # The 'official' proposals doesn't have an author id
       def search_origin
         if origin == "official"
-          query.where(decidim_author_id: nil)
+          query.where(coauthorships_count: 0)
         elsif origin == "citizens"
-          query.where.not(decidim_author_id: nil)
+          query.where.not(coauthorships_count: 0)
         else # Assume 'all'
           query
         end

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -5,7 +5,7 @@
     <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
     <% if allowed_to? :create, :proposal %>
-      <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: "button tiny button--simple" %>
+      <%= link_to t("actions.new", scope: "decidim.proposals"), new_proposal_path, class: "button tiny button--simple" %>
     <% end %>
 
     <%= export_dropdown %>

data/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -55,7 +55,7 @@
             <% end %>
 
             <th>
-              <%= sort_link(query, :created_at, t("models.proposal.fields.created_at", scope: "decidim.proposals") ) %>
+              <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
             </th>
 
             <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>

data/app/views/decidim/proposals/proposal_endorsements/update_buttons_and_counters.js.erb

@@ -10,7 +10,7 @@ function update_main_page_button() {
 function update_identities_rows() {
   <% fully_endorsed= fully_endorsed?(proposal, current_user) %>
   var $proposalEndorsementsRowCount = $('#proposal-<%= proposal.id %>-endorsements-count');
-  morphdom($proposalEndorsementsRowCount[0], '<%= j(render partial: 'decidim/proposals/proposals/endorsements_count', locals: { proposal: proposal, fully_endorsed: fully_endorsed }).strip.html_safe %>');
+  morphdom($proposalEndorsementsRowCount[0], '<%= j(render_endorsements_count_card_part(proposal, fully_endorsed)).strip.html_safe %>');
   var $proposalEndorsementsRowButton = $($('#select-identity-button')[0]);
   <% if fully_endorsed %>
     $proposalEndorsementsRowButton.addClass('success')

data/app/views/decidim/proposals/proposals/_endorsements_card_row.html.erb

@@ -3,7 +3,7 @@
   <% if endorsements_enabled? %>
     <div class="column small-9 collapse">
       <div class="button-group button-group--collapse button--nomargin small">
-        <%= render partial: "endorsements_count", locals: { proposal: @proposal, fully_endorsed: fully_endorsed } %>
+        <%= render_endorsements_count_card_part(@proposal, fully_endorsed) %>
         <% if current_settings.endorsements_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
           <%= content_tag :span, t(".endorse"), class: "card__button button #{endorsement_button_classes(false)} disabled", disabled: true, title: t(".endorse") %>
         <% elsif current_user %>