decidim-core 0.30.0.rc3 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1741dcb0de873587b3e2ff7eb8faae32fa98107e26b42a1c30e1cff7c876f7b3
-  data.tar.gz: 7d5c4a405e277850a00645b6625097cf69a0b4b18dfdfa876be69ca045e71062
+  metadata.gz: cfb327cabebd03ca7eb5e5327c4c10f0e8f1509552e959206bf19c75032a4152
+  data.tar.gz: 8062e844f6cfa3e3777d0684e4f9e2e071b68355e9008639d7dbb06803b792ac
 SHA512:
-  metadata.gz: fd16b3dbf24ccaf8cced5f0b23eb3dd496e5269bb19fb14010c4db9cc21e01f19c9cd19cff38540d1c9fd474d5e28d3e2a191d9a4e7d2bebde039eff54cdcf1b
-  data.tar.gz: 598051abedb973a6c95e2504d03a30de39f050a57d414aa625c474a2483cc0db42b78e0c923456aab83b960f2ed0dc42983304bc1798d24e9e80a4f08907ad1d
+  metadata.gz: 9c7420aa2cb261ced54ea359fdaa3b4ef515b573ff6ef5eb2665df5f1d41858e4e1f5c08381d07e9fda401671be922dd9585dbcef14ada0cb3af197aea7cd66d
+  data.tar.gz: beeb21d36c097492f708b4de337e040bef8940e0d872b5e8d0d319c5ec6ad6f416d2f8ca225f8569a8e241d2b1140a17e6b9834ea4321343398ee38a074116c9

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

@@ -3,7 +3,9 @@
     <%= render :metadata %>
     <%= cell "decidim/content_blocks/menu_breadcrumb_last_activity", model, hide_participatory_space: true %>
   </div>
-  <ul class="menu-bar__secondary-dropdown__menu">
-    <%= render :links %>
-  </ul>
+  <nav role="navigation" aria-label="<%= t("decidim.accessibility.secondary_menu") %>">
+    <ul class="menu-bar__secondary-dropdown__menu">
+      <%= render :links %>
+    </ul>
+  </nav>
 </div>

data/app/commands/decidim/create_report.rb

@@ -34,7 +34,7 @@ module Decidim
       send_report_notification_to_moderators
 
       if hideable?
-        hide!
+        @tool.hide!
         send_hide_notification_to_moderators
       end
 
@@ -72,11 +72,6 @@ module Decidim
       hidden_by_admin? || (!@reportable.hidden? && moderation.report_count >= Decidim.max_reports_before_hiding)
     end
 
-    def hide!
-      @tool.hide!
-      @tool.send_notification_to_author
-    end
-
     def send_hide_notification_to_moderators
       participatory_space_moderators.each do |moderator|
         next unless moderator.email_on_moderations

data/app/commands/decidim/search.rb

@@ -37,6 +37,12 @@ module Decidim
                     klass.order_by_id_list(result_ids.take(HIGHLIGHTED_RESULTS_COUNT))
                   end
 
+        uncommentable_resources = uncommentable_resources(results) if results.present?
+        if uncommentable_resources.present?
+          results -= uncommentable_resources
+          results_count -= uncommentable_resources.count
+        end
+
         results_by_type.update(class_name => {
                                  count: results_count,
                                  results:
@@ -89,5 +95,13 @@ module Decidim
       query = query.global_search(I18n.transliterate(term)) if term.present?
       query
     end
+
+    def uncommentable_resources(results)
+      results.where(id: results.select { |obj| related_uncommentable_resources?(obj) }.map(&:id))
+    end
+
+    def related_uncommentable_resources?(object)
+      object.respond_to?(:commentable) && !object.commentable.commentable?
+    end
   end
 end

data/app/controllers/decidim/reports_controller.rb

@@ -16,7 +16,7 @@ module Decidim
       CreateReport.call(@form, reportable) do
         on(:ok) do
           flash[:notice] = I18n.t("decidim.reports.create.success")
-          redirect_back fallback_location: root_path
+          redirect_to reportable.reload.reported_content_url
         end
 
         on(:invalid) do

data/app/forms/decidim/account_form.rb

@@ -21,7 +21,10 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname, presence: true, format: { with: Decidim::UserBaseEntity::REGEXP_NAME }
+    validates :nickname,
+              presence: true,
+              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
+              length: { maximum: Decidim::User.nickname_max_length }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }

data/app/mailers/decidim/reported_mailer.rb

@@ -25,6 +25,7 @@ module Decidim
       with_user(user) do
         @report = report
         @participatory_space = @report.moderation.participatory_space
+        @reportable = @report.moderation.reportable
         @organization = user.organization
         @user = user
         subject = I18n.t("hide.subject", scope: "decidim.reported_mailer")

data/app/models/decidim/action_log.rb

@@ -157,15 +157,7 @@ module Decidim
 
     def self.publicable_public_resource_types
       @publicable_public_resource_types ||= public_resource_types
-                                            .select { |klass| klass.constantize.column_names.include?("published_at") } - publicable_exceptions
-    end
-
-    def self.publicable_exceptions
-      @publicable_exceptions = %w(
-        Decidim::Blogs::Post
-      ).select do |klass|
-        klass.safe_constantize.present?
-      end
+                                            .select { |klass| klass.constantize.column_names.include?("published_at") }
     end
 
     def self.ransackable_scopes(auth_object = nil)

data/app/packs/src/decidim/datepicker/datepicker_functions.js

@@ -29,12 +29,12 @@ export const formatInputDate = (date, formats) => {
   const month = dateList[1];
   const day = dateList[2];
 
-  if (formats.order === "d-m-y") {
-    return `${day}${formats.separator}${month}${formats.separator}${year}`;
+  if (formats.order === "m-d-y") {
+    return `${month}${formats.separator}${day}${formats.separator}${year}`;
   } else if (formats.order === "y-m-d") {
     return `${year}${formats.separator}${month}${formats.separator}${day}`;
   };
-  return `${month}${formats.separator}${day}${formats.separator}${year}`;
+  return `${day}${formats.separator}${month}${formats.separator}${year}`;
 };
 
 export const formatInputTime = (time, format, input) => {

data/app/packs/src/decidim/index.js

@@ -71,7 +71,8 @@ import handleNotificationActions from "src/decidim/notifications_actions"
 import RemoteModal from "src/decidim/remote_modal"
 import selectActiveIdentity from "src/decidim/identity_selector_dialog"
 import createTooltip from "src/decidim/tooltips"
-import fetchRemoteTooltip from "src/decidim/remote_tooltips"
+// Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+// import fetchRemoteTooltip from "src/decidim/remote_tooltips"
 import createToggle from "src/decidim/toggle"
 import {
   createAccordion,
@@ -202,7 +203,8 @@ const initializer = (element = document) => {
   // Initialize data-toggles
   element.querySelectorAll("[data-toggle]").forEach((elem) => createToggle(elem))
 
-  element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
+  // Temporary disabling this feature because we have a poor performance. See https://github.com/decidim/decidim/issues/14431
+  // element.querySelectorAll("[data-remote-tooltip]").forEach((elem) => fetchRemoteTooltip(elem))
 
   element.querySelectorAll(".new_report").forEach((elem) => changeReportFormBehavior(elem))
 

data/app/packs/stylesheets/decidim/_content_blocks.scss

@@ -27,6 +27,10 @@
         @apply block;
       }
     }
+
+    > h3:not([class~="not-prose"]) {
+      @apply mb-[-0.4rem] pt-4 pb-2;
+    }
   }
 
   &__span {

data/app/packs/stylesheets/decidim/_header.scss

@@ -167,7 +167,7 @@ header {
       }
 
       &__item {
-        @apply relative;
+        @apply flex relative;
       }
 
       &__search {
@@ -434,8 +434,12 @@ header {
         @apply h4 md:h3;
       }
 
+      nav {
+        @apply w-full md:w-1/4;
+      }
+
       &__menu {
-        @apply w-full md:w-1/4 bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
+        @apply w-full bg-primary px-4 md:px-8 pt-0 pb-3 md:py-3 divide-y divide-gray-3 text-white;
 
         > * {
           @apply py-3 md:py-3.5;

data/app/presenters/decidim/log/user_presenter.rb

@@ -46,6 +46,7 @@ module Decidim
       # Returns an HTML-safe String.
       def present_user
         return h.content_tag(:span, present_user_name, class: "logs__log__author") if user.blank?
+        return I18n.t("decidim.profile.deleted") if user.respond_to?(:deleted?) && user.deleted?
 
         h.link_to(
           present_user_name,

data/app/presenters/decidim/user_presenter.rb

@@ -37,7 +37,7 @@ module Decidim
       return default_avatar_url if __getobj__.blocked?
       return default_avatar_url unless avatar.attached?
 
-      avatar.path(variant:)
+      avatar.url(variant:)
     end
 
     def default_avatar_url

data/app/services/decidim/base_diff_renderer.rb

@@ -41,6 +41,8 @@ module Decidim
     end
 
     def parse_i18n_changeset(attribute, values, type, diff)
+      return diff unless values.last.is_a?(Hash)
+
       (values.last.keys - ["machine_translations"]).each do |locale, _value|
         first_value = values.first.try(:[], locale)
         last_value = values.last.try(:[], locale)

data/app/views/decidim/reported_mailer/hide.html.erb

@@ -1,9 +1,25 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", url: reported_content_url ) %>
+  <%= t(".report_html", url: report_url ) %>
 </p>
 
+<p><b><%= t(".participatory_space") %></b></p>
+<p><%= link_to translated_attribute(@participatory_space.title), resource_locator(@participatory_space).url %></p>
+
+<p><b><%= t(".reason") %></b></p>
+<p><%= t(@report.reason, organization_name: organization_name(@participatory_space.organization), scope: "decidim.shared.flag_modal") %></p>
+
+<% if @report.details.present? %>
+  <p><b><%= t(".details") %></b></p>
+  <blockquote>
+    <%= @report.details %>
+  </blockquote>
+<% end %>
+
+<p><b><%= t(".content") %></b></p>
+<%= reported_content_cell %>
+
 <p class="email-button email-button__cta">
   <%= link_to t(".manage_moderations"), manage_moderations_url %>
 </p>

data/app/views/decidim/reported_mailer/report.html.erb

@@ -1,7 +1,7 @@
 <p class="email-greeting"><%= t(".hello", name: @user.name) %></p>
 
 <p class="email-instructions">
-  <%= t(".report_html", url: reported_content_url) %>
+  <%= t(".report_html", url: report_url) %>
 </p>
 
 <br>

data/app/views/decidim/searches/_count.html.erb

@@ -15,6 +15,6 @@
   <% end %>
 </div>
 
-<h1 class="h3 decorator mb-10 md:my-10">
+<h1 id="search-results-title" class="h3 decorator mb-10 md:my-10">
   <%= t("decidim.search.results_found_for_term", count: @results_count, term:) %>
 </h1>

data/app/views/decidim/searches/_filters.html.erb

@@ -1,44 +1,46 @@
-<div class="filter-container search__filter">
-  <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
-    <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
-    <% @blocks.each do |elements| %>
-      <% elements.each do |type, results| %>
-        <%= content_tag :span, class: "#{"is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
-          <span><%= searchable_resource_human_name(type) %></span>
+<nav role="navigation" aria-labelledby="search-results-title">
+  <div class="filter-container search__filter">
+    <button id="dropdown-trigger-search" data-component="dropdown" data-target="dropdown-menu-search" data-auto-close="true">
+      <%= content_tag :span, t("decidim.searches.filters_small_view.filter_by"), class: "#{"is-active" if params.dig(:filter, :with_resource_type) == nil}" %>
+      <% @blocks.each do |elements| %>
+        <% elements.each do |type, results| %>
+          <%= content_tag :span, class: "#{"is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
+            <span><%= searchable_resource_human_name(type) %></span>
+          <% end %>
         <% end %>
       <% end %>
-    <% end %>
-    <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
-    <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
-  </button>
-  <div id="dropdown-menu-search" aria-hidden="true">
-    <div>
-      <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}" do %>
-        <%= resource_type_icon("all") %>
-        <span><%= t("all", scope: "decidim.searches.filters.state") %></span>
-        <span class="label ml-auto"><%= @results_count %></span>
-      <% end %>
-    </div>
-    <% @blocks.each do |elements| %>
+      <%= icon "arrow-down-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
+      <%= icon "arrow-up-s-line", class: "w-8 h-8 flex-none text-secondary fill-current" %>
+    </button>
+    <div id="dropdown-menu-search" aria-hidden="true">
       <div>
-        <% elements.each do |type, results| %>
-          <div>
-            <% if results[:count].positive? %>
-              <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
-                <%= resource_type_icon(type) %>
-                <span><%= searchable_resource_human_name(type) %></span>
-                <span class="label ml-auto"><%= results[:count] %></span>
-              <% end %>
-            <% else %>
-              <%= content_tag :div, class: "filter#{" is-empty" if results[:count].zero?}" do %>
-                <%= resource_type_icon(type) %>
-                <span><%= searchable_resource_human_name(type) %></span>
-                <span class="label ml-auto"><%= results[:count] %></span>
-              <% end %>
-            <% end %>
-          </div>
+        <%= link_to main_search_path, class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == nil}" do %>
+          <%= resource_type_icon("all") %>
+          <span><%= t("all", scope: "decidim.searches.filters.state") %></span>
+          <span class="label ml-auto"><%= @results_count %></span>
         <% end %>
       </div>
-    <% end %>
+      <% @blocks.each do |elements| %>
+        <div>
+          <% elements.each do |type, results| %>
+            <div>
+              <% if results[:count].positive? %>
+                <%= link_to search_path_by_resource_type(type), class: "filter#{" is-active" if params.dig(:filter, :with_resource_type) == type}" do %>
+                  <%= resource_type_icon(type) %>
+                  <span><%= searchable_resource_human_name(type) %></span>
+                  <span class="label ml-auto"><%= results[:count] %></span>
+                <% end %>
+              <% else %>
+                <%= content_tag :div, class: "filter#{" is-empty" if results[:count].zero?}" do %>
+                  <%= resource_type_icon(type) %>
+                  <span><%= searchable_resource_human_name(type) %></span>
+                  <span class="label ml-auto"><%= results[:count] %></span>
+                <% end %>
+              <% end %>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
   </div>
-</div>
+</nav>

data/app/views/layouts/decidim/footer/_main_legal.html.erb

@@ -3,6 +3,6 @@
     <%= link_to t("layouts.decidim.footer.terms_of_service"), decidim.page_path("terms-of-service") %>
   </li>
   <li>
-    <a href="#" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>
+    <a href="#" role="button" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>
   </li>
 </ul>

data/config/locales/ar.yml

@@ -488,7 +488,7 @@ ar:
       metrics:
         name: مقاييس المنظمة
       participatory_space_metrics:
-        name: المقاييس
+        name: المشاركة في الأرقام
       participatory_space_stats:
         name: الإحصائيات
       social_networks_metadata:
@@ -994,7 +994,7 @@ ar:
       participants:
         description: عدد المشاركين النشطين في المنظمة
         object: المشاركين
-        title: المشاركين
+        title: المشاركون
       reported_users:
         description: عدد المشاركين المبلّغ عنهم
       user_reports:
@@ -1002,7 +1002,7 @@ ar:
       users:
         description: عدد المشاركين في المنظمة
         object: المشاركين
-        title: المشاركين
+        title: المشاركون
     newsletter_mailer:
       newsletter:
         no_reply_notice: تم إرسال هذا البريد الإلكتروني من عنوان بريد إلكتروني للإشعارات لا يستقبل لا بريد إلكتروني وارد. يرجى عدم الرد على هذه الرسالة.

data/config/locales/bg.yml

@@ -92,7 +92,7 @@ bg:
       decidim_with_month_name_short: "%d %b"
       help:
         date_format: 'Формат: дд/мм/гггг'
-      order: д-м-г
+      order: d-m-y
       separator: "/"
   datetime:
     distance_in_words:
@@ -539,7 +539,7 @@ bg:
       metrics:
         name: Показатели за организацията
       participatory_space_metrics:
-        name: Метрики
+        name: Индикатори
       participatory_space_stats:
         name: Статистики
       social_networks_metadata:

data/config/locales/bs-BA.yml

@@ -25,6 +25,8 @@ bs:
       hero_settings_form:
         background_image: Pozadinska slika
         welcome_text: Tekst dobrodošlice
+      participatory_space_metrics:
+        name: Metrika
       stats:
         name: Statistika organizacije
     endorsements: