decidim-core 0.29.1 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a3dc5c9feb9a081fb911d75e25eba2847b1d159837b23853140d96f3c6754b
-  data.tar.gz: 18e41bc984ad456282a1b0c9d3ec3fef7fc89376b330b79198fe3e650cee1301
+  metadata.gz: 77df3a6de553546de92afda8c288ccedbf4412cf0546c1bf94e92efa7e8d3325
+  data.tar.gz: 9cd7cba3a6c3ad45e8acc75e85e0c6e2a3c0f0887eb7524d9f72b6335d978860
 SHA512:
-  metadata.gz: 1c3e01dc59cb7b999828421bfad4e0bdbbddc813200b4b99de17bd89c4b6a664ad0f98af080ec0f84bcd335b89f99fa871c851d56429ee998979ad68bbec4c3c
-  data.tar.gz: 593fff36a401ad9116314865972323861374a70b53883c5c7421f902899d3ea0b934f64aaec1f2c9ed8879440fd647344e60a67beab12e76924851f7b377e788
+  metadata.gz: edf03c50896d3b4012b3132249013c9957c28449ec869d5b986793a732f423732712049c23507fb1d2a8608501c4f4df475719adaf12a5ed566deb4e26d2bb90
+  data.tar.gz: fb820a54a48ea4066d03748f56128683b6fa4b14aec5919b8c11e69e40b1cf6615bd15b63a6f1fd1a09198873470d49c288e8b143a9cac7189c7c0dae4cbc65a

data/app/cells/decidim/activity_cell.rb

@@ -105,9 +105,6 @@ module Decidim
       hash << I18n.locale.to_s
       hash << model.class.name.underscore
       hash << model.cache_key_with_version if model.respond_to?(:cache_key_with_version)
-      if (author_cell = author)
-        hash.push(Digest::MD5.hexdigest(author_cell.send(:cache_hash)))
-      end
 
       hash.join(Decidim.cache_key_separator)
     end

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

@@ -1,4 +1,6 @@
-<%= 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 %>
+<li role="menuitem">
+  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "button button__sm button__text button__text-secondary" do %>
+    <span><%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %></span>
+    <%= icon "pencil-line" %>
+  <% end %>
+</li>

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

@@ -4,6 +4,14 @@ module Decidim
   module Amendable
     # This cell renders the button to amend the given resource.
     class AmendButtonCardCell < Decidim::ViewModel
+      def show
+        return unless amendments_enabled? && model.amendable?
+        return unless current_component.current_settings.amendment_creation_enabled
+        return unless can_participate_in_private_space?
+
+        render
+      end
+
       def model_name
         model.model_name.human
       end

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

@@ -6,7 +6,7 @@
 
   <div id="amendment-list">
     <% emendations.each do |emendation| %>
-      <%= card_for emendation, context: { current_user: } %>
+      <%= card_for emendation, hide_voting: true, context: { current_user: } %>
     <% end %>
   </div>
 </section>

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

@@ -1,7 +1,9 @@
 <%= action_authorized_link_to :amend,
                               promote_amend_path,
                               method: :post,
+                              resource: emendation,
                               data: { confirm: promote_confirm_text },
+                              title: promote_amend_button_label,
                               class: "button button__sm button__transparent-secondary" do %>
     <span><%= promote_amend_button_label %></span>
     <%= icon "pencil-line" %>

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

@@ -1,6 +1,7 @@
-<% data = has_tooltip? ? { tooltip: render(:profile_minicard).html_safe } : nil %>
-<span class="author" data-author>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: do %>
+<%# If the options hash has the demo key it means we are in the decidim-design engine, so it is not a real-world scenario with actual users %>
+<% tooltip = options.has_key?(:demo) ? { tooltip: render(:profile_minicard).html_safe } : nil %>
+<%= content_tag(:span, class: :author, data: ) do %>
+  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}", data: tooltip do %>
     <% if layout == :compact %>
       <%= render :avatar %>
 
@@ -24,4 +25,4 @@
       <%= render action %>
     <% end %>
   <% end %>
-</span>
+<% end %>

data/app/cells/decidim/author_cell.rb

@@ -47,14 +47,32 @@ module Decidim
       @context_actions_options ||= options[:context_actions].map(&:to_sym)
     end
 
+    def profile_minicard
+      render
+    end
+
     private
 
+    # If the options hash has the demo key it means we are in the decidim-design engine,
+    # so it is not a real-world scenario with actual users
+    def data
+      @data ||= begin
+        internal_data = { author: true }
+        if has_tooltip? && !options.has_key?(:demo)
+          internal_data["remote_tooltip"] = true
+          internal_data["tooltip-url"] = decidim.profile_tooltip_path(raw_model.nickname)
+        end
+
+        internal_data
+      end
+    end
+
     def layout
       @layout ||= LAYOUTS.include?(options[:layout]) ? options[:layout] : :default
     end
 
     def show_icons?
-      layout != :compact
+      options[:show_icons] != false && layout != :compact
     end
 
     def context_actions
@@ -160,5 +178,13 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
+
+    def has_tooltip?
+      return false if model.deleted?
+      return false if model.respond_to?(:blocked?) && model.blocked?
+      return true if options.has_key?(:tooltip)
+
+      model.has_tooltip?
+    end
   end
 end

data/app/cells/decidim/card_l/extra_data.erb

@@ -0,0 +1 @@
+<!-- This file is intentionally left empty because it may be overwritten by the child cells in case they need to display extra data -->

data/app/cells/decidim/card_metadata_cell.rb

@@ -110,22 +110,15 @@ module Decidim
       }
     end
 
-    def scope_item
-      return unless resource.is_a?(Decidim::ScopableResource) && has_visible_scopes?(resource)
-
-      {
-        icon: resource_type_icon_key("Decidim::Scope"),
-        text: translated_attribute(resource.scope.name)
-      }
-    end
-
-    def category_item
-      return unless resource.is_a?(Decidim::HasCategory) && resource.category.present?
-
-      {
-        text: resource.category.translated_name,
-        icon: resource_type_icon_key("Decidim::Category")
-      }
+    def taxonomy_items
+      return [] unless resource.is_a?(Taxonomizable) && resource.taxonomies.any?
+
+      resource.taxonomies.map do |taxonomy|
+        {
+          text: translated_attribute(taxonomy.name),
+          icon: resource_type_icon_key("Decidim::Taxonomy")
+        }
+      end
     end
 
     def enable_links?

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

@@ -1,10 +1,12 @@
-<%= link_to resource_path, class: "card__search", id: dom_id(resource) do %>
+<%= content_tag :div, id: dom_id(resource), class: "card__search" do %>
   <%= content_tag title_tag, class: "h4 card__search-title" do %>
-    <%= title %>
+    <%= link_to resource_path, class: "card__search" do %>
+      <%= title %>
+    <% end %>
   <% end %>
   <% if metadata_cell.present? %>
     <div class="card__search-metadata">
-      <%= cell metadata_cell, resource, links: false %>
+     <%= cell metadata_cell, resource, links: false %>
     </div>
   <% end %>
 <% end %>

data/app/cells/decidim/comments_button_cell.rb

@@ -2,6 +2,8 @@
 
 module Decidim
   class CommentsButtonCell < ButtonCell
+    include UserRoleChecker
+
     def show
       if options.has_key?(:display)
         return render if options[:display]
@@ -9,13 +11,19 @@ module Decidim
         return
       end
 
-      render if component_settings.comments_enabled? && !current_settings.try(:comments_blocked?)
+      render if comments_enabled?
     end
 
     private
 
+    def comments_enabled?
+      return true if user_has_any_role?(current_user, current_participatory_space)
+
+      component_settings.comments_enabled? && !current_settings.try(:comments_blocked?)
+    end
+
     def path
-      "#comments"
+      "#add-comment-anchor"
     end
 
     def text
@@ -25,5 +33,9 @@ module Decidim
     def icon_name
       resource_type_icon_key "Decidim::Comments::Comment"
     end
+
+    def button_classes
+      "button button__sm button__transparent-secondary add-comment-mobile"
+    end
   end
 end

data/app/cells/decidim/content_blocks/highlighted_elements_cell.rb

@@ -4,6 +4,8 @@ module Decidim
   module ContentBlocks
     class HighlightedElementsCell < BaseCell
       include Decidim::ContentBlocks::HasRelatedComponents
+      include Decidim::ComponentPathHelper
+      include Decidim::CardHelper
 
       def published_components
         @published_components ||= if model.settings.try(:component_id).present?

data/app/cells/decidim/content_blocks/highlighted_elements_with_cell_for_list_cell.rb

@@ -19,7 +19,7 @@ module Decidim
         @list_cell ||= cell(
           list_cell_path,
           published_components.one? ? published_components.first : published_components,
-          **model.settings.to_h.merge(see_all_path:)
+          **model.settings.to_h, see_all_path:
         )
       end
 

data/app/cells/decidim/diff_cell.rb

@@ -70,6 +70,10 @@ module Decidim
 
     # DiffRenderer class for the current_version's item; falls back to `BaseDiffRenderer`.
     def diff_renderer_class
+      renderer_class = "#{current_version.item_type}DiffRenderer".safe_constantize
+
+      return renderer_class if renderer_class
+
       if current_version.item_type.deconstantize == "Decidim"
         "#{current_version.item_type.pluralize}::DiffRenderer".constantize
       else

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

@@ -1,4 +1,3 @@
 <div id="resource-<%= resource&.id %>-endorsement-block" class="flex gap-2">
-  <%= cell "decidim/endorsers_list_button", resource %>
   <%= cell "decidim/endorsement_buttons", resource %>
 </div>

data/app/cells/decidim/endorsement_block_cell.rb

@@ -2,6 +2,12 @@
 
 module Decidim
   class EndorsementBlockCell < Decidim::ViewModel
+    def show
+      return unless endorsements_enabled?
+
+      render :show
+    end
+
     alias resource model
   end
 end

data/app/cells/decidim/endorsement_buttons/button_content.erb

@@ -1,2 +1,2 @@
-<span><%= endorse_translated %></span>
+<span><%= t("decidim.endorsement_buttons_cell.endorse") %></span>
 <%= endorse_icon %>

data/app/cells/decidim/endorsement_buttons/select_identity_button.erb

@@ -1,5 +1,5 @@
 <div id="resource-<%= resource&.id %>-endorsement-button">
-  <button id="select-identity-button" type="button" name="button" class="<%= button_classes %>" data-dialog-open="user-identities" data-dialog-remote-url="<%= reveal_identities_url %>">
+  <button id="select-identity-button" type="button" name="button" class="<%= button_classes %>" data-dialog-open="user-identities" data-dialog-remote-url="<%= reveal_identities_url %>" aria-label="<%= endorse_translated %>">
     <%= render "button_content" %>
   </button>
 

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

@@ -1,17 +1,17 @@
 <div id="resource-<%= resource&.id %>-endorsement-button">
   <% path = resource.endorsed_by?(current_user) ? path_to_destroy_endorsement(resource) : path_to_create_endorsement(resource) %>
-  <% label = resource.endorsed_by?(current_user) ? t("decidim.endorsement_buttons_cell.already_endorsed") : endorse_translated %>
   <% method = resource.endorsed_by?(current_user) ? :delete : :post %>
   <%= action_authorized_button_to(
         :endorse,
         path,
-        resource:,
-        method:,
-        remote: true,
-        class: button_classes,
-        id: "endorsement-button"
+        :resource => resource,
+        :method => method,
+        :remote => true,
+        :class => button_classes,
+        :id => "endorsement-button",
+        "aria-label" => endorse_translated
       ) do %>
-    <%= label %>
+    <span><%= t("decidim.endorsement_buttons_cell.endorse") %></span>
     <%= endorse_icon %>
   <% end %>
 </div>

data/app/cells/decidim/endorsement_buttons/verification_modal.erb

@@ -1,5 +1,7 @@
 <%= button_to(endorsement_path(resource),
-              data: { "dialog-open": "authorizationModal", "dialog-remote-url": modal_path(:endorse, resource) },
-              class: button_classes) do %>
+              :data => { "dialog-open": "authorizationModal", "dialog-remote-url": modal_path(:endorse, resource) },
+              :class => button_classes,
+              "aria-label" => endorse_translated
+    ) do %>
   <%= render "button_content" %>
 <% end %>

data/app/cells/decidim/endorsers_list/empty.erb

@@ -0,0 +1,3 @@
+<section class="hidden layout-main__section" id="endorser-list-<%= model.id %>">
+
+</section>

data/app/cells/decidim/endorsers_list/full.erb

@@ -1,6 +1,18 @@
-<div id="dropdown-menu-endorsers-list" class="endorsers-list">
-  <div class="endorsers-list__text"><%= t("decidim.endorsers_list.endorsed_by") %></div>
-  <div class="endorsers-list__grid">
-    <%= render :full_endorsers_list %>
+<%= decidim_modal id: "endorsersModal-#{model.id}", class: "endorsers-list__modal" do %>
+  <div data-dialog-container>
+    <%= icon "like" %>
+    <h2 id="dialog-title-endorsersModal" tabindex="-1" data-dialog-title><%= t("decidim.endorsers_list.title") %></h2>
+    <div>
+      <% full_endorsers.each do |author| %>
+        <div class="list-item__author">
+          <div>
+            <%= cell "decidim/author", author, has_actions: true, skip_profile_link: true %>
+          </div>
+          <div class="ml-auto">
+            <%= cell("decidim/follow_button", author, button_classes: "button button__sm button__transparent-secondary") %>
+          </div>
+        </div>
+      <% end %>
+    </div>
   </div>
-</div>
+<% end %>

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

@@ -1,11 +1,20 @@
-<% visible_endorsers.each do |visible_endorser| %>
-  <span class="endorsers-list__avatar">
-    <%= cell "decidim/author", visible_endorser, layout: :avatar, skip_profile_link: true %>
-  </span>
-<% end %>
+<section class="layout-main__section" id="endorser-list-<%= model.id %>">
+  <div class="endorsers-list__container">
+    <% visible_endorsers.each do |visible_endorser| %>
+      <span class="endorsers-list__avatar">
+        <%= cell "decidim/author", visible_endorser, layout: :avatar, skip_profile_link: true %>
+      </span>
+    <% end %>
 
-<% if full_endorsers.length > MAX_ITEMS_STACKED %>
-  <span class="endorsers-list__counter">
-    <%= "+" + (endorsers_count - MAX_ITEMS_STACKED).to_s %>
-  </span>
-<% end %>
+    <div class="text-center">
+      <div class="endorsers-list__text">
+        <%= t("decidim.endorsers_list.endorsed_by",
+              visible: display_link(voted_by_me? ? t("decidim.endorsers_list.you") : visible_endorsers.first.try(:name)),
+              others: display_link(t("decidim.endorsers_list.others", count: endorsers_count - 1), css_class: " first-letter:uppercase"),
+              count: endorsers_count
+            ) %>
+      </div>
+    </div>
+  </div>
+  <%= render :full %>
+</section>

data/app/cells/decidim/endorsers_list_cell.rb

@@ -11,18 +11,15 @@ module Decidim
   class EndorsersListCell < Decidim::ViewModel
     include ApplicationHelper
 
-    MAX_ITEMS_STACKED = 3
+    MAX_ITEMS_STACKED = 8
 
     def show
+      return render :empty if visible_endorsers.count.zero?
       return render :full if full_list?
 
       render
     end
 
-    def full_endorsers_list
-      render
-    end
-
     def endorsers_count
       base_relation.count
     end
@@ -37,7 +34,13 @@ module Decidim
     #
     # Returns an Array of presented Users/UserGroups
     def visible_endorsers
-      @visible_endorsers ||= base_relation.limit(MAX_ITEMS_STACKED).map { |identity| present(identity.normalized_author) }
+      @visible_endorsers ||= if voted_by_me?
+                               base_relation.where.not(author: current_user).limit(MAX_ITEMS_STACKED - 1).map do |identity|
+                                 present(identity.normalized_author)
+                               end + [present(current_user)]
+                             else
+                               base_relation.limit(MAX_ITEMS_STACKED).map { |identity| present(identity.normalized_author) }
+                             end
     end
 
     def full_endorsers
@@ -47,5 +50,15 @@ module Decidim
     def base_relation
       @base_relation ||= model.endorsements.for_listing.includes(:author, :user_group)
     end
+
+    def voted_by_me?
+      @voted_by_me ||= model.endorsed_by?(current_user)
+    end
+
+    def display_link(text, css_class: "")
+      link_to(text, "#",
+              class: "text-sm font-semibold text-secondary inline-block #{css_class}",
+              data: { "dialog-open": "endorsersModal-#{model.id}" })
+    end
   end
 end

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

@@ -10,8 +10,7 @@
     <%= render :content %>
   <% end %>
 <% else %>
-  <%= action_authorized_button_to(
-        :follow,
+  <%= logged_button_to(
         path,
         resource: model,
         class: button_classes,

data/app/cells/decidim/follow_button_cell.rb

@@ -23,6 +23,11 @@ module Decidim
 
     private
 
+    # This method is required by action_authorized_button_to
+    def current_component
+      controller.try(:current_component)
+    end
+
     def button_classes
       options[:button_classes] || "button button__sm button__text-secondary only:m-auto"
     end

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

@@ -0,0 +1,3 @@
+<%= dynamic_map_for geocoded_data do %>
+  <%= render :template %>
+<% end.html_safe %>

data/app/cells/decidim/map/template.erb

@@ -0,0 +1,14 @@
+<template id="marker-popup">
+  <div class="space-y-6">
+    <a href="${link}" class="card__list">
+      <div class="card__list-content">
+        <h3 class="h4 card__list-title">${title}</h3>
+        <div class="card__list-metadata">
+          {{each JSON.parse(items)}}
+          <span>{{html icon}}${text}</span>
+          {{/each}}
+        </div>
+      </div>
+    </a>
+  </div>
+</template>

data/app/cells/decidim/map_cell.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  class MapCell < Decidim::ViewModel
+    include Decidim::MapHelper
+
+    def show
+      return unless Decidim::Map.available?(:geocoding, :dynamic)
+
+      render
+    end
+
+    def geocoded_data
+      @geocoded_data ||= data_for_map
+    end
+
+    private
+
+    def data_for_map
+      data = model.select(&:geocoded_and_valid?)
+      data.map do |map|
+        map.slice(:latitude, :longitude, :address)
+           .merge(
+             title: map.presenter.title,
+             link: resource_locator(map).path,
+             items: cell(options[:metadata_card], map).send(:items_for_map).to_json
+           )
+      end
+    end
+
+    def metadata_card
+      "decidim/meetings/meeting_card_metadata"
+    end
+
+    def cache_hash
+      nil
+    end
+  end
+end

data/app/cells/decidim/newsletter_templates/image_text_cta_cell.rb

@@ -50,7 +50,7 @@ module Decidim
       end
 
       def main_image_url
-        newsletter.template.images_container.attached_uploader(:main_image).url(host: organization.host)
+        newsletter.template.images_container.attached_uploader(:main_image).url
       end
 
       def organization_primary_color

data/app/cells/decidim/notification_actions/buttons_cell.rb

@@ -34,7 +34,7 @@ module Decidim
       end
 
       def class_for(item)
-        (item[:class].presence || "button__transparent-secondary")
+        item[:class].presence || "button__transparent-secondary"
       end
     end
   end

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

@@ -0,0 +1,15 @@
+<div id="onboarding-messages-container" class="container">
+  <div class="flash info" data-closable>
+    <div class="flash__icon">
+      <%= info_icon %>
+    </div>
+
+    <div class="flash__message">
+      <%= message_text %>
+    </div>
+
+    <%= button_to decidim_verifications.clear_onboarding_data_authorizations_path, form_class: "close-button", role: :button, method: :delete, remote: true, data: { close: "" } do %>
+      <%= close_icon %>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/onboarding_action_message_cell.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders an announcement of pending onboarding action
+  # if exists for a user
+  #
+  # The `model` is expected to be a user
+  #
+  class OnboardingActionMessageCell < Decidim::ViewModel
+    include ActiveLinkTo
+
+    alias user model
+
+    def show
+      return if is_active_link?(onboarding_path)
+      return unless onboarding_manager.valid?
+      return unless onboarding_manager.pending_action?
+      return if authorization_status == :unauthorized
+      return if pending_authorization_link_active?
+      return if ephemeral_authorized?
+
+      render :show
+    end
+
+    private
+
+    def onboarding_path
+      decidim_verifications.onboarding_pending_authorizations_path
+    end
+
+    def onboarding_manager
+      @onboarding_manager ||= OnboardingManager.new(user)
+    end
+
+    def authorizations
+      @authorizations ||= action_authorized_to(onboarding_manager.action, **onboarding_manager.action_authorized_resources)
+    end
+
+    def authorization_status
+      @authorization_status ||= authorizations.global_code
+    end
+
+    def pending_authorization_link_active?
+      return unless authorizations.single_authorization_required?
+
+      is_active_link? authorizations.statuses.first.current_path
+    end
+
+    def message_text
+      t(
+        "cta_html",
+        scope: "decidim.onboarding_action_message",
+        link_text:,
+        path: onboarding_path,
+        action: onboarding_manager.action_text.downcase,
+        resource_name: onboarding_manager.model_name.human.downcase,
+        resource_title: decidim_sanitize_translated(onboarding_manager.model_title)
+      )
+    end
+
+    def link_text
+      if onboarding_manager.finished_verifications?
+        t("click_link", scope: "decidim.onboarding_action_message")
+      else
+        t("finish_authorization_process", scope: "decidim.onboarding_action_message")
+      end
+    end
+
+    def ephemeral_authorized?
+      user.ephemeral? && authorization_status == :ok
+    end
+
+    def info_icon
+      icon("information-line")
+    end
+
+    def close_icon
+      icon("close-line")
+    end
+  end
+end