decidim-core 0.29.4 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c870efc9a61fb35a4d203542d3c151236fa734857034cd0218962c0d8a5889a2
-  data.tar.gz: 870b0671cef65194a32e2fc33e430b92bab41f347c8b1068fe954dcc8e5b2990
+  metadata.gz: 77df3a6de553546de92afda8c288ccedbf4412cf0546c1bf94e92efa7e8d3325
+  data.tar.gz: 9cd7cba3a6c3ad45e8acc75e85e0c6e2a3c0f0887eb7524d9f72b6335d978860
 SHA512:
-  metadata.gz: 3370c446ba0ebc647b221e031500993fd56719e96908a38832d62497103893295a46a33da7eadb42f110f119a4f4abf634cfd8c5a8ae707009c9a186ca31352b
-  data.tar.gz: babce000ab8d7cd3fa51f6c8f81a2e5d6791817dda5e3336369af31316d8d7ba061e85cb38fd5f97885100b74f06f61e05b109d91fc9d1b67c2f49dc77e96c34
+  metadata.gz: edf03c50896d3b4012b3132249013c9957c28449ec869d5b986793a732f423732712049c23507fb1d2a8608501c4f4df475719adaf12a5ed566deb4e26d2bb90
+  data.tar.gz: fb820a54a48ea4066d03748f56128683b6fa4b14aec5919b8c11e69e40b1cf6615bd15b63a6f1fd1a09198873470d49c288e8b143a9cac7189c7c0dae4cbc65a

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

@@ -4,13 +4,13 @@
       <%= icon "map-pin-line" %>
       <div class="address">
         <% if has_location? %>
-          <p class="address__location"><%= location %></p>
+          <div class="address__location"><%= location %></div>
         <% end %>
 
-        <p class="address__address"><%= address %></p>
+        <div class="address__address"><%= address %></div>
 
         <% if has_location_hints? %>
-          <p class="address__hints"><%= location_hints %></p>
+          <div class="address__hints"><%= location_hints %></div>
         <% end %>
       </div>
     </div>

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/flag.erb

@@ -0,0 +1,6 @@
+<button type="button" data-open="<%= current_user.present? ? "flagModal" : "loginModal" %>" title="<%= t("report", scope: "decidim.shared.flag_modal" ) %>" aria-controls="<%= current_user.present? ? "flagModal" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+  <%= icon "flag", aria_hidden: true, class: "icon--small", role: "img", "aria-hidden": true %>
+  <span>
+    <%= t("report", scope: "decidim.shared.flag_modal" ) %>
+  </span>
+</button>

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

@@ -0,0 +1,14 @@
+<% if user_flaggable? && model.try(:id) != current_user.try(:id) %>
+  <%= cell(
+        "decidim/button",
+        { icon: "flag-line", text: t("decidim.shared.flag_modal.report") },
+        button_classes: "button button__sm button__text-secondary only:m-auto",
+        html_options: {
+          "data-open" => current_user.present? ? "flagUserModal" : "loginModal",
+          "aria-controls" => current_user.present? ? "flagUserModal" : "loginModal",
+          "aria-haspopup" => "dialog"
+        }
+      ) %>
+
+  <%= cell("decidim/flag_modal", model).flag_user %>
+<% end %>

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

@@ -1,5 +1,7 @@
-<%= content_tag(:p, class: :author, data: ) do %>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}" 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 %>
 

data/app/cells/decidim/author_cell.rb

@@ -72,7 +72,7 @@ module Decidim
     end
 
     def show_icons?
-      layout != :compact
+      options[:show_icons] != false && layout != :compact
     end
 
     def context_actions

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/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/content_blocks/participatory_space_extra_data/extra_data.erb

@@ -2,10 +2,10 @@
   <div class="participatory-space__metadata-item">
     <div class="participatory-space__metadata-item-title">
       <%= icon item[:icon] %>
-      <h2><%= item[:title] %></h2>
+      <span><%= item[:title] %></span>
     </div>
     <% if item[:text].present? %>
-      <%= content_tag :p, item[:text] %>
+      <%= content_tag :span, item[:text] %>
     <% elsif item[:partial].present? %>
       <%= render item[:partial] %>
     <% end %>

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/flag_modal/flag_user.erb

@@ -0,0 +1,34 @@
+<div class="flag-modal hidden" id="flagUserModal" data-reveal role="dialog" aria-modal="true" aria-labelledby="flagUserModal-label">
+  <div>
+    <h3 id="flagUserModal-label"><%= t("decidim.shared.flag_user_modal.title") %></h3>
+    <button class="close-button" data-close aria-label="<%= t("decidim.shared.flag_user_modal.close") %>" type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <% if model.reported_by? current_user %>
+    <p><%= t("decidim.shared.flag_user_modal.already_reported") %></p>
+  <% else %>
+    <p><%= t("decidim.shared.flag_user_modal.description") %></p>
+    <%= decidim_form_for report_form, url: decidim.report_user_path(sgid: model.to_sgid.to_s), method: :post do |f| %>
+      <%= f.collection_radio_buttons :reason, [
+          [:spam, t("decidim.shared.flag_user_modal.spam")],
+          [:offensive, t("decidim.shared.flag_user_modal.offensive")],
+          [:does_not_belong, t("decidim.shared.flag_user_modal.does_not_belong", organization_name: current_organization.name)]
+      ], :first, :last do |builder| %>
+        <%= builder.label { builder.radio_button + builder.text } %>
+      <% end %>
+      <%= f.text_area :details, rows: 4 %>
+      <% if current_user&.admin? %>
+        <%= f.check_box :block, label: t("decidim.shared.flag_user_modal.block"),
+                                include_hidden: false,
+                                data: {
+                                  label_action: t("decidim.shared.flag_user_modal.block"),
+                                  label_report: t("decidim.shared.flag_user_modal.report"),
+                                  block: "true"
+                                } %>
+        <%= f.check_box :hide, label: t("decidim.shared.flag_user_modal.hide"), label_options: { id: "block_and_hide" } %>
+      <% end %>
+      <%= f.submit t("decidim.shared.flag_user_modal.report") %>
+    <% end %>
+  <% end %>
+</div>

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

@@ -0,0 +1,52 @@
+<%= decidim_modal id: modal_id do %>
+  <%= decidim_form_for report_form, url: decidim.report_path(sgid: model.to_sgid.to_s), method: :post, html: { id: nil, class: "modal__report form-defaults" } do |f| %>
+    <div data-dialog-container>
+      <%= icon "flag-line", class: "inline-block align-middle" %>
+      <h3 data-dialog-title id="dialog-title-<%= modal_id %>">
+        <%= t("decidim.shared.flag_modal.title") %>
+      </h3>
+
+      <% if model.reported_by? current_user %>
+        <div>
+          <p class="modal__report-text">
+            <%= t("decidim.shared.flag_modal.already_reported") %>
+          </p>
+        </div>
+      <% else %>
+        <div>
+          <p class="modal__report-text">
+            <%= t("decidim.shared.flag_modal.description") %>
+          </p>
+          <fieldset>
+            <legend><%= t("decidim.shared.flag_modal.reason") %></legend>
+            <%= f.collection_radio_buttons :reason, [
+              [:spam, t("decidim.shared.flag_modal.spam")],
+              [:offensive, t("decidim.shared.flag_modal.offensive")],
+              [:does_not_belong, t("decidim.shared.flag_modal.does_not_belong", organization_name: current_organization.name)]
+            ], :first, :last do |builder| %>
+              <div class="modal__report-container__radio">
+                <%= builder.radio_button(id: builder.value) %>
+                <label for="<%= builder.value %>">
+                  <%= builder.text %>
+                </label>
+              </div>
+            <% end %>
+          </fieldset>
+          <% unless model.reported_by? current_user %>
+            <%= f.text_area :details, class: "w-full rounded border min-h-[160px] border-text-gray-2 mt-2", id: "#{modal_id}_details", label_options: { for: "#{modal_id}_details", class: "text-gray-2" } %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+    <div data-dialog-actions>
+      <% unless model.reported_by? current_user %>
+        <button type="submit" class="button button__lg button__secondary">
+          <span>
+            <%= t("decidim.shared.flag_modal.report") %>
+          </span>
+          <%= icon "arrow-right-line" %>
+        </button>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/app/cells/decidim/flag_modal_cell.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  class FlagModalCell < Decidim::ViewModel
+    include ActionView::Helpers::FormOptionsHelper
+
+    def flag_user
+      render
+    end
+
+    def cache_hash
+      hash = []
+      hash.push(I18n.locale)
+      hash.push(current_user.try(:id))
+      hash.push(model.reported_by?(current_user) ? 1 : 0)
+      hash.push(model.class.name.gsub("::", ":"))
+      hash.push(model.id)
+      hash.join(Decidim.cache_key_separator)
+    end
+
+    private
+
+    def frontend_administrable?
+      author.respond_to?(:nickname) &&
+        model.can_be_administered_by?(current_user) &&
+        (model.respond_to?(:official?) && !model.official?)
+    end
+
+    def link_to_profile
+      author.presenter.profile_url
+    end
+
+    def author
+      model.try(:creator_identity) || model.try(:normalized_author)
+    end
+
+    def user_report_form
+      Decidim::ReportForm.from_params(reason: "spam")
+    end
+
+    def modal_id
+      options[:modal_id] || "flagModal"
+    end
+
+    def hide_checkbox_id
+      @hide_checkbox_id ||= Digest::MD5.hexdigest("report_form_hide_#{model.class.name}_#{model.id}")
+    end
+
+    def report_form
+      @report_form ||= begin
+        context = { can_hide: model.try(:can_be_administered_by?, current_user) }
+        Decidim::ReportForm.new(reason: "spam").with_context(context)
+      end
+    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>