decidim-proposals 0.27.9 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa7efdb3065653d22e18a4f6aa0e3aba6ea37fa52bcd63019e258aeef3f1c117
-  data.tar.gz: 7f6d73cda1e2c88577710d48f3666168ff7a3849fbb2d48ce7363afe18aedbf4
+  metadata.gz: f4261c8defc7335c582aafffe209f651b972ca1e3302dad3844ef31e53324f14
+  data.tar.gz: 17ea361750db85baad4063d0f1bb400548f9e07fd39a15e41a78d474908692d8
 SHA512:
-  metadata.gz: c5a1ebf9ae87905d53a0f537d160c56bae61b2de957fc7c8a7cd77c4d49c082e992d4c16c960fce5512cfb625f30ff0c8add8521f736990bf914f6d83e33dbb7
-  data.tar.gz: 4e95540ab7f00079cd911e415b9a5a81ccb445cdd8079e324f4b7a9bcdf88d47d2316140c479af64746e2dcaa33f74a93772d629d64692e1ce9dee12166d5e93
+  metadata.gz: 76c72ecf3698d323fa6cc2beef6c08624108789fcad59e85a2afed9eba97f6e868abe01e03aea32cb06f84f1bb45ae04eadecdc0dcab14cdf93b0e2e1f5242d1
+  data.tar.gz: 54515a7042a4327fb35efb96ba26e7f9ea22c41fa6a00752ab85a8d71a466d17e73b8a59a8bc0a5f0b1f5066b26f162ef6e621e1c4656813ebd6230f48d40752

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

@@ -18,7 +18,7 @@ module Decidim
       private
 
       def card_size
-        "decidim/proposals/collaborative_draft_m"
+        "decidim/proposals/collaborative_draft_l"
       end
 
       def resource_path

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders a proposal with its L-size card.
+    class CollaborativeDraftLCell < Decidim::CardLCell
+      private
+
+      def metadata_cell
+        "decidim/proposals/collaborative_draft_metadata"
+      end
+    end
+  end
+end

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

@@ -1,13 +1,5 @@
-<div>
-  <%= link_header %>
-</div>
-
-<div>
-  <%= link_help_text %>
-</div>
-
-<%= link_to_resource %>
-
-<div class="mt-xs">
-  <%= link_to_versions %>
+<div class="flex flex-col gap-2 items-center">
+  <h3 class="h3"><%= t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show") %></h3>
+  <p class="text-center text-gray-2"><%= t("final_proposal_help_text", scope: "decidim.proposals.collaborative_drafts.show") %></p>
+  <%= link_to t("published_proposal", scope: "decidim.proposals.collaborative_drafts.show"), resource_locator(@proposal).path, class: "button button__lg button__secondary w-full mt-4" %>
 </div>

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

@@ -16,35 +16,6 @@ module Decidim
         @proposal ||= model.linked_resources(:proposal, "created_from_collaborative_draft").first
       end
 
-      def link_to_resource
-        link_to resource_locator(proposal).path, class: "button secondary light expanded button--sc mt-s" do
-          t("published_proposal", scope: "decidim.proposals.collaborative_drafts.show")
-        end
-      end
-
-      def link_header
-        tag.strong(class: "text-large") do
-          t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show")
-        end
-      end
-
-      def link_help_text
-        tag.span(class: "text-medium") do
-          t("final_proposal_help_text", scope: "decidim.proposals.collaborative_drafts.show")
-        end
-      end
-
-      def link_to_versions
-        @path ||= decidim_proposals.collaborative_draft_versions_path(
-          collaborative_draft_id: model.id
-        )
-        link_to @path, class: "text-medium" do
-          tag.u do
-            t("version_history", scope: "decidim.proposals.collaborative_drafts.show")
-          end
-        end
-      end
-
       def decidim
         Decidim::Core::Engine.routes.url_helpers
       end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cell renders metadata for an instance of a CollaborativeDraft
+    class CollaborativeDraftMetadataCell < Decidim::CardMetadataCell
+      include Decidim::Proposals::ApplicationHelper
+
+      delegate :state, to: :model
+
+      def initialize(*)
+        super
+
+        @items.prepend(*collaborative_draft_items)
+      end
+
+      private
+
+      def collaborative_draft_items
+        [coauthors_item, comments_count_item, endorsements_count_item, state_item]
+      end
+
+      def state_item
+        return if state.blank?
+
+        { text: content_tag(:span, humanize_collaborative_draft_state(state), class: "label #{collaborative_drafts_state_class(state)}") }
+      end
+    end
+  end
+end

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

@@ -3,16 +3,10 @@
 module Decidim
   module Proposals
     module ContentBlocks
-      class HighlightedProposalsCell < Decidim::ContentBlocks::HighlightedElementsCell
-        def base_relation
-          @base_relation ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn.where(component: published_components)
-        end
-
+      class HighlightedProposalsCell < Decidim::ContentBlocks::HighlightedElementsWithCellForListCell
         private
 
-        def limit
-          Decidim::Proposals.config.process_group_highlighted_proposals_limit
-        end
+        def list_cell_path = "decidim/proposals/highlighted_proposals_for_component"
       end
     end
   end

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

@@ -1,35 +1,6 @@
-<div id="proposal-costs" class="card card--secondary" data-toggler=".expanded-text">
-  <div class="card__content">
-    <div class="mb-s">
-      <div class="data-title">
-        <h3 class="data-title__over">
-          <%= t("decidim.proposals.proposals.show.estimated_cost") %>
-        </h3>
-        <div>
-          <strong class="data-title__main">
-            <%= cost %>
-          </strong>
-        </div>
-        <div class="data-title__sub">
-          <%= execution_period %>
-        </div>
-      </div>
-    </div>
-    <div id="execution-cost-short" class="text-toggle__short">
-      <%= cost_report_short %>
-      <% if needs_text_toggle? %>
-      <button class="muted-link" data-toggle="proposal-costs">
-        <%= t("decidim.proposals.proposals.show.read_more") %>
-      </button>
-      <% end %>
-    </div>
-    <% if needs_text_toggle? %>
-    <div id="execution-cost-long" class="text-toggle__long">
-      <%= cost_report %>
-      <button class="muted-link" data-toggle="proposal-costs">
-        <%= t("decidim.proposals.proposals.show.read_less") %>
-      </button>
-    </div>
-    <% end %>
-  </div>
+<div id="proposal-costs" class="proposal__cost">
+  <h2 class="h4"><%= t("decidim.proposals.proposals.show.estimated_cost") %></h2>
+  <div class="h2"><%= cost %></div>
+  <div class="proposal__cost-period"><%= execution_period %></div>
+  <%= cost_report %>
 </div>

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

@@ -21,19 +21,6 @@ module Decidim
         decidim_sanitize_editor(translated_attribute(model.cost_report).html_safe)
       end
 
-      def needs_text_toggle?
-        cost_report != cost_report_short
-      end
-
-      def cost_report_short
-        decidim_sanitize_editor(
-          html_truncate(
-            translated_attribute(model.cost_report).html_safe,
-            length: 200
-          )
-        )
-      end
-
       def execution_period
         decidim_sanitize_editor(translated_attribute(model.execution_period).html_safe)
       end

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

@@ -1,19 +1,31 @@
-<section class="section row collapse highlighted_proposals">
-  <h3 class="section-heading">
-    <%= decidim_escape_translated(model.name) %>  <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count) %></a>
-  </h3>
+<div class="content-block__title">
+  <h2 class="h2 decorator">
+    <%= single_component? ? translated_attribute(model.name) : t("decidim.components.proposals.name") %>
+  </h2>
+  <div class="label text-lg"><%= proposals_count %></div>
+  <% if single_component? %>
+    <%= link_to decidim_proposals.root_path, class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.participatory_spaces.highlighted_proposals.see_all") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
 
-  <%= cell(
-    "decidim/collapsible_list",
-    proposals_to_render,
-    cell_options: {},
-    list_class: "row small-up-1 medium-up-2 card-grid",
-    size: proposals_count
-    ) %>
+<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>
 
-  <%= link_to(
-    t("decidim.participatory_spaces.highlighted_proposals.see_all", count: proposals_count),
-    main_component_path(model),
-    class: "button button--sc hollow button--right"
-  ) %>
-</section>
+    <% proposals_to_render.each do |p| %>
+      <%= card_for p, link_whole_card: 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

@@ -9,25 +9,47 @@ module Decidim
     # view hook.
     class HighlightedProposalsForComponentCell < Decidim::ViewModel
       include Decidim::ComponentPathHelper
+      include Decidim::CardHelper
 
       def show
-        render unless proposals_count.zero?
+        render unless items_blank?
+      end
+
+      def items_blank?
+        proposals_count.zero?
       end
 
       private
 
+      def proposals_count
+        @proposals_count ||= base_relation.size
+      end
+
       def proposals
-        @proposals ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn
-                                                   .where(component: model)
-                                                   .order_randomly((rand * 2) - 1)
+        @proposals ||= case options[:order]
+                       when "recent"
+                         base_relation.order_by_most_recent
+                       else
+                         base_relation.order_randomly(random_seed)
+                       end
       end
 
-      def proposals_to_render
-        @proposals_to_render ||= proposals.includes([:amendable, :category, :component, :scope]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
+      def base_relation
+        Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn.where(component: model)
       end
 
-      def proposals_count
-        @proposals_count ||= proposals.count
+      def decidim_proposals
+        return unless single_component?
+
+        Decidim::EngineRouter.main_proxy(model)
+      end
+
+      def single_component?
+        @single_component ||= model.is_a?(Decidim::Component)
+      end
+
+      def proposals_to_render
+        @proposals_to_render ||= proposals.includes([:amendable, :category, :component, :scope]).limit(Decidim::Proposals.config.participatory_space_highlighted_proposals_limit)
       end
 
       def cache_hash
@@ -37,6 +59,10 @@ module Decidim
         hash << I18n.locale.to_s
         hash.join(Decidim.cache_key_separator)
       end
+
+      def random_seed
+        (rand * 2) - 1
+      end
     end
   end
 end

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

@@ -1,27 +1,19 @@
 <%= button_reveal_modal %>
 
-<div id="<%= modal_id %>" class="reveal" data-reveal aria-labelledby="<%= modal_id %>-title" aria-hidden="true" role="dialog">
-  <div class="reveal__header">
-    <h3 id="<%= modal_id %>-title" class="reveal__title">
+<%= decidim_modal id: modal_id do %>
+  <div data-dialog-container>
+    <%= icon "draft-line" %>
+    <h3 class="h3" id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title>
       <%= modal_title %>
     </h3>
 
-    <button class="close-button" data-close aria-label="<%= close_label %>" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
+    <p>
+      <%= modal_body %>
+    </p>
   </div>
 
-  <div class="row">
-    <div>
-      <p>
-        <%= modal_body %>
-      </p>
-    </div>
-  </div>
-
-  <div class="row">
+  <div data-dialog-actions>
     <%= button_cancel %>
-
     <%= button_continue %>
   </div>
-</div>
+<% end %>

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

@@ -33,11 +33,11 @@ module Decidim
       end
 
       def button_reveal_modal
-        data = { open: modal_id }
+        data = { "dialog-open": modal_id }
         label = t(action, scope: "decidim.proposals.collaborative_drafts.show")
-        css = publish? ? "button expanded button--sc" : "secondary"
+        css = publish? ? "button button__lg button__secondary w-full" : "text-secondary"
 
-        button_tag label, type: "button", class: css, data: data
+        button_tag label, type: "button", class: css, data:
       end
 
       def modal_title
@@ -51,8 +51,8 @@ module Decidim
       def button_continue
         label = t("ok", scope: "decidim.proposals.collaborative_drafts.collaborative_draft.#{action}.irreversible_action_modal")
         path = resource_path action
-        css = "button expanded"
-        button_to label, path, class: css, form_class: "columns medium-6"
+        css = "button button__lg button__secondary"
+        button_to label, path, class: css
       end
 
       def close_label
@@ -60,10 +60,8 @@ module Decidim
       end
 
       def button_cancel
-        tag.div(class: "columns medium-6") do
-          button_tag type: "button", class: "clear button secondary expanded", "data-close": "" do
-            close_label
-          end
+        button_tag type: "button", class: "button button__lg button__transparent-secondary", "data-dialog-close": modal_id do
+          close_label
         end
       end
 

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

@@ -1,33 +1,23 @@
-<div class="columns mediumlarge-4 hidden-section p-sm">
-  <div class="medium-8">
-    <%= follow_button_for(model, true) %>
-    <% if amendmendment_creation_enabled? || visible_emendations.any? %>
-      <div class="button-group button-group--collapse mb-s row collapse amend-buttons">
-        <%= link_to resource_amendments_path, class: "column medium-4 button light secondary" do %>
-          <%= visible_emendations.count %>
-        <% end %>
-        <%= action_authorized_link_to :amend, amend_resource_path, resource: model, data: { "redirect_url" => amend_resource_path }, class: "column button hollow secondary button--sc", disabled: amend_button_disabled? do %>
-          <%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
-        <% end %>
-      </div>
+<% if amendmendment_creation_enabled? || visible_emendations.any? %>
+  <%= link_to amend_resource_path, disabled: amend_button_disabled?, class: "proposal-participatory__button" do %>
+    <%= icon "chat-1-line" %>
+    <span><%= t("amend", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>
+    <div class="label"><%= visible_emendations.count %></div>
+  <% end %>
+<% end %>
+
+<% if component_settings.comments_enabled? %>
+  <% if current_settings.comments_blocked? %>
+    <%= content_tag :button, disabled: true, class: "proposal-participatory__button" do %>
+      <%= icon "chat-1-line" %>
+      <span><%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>
+      <div class="label"><%= model.comments_count %></div>
     <% end %>
-    <% if component_settings.comments_enabled? %>
-      <div class="button-group button-group--collapse row collapse comment-buttons">
-        <% if current_settings.comments_blocked? %>
-          <%= content_tag :button, 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 %>
-          <%= 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 %>
-          <%= action_authorized_link_to :comment, resource_comments_path, resource: model, class: "column button hollow secondary button--sc" do %>
-            <%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %>
-          <% end %>
-        <% end %>
-      </div>
+  <% else %>
+    <%= link_to resource_comments_path, class: "proposal-participatory__button" do %>
+      <%= icon "chat-1-line" %>
+      <span><%= t("comment", scope: "decidim.proposals.participatory_text_proposal.buttons") %></span>
+      <div class="label"><%= model.comments_count %></div>
     <% end %>
-  </div>
-</div>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,5 @@
-<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>
+<section id="<%= dom_id(model) %>" class="proposal-participatory__section">
+  <%= link_to section_title, resource_path, class: "proposal-participatory__title" %>
+  <div class="proposal-participatory__text"><%= body %></div>
+  <div class="flex"><%= render :buttons %></div>
+</section>

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

@@ -18,15 +18,6 @@ module Decidim
 
       private
 
-      def title
-        case model.participatory_text_level
-        when "section"
-          "<h5><strong>#{section_title}</strong></h5>"
-        else
-          "<h6><strong>#{section_title}</strong></h6>"
-        end
-      end
-
       def section_title
         decidim_html_escape(present(model).title).html_safe
       end

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

@@ -5,18 +5,7 @@ module Decidim
     # A cell to display when actions happen on a proposal.
     class ProposalActivityCell < ActivityCell
       def title
-        case action
-        when "update"
-          I18n.t(
-            "decidim.proposals.last_activity.proposal_updated_at_html",
-            link: participatory_space_link
-          )
-        else
-          I18n.t(
-            "decidim.proposals.last_activity.new_proposal_at_html",
-            link: participatory_space_link
-          )
-        end
+        action == "update" ? I18n.t("decidim.proposals.last_activity.proposal_updated") : I18n.t("decidim.proposals.last_activity.new_proposal")
       end
 
       def resource_link_text

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

@@ -18,7 +18,12 @@ module Decidim
       private
 
       def card_size
-        "decidim/proposals/proposal_m"
+        case @options[:size]
+        when :s
+          "decidim/proposals/proposal_s"
+        else
+          "decidim/proposals/proposal_l"
+        end
       end
 
       def resource_path

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders the List (:l) proposal card
+    # for an instance of a Proposal
+    class ProposalLCell < Decidim::CardLCell
+      delegate :component_settings, to: :controller
+
+      alias proposal model
+
+      def title
+        present(proposal).title(html_escape: true)
+      end
+
+      private
+
+      def metadata_cell
+        "decidim/proposals/proposal_metadata"
+      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_path) if resource_image_path
+        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)
+
+        hash.join(Decidim.cache_key_separator)
+      end
+    end
+  end
+end

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

@@ -12,10 +12,12 @@ module Decidim
         @linked_resource ||= model.linked_resources(:collaborative_draft, "created_from_collaborative_draft").first
       end
 
-      def link_to_resource
-        link_to resource_locator(linked_resource).path, class: "link" do
-          t("link_to_collaborative_draft_text", scope: "decidim.proposals.proposals.show")
-        end
+      def link_to_resource_url
+        resource_locator(linked_resource).path
+      end
+
+      def link_to_resource_text
+        t("link_to_collaborative_draft_text", scope: "decidim.proposals.proposals.show")
       end
 
       def link_help_text

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

@@ -12,13 +12,15 @@ module Decidim
         @linked_resource ||= model.linked_promoted_resource
       end
 
-      def link_to_resource
-        link_to resource_locator(linked_resource).path, class: "link" do
-          if model.emendation?
-            t("link_to_proposal_from_emendation_text", scope: "decidim.proposals.proposals.show")
-          else
-            t("link_to_promoted_emendation_text", scope: "decidim.proposals.proposals.show")
-          end
+      def link_to_resource_url
+        resource_locator(linked_resource).path
+      end
+
+      def link_to_resource_text
+        if model.emendation?
+          t("link_to_proposal_from_emendation_text", scope: "decidim.proposals.proposals.show")
+        else
+          t("link_to_promoted_emendation_text", scope: "decidim.proposals.proposals.show")
         end
       end
 

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

@@ -1,9 +1,4 @@
-<div class="text-center mt-sm">
-  <%= link_to_resource %>
-
-  <div class="text-center">
-    <small>
-      <%= link_help_text %>
-    </small>
-  </div>
+<div class="text-center space-y-4">
+  <span class="block text-gray-2 text-xs"><%= link_help_text %></span>
+  <%= link_to link_to_resource_text, link_to_resource_url, class: "text-secondary hover:underline block" %>
 </div>