decidim-core 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18193603bd469c0ea5937875b577f4cc5439727b2ad1759e60ea725d029e18f1
-  data.tar.gz: 91c95bec2cdc7af5ad17a5d5ccd165817516fbaf0ed46051c198d3b8b5b1321b
+  metadata.gz: 150f88886f1b4e3b5e3402c9f7fa34057d3c808a4de16cef92493aafb82597f9
+  data.tar.gz: b1fe1fa4fd31ed1038cb77395e7eee3bc0af36853f42c60d34bc96b388a3f7f4
 SHA512:
-  metadata.gz: 71b39ec5cae4751ab21048ef686cd6b3704e8d5469d9ba608fcf163944ebf83fc100d1a47c59d4eae4b4c01af4d5074918113a8cf533151e954eb97defa14bf9
-  data.tar.gz: 72011b7df988f022988d64892177f9f4b28338019152d0a2ce46f489696256acdcd095d0da83346e41d70cdeb72c72ef7e21c0e701b50a1d4b35a6de8c51840d
+  metadata.gz: 559ef49a486a762a2928150e7511faf9f9946bf50d825f1060613c3c0fcac696cfb6be68222895eb2ea0570e9d1b2e8dfccde78f56afb1b8b31704e8a14b5d76
+  data.tar.gz: aa814eae2a1d8ac9d2baaab67b9547b6066ddb14537c38be2f5e2990f84e1fb5727e3608912ec768fbb6f62cf908fc73be46c4cf0708b42586bec79d387a4945

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
@@ -62,7 +62,7 @@ module Decidim
     end
 
     def clean(value)
-      decidim_sanitize(translated_attribute(value))
+      decidim_sanitize_admin(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/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(translated_attribute(model.settings.description))
+        @translated_description ||= decidim_sanitize_editor_admin(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 translated_welcome_text %>
+            <%= decidim_sanitize_admin translated_welcome_text %>
           <% end %>
         </h1>
       </div>

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

@@ -29,6 +29,7 @@ module Decidim
         hash << Digest::MD5.hexdigest(model.attributes.to_s)
         hash << current_organization.cache_key_with_version
         hash << I18n.locale.to_s
+        hash << background_image
 
         hash.join(Decidim.cache_key_separator)
       end

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 translated_attribute current_organization.highlighted_content_banner_short_description %>
-        </span>
+        <div class="text-highlight">
+          <%= decidim_sanitize_editor_admin 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,8 +12,13 @@ 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(translated_attribute(current_organization.description))
+        desc = decidim_sanitize_admin(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="dc-title padding-left-3">
+      <span class="h5 dc-category-title">
+        <strong><%= category[:title] %></strong>
+      </span>
+    </button>
+
+    <div class="dc-switch">
+      <input
+        class="switch-input"
+        <%= %(checked="checked") if category[:mandatory] %>
+        id="dc-<%= category[:slug] %>"
+        type="checkbox"
+        name="<%= category[:slug] %>"
+        <%= "disabled" if category[:mandatory] %>>
+
+      <label class="switch-paddle" for="dc-<%= category[:slug] %>">
+        <span class="show-for-sr"><%= t("layouts.decidim.data_consent.modal.toggle", consent_category: category[:title]) %></span>
+      </label>
+    </div>
+  </div>
+  <div class="dc-description hide">
+    <div class="description-text">
+      <p><%= category[:description] %></p>
+    </div>
+
+    <% if category[:items].present? %>
+      <div class="dataconsent-details-wrapper">
+        <div class="row detail-titles">
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.type") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.name") %>
+          </div>
+          <div class="columns small-2">
+            <%= t("layouts.decidim.data_consent.details.columns.service") %>
+          </div>
+          <div class="columns small-6">
+            <%= t("layouts.decidim.data_consent.details.columns.description") %>
+          </div>
+        </div>
+
+        <% category[:items].each do |item| %>
+          <div class="row dataconsent-detail-row">
+            <div class="columns small-2">
+              <%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %>
+            </div>
+            <div class="columns small-2">
+              <%= item[:name] %>
+            </div>
+            <div class="columns small-2">
+              <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %>
+            </div>
+            <div class="columns small-6">
+              <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,39 @@
+<div class="reveal dc-modal" id="dc-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.data_consent.modal.title") %>
+    </h3>
+    <p>
+      <%= t("layouts.decidim.data_consent.modal.description") %>
+    </p>
+  </div>
+
+  <div class="dc-categories">
+    <% categories.each do |category| %>
+      <%= render(
+        {
+          view: :category,
+          locals: {
+            category: category
+          }
+        }
+      ) %>
+    <% end %>
+  </div>
+
+  <div class="dc-buttons-wrapper flex-center">
+    <div class="dc-buttons-left">
+      <button id="dc-modal-accept" class="button" data-close>
+        <%= t("layouts.decidim.data_consent.modal.accept_all") %>
+      </button>
+      <button id="dc-modal-reject" class="button hollow" data-close>
+        <%= t("layouts.decidim.data_consent.modal.accept_only_essential") %>
+      </button>
+    </div>
+    <div class="dc-buttons-right">
+      <button id="dc-modal-save" class="button clear" data-close>
+        <%= t("layouts.decidim.data_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.data_consent.modal.#{category[:slug]}.title"),
+          description: t("layouts.decidim.data_consent.modal.#{category[:slug]}.description"),
+          mandatory: category[:mandatory],
+          items: category.has_key?(:items) ? category[:items] : []
+        }
+      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/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>

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

@@ -0,0 +1,49 @@
+<div class="reveal upload-modal" id="<%= modal_id %>" data-reveal>
+  <div class="reveal__header">
+    <h3 class="reveal__title" data-addlabel="<%= button_label %>" data-editlabel="<%= button_edit_label %>"><%= label %></h3>
+    <button class="close-button" data-close aria-label="<%= t("layouts.decidim.upload_modal.close_modal") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+
+  <div class="help">
+    <span><%= explanation %></span>
+    <ul>
+      <% help_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+  <div class="row dropzone-container" data-name="<%= attribute %>">
+    <%= tag.div class: "upload-items", data: {
+        locales: {
+          error: t("decidim.forms.upload.labels.error"),
+          title_required: t("decidim.forms.upload.labels.title_required"),
+          file_size_too_large: t("decidim.forms.upload.labels.file_size_too_large", megabytes: (max_file_size_mb)),
+          remove: t("decidim.forms.upload.labels.remove"),
+          title: t("decidim.forms.upload.labels.title"),
+          uploaded: t("decidim.forms.upload.labels.uploaded"),
+          validating: t("decidim.forms.upload.labels.validating"),
+          validation_error: t("decidim.forms.upload.labels.validation_error")
+        }
+      } %>
+    <label class="dropzone">
+      <%= form.file_field add_attribute,
+        id: nil,
+        class: "hide",
+        label: false,
+        multiple: true,
+        direct_upload: true,
+        data: { direct_upload_url: direct_upload_url } %>
+      <span><%= t("decidim.forms.upload_help.dropzone") %></span>
+    </label>
+  </div>
+
+  <div class="row columns reveal__content">
+    <div class="text-center">
+      <button class="button add-file-<%= attribute %>" data-close><%= t("decidim.forms.upload.labels.save") %></button>
+      <button class="link cancel-attachment margin-left-1" data-close><%= t("decidim.forms.upload.labels.cancel") %></button>
+    </div>
+  </div>
+</div>

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

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