decidim-core 0.26.9 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b439f283c43183815f29f97ff9bf9098c8378b8a5cb16191390bd874e83cbb05
-  data.tar.gz: 117c9e1d3d6f9ac3dc55c5984e717c384e5274dc198babddc8ea7a1efe29e863
+  metadata.gz: db2049c9f719053d8344dc12a1cc1333b839c20c53de98b67e3ca27bb013e0be
+  data.tar.gz: 139361af6d051e502902469fed8c2fb0ed5357cd30d3f41895f63040f2140c7c
 SHA512:
-  metadata.gz: 299d8bcecdf6084d93845ebcb256105c79077b2b6895f177dc22ddf296cf09973f92f5c425db5a078cb5e5eb9070f4e6ea6b3ad8e4c792236a6d567de7dc155d
-  data.tar.gz: 906b497e36d89c374d4f80114b5a6c4633d3a6da254832d26c8a9d22fa41c7dfc23fb5ce93ffcd1170e3e2f4caec1859c0e44c661a7dcc3567e31b75c969832c
+  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
@@ -39,7 +36,7 @@ module Decidim::Amendable
     end
 
     def proposal_link(resource = model.amendable, text = nil)
-      text ||= %(<strong>#{decidim_sanitize(present(model.amendable).title, strip_tags: true)}</strong>)
+      text ||= %(<strong>#{present(model.amendable).title}</strong>)
       link_to resource_locator(resource).path do
         text
       end
@@ -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
@@ -62,7 +62,7 @@ module Decidim
     end
 
     def clean(value)
-      decidim_sanitize_admin(translated_attribute(value))
+      decidim_sanitize(translated_attribute(value))
     end
   end
 end

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_cell.rb

@@ -57,7 +57,7 @@ module Decidim
     end
 
     def title
-      decidim_html_escape(translated_attribute(model.title))
+      translated_attribute model.title
     end
 
     def description

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

@@ -16,7 +16,7 @@
     </span>
   </div>
 <% else %>
-  <div class="<%= list_class %>">
+  <div class="collapsible-list <%= list_class %>">
     <% list.each do |element| %>
       <% if cell_name %>
         <%= cell cell_name, element, cell_options %>

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

@@ -1,5 +1,5 @@
 <section class="section">
-  <div class="expanded hero" style="background-image:url('<%= background_image %>');">
+  <div class="expanded hero" style="background-image:url(<%= background_image %>);">
     <div class="hero__container">
       <div class="row">
         <div class="columns small-centered medium-6 text-center">

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

@@ -16,7 +16,7 @@ module Decidim
       end
 
       def translated_description
-        @translated_description ||= decidim_sanitize_editor_admin(translated_attribute(model.settings.description))
+        @translated_description ||= decidim_sanitize_editor(translated_attribute(model.settings.description))
       end
 
       def button_url

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">
@@ -6,7 +6,7 @@
           <% if translated_welcome_text.blank? %>
             <%= t("decidim.pages.home.hero.welcome", organization: current_organization.name) %>
           <% else %>
-            <%= decidim_sanitize_admin translated_welcome_text %>
+            <%= decidim_sanitize translated_welcome_text %>
           <% end %>
         </h1>
       </div>

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

@@ -1,14 +1,14 @@
-<section class="extended highligted-content-banner home-section"
-          style="background-image:url('<%= current_organization.attached_uploader(:highlighted_content_banner_image).path %>');">
+<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">
       <div class="columns large-10">
         <h1 class="text-highlight heading1 highligted-content-banner-heading">
           <%= translated_attribute current_organization.highlighted_content_banner_title %>
         </h1>
-        <span class="text-highlight">
-          <%= decidim_sanitize_editor_admin translated_attribute current_organization.highlighted_content_banner_short_description %>
-        </span>
+        <div class="text-highlight">
+          <%= decidim_sanitize_editor translated_attribute current_organization.highlighted_content_banner_short_description %>
+        </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
@@ -16,9 +12,12 @@ module Decidim
       def cache_hash
         hash = []
         hash.push(I18n.locale)
-        hash.push(current_organization.cache_key)
         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/content_blocks/sub_hero_cell.rb

@@ -15,7 +15,7 @@ module Decidim
       private
 
       def organization_description
-        desc = decidim_sanitize_admin(translated_attribute(current_organization.description))
+        desc = decidim_sanitize(translated_attribute(current_organization.description))
 
         # Strip the surrounding paragraph tag because it is not allowed within
         # a <hN> element.

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/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/newsletter_templates/base_cell.rb

@@ -25,14 +25,6 @@ module Decidim
       def recipient_user
         options[:recipient_user]
       end
-
-      def custom_url_for_mail_root
-        options[:custom_url_for_mail_root]
-      end
-
-      def decidim
-        @decidim ||= EngineRouter.new("decidim", {})
-      end
     end
   end
 end

data/app/cells/decidim/newsletter_templates/basic_only_text/show.erb

@@ -16,7 +16,7 @@
               <tr>
                 <th>
                   <center>
-                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization, custom_url_for_mail_root: custom_url_for_mail_root } %>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
                   </center>
                 </th>
               </tr>
@@ -27,7 +27,7 @@
               <tr>
                 <th>
                   <% if organization.official_img_header.attached? %>
-                    <%= link_to newsletter.organization_official_url do %>
+                    <%= link_to organization.official_url do %>
                       <%= image_tag organization.attached_uploader(:official_img_header).path, alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
@@ -72,8 +72,8 @@
           <th class="expander"></th>
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
-              <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+              <% if @custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
               <% else %>
                 <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
               <% end %>

data/app/cells/decidim/newsletter_templates/image_text_cta/show.erb

@@ -24,7 +24,7 @@ table.button table td {
               <tr>
                 <th>
                   <center>
-                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization, custom_url_for_mail_root: custom_url_for_mail_root } %>
+                    <%= render partial: "layouts/decidim/mailer_logo.html", locals: { organization: organization } %>
                   </center>
                 </th>
               </tr>
@@ -35,7 +35,7 @@ table.button table td {
               <tr>
                 <th>
                   <% if organization.official_img_header.attached? %>
-                    <%= link_to newsletter.organization_official_url do %>
+                    <%= link_to organization.official_url do %>
                       <%= image_tag organization.attached_uploader(:official_img_header).url(host: organization.host), alt: "", style: "max-height: 50px", class: "float-right" %>
                     <% end %>
                   <% end %>
@@ -111,8 +111,8 @@ table.button table td {
           <th class="expander"></th>
           <th class="small-12 first columns cityhall-bar">
             <div class="decidim-logo" style="float: right; text-align: right; padding-right: 16px">
-              <% if custom_url_for_mail_root.present? %>
-                <%= link_to organization.name.html_safe, custom_url_for_mail_root %>
+              <% if @custom_url_for_mail_root.present? %>
+                <%= link_to organization.name.html_safe, @custom_url_for_mail_root %>
               <% else %>
                 <%= link_to organization.name.html_safe, decidim.root_url(host: organization.host) %>
               <% end %>

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>
 

data/app/cells/decidim/upload_modal/files.erb

@@ -0,0 +1,52 @@
+<div class="dynamic-uploads <%= with_title %> upload-container-for-<%= attribute %>">
+  <%= tag.strong label unless has_title? %>
+  <div class="<%= actions_wrapper_class %>">
+    <div class="active-uploads">
+      <% attachments.each do |attachment| %>
+        <% next if attachment.is_a? Array %>
+
+        <div class="attachment-details" data-title="<%= title_for(attachment) %>" data-filename="<%= file_name_for(attachment) %>" data-state="uploaded">
+          <% if has_title? %>
+            <span><%= title_for(attachment) %> (<%= truncated_file_name_for(attachment) %>)</span>
+            <%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %>
+          <% else %>
+            <% if blob(attachment).image? %>
+              <span><%= truncated_file_name_for(attachment, 15) %></span>
+            <% else %>
+              <%= link_to truncated_file_name_for(attachment), file_attachment_path(attachment) %>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+    <%= tag.button button_label,
+      id: button_id,
+      name: attribute,
+      class: button_class,
+      type: "button",
+      data: {
+        open: modal_id,
+        upload: {
+          add_attribute: add_attribute,
+          resource_name: resource_name,
+          resource_class: resource_class,
+          optional: optional,
+          max_file_size: max_file_size,
+          multiple: multiple,
+          titled: has_title?,
+          form_object_class: form_object_class
+        }.transform_keys { |key| key.to_s.camelize(:lower) }
+      } %>
+    <%= input_validation_field unless optional %>
+  </div>
+
+  <% if !has_title? && file_attachment_path(attachments.first) && blob(attachments.first).image? %>
+    <strong><%= attachment_label %></strong>
+    <%= link_to image_tag(file_attachment_path(attachments.first), alt: attribute), file_attachment_path(attachments.first) %>
+  <% elsif !has_title? && uploader_default_image_path(attribute).present? %>
+      <span><%= t("default_image", scope: "decidim.forms") %></span>
+      <%= link_to uploader_default_image_path(attribute) do %>
+        <%= image_tag uploader_default_image_path(attribute) %>
+      <% end %>
+  <% end %>
+</div>