decidim-core 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f92f8225a3998e9e26e1c147c90eafb9ebb90a7c153e300b3ea2b9695e63e2ba
-  data.tar.gz: 8c3eb2093ab824160548f3089e3b5ba68536a7231892f2c2484aa384c49307b5
+  metadata.gz: db2049c9f719053d8344dc12a1cc1333b839c20c53de98b67e3ca27bb013e0be
+  data.tar.gz: 139361af6d051e502902469fed8c2fb0ed5357cd30d3f41895f63040f2140c7c
 SHA512:
-  metadata.gz: 1abf1ab6e14a84745b3bb8fd176f002b7fd65ecbd497b1e4544202b517d265a2eded3d628e0ab27ed53f2385849da158f31571af32181e68cb7df02ee60844a4
-  data.tar.gz: 9f0209ace6ff368bd4dfb87d3b28c704d4ba1726abf8bfe29efab5a0aa52babb06eb214a6bee663d1b6d6728f9c4fff222ff83008b0f44cb868b5d575437be32
+  metadata.gz: 58f161196f88af069f757f01d0cb008a0a0821d5e6fe26b8151bdeb8aac7b5b9646435e0108ef1bb6a4438c91161fa8c8de6896a4dc61bf9e6aa283cf62128ec
+  data.tar.gz: 070fbf34950a9c38c70aa55f877dcc18e86b19914ed587536e5711c4fa2e68a14f43fd786197e3b99e07e4f66c2482978279f8aa96499639f4db91fd216da2fd

data/README.md

@@ -70,7 +70,7 @@ This can be done in an initializer (like user does), in a participatory_space ma
 
 ## Metrics docs
 
-Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://github.com/decidim/decidim/tree/develop/docs/advanced/metrics.md)
+Core adds an implementation to show APP metrics within some pages. You can see specific documentation at [Metrics](https://docs.decidim.org/en/develop/metrics/)
 
 ## Contributing
 

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

@@ -6,16 +6,13 @@ module Decidim::Amendable
     include Decidim::ApplicationHelper
 
     def show
-      cell "decidim/announcement", announcement
+      cell "decidim/announcement", announcement, callout_class: state_classes
     end
 
     private
 
     def announcement
-      {
-        announcement: emendation_message + promoted_message,
-        callout_class: state_classes
-      }
+      emendation_message + promoted_message
     end
 
     def emendation_message
@@ -57,12 +54,10 @@ module Decidim::Amendable
       case model.state
       when "accepted"
         "success"
-      when "rejected"
+      when "rejected", "withdrawn"
         "alert"
       when "evaluating"
         "warning"
-      when "withdrawn"
-        "alert"
       else
         "muted"
       end

data/app/cells/decidim/announcement_cell.rb

@@ -54,7 +54,7 @@ module Decidim
     def clean_body
       return unless body
 
-      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join("")
+      Array(body).map { |paragraph| tag.p(clean(paragraph)) }.join
     end
 
     def clean_announcement

data/app/cells/decidim/author_cell.rb

@@ -102,7 +102,7 @@ module Decidim
     end
 
     def commentable?
-      from_context && from_context.class.include?(Decidim::Comments::Commentable)
+      from_context && from_context.class.include?(Decidim::Comments::Commentable) && from_context.try(:commentable?)
     end
 
     def endorsable?

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

@@ -9,7 +9,7 @@
       <div class="card__text">
         <div class="card__text--paragraph">
           <%= render :badge if has_badge? %>
-          <%= description %>
+          <%= Decidim::ContentProcessor.render(description, "div") %>
         </div>
       </div>
 

data/app/cells/decidim/card_m_cell.rb

@@ -19,7 +19,7 @@ module Decidim
     private
 
     def resource_path
-      resource_locator(model).path(filter_link_params)
+      resource_locator(model).path
     end
 
     def resource_image_path

data/app/cells/decidim/content_blocks/footer_sub_hero/show.erb

@@ -1,4 +1,4 @@
-<section class="footer__subhero extended subhero home-section">
+<section id="footer_sub_hero" class="footer__subhero extended subhero home-section">
   <div class="row">
     <div class="columns small-centered large-10">
       <h3 class="heading3"><%= t("decidim.pages.home.footer_sub_hero.footer_sub_hero_headline", organization: current_organization.name) %></h3>

data/app/cells/decidim/content_blocks/hero/show.erb

@@ -1,4 +1,4 @@
-<section class="extended hero home-section" style="background-image:url(<%= background_image %>);">
+<section id="hero" class="extended hero home-section" style="background-image:url(<%= background_image %>);">
   <div class="hero__container">
     <div class="row">
       <div class="columns small-centered large-10">

data/app/cells/decidim/content_blocks/highlighted_content_banner/show.erb

@@ -1,4 +1,4 @@
-<section class="extended highligted-content-banner home-section"
+<section id="highlighted_content_banner" class="extended highligted-content-banner home-section"
           style="background-image:url(<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>);">
   <div class="highligted-content-banner__container">
     <div class="row">
@@ -6,9 +6,9 @@
         <h1 class="text-highlight heading1 highligted-content-banner-heading">
           <%= translated_attribute current_organization.highlighted_content_banner_title %>
         </h1>
-        <span class="text-highlight">
+        <div class="text-highlight">
           <%= decidim_sanitize_editor translated_attribute current_organization.highlighted_content_banner_short_description %>
-        </span>
+        </div>
       </div>
       <div class="columns large-2">
         <%= link_to current_organization.highlighted_content_banner_action_url,

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

@@ -44,7 +44,7 @@ module Decidim
       end
 
       def random_seed
-        rand * 2 - 1
+        (rand * 2) - 1
       end
     end
   end

data/app/cells/decidim/content_blocks/how_to_participate/show.erb

@@ -1,4 +1,4 @@
-<section class="extended home-section">
+<section id="how_to_participate" class="extended home-section">
   <div class="wrapper-home">
     <div class="row column text-center">
       <h2 class="heading3"><%= t("decidim.pages.home.extended.how_to_participate") %></h2>

data/app/cells/decidim/content_blocks/last_activity/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home upcoming-events home-section">
+<section id="last_activity" class="wrapper-home upcoming-events home-section">
   <div class="row">
     <h3 class="section-heading"><%= t("decidim.content_blocks.last_activity.title") %></h3>
     <div class="row">

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

@@ -56,10 +56,10 @@ module Decidim
       end
 
       def activities
-        @activities ||= HomeActivitySearch.new(
+        @activities ||= ActionLog.where(
           organization: current_organization,
-          resource_type: "all"
-        ).results.limit(activities_to_show * 6)
+          visibility: %w(public-only all)
+        ).with_new_resource_type("all").order(created_at: :desc).limit(activities_to_show * 6)
       end
 
       def activities_to_show

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

@@ -3,10 +3,6 @@
 module Decidim
   module ContentBlocks
     class StatsCell < Decidim::ViewModel
-      cache :show, expires_in: 10.minutes, if: :perform_caching? do
-        cache_hash
-      end
-
       def stats
         @stats ||= HomeStatsPresenter.new(organization: current_organization)
       end
@@ -18,6 +14,10 @@ module Decidim
         hash.push(I18n.locale)
         hash.join(Decidim.cache_key_separator)
       end
+
+      def cache_expiry_time
+        10.minutes
+      end
     end
   end
 end

data/app/cells/decidim/content_blocks/sub_hero/show.erb

@@ -1,4 +1,4 @@
-  <section class="extended subhero home-section">
+  <section id="sub_hero" class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
         <h2 class="heading2">

data/app/cells/decidim/data_consent/category.erb

@@ -0,0 +1,64 @@
+<div class="category-wrapper margin-vertical-1" data-id="<%= category[:slug] %>">
+  <div class="category-row flex-center">
+    <button class="cc-title padding-left-3">
+      <span class="h5 cc-category-title">
+        <strong><%= category[:title] %></strong>
+      </span>
+    </button>
+
+    <div class="cc-switch">
+      <input
+        class="switch-input"
+        <%= %(checked="checked") if category[:mandatory] %>
+        id="cc-<%= category[:slug] %>"
+        type="checkbox"
+        name="<%= category[:slug] %>"
+        <%= "disabled" if category[:mandatory] %>>
+
+      <label class="switch-paddle" for="cc-<%= category[:slug] %>">
+        <span class="show-for-sr"><%= t("layouts.decidim.cookie_consent.modal.toggle", consent_category: category[:title]) %></span>
+      </label>
+    </div>
+  </div>
+  <div class="cc-description hide">
+    <div class="description-text">
+      <p><%= category[:description] %></p>
+    </div>
+
+    <% if category[:cookies].present? %>
+      <div class="cookie-details-wrapper">
+        <div class="row detail-titles">
+          <div class="columns small-2">
+            <%= t("layouts.decidim.cookie_consent.cookie_details.columns.type") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.cookie_consent.cookie_details.columns.name") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.cookie_consent.cookie_details.columns.service") %>
+          </div>
+          <div class="columns small-6">
+            <%= t("layouts.decidim.cookie_consent.cookie_details.columns.description") %>
+          </div>
+        </div>
+
+        <% category[:cookies].each do |cookie| %>
+          <div class="row cookie-detail-row">
+            <div class="columns small-2">
+              <%= t("layouts.decidim.cookie_consent.cookie_details.types.#{cookie[:type]}") %>
+            </div>
+            <div class="columns small-2">
+              <%= cookie[:name] %>
+            </div>
+            <div class="columns small-2">
+              <%= t("layouts.decidim.cookie_consent.cookie_details.cookies.#{cookie[:name]}.service") %>
+            </div>
+            <div class="columns small-6">
+              <%= t("layouts.decidim.cookie_consent.cookie_details.cookies.#{cookie[:name]}.description") %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/cells/decidim/data_consent/dialog.erb

@@ -0,0 +1,29 @@
+<div id="cc-dialog-wrapper" class="flex-center hide robots-noindex robots-nocontent noindex" data-nosnippet role="region">
+  <div class="cc-dialog padding-vertical-1">
+    <div class="row expanded">
+      <div class="columns medium-12 large-8">
+        <div class="cc-content">
+          <div class="h5">
+            <%= t("layouts.decidim.cookie_consent.dialog.title") %>
+          </div>
+          <div>
+            <%= t("layouts.decidim.cookie_consent.dialog.description") %>
+          </div>
+        </div>
+      </div>
+      <div class="columns medium-12 large-4">
+        <div class="cc-button-wrapper flex-center">
+          <button id="cc-dialog-accept" class="button">
+            <%= t("layouts.decidim.cookie_consent.dialog.accept_all") %>
+          </button>
+          <button id="cc-dialog-reject" class="button hollow">
+            <%= t("layouts.decidim.cookie_consent.dialog.accept_only_essential") %>
+          </button>
+          <button id="cc-dialog-settings" class="button clear" data-open="cc-modal">
+            <%= t("layouts.decidim.cookie_consent.dialog.cookie_settings") %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/data_consent/modal.erb

@@ -0,0 +1,39 @@
+<div class="reveal cc-modal" id="cc-modal" role="dialog" data-close-on-click="false" data-close-on-esc="false" aria-modal="true" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title">
+      <%= t("layouts.decidim.cookie_consent.modal.title") %>
+    </h3>
+    <p>
+      <%= t("layouts.decidim.cookie_consent.modal.description") %>
+    </p>
+  </div>
+
+  <div class="cc-categories">
+    <% categories.each do |category| %>
+      <%= render(
+        {
+          view: :category,
+          locals: {
+            category: category
+          }
+        }
+      ) %>
+    <% end %>
+  </div>
+
+  <div class="cc-buttons-wrapper flex-center">
+    <div class="cc-buttons-left">
+      <button id="cc-modal-accept" class="button" data-close>
+        <%= t("layouts.decidim.cookie_consent.modal.accept_all") %>
+      </button>
+      <button id="cc-modal-reject" class="button hollow" data-close>
+        <%= t("layouts.decidim.cookie_consent.modal.accept_only_essential") %>
+      </button>
+    </div>
+    <div class="cc-buttons-right">
+      <button id="cc-modal-save" class="button clear" data-close>
+        <%= t("layouts.decidim.cookie_consent.modal.save_settings") %>
+      </button>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+<%= render :dialog %>
+
+<%= render :modal %>

data/app/cells/decidim/data_consent_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  class DataConsentCell < Decidim::ViewModel
+    def show
+      render
+    end
+
+    def categories
+      @categories ||= Decidim.consent_categories.map do |category|
+        {
+          slug: category[:slug],
+          title: t("layouts.decidim.cookie_consent.modal.#{category[:slug]}.title"),
+          description: t("layouts.decidim.cookie_consent.modal.#{category[:slug]}.description"),
+          mandatory: category[:mandatory],
+          cookies: category.has_key?(:cookies) ? category[:cookies] : []
+        }
+      end
+    end
+  end
+end

data/app/cells/decidim/diff/diff_mode_dropdown.erb

@@ -4,21 +4,26 @@
       <%= t("versions.dropdown.choose_diff_view_mode") %>
     </span>
 
-    <ul class="dropdown menu" data-dropdown-menu>
-      <li class="is-dropdown-submenu-parent">
-        <a id="diff-view-selected">
+    <ul class="dropdown menu" data-dropdown-menu
+      data-autoclose="false"
+      data-disable-hover="true"
+      data-click-open="true"
+      data-close-on-click="true"
+      role="menubar">
+      <li class="is-dropdown-submenu-parent" role="presentation">
+        <a href="#diffmode-chooser-menu" id="diff-view-selected" aria-controls="diffmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
           <%= t("versions.dropdown.option_unified") %>
         </a>
 
-        <ul class="menu">
-          <li>
-            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified" do %>
+        <ul class="menu is-dropdown-submenu" id="diffmode-chooser-menu" role="menu" aria-labelledby="diff-view-selected">
+          <li role="presentation">
+            <%= link_to "#diff-view-unified", class: "diff-view-mode", id:"diff-view-unified", role: "menuitem" do %>
               <%= t("versions.dropdown.option_unified") %>
             <% end %>
           </li>
 
-          <li>
-            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split" do %>
+          <li role="presentation">
+            <%= link_to "#diff-view-split", class: "diff-view-mode", id:"diff-view-split", role: "menuitem" do %>
               <%= t("versions.dropdown.option_split") %>
             <% end %>
           </li>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -5,21 +5,26 @@
         <%= t("versions.dropdown.choose_diff_view_html") %>
       </span>
 
-      <ul class="dropdown menu" data-dropdown-menu>
-        <li class="is-dropdown-submenu-parent">
-          <a id="diff-view-selected">
+      <ul class="dropdown menu" data-dropdown-menu
+        data-autoclose="false"
+        data-disable-hover="true"
+        data-click-open="true"
+        data-close-on-click="true"
+        role="menubar">
+        <li class="is-dropdown-submenu-parent" role="presentation">
+          <a href="#htmlmode-chooser-menu" id="diff-view-html-selected" aria-controls="htmlmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem">
             <%= t("versions.dropdown.option_unescaped") %>
           </a>
 
-          <ul class="menu">
-            <li>
-              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+          <ul class="menu is-dropdown-submenu" id="htmlmode-chooser-menu" role="menu" aria-labelledby="diff-view-html-selected">
+            <li role="presentation">
+              <%= link_to "#diff-view-unescaped-html", class: "diff-view-html", id: "diff-view-unescaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_unescaped") %>
               <% end %>
             </li>
 
-            <li>
-              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+            <li role="presentation">
+              <%= link_to "#diff-view-escaped-html", class: "diff-view-html", id: "diff-view-escaped-html", role: "menuitem" do %>
                 <%= t("versions.dropdown.option_escaped") %>
               <% end %>
             </li>

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

@@ -1,6 +1,8 @@
 <%= render :diff_mode_dropdown %>
 <%= render :diff_mode_html %>
 
-<% diff_data.each do |data| %>
-  <%= attribute(data) %>
-<% end %>
+<div aria-live="polite">
+  <% diff_data.each do |data| %>
+    <%= attribute(data) %>
+  <% end %>
+</div>

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

@@ -1,7 +1,7 @@
 <div id="list-of-endorsements" class="section">
   <div class="row">
     <div class="columns large-12">
-      <h4 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h4>
+      <h3 class="section-heading"><%= t("decidim.proposals.proposals.show.endorsements_list") %></h3>
     </div>
     <div class="columns large-12">
       <%= cell(

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

@@ -3,7 +3,7 @@
 </div>
 
 <div id="<%= modal_name %>" class="reveal fingerprint-dialog" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
-  <h2 id="modalTitle"><%= t "decidim.fingerprint.title" %></h2>
+  <h2 id="modalTitle" class="reveal__title"><%= t "decidim.fingerprint.title" %></h2>
   <p><%= t "decidim.fingerprint.explanation" %></p>
   <p>
     <strong><%= t "decidim.fingerprint.value" %>:</strong>

data/app/cells/decidim/follow_button_cell.rb

@@ -28,13 +28,11 @@ module Decidim
 
       extra_classes = ""
       extra_classes += " active" if current_user_follows?
-      extra_classes += begin
-        if large?
-          " button--sc"
-        else
-          " small"
-        end
-      end
+      extra_classes += if large?
+                         " button--sc"
+                       else
+                         " small"
+                       end
 
       "button expanded button--icon follow-button secondary hollow #{extra_classes}"
     end

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if followers.any? %>">
+<div class="callout secondary <%= "hide" if followers.any? %>">
   <p><%= t("decidim.followers.no_followers") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

data/app/cells/decidim/followers_cell.rb

@@ -12,7 +12,7 @@ module Decidim
     end
 
     def followers
-      @followers ||= model.followers.page(params[:page]).per(20)
+      @followers ||= model.followers.not_blocked.page(params[:page]).per(20)
     end
   end
 end

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

@@ -1,6 +1,6 @@
 <% if public_followings.any? %>
   <% if non_public_followings? %>
-    <div class="empty-notifications callout secondary">
+    <div class="callout secondary">
       <p><%= t("decidim.following.non_public_followings") %></p>
     </div>
   <% end %>
@@ -12,7 +12,7 @@
   </div>
   <%= decidim_paginate public_followings %>
 <% else %>
-  <div class="empty-notifications callout secondary">
+  <div class="callout secondary">
     <p><%= t("decidim.following.no_followings") %></p>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= cell "decidim/user_group_pending_invitations_list", model %>
-<div class="empty-notifications callout secondary <%= "hide" if user_groups.any? %>">
+<div class="callout secondary <%= "hide" if user_groups.any? %>">
   <p><%= t("decidim.groups.no_user_groups") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -1,4 +1,4 @@
-<div class="empty-notifications callout secondary <%= "hide" if memberships.any? %>">
+<div class="callout secondary <%= "hide" if memberships.any? %>">
   <p><%= t("decidim.members.no_members") %></p>
 </div>
 <div class="row small-up-1 medium-up-2 card-grid">

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

@@ -13,7 +13,7 @@
         <span class="text-small"><%= notification.event_class.constantize.model_name.human %></span>
         <br>
         <span>
-          <%= notification.event_class_instance.notification_title %>
+          <%= notification_title %>
         </span>
         <% if notification.display_resource_text? %>
           <p>

data/app/cells/decidim/notification_cell.rb

@@ -11,6 +11,12 @@ module Decidim
       render :show
     end
 
+    def notification_title
+      notification.event_class_instance.notification_title
+    rescue StandardError
+      I18n.t("decidim.notifications.show.missing_event")
+    end
+
     private
 
     def notification

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

@@ -23,7 +23,7 @@
       <small><%= decidim_html_escape(profile_user.about.to_s) %></small>
     </div>
     <% if profile_user.personal_url.present? %>
-      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url, rel: "nofollow noopener" %>
+      <%= link_to html_truncate(profile_user.personal_url.gsub(%r{https?\:\/\/}, ""), length: 30), profile_user.personal_url, rel: "nofollow noopener noreferrer ugc" %>
     <% end %>
   </div>
   <% if profile_user.badge.present? %>

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -64,7 +64,7 @@ module Decidim
       return false unless current_user
       return false if model.is_a?(Decidim::User)
 
-      Decidim::UserGroupMembership.where(user: current_user, user_group: model).where.not(role: :creator).any?
+      Decidim::UserGroupMembership.where(user: current_user, user_group: model).any?
     end
 
     def user_group_email_to_be_confirmed?

data/app/cells/decidim/search_results_cell.rb

@@ -29,7 +29,7 @@ module Decidim
     end
 
     def selected_resource_type
-      params.dig(:filter, :resource_type)
+      params.dig(:filter, :with_resource_type)
     end
 
     def has_selected_resource_type?

data/app/cells/decidim/tos_page/refuse_btn_modal.erb

@@ -16,7 +16,7 @@
 
   <div class="row">
     <p>
-      <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", data_portability_path: decidim.data_portability_path, delete_path: decidim.delete_account_path) %>
+      <%= t("refuse.modal_body", scope: "decidim.pages.terms_and_conditions", download_your_data_path: decidim.download_your_data_path, delete_path: decidim.delete_account_path) %>
     </p>
   </div>