decidim-core 0.27.4 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d976829c2218ab34a1bf7c2ad99443edd61c4f37bb56963c8bb21a3e74afddef
-  data.tar.gz: acbaa2ce577af7e32648ce22941616e258f48bdbfb304e754344770fafaf9ef4
+  metadata.gz: 3bbd75ffde3e5d911a23282dd17dbf7d7c89892afe0559dd88d427e864ae2f14
+  data.tar.gz: 7e794b245545ba6ab7f46f7c22d271d723bcd398c2f0149c37ecba577add235c
 SHA512:
-  metadata.gz: 868d324e0f83442b37750933c39985dffdba9bfd06a2f47ad00836b7c9b89164bafff5d2083d5e24d7f01eb9c47dac46f564a375bacaa17726fe5d472bf6c86b
-  data.tar.gz: 1af449d8a281aa2ae5db6c0f03a7be077f7a7eeaa2a300e8bc2a2d36622cd4be5aafb4245878a24e4bd2496542d0166a84287974e72cdeb294acdcd021144b00
+  metadata.gz: f28d4b6445a5492d52528e6add707d7fb57cabddc4132bfac229a04c6fa231f9867642b974996605850b5992a1ea652dcb87855524167d4f2673af6df26a7074
+  data.tar.gz: e00c4df62dcaf1595cbc02e4d82bac24410dcbd86b81b6f6fb55d5827d96bb8197c919240608a6ea8284ad2929b637ee6d772278456438255bdec20f292c072c

data/README.md

@@ -4,11 +4,11 @@ Core functionality in Decidim. Every single decidim functionality depends on thi
 
 ## Usage
 
-You'll be using indirectly on any decidim application.
+You will be using indirectly on any decidim application.
 
 ## Installation
 
-Add `decidim` to your `Gemfile` and you'll be using it:
+Add `decidim` to your `Gemfile` and you will be using it:
 
 ```ruby
 gem 'decidim'
@@ -26,7 +26,7 @@ User authentication is set up with [`Devise`](https://github.com/plataformatec/d
 
 ## Amendments
 
-Core implements an Amendment feature that can be activated in the components. As of now, it's only implemented in the proposal component.
+Core implements an Amendment feature that can be activated in the components. As of now, it is only implemented in the proposal component.
 
 This feature makes it possible for anyone to edit the text of an amendable resource and create a child resource as an amendment. This child resource may receive support and the author of the amendable resource may accept or reject the amendment (or child proposal). In case of rejection, the author of the rejected emendation may raise the child resource to an independent resource.
 
@@ -59,7 +59,7 @@ They should be registered as resources. In their manifest, in the `register_reso
 This can be done in an initializer (like user does), in a participatory_space manifest, or in a component manifest. i.e.:
 
 ```ruby
-      initializer "decidim.core.register_resources" do
+      initializer "decidim_core.register_resources" do
         Decidim.register_resource(:user) do |resource|
           resource.model_class_name = "Decidim::User"
           resource.card = "decidim/user_profile"

data/app/cells/decidim/activities/show.erb

@@ -1,3 +1,5 @@
-<% activities.each do |activity| %>
-  <%= activity_cell_for(activity) %>
-<% end %>
+<div class="activity__container">
+  <% activities.each do |activity| %>
+    <%= activity_cell_for(activity) %>
+  <% end %>
+</div>

data/app/cells/decidim/activities_cell.rb

@@ -8,7 +8,7 @@ module Decidim
     include Decidim::IconHelper
     include Decidim::Core::Engine.routes.url_helpers
 
-    # Since we're rendering each activity separatedly we need to trigger
+    # Since we are rendering each activity separatedly we need to trigger
     # BatchLoader in order to accumulate all the ids to be found later.
     def show
       return if activities.blank?
@@ -17,13 +17,13 @@ module Decidim
     end
 
     def activity_cell_for(activity)
-      options = {
+      opts = options.slice(:id_prefix, :hide_participatory_space).merge(
         show_author: (context[:user] != activity.user)
-      }
+      )
 
-      cell "#{activity.resource_type.constantize.name.underscore}_activity", activity, context: options
+      cell "#{activity.resource_type.constantize.name.underscore}_activity", activity, context: opts
     rescue NameError
-      cell "decidim/activity", activity, context: options
+      cell "decidim/activity", activity, context: opts
     end
 
     def activities

data/app/cells/decidim/activity/show.erb

@@ -1,27 +1,28 @@
-<div class="card card--activity" id="<%= element_id %>">
-  <div class="card__content">
-    <div class="card__text">
-      <div class="text-medium">
-        <% if title.present? %>
+<div class="activity" data-activity>
+  <div class="activity__time">
+    <%= created_at %>
+  </div>
+  <div class="activity__content">
+    <span>
+      <% if title.present? %>
+        <span>
+          <%= title_icon %>
           <%= title %>
-        <% end %>
-      </div>
-    </div>
-    <div class="card__author inline-block">
-      <%= author_data = author %>
-    </div><div class="card__activity-date inline-block <%= "before-content" if author_data.present? %>">
-      <span class="text-medium mt-xs"><%= created_at %></span>
-    </div>
-    <div class="card__header mb-none">
-      <%= link_to resource_link_path, class: "card__link" do %>
-        <span class="card__title mb-none">
-          <% @sanitized_resource_link_text = html_truncate decidim_sanitize(resource_link_text, strip_tags: true), length: 80 %>
-          <%= @sanitized_resource_link_text %>
         </span>
       <% end %>
-      <% if description.present? && @sanitized_resource_link_text.present? %>
-        <%= html_truncate decidim_sanitize(description, strip_tags: true), length: 80 %>
-      <% end %>
-    </div>
+      <a href="<%= resource_link_path %>">
+        <%= html_truncate decidim_sanitize(resource_link_text, strip_tags: true), length: 80 %>
+      </a>
+    </span>
+    <% unless hide_participatory_space? %>
+      <span>
+        <%= participatory_space_link %>
+      </span>
+    <% end %>
   </div>
+  <% if show_author? %>
+    <div class="activity__author">
+      <%= author %>
+    </div>
+  <% end %>
 </div>

data/app/cells/decidim/activity_cell.rb

@@ -10,6 +10,7 @@ module Decidim
     include Decidim::IconHelper
     include Decidim::ApplicationHelper
     include Decidim::SanitizeHelper
+    include ActionView::Helpers::DateHelper
 
     def show
       return unless renderable?
@@ -18,7 +19,7 @@ module Decidim
     end
 
     # Since activity logs could be linked to resource no longer available
-    # this method is added in order to skip rendering a cell if there's
+    # this method is added in order to skip rendering a cell if there is
     # not enough data.
     def renderable?
       resource.present? && participatory_space.present? && published?
@@ -31,7 +32,7 @@ module Decidim
 
     # The title to show at the card.
     #
-    # The card will also be displayed OK if there's no title.
+    # The card will also be displayed OK if there is no title.
     def title
       resource_title = resource.try(:resource_title) || resource.try(:title)
       return if resource_title.blank?
@@ -44,9 +45,15 @@ module Decidim
       end
     end
 
+    def title_icon
+      return if resource.blank?
+
+      resource_type_icon(resource.class)
+    end
+
     # The description to show at the card.
     #
-    # The card will also be displayed OK if there's no description.
+    # The card will also be displayed OK if there is no description.
     def description
       resource_description = resource.try(:resource_description) || resource.try(:description)
       return if resource_description.blank?
@@ -72,7 +79,7 @@ module Decidim
     end
 
     def created_at
-      I18n.l(model.created_at, format: :short)
+      t("decidim.activity.time_ago", time: time_ago_in_words(model.created_at))
     end
 
     def user
@@ -87,11 +94,16 @@ module Decidim
     delegate :action, to: :model
 
     def element_id
-      "action-#{model.id}"
+      "#{id_prefix}-#{model.id}"
+    end
+
+    def id_prefix
+      @id_prefix ||= context[:id_prefix].presence || "action"
     end
 
     def cache_hash
       hash = []
+      hash << id_prefix
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version
@@ -130,7 +142,7 @@ module Decidim
 
       return unless presenter
 
-      cell "decidim/author", presenter
+      cell "decidim/author", presenter, layout: :avatar
     end
 
     def participatory_space
@@ -139,6 +151,10 @@ module Decidim
       model.participatory_space_lazy
     end
 
+    def participatory_space_icon
+      icon "treasure-map-line"
+    end
+
     def participatory_space_link
       link_to(
         decidim_html_escape(translated_attribute(participatory_space.title)),
@@ -149,5 +165,9 @@ module Decidim
     def show_author?
       context[:show_author]
     end
+
+    def hide_participatory_space?
+      context[:hide_participatory_space]
+    end
   end
 end

data/app/cells/decidim/address/online.erb

@@ -0,0 +1,9 @@
+<div class="address__container">
+  <%= icon "map-pin-line" %>
+  <div class="address">
+    <div class="address__location"><%= t(model.type_of_meeting, scope: "decidim.meetings.meetings.filters.type_values") %></div>
+    <a href="<%= model.online_meeting_url %>" target="_blank" rel="noopener noreferrer" class="address__hints underline break-all">
+      <%= model.online_meeting_url %>
+    </a>
+  </div>
+</div>

data/app/cells/decidim/address/show.erb

@@ -1,14 +1,14 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
-      <%= resource_icon %>
-    </li>
-    <li class="card-data__item">
-      <div class="text-left">
-        <div class="card__icondata--address">
-          <%= render :details %>
-        </div>
-      </div>
-    </li>
-  </ul>
+<div class="address__container">
+  <%= icon "map-pin-line" %>
+  <div class="address">
+    <% if has_location? %>
+      <div class="address__location"><%= location %></div>
+    <% end %>
+
+    <div class="address__address"><%= address %></div>
+
+    <% if has_location_hints? %>
+      <div class="address__hints"><%= location_hints %></div>
+    <% end %>
+  </div>
 </div>

data/app/cells/decidim/address_cell.rb

@@ -7,7 +7,9 @@ module Decidim
     include LayoutHelper
     include Decidim::SanitizeHelper
 
-    def details
+    def show
+      return render :online if options[:online]
+
       render
     end
 
@@ -30,11 +32,5 @@ module Decidim
     def address
       decidim_sanitize(translated_attribute(model.address))
     end
-
-    private
-
-    def resource_icon
-      icon "meetings", class: "icon--big", role: "img", "aria-hidden": true
-    end
   end
 end

data/app/cells/decidim/amendable/amend_button_card/show.erb

@@ -1,9 +1,4 @@
-<div class="card text-center card__amend-button">
-  <div class="card__content">
-    <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, class: button_classes do %>
-      <%= new_amend_button_label %>
-    <% end %>
-
-    <%= new_amend_help_text %>
-  </div>
-</div>
+<%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "button button__sm button__transparent-secondary w-full" do %>
+  <span><%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %></span>
+  <%= icon "pencil-line" %>
+<% end %>

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -17,23 +17,6 @@ module Decidim
       def new_amend_path
         decidim.new_amend_path(amendable_gid: model.to_sgid.to_s)
       end
-
-      def new_amend_button_label
-        t("button", scope: "decidim.amendments.amendable", model_name: model_name)
-      end
-
-      def new_amend_help_text
-        content_tag :small do
-          t("help_text",
-            scope: "decidim.amendments.amendable",
-            model_name: model_name.downcase,
-            amendable_fields: model.amendable_fields.to_sentence)
-        end
-      end
-
-      def button_classes
-        "amend_button_card_cell button hollow expanded button--icon button--sc"
-      end
     end
   end
 end

data/app/cells/decidim/amendable/amenders_list/show.erb

@@ -1,12 +0,0 @@
-<div class="card extra amender-list">
-  <div class="definition-data__item">
-    <span class="definition-data__title">
-      <%= t("amended_by", scope: "decidim.amendments.amendable") %>
-    </span>
-  </div>
-  <% amenders.each do |amender| %>
-    <div class="definition-data__item expanded" id="amendment_<%= amender.id %>">
-      <%= cell("decidim/author", amender, options: options, has_actions: false) %>
-    </div>
-  <% end %>
-</div>

data/app/cells/decidim/amendable/amendments/show.erb

@@ -0,0 +1,12 @@
+<section id="amendments">
+  <h2 class="h4 flex items-center gap-2 mb-4">
+    <%= resource_type_icon "Decidim::Amendment", class: "fill-tertiary w-6 h-6" %>
+    <%= t("decidim.amendments.amendments.title", count: emendations.count) %>
+  </h2>
+
+  <div id="amendment-list">
+    <% emendations.each do |emendation| %>
+      <%= card_for emendation, context: { current_user: } %>
+    <% end %>
+  </div>
+</section>

data/app/cells/decidim/amendable/amendments_cell.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim::Amendable
+  # This cell renders the list of amendments of a resource.
+  class AmendmentsCell < Decidim::ViewModel
+    include Decidim::ApplicationHelper
+    include Decidim::CardHelper
+    include Decidim::IconHelper
+
+    delegate :amendable?, :visible_emendations_for, to: :model
+
+    def show
+      return unless amendable?
+      return unless emendations.any?
+
+      render
+    end
+
+    private
+
+    def emendations
+      @emendations ||= visible_emendations_for(current_user)
+    end
+  end
+end

data/app/cells/decidim/amendable/announcement_cell.rb

@@ -32,7 +32,7 @@ module Decidim::Amendable
         scope: "decidim.amendments.emendation.announcement",
         amendable_type: type,
         proposal_link: link,
-        date: date)
+        date:)
     end
 
     def proposal_link(resource = model.amendable, text = nil)

data/app/cells/decidim/amendable/emendation_actions/show.erb

@@ -1,13 +1,15 @@
-<div class="card text-center card__amend-button">
-  <div class="card__content">
-      <%= action_authorized_link_to :amend, review_amend_path, resource: model, data: { "redirect_url" => review_amend_path }, class: accept_button_classes do %>
-        <%= accept_button_label %>
-      <% end %>
+<div class="space-y-4">
+  <div class="flex justify-between items-center gap-4 [&>*]:grow">
+    <%= action_authorized_link_to :amend, review_amend_path, resource: model, data: { "redirect_url" => review_amend_path }, class: "button button__sm button__secondary" do %>
+      <%= icon "thumb-up-line" %>
+      <span><%= t(:button_accept, scope: "decidim.amendments.emendation.actions") %></span>
+    <% end %>
 
-      <%= action_authorized_link_to :amend, reject_amend_path, method: :patch, resource: model, data: { "redirect_url" => reject_amend_path }, class: reject_button_classes do %>
-        <%= reject_button_label %>
-      <% end %>
-
-      <%= accept_reject_help_text %>
+    <%= action_authorized_link_to :amend, reject_amend_path, method: :patch, resource: model, data: { "redirect_url" => reject_amend_path }, class: "button button__sm button__transparent-secondary" do %>
+      <%= icon "thumb-down-line" %>
+      <span><%= t(:button_reject, scope: "decidim.amendments.emendation.actions") %></span>
+    <% end %>
   </div>
+
+  <span class="block text-gray-2 text-xs"><%= t(:help_text, scope: "decidim.amendments.emendation.actions") %></span>
 </div>

data/app/cells/decidim/amendable/emendation_actions_cell.rb

@@ -15,36 +15,10 @@ module Decidim::Amendable
       decidim.review_amend_path(amendment)
     end
 
-    def accept_button_classes
-      "button success hollow expanded button--icon button--sc"
-    end
-
-    def accept_button_label
-      content = icon "thumb-up"
-      content += t(:button_accept, scope: "decidim.amendments.emendation.actions")
-      content
-    end
-
     def reject_amend_path
       decidim.reject_amend_path(amendment)
     end
 
-    def reject_button_classes
-      "button alert hollow expanded button--icon button--sc"
-    end
-
-    def reject_button_label
-      content = icon "thumb-down"
-      content += t(:button_reject, scope: "decidim.amendments.emendation.actions")
-      content
-    end
-
-    def accept_reject_help_text
-      content_tag :small do
-        t(:help_text, scope: "decidim.amendments.emendation.actions")
-      end
-    end
-
     def decidim
       Decidim::Core::Engine.routes.url_helpers
     end

data/app/cells/decidim/amendable/promote_button_card/show.erb

@@ -1,10 +1,10 @@
-<div class="card text-center card__amend-button">
-  <div class="card__content">
-    <%= action_authorized_link_to :amend, promote_amend_path, method: :post,
-        data: { confirm: promote_confirm_text }, class: button_classes do %>
-      <%= promote_amend_button_label %>
-    <% end %>
+<%= action_authorized_link_to :amend,
+                              promote_amend_path,
+                              method: :post,
+                              data: { confirm: promote_confirm_text },
+                              class: "button button__sm button__transparent-secondary" do %>
+    <span><%= promote_amend_button_label %></span>
+    <%= icon "pencil-line" %>
+<% end %>
 
-    <%= promote_amend_help_text %>
-  </div>
-</div>
+<%= promote_amend_help_text %>

data/app/cells/decidim/amendable/promote_button_card_cell.rb

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def promote_amend_button_label
-        t("promote_button", scope: "decidim.amendments.amendable", model_name: model_name)
+        t("promote_button", scope: "decidim.amendments.amendable", model_name:)
       end
 
       def promote_confirm_text
@@ -42,10 +42,6 @@ module Decidim
       def decidim
         Decidim::Core::Engine.routes.url_helpers
       end
-
-      def button_classes
-        "amend_button_card_cell button expanded button--icon button--sc"
-      end
     end
   end
 end

data/app/cells/decidim/amendable/wizard_step_form_cell.rb

@@ -45,8 +45,8 @@ module Decidim
       # A Hash of data that is used in both :wizard_header and :wizard_aside views.
       def common_options
         {
-          view: view,
-          current_step: current_step,
+          view:,
+          current_step:,
           total_steps: 4,
           steps: {
             "1": i18n_step(1),
@@ -60,16 +60,16 @@ module Decidim
       # A Hash of data needed for the :wizard_aside view.
       def wizard_aside_options
         {
-          wizard_aside_back_url: wizard_aside_back_url
+          wizard_aside_back_url:
         }
       end
 
       # A Hash of data needed for the :wizard_header view.
       def wizard_header_options
         {
-          wizard_header_title: wizard_header_title,
+          wizard_header_title:,
           wizard_header_similar_resources_count: options[:similar_resources_count],
-          wizard_header_help_text: wizard_header_help_text
+          wizard_header_help_text:
         }
       end
 

data/app/cells/decidim/announcement/show.erb

@@ -1,11 +1,11 @@
-<div class="row column">
-  <%= content_tag :div, class: "callout announcement mb-sm #{callout_class} cell-announcement" do %>
-    <% if has_title? %>
-      <p class="heading5"><%= clean_title %></p>
-
-      <%= clean_body %>
-    <% else %>
-      <%= clean_announcement %>
-    <% end %>
+<%= content_tag :div, id: options[:id], class: "flash flex-col #{css_class}", data: { announcement: "" }.compact, hidden: options[:hidden] do %>
+  <% if has_title? %>
+    <div class="flash__title">
+      <%= clean_title %>
+    </div>
   <% end %>
-</div>
+
+  <span class="flash__message">
+    <%= text %>
+  </span>
+<% end %>

data/app/cells/decidim/announcement_cell.rb

@@ -16,25 +16,35 @@ module Decidim
   # or a value accepted by the `translated_attribute` method.
   #
   # As options, the cell accepts a Hash with these keys:
-  #   - `callout_class`: The Css class to apply. Default to `"secondary"`
+  #   - `callout_class`: The Css class to apply
   #
   class AnnouncementCell < Decidim::ViewModel
     include Decidim::SanitizeHelper
 
     def show
-      return if clean_body.blank? && clean_announcement.blank?
+      return if blank_content?
 
       render :show
     end
 
+    def blank_content?
+      @blank_content ||= clean_body.blank? && clean_announcement.blank?
+    end
+
     private
 
     def has_title?
       announcement.is_a?(Hash) && announcement.has_key?(:title)
     end
 
-    def callout_class
-      options[:callout_class] ||= "secondary"
+    def text
+      has_title? ? clean_body : clean_announcement
+    end
+
+    def css_class
+      return unless options[:callout_class]
+
+      options[:callout_class]
     end
 
     def announcement

data/app/cells/decidim/author/avatar.erb

@@ -0,0 +1,9 @@
+<%= content_tag :span, class: "author__avatar-container" do %>
+  <% if profile_path? %>
+    <%= link_to profile_path do %>
+      <%= render :avatar_image %>
+    <% end %>
+  <% else %>
+    <%= render :avatar_image %>
+  <% end %>
+<% end %>

data/app/cells/decidim/author/avatar_image.erb

@@ -0,0 +1 @@
+<%= image_tag model.avatar_url(:thumb), alt: t("decidim.author.avatar", name: display_name), class: "author__avatar" %>

data/app/cells/decidim/author/cancelled_on.erb

@@ -0,0 +1,4 @@
+<span class="author__metadata">
+  <%= icon "calendar-line" if show_icons? %>
+  <%= cancelled_on_date %>
+</span>

data/app/cells/decidim/author/comments.erb

@@ -1,6 +1,4 @@
-<% if commentable? %>
-  <%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments_count) do %>
-    <%= icon "comment-square", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= from_context.comments_count %> <%= t("decidim.author.comments", count: from_context.comments_count) %>
-  <% end %>
+<%= link_to "#{resource_locator(from_context).path}#comments", title: t("decidim.author.comments", count: from_context.comments_count), class: "author__metadata" do %>
+  <%= icon "chat-1-line" if show_icons? %>
+  <%= from_context.comments_count %> <%= t("decidim.author.comments", count: from_context.comments_count) %>
 <% end %>

data/app/cells/decidim/author/date.erb

@@ -1,5 +1,4 @@
-<% if creation_date? %>
-  <span>
-    <%= creation_date %> &nbsp;
-  </span>
-<% end %>
+<span class="author__metadata">
+  <%= icon "calendar-line" if show_icons? %>
+  <%= creation_date %>
+</span>

data/app/cells/decidim/author/endorsements.erb

@@ -1,6 +1,4 @@
-<% if endorsable? %>
-  <%= link_to "#{resource_locator(from_context).path}#list-of-endorsements", title: t("decidim.author.endorsements",count: from_context.endorsements_count) do %>
-    <%= icon "bullhorn", class: "icon--small", role: "img", "aria-hidden": true %>
-    <%= from_context.endorsements_count %> <%= t("decidim.author.endorsements", count: from_context.endorsements_count) %>
-  <% end %>
+<%= link_to "#{resource_locator(from_context).path}#list-of-endorsements", title: t("decidim.author.endorsements", count: from_context.endorsements_count), class: "author__metadata" do %>
+  <%= icon "like" if show_icons? %>
+  <%= from_context.endorsements_count %> <%= t("decidim.author.endorsements", count: from_context.endorsements_count) %>
 <% end %>