decidim-proposals 0.29.1 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2109029e1165afe1fe039f4f5e1d2f0b8af26d8e80bb2e0db0c11053da033e61
-  data.tar.gz: 9e72ff8d19ba6f4442eed68fa4c5625e2d22367b3c00a8faf2b36fa58c888dbe
+  metadata.gz: df9005202c6078251b19d437ce9dad80b29d44bd6bec63b9d64e5fd89009f385
+  data.tar.gz: 02a8ec7149f40e004177f0fb8fc25e223f7c482f81c666ccedb8a9292d284f61
 SHA512:
-  metadata.gz: 3d2b4e79ae0fb506248ca119acca6ce128649457f53b6047a9def36168110a63a36bccb6abde7fd8300194cd8bf785546d9d21d066e4f628da6742c2601fb8d6
-  data.tar.gz: 3ad98b72afdc5b9b2601cffa7f5c872b5bf5202ed35f9bff830014af78d7b1de2c5aaae4b5ffc4e721f2d21594a8229bb96ef549f653a0caf36ae8f2a36b0cf9
+  metadata.gz: 274abec4fe629268688e921100ffde55cdf4b6184a21bb47c6101fab45a697741ffe77937848b04637f427af7a8e14b222e52f990fd2e516e458fffcf7375e77
+  data.tar.gz: 67248a8cbd8d13029e82780ad4a6e10780567c92dbb7e94da8d8c752cb6e549ca7602fd40b2ed9539cb68ede4e7ac130e2633b5bc364cd119d665f8f41d31999

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

@@ -11,21 +11,21 @@
   <% end %>
 </div>
 
+<div class="flex items-center justify-between space-x-6">
+  <span class="content-block__span flex-shrink-0">
+    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
+  </span>
+  <% if single_component? %>
+    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
+      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
+      <%= icon "add-line" %>
+    <% end %>
+  <% end %>
+</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
-    <span class="content-block__span">
-      <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-    </span>
-
     <% proposals_to_render.each do |p| %>
-      <%= card_for p, link_whole_card: true, title_tag: :h3, **options.slice(:show_space) %>
+      <%= card_for p, link_whole_card: true, hide_voting: true, title_tag: :h3, **options.slice(:show_space) %>
     <% end %>
   </div>
-
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__sm md:button__lg button__secondary" do %>
-      <span><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
 </div>

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

@@ -49,7 +49,7 @@ module Decidim
       end
 
       def proposals_to_render
-        @proposals_to_render ||= proposals.includes([:amendable, :category, :component, :scope]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
+        @proposals_to_render ||= proposals.includes([:amendable, :component, :taxonomies]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
       end
 
       def cache_hash

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

@@ -69,7 +69,7 @@ module Decidim
       end
 
       def amendment_creation_enabled?
-        (current_component.settings.amendments_enabled? && current_settings.amendment_creation_enabled?)
+        current_component.settings.amendments_enabled? && current_settings.amendment_creation_enabled?
       end
 
       def amend_button_disabled?

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

@@ -1,3 +1,4 @@
+<div class="card__proposals-item">
 <%= link_to resource_path, class: classes[:default], id: resource_id do %>
   <div class="<%= classes[:img] %>">
     <% if has_image? %>
@@ -21,3 +22,15 @@
     <% end %>
   </div>
 <% end %>
+  <% if has_actions? %>
+    <% if current_settings.votes_hidden? %>
+      <div class="card__proposals-votes-hidden">
+        <%= cell proposal_vote_cell, resource, **options %>
+      </div>
+   <% else %>
+      <div class="card__proposals-votes">
+        <%= cell proposal_vote_cell, resource, **options %>
+      </div>
+   <% end %>
+  <% end %>
+</div>

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

@@ -24,6 +24,18 @@ module Decidim
         "decidim/proposals/proposal_metadata"
       end
 
+      def proposal_vote_cell
+        "decidim/proposals/proposal_vote"
+      end
+
+      def has_actions?
+        model.component.current_settings.votes_enabled? && !model.draft? && !model.withdrawn? && !model.rejected?
+      end
+
+      def proposal_votes_count
+        model.proposal_votes_count || 0
+      end
+
       def metadata_cell_instance
         @metadata_cell_instance ||= cell("decidim/proposals/proposal_metadata", model)
       end
@@ -34,6 +46,28 @@ module Decidim
 
       private
 
+      def cache_hash
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << options[:hide_voting] ? 1 : 0
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << 0 # render space
+          hash << model.follows_count
+          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+
+          hash.join(Decidim.cache_key_separator)
+        end
+      end
+
       def classes
         super.merge(metadata: "card__list-metadata")
       end

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

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cell is used to render the proposal history panel of a resource
+    # inside a tab of a show view
+    #
+    # The `model` must be a proposal resource to get the history from.
+    #
+    # Example:
+    #
+    #   cell(
+    #     "decidim/proposal_history",
+    #     proposal
+    #   )
+    class ProposalHistoryCell < Decidim::ResourceHistoryCell
+      include Decidim::Proposals::ApplicationHelper
+
+      private
+
+      def linked_resources_items
+        # linked resources generate from this proposal
+        [
+          {
+            resources: @model.linked_resources_from(:proposals, "copied_from_component"),
+            link_name: "copied_from_component",
+            text_key: "decidim.proposals.proposal.import_from_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources_from(:proposals, "splitted_from_component"),
+            link_name: "splitted_from_component",
+            text_key: "decidim.proposals.proposal.split_from_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources_from(:proposals, "merged_from_component"),
+            link_name: "merged_from_component",
+            text_key: "decidim.proposals.proposal.merge_from_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+
+            resources: @model.linked_resources(:projects, "included_proposals"),
+            link_name: "included_proposals",
+            text_key: "decidim.budgets.project.text",
+            icon_key: "Decidim::Budgets::Project"
+          },
+          {
+            resources: @model.linked_resources(:results, "included_proposals"),
+            link_name: "included_proposals",
+            text_key: "decidim.accountability.result.text",
+            icon_key: "Decidim::Accountability::Result"
+          },
+          {
+            resources: @model.linked_resources(:meetings, "proposals_from_meeting"),
+            link_name: "proposals_from_meeting",
+            text_key: "decidim.meetings.meeting.text",
+            icon_key: "Decidim::Meetings::Meeting"
+          },
+          {
+
+            # linked resource generate to this proposal
+            resources: @model.linked_resources_to(:proposals, "copied_from_component"),
+            link_name: "copied_to_component",
+            text_key: "decidim.proposals.proposal.import_to_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources_to(:proposals, "splitted_from_component"),
+            link_name: "splitted_to_component",
+            text_key: "decidim.proposals.proposal.split_to_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources_to(:proposals, "merged_from_component"),
+            link_name: "merged_to_component",
+            text_key: "decidim.proposals.proposal.merge_to_proposal_text",
+            icon_key: "Decidim::Proposals::Proposal"
+          }
+        ]
+      end
+
+      def creation_item
+        creation_text = if history_items_contains?(:merged_to_component)
+                          t("decidim.proposals.creation.merged_text")
+                        elsif history_items_contains?(:splitted_to_component)
+                          t("decidim.proposals.creation.splitted_text")
+                        elsif history_items_contains?(:copied_to_component)
+                          t("decidim.proposals.creation.imported_text")
+                        else
+                          t("decidim.proposals.creation.text")
+                        end
+        {
+          id: "proposal_creation",
+          date: @model.created_at,
+          text: creation_text,
+          icon: resource_type_icon_key("Decidim::Proposals::Proposal")
+        }
+      end
+
+      def history_cell_id
+        "proposal"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+<% if has_link_to_resource? && link_whole_card? %>
+  <div class="card__proposals-item">
+  <%= link_to resource_path, class: item_list_class, id: resource_id, **html_options do %>
+    <%= render :content %>
+    <%= render :extra_data if render_extra_data? %>
+  <% end %>
+    <% if has_actions? && options.fetch(:hide_voting, false) == false %>
+      <% if current_settings.votes_hidden? %>
+        <div class="card__proposals-votes-hidden">
+          <%= cell proposal_vote_cell, resource, **options %>
+        </div>
+      <% else %>
+        <div class="card__proposals-votes">
+          <%= cell proposal_vote_cell, resource, **options %>
+        </div>
+      <% end %>
+    <% end %>
+  </div>
+<% else %>
+  <%= content_tag :div, class: wrapper_class, id: resource_id do %>
+    <%= content_tag :div, class: item_list_class do %>
+      <%= render :content %>
+    <% end %>
+    <%= render :extra_data if render_extra_data? %>
+    <% if has_actions? %>
+      <% if current_settings.votes_hidden? %>
+        <div class="card__proposals-votes-hidden">
+          <%= cell proposal_vote_cell, resource, **options %>
+        </div>
+      <% else %>
+        <div class="card__proposals-votes">
+          <%= cell proposal_vote_cell, resource, **options %>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -19,26 +19,34 @@ module Decidim
         "decidim/proposals/proposal_metadata"
       end
 
+      def has_actions?
+        model.component.current_settings.votes_enabled? && !model.draft? && !model.withdrawn? && !model.rejected?
+      end
+
+      def proposal_vote_cell
+        "decidim/proposals/proposal_vote"
+      end
+
       def cache_hash
-        hash = []
-        hash << I18n.locale.to_s
-        hash << model.cache_key_with_version
-        hash << model.proposal_votes_count
-        hash << model.endorsements_count
-        hash << model.comments_count
-        hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-        hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
-        hash << render_space? ? 1 : 0
-        if current_user
-          hash << current_user.cache_key_with_version
-          hash << current_user.follows?(model) ? 1 : 0
-        end
-        hash << model.follows_count
-        hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
-        hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
-        hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << options[:hide_voting] ? 1 : 0
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << render_space? ? 1 : 0
+          hash << model.follows_count
+          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
 
-        hash.join(Decidim.cache_key_separator)
+          hash.join(Decidim.cache_key_separator)
+        end
       end
     end
   end

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

@@ -44,10 +44,10 @@ module Decidim
       private
 
       def proposal_items
-        [coauthors_item, comments_count_item, endorsements_count_item, state_item, emendation_item]
+        [coauthors_item] + taxonomy_items + [comments_count_item, endorsements_count_item, state_item, emendation_item]
       end
 
-      def proposal_items_for_map
+      def items_for_map
         [coauthors_item_for_map, comments_count_item, endorsements_count_item, state_item, emendation_item].compact_blank.map do |item|
           {
             text: item[:text].to_s.html_safe,

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

@@ -0,0 +1,75 @@
+<% if !current_settings.votes_hidden? && current_component.participatory_space.can_participate?(current_user) %>
+  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_votes_count", locals: { proposal: resource, from_proposals_list: true } %>
+  <% else %>
+    <% progress ||= resource.proposal_votes_count || 0 %>
+    <% total ||= resource.maximum_votes || 0 %>
+    <%= cell(
+          "decidim/progress_bar",
+          progress,
+          total:,
+          units_name: "decidim.proposals.proposals.votes_count.count",
+          element_id: "proposal-#{resource.id}-votes-count",
+          class: total.positive? ? "card__proposals-votes-limited" : "card__proposals-votes-unlimited"
+        ) %>
+  <% end %>
+<% end %>
+
+<% button_classes = "button button__lg button__secondary w-full" %>
+
+<% unless resource.rejected? || resource.withdrawn? %>
+  <% if component_settings.participatory_texts_enabled? && from_proposals_list %>
+    <%= render partial: "decidim/proposals/proposals/participatory_texts/proposal_vote_button", locals: { resource:, from_proposals_list: true } %>
+  <% else %>
+    <div id="proposal-<%= resource.id %>-vote-button" class="card__proposals-votes-container">
+      <% if !current_user %>
+        <% if current_settings.votes_blocked? %>
+          <%= action_authorized_button_to :vote, t("decidim.proposals.proposals.vote_button.votes_blocked"), proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, disabled: true %>
+        <% else %>
+          <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , class: button_classes, data: { "proposal-vote-button": true, disable: true, "redirect-url": proposal_path(resource) } do %>
+            <%= t("decidim.proposals.proposals.vote_button.vote") %>
+            <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
+          <% end %>
+        <% end %>
+      <% else %>
+        <% if @voted_proposals ? @voted_proposals.include?(resource.id) : resource.voted_by?(current_user) %>
+          <%= action_authorized_button_to(
+                :vote,
+                proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:),
+                resource:,
+                method: :delete,
+                remote: true,
+                data: {
+                  disable: true,
+                  original: t("decidim.proposals.proposals.vote_button.already_voted"),
+                  replace: t("decidim.proposals.proposals.vote_button.already_voted_hover"),
+                  "redirect-url": proposal_path(resource)
+                },
+                disabled: current_settings.votes_blocked?,
+                class: "#{button_classes}",
+                id: "vote_button-#{resource.id}"
+              ) do %>
+            <%= t("decidim.proposals.proposals.vote_button.already_voted") %>
+            <%= icon "check-line", class: "already-voted-icon" %>
+            <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
+          <% end %>
+        <% else %>
+          <% if resource.maximum_votes_reached? && !resource.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+            <%= content_tag :button, t("decidim.proposals.proposals.vote_button.maximum_votes_reached"), class: button_classes, disabled: true %>
+          <% else %>
+            <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.no_votes_remaining"), class: button_classes, disabled: true %>
+            <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
+              <%= content_tag :button, t("decidim.proposals.proposals.vote_button.votes_blocked"), class: button_classes, disabled: true %>
+            <% else %>
+              <%= action_authorized_button_to :vote, proposal_proposal_vote_path(proposal_id: resource, from_proposals_list:), resource: , remote: true, data: { disable: true, "redirect-url": proposal_path(resource) }, class: button_classes do %>
+                <%= t("decidim.proposals.proposals.vote_button.vote") %>
+                <span class="sr-only"><%= decidim_html_escape(present(resource).title) %></span>
+              <% end %>
+            <% end %>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to display votes inside a card
+  module Proposals
+    class ProposalVoteCell < Decidim::ViewModel
+      include Decidim::DateRangeHelper
+      include Cell::ViewModel::Partial
+      include Decidim::ViewHooksHelper
+
+      alias resource model
+
+      def show
+        return if @items.blank?
+
+        render
+      end
+
+      def initialize(*)
+        super
+
+        @items ||= []
+        @items << votes_count_item
+      end
+
+      private
+
+      def from_proposals_list
+        true
+      end
+
+      def votes_count_item
+        return unless resource.respond_to?(:proposal_votes_count)
+
+        {
+          text: resource.proposal_votes_count,
+          icon: resource_type_icon_key(:like),
+          data_attributes: { votes_count: "" }
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A command with all the business logic when a user accepts an invitation to be a coauthor of a proposal.
+    class AcceptCoauthorship < Decidim::Command
+      # Public: Initializes the command.
+      #
+      # proposal     - The proposal to add a coauthor to.
+      # coauthor - The user to invite as coauthor.
+      def initialize(proposal, coauthor)
+        @proposal = proposal
+        @coauthor = coauthor
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the proposal.
+      # - :invalid if the coauthor is not valid.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @coauthor
+        return broadcast(:invalid) if @proposal.authors.include?(@coauthor)
+
+        begin
+          transaction do
+            @proposal.add_coauthor(@coauthor)
+            @proposal.coauthor_invitations_for(@coauthor).destroy_all
+          end
+
+          generate_notifications
+        rescue ActiveRecord::RecordInvalid
+          return broadcast(:invalid)
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      def generate_notifications
+        # notify the author that the co-author has accepted the invitation
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.coauthor_accepted_invite",
+          event_class: Decidim::Proposals::CoauthorAcceptedInviteEvent,
+          resource: @proposal,
+          affected_users: @proposal.authors.reject { |author| author == @coauthor },
+          extra: { coauthor_id: @coauthor.id }
+        )
+
+        # notify the co-author of the new co-authorship
+        Decidim::EventsManager.publish(
+          event: "decidim.events.proposals.accepted_coauthorship",
+          event_class: Decidim::Proposals::AcceptedCoauthorshipEvent,
+          resource: @proposal,
+          affected_users: [@coauthor]
+        )
+      end
+    end
+  end
+end

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

@@ -37,6 +37,7 @@ module Decidim
             form.proposals.flat_map do |proposal|
               form.valuator_roles.each do |valuator_role|
                 find_assignment(proposal, valuator_role) || assign_proposal(proposal, valuator_role)
+                notify_valuator(proposal, valuator_role)
               end
             end
           end
@@ -57,6 +58,19 @@ module Decidim
             valuator_role:
           )
         end
+
+        def notify_valuator(proposal, valuator_role)
+          return unless valuator_role.user.email_on_assigned_proposals?
+
+          data = {
+            event: "decidim.events.proposals.admin.proposal_assigned_to_valuator",
+            event_class: Decidim::Proposals::Admin::ProposalAssignedToValuatorEvent,
+            resource: proposal,
+            affected_users: [valuator_role.user]
+          }
+
+          Decidim::EventsManager.publish(**data)
+        end
       end
     end
   end

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

@@ -5,8 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Decidim::Command
-        include ::Decidim::AttachmentMethods
-        include GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
         include HashtagsMethods
 
         # Public: Initializes the command.
@@ -26,19 +25,13 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           if process_attachments?
-            build_attachment
-            return broadcast(:invalid) if attachment_invalid?
-          end
-
-          if process_gallery?
-            build_gallery
-            return broadcast(:invalid) if gallery_invalid?
+            build_attachments
+            return broadcast(:invalid) if attachments_invalid?
           end
 
           transaction do
             create_proposal
-            create_gallery if process_gallery?
-            create_attachment(weight: first_attachment_weight) if process_attachments?
+            create_attachments(first_weight: first_attachment_weight) if process_attachments?
             link_author_meeting if form.created_in_meeting?
           end
 
@@ -49,7 +42,7 @@ module Decidim
 
         private
 
-        attr_reader :form, :proposal, :attachment, :gallery
+        attr_reader :form, :proposal, :attachment
 
         def create_proposal
           @proposal = Decidim::Proposals::ProposalBuilder.create(
@@ -69,8 +62,7 @@ module Decidim
           {
             title: parsed_title,
             body: parsed_body,
-            category: form.category,
-            scope: form.scope,
+            taxonomizations: form.taxonomizations,
             component: form.component,
             address: form.address,
             latitude: form.latitude,