decidim-core 0.31.0.rc1 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ac792c6ae7948c567414610e5822df045b3f9f6c4dc638a8e5813a6043c6aa
-  data.tar.gz: 4b19fd5477f45a51b816eeabdb81961c181ef8d4a46d1fbe920c9fbe0a5cef25
+  metadata.gz: 644720c93a8b08cdb4aa839557a74298774aef2719321671ca3bee677d8e93a6
+  data.tar.gz: e603634ef33432a213f5122b5e00c11614085d95fcc35e4a3c1b180d582427d8
 SHA512:
-  metadata.gz: a44f376207a878d0ac6d250dc82d82e0c9c6ae06ca51f97140fe65e01eecc01780bbfe49c9434bf4dde2631141912d765e6052897ab07ae360ee57848f9e28a3
-  data.tar.gz: ac20b49d78c501a49757a3483e483e60b47ba4de6652ffbafbe6d97d535ab8a25aa6b1d21b8a93870116eff87c8f6489e2171238265393c3976e8ce22dd704aa
+  metadata.gz: a98933696db00e724d2b7ae56c14e3cc718be1026234a9a36679ef3678395a3fe4308be1ff8d9fd59aa233f7c056459e2466089a2f9e21368c9df6b37c722505
+  data.tar.gz: 2dc98284fe86eb99c409a4f418b00ec6baba661476bfa2114b518a63dfba5313b33e268099a1e90703d98ec4ec438c8e1e4a30e51717ca63c2fb2f57b20e4664

data/app/cells/decidim/activity_cell.rb

@@ -12,6 +12,12 @@ module Decidim
       return unless renderable?
 
       render
+    rescue NoMethodError => e
+      # Soft-deleted components or participatory spaces could cause errors
+      # when rendering activities. We log them for further inspection but
+      # avoid breaking the entire activity feed.
+      Rails.logger.error("Error rendering activity cell for #{model.id}: #{e.message}")
+      nil
     end
 
     # Since activity logs could be linked to resource no longer available

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

@@ -1,9 +1,3 @@
 <%= content_tag :span, class: "author__avatar-container" do %>
-  <% if profile_path? %>
-    <%= link_to profile_path do %>
-      <%= render :avatar_image %>
-    <% end %>
-  <% else %>
-    <%= render :avatar_image %>
-  <% end %>
+  <%= render :avatar_image %>
 <% end %>

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

@@ -0,0 +1,6 @@
+<% if show_badge? %>
+  <span class="author__badge">
+    <%= icon "star-s-fill" %>
+    <span class="sr-only"><%= officialization_text %></span>
+  </span>
+<% end %>

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

@@ -1,5 +1 @@
-<% if profile_path? %>
-  <%= link_to display_name, profile_path, class: "author__name underline" %>
-<% else %>
-  <%= content_tag :span, display_name, class: "author__name" %>
-<% end %>
+<%= content_tag :span, display_name, class: "author__name" %>

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

@@ -1,26 +1,58 @@
 <%= content_tag(:p, class: :author, data: ) do %>
-  <%= content_tag :span, class: "author__container#{" is-compact" if layout == :compact}" do %>
-    <% if layout == :compact %>
-      <%= render :avatar %>
+  <% if layout == :compact %>
 
-      <span>
-        <%= render :name %>
+    <% if profile_path? %>
+      <%= link_to profile_path, class: "author__container is-compact" do %>
+        <%= render :avatar %>
+
+        <span>
+          <span class="flex gap-2">
+            <%= render :name %>
+            <%= render :badge %>
+          </span>
 
-        <% context_actions.each do |action| %>
-          <%= render action %>
-        <% end %>
-      </span>
-    <% elsif layout == :avatar %>
-      <%= render :avatar %>
+          <% context_actions.each do |action| %>
+            <%= render action %>
+          <% end %>
+        </span>
+      <% end %>
     <% else %>
-      <%= render :avatar %>
-      <%= render :name %>
+      <%= content_tag :span, class: "author__container is-compact" do %>
+        <%= render :avatar %>
+
+        <span>
+          <%= render :name %>
+
+          <% context_actions.each do |action| %>
+            <%= render action %>
+          <% end %>
+        </span>
+      <% end %>
+    <% end %>
+  <% elsif layout == :avatar %>
+    <%= render :avatar %>
+  <% else %>
+    <% if profile_path? %>
+      <%= link_to profile_path, class: "author__container" do %>
+        <%= render :avatar %>
+
+        <%= render :name %>
+        <%= render :badge %>
+      <% end %>
+    <% else %>
+      <%= content_tag :span, class: "author__container" do %>
+        <%= render :avatar %>
+        <%= render :name %>
+        <%= render :badge %>
+      <% end %>
     <% end %>
   <% end %>
 
   <% if layout == :default %>
-    <% context_actions.each do |action| %>
-      <%= render action %>
+    <%= content_tag :span, class: "author__container" do %>
+      <% context_actions.each do |action| %>
+        <%= render action %>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

data/app/cells/decidim/author_cell.rb

@@ -163,5 +163,15 @@ module Decidim
     def resource_name
       @resource_name ||= from_context.class.name.demodulize.underscore
     end
+
+    def show_badge?
+      return false unless model.respond_to? :officialized?
+
+      model.officialized?
+    end
+
+    def officialization_text
+      translated_attribute(model.officialized_as).presence || t("decidim.profiles.show.officialized")
+    end
   end
 end

data/app/cells/decidim/profile/avatar.erb

@@ -2,6 +2,4 @@
   <div class="profile__avatar">
     <%= image_tag avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(presented_profile.name)) %>
   </div>
-
-  <%= render :badge if show_badge? %>
 </div>

data/app/cells/decidim/profile/badge.erb

@@ -1,4 +1,4 @@
-<div class="profile__avatar-badge">
+<span class="profile__details-badge">
   <%= icon "star-s-fill" %>
-  <span class="sr-only"><%= officialization_text %></span>
-</div>
+  <%= officialization_text %>
+</span>

data/app/cells/decidim/profile/details.erb

@@ -1,7 +1,8 @@
 <div class="profile__details">
-  <h1 class="h3">
+  <h1 class="h3 flex gap-2">
     <%= presented_profile.name %>
     <span class="sr-only"><%= user_tabs.find { |tab_item| is_active_link?(tab_item[:path]) }&.dig(:text) %> (<%= presented_profile.name %>)</span>
+    <%= render :badge if show_badge? %>
   </h1>
   <div class="profile__details-data">
     <% details_items.each do |detail| %>

data/app/cells/decidim/user_activity_cell.rb

@@ -11,7 +11,12 @@ module Decidim
     end
 
     def activities
-      context[:activities]
+      resource_ids_to_filter = context[:activities].select { |log| log[:action] == "delete" && log[:resource_type] == "Decidim::Comments::Comment" }.map(&:resource_id)
+      if resource_ids_to_filter.any?
+        context[:activities].where.not("resource_id in (?) AND resource_type = ?", resource_ids_to_filter, "Decidim::Comments::Comment")
+      else
+        context[:activities]
+      end
     end
 
     def resource_types

data/app/controllers/decidim/download_your_data_controller.rb

@@ -43,7 +43,10 @@ module Decidim
     def download_file
       enforce_permission_to(:download, :user, current_user:)
 
-      if private_export.expired?
+      if private_export.blank?
+        flash[:error] = t("decidim.account.download_your_data_export.export_not_found")
+        redirect_to download_your_data_path
+      elsif private_export.expired?
         flash[:error] = t("decidim.account.download_your_data_export.export_expired")
         redirect_to download_your_data_path
       elsif private_export.file.attached?
@@ -57,7 +60,7 @@ module Decidim
     private
 
     def private_export
-      @private_export ||= current_user.private_exports.find(params[:uuid])
+      @private_export ||= current_user.private_exports.where(uuid: params[:uuid]).first
     end
 
     def help_definitions

data/app/helpers/decidim/map_helper.rb

@@ -81,7 +81,7 @@ module Decidim
 
       help = content_tag(:div, class: "map__skip-container") do
         sr_content = content_tag(:p, t("screen_reader_explanation", scope: "decidim.map.dynamic"), class: "sr-only")
-        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "##{bottom_id}", class: "map__skip")
+        link = link_to(t("skip_button", scope: "decidim.map.dynamic"), "##{bottom_id}", class: "map__skip", "data-skip-to-content": true)
 
         sr_content + link
       end

data/app/helpers/decidim/menu_helper.rb

@@ -68,8 +68,14 @@ module Decidim
       @menu_highlighted_participatory_process ||= (
         # The queries already include the order by weight
         Decidim::ParticipatoryProcesses::OrganizationParticipatoryProcesses.new(current_organization) |
-        Decidim::ParticipatoryProcesses::PromotedParticipatoryProcesses.new
-      ).first
+          Decidim::ParticipatoryProcesses::PromotedParticipatoryProcesses.new
+      ).select(&:published?).map { |process| remove_private_space_if_not_private_user(process) }&.compact&.first
+    end
+
+    def remove_private_space_if_not_private_user(process)
+      return nil if process.private_space == true && !process.can_participate?(current_user)
+
+      process
     end
 
     def home_content_block_menu

data/app/mailers/decidim/user_group_mailer.rb

@@ -2,6 +2,9 @@
 
 module Decidim
   class UserGroupMailer < ApplicationMailer
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
     def notify_deprecation_to_owner(group)
       with_user(group) do
         @group_name = group.name
@@ -13,6 +16,9 @@ module Decidim
       end
     end
 
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
     def notify_deprecation_to_member(user, group_name, group_email)
       with_user(user) do
         @user = user
@@ -24,5 +30,20 @@ module Decidim
         mail(to: user.email, subject:)
       end
     end
+
+    # This is a mailer that aids migration from the old user_groups to the new user group system
+    # This should be used only in the scope of the migration process
+    # @deprecated This mailer will be removed in decidim v0.32.0
+    def notify_user_group_patched(group, user, password)
+      with_user(user) do
+        @group = group
+        @user = user
+        @password = password
+        @organization = user.organization
+
+        subject = I18n.t("notify_user_group_patched.subject", scope: "decidim.user_group_mailer")
+        mail(to: user.email, subject:)
+      end
+    end
   end
 end

data/app/models/decidim/private_export.rb

@@ -12,6 +12,10 @@ module Decidim
 
     default_scope { order(created_at: :desc) }
 
+    before_create do |record|
+      record.uuid = SecureRandom.uuid
+    end
+
     def expired?
       expires_at < Time.zone.now
     end

data/app/models/decidim/user.rb

@@ -66,8 +66,8 @@ module Decidim
     scope :active_after_notification, lambda {
       where("current_sign_in_at > (extended_data->'inactivity_notification'->>'sent_at')::timestamp")
     }
-    scope :user_group, -> { where("#{arel_table.name}.extended_data @> ?", Arel.sql({ group: true }.to_json)) }
-    scope :not_user_group, -> { where.not("#{arel_table.name}.extended_data @> ?", Arel.sql({ group: true }.to_json)) }
+    scope :user_group, -> { where("#{arel_table.name}.extended_data @> ?", { group: true }.to_json) }
+    scope :not_user_group, -> { where.not("#{arel_table.name}.extended_data @> ?", { group: true }.to_json) }
 
     attr_accessor :newsletter_notifications
 

data/app/packs/src/decidim/controllers/dropdown/controller.js

@@ -116,10 +116,10 @@ export default class extends Controller {
   changeStyleOfSelectedElement() {
     this.element.addEventListener("click", function(event) {
       event.target.parentNode.parentNode.querySelectorAll("a").forEach((link) => {
-        link.parentNode.classList.remove("dropdown__item-hovered")
+        link.parentNode.classList.remove("dropdown__item-opened");
       })
 
-      event.target.parentNode.classList.add("dropdown__item-hovered")
+      event.target.parentNode.classList.add("dropdown__item-opened")
     })
   }
 }

data/app/packs/src/decidim/controllers/editor/controller.js

@@ -3,6 +3,9 @@ import createEditor from "src/decidim/editor";
 
 export default class extends Controller {
   connect() {
-    this.editor = createEditor(this.element)
+    if (!this.element.dataset.editorInitialized) {
+      this.editor = createEditor(this.element);
+      this.element.dataset.editorInitialized = true;
+    }
   }
 }

data/app/packs/src/decidim/controllers/form_filter/controller.js

@@ -213,6 +213,12 @@ export default class extends Controller {
     this.changeEvents = false;
     this._clearForm();
 
+    // Prevent filtering again on anchor link "Skip to main content", "Skip map", or "Skip to results"
+    const filterSkipValues = [...document.querySelectorAll("[data-skip-to-content]")].map((el) => el.hash);
+    if (filterSkipValues.includes(window.location.hash)) {
+      return;
+    }
+
     const filterParams = this._parseLocationFilterValues();
     const currentOrder = this._parseLocationOrderValue();
 

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

@@ -14,12 +14,18 @@ export default function generateDatePicker(input, row, formats) {
   date.setAttribute("id", `${input.id}_date`);
   date.setAttribute("type", "text");
   date.setAttribute("aria-label", input.dataset.dateLabel);
+  if (input.attributes.disabled) {
+    date.setAttribute("disabled", input.attributes.disabled);
+  };
 
   const calendar = document.createElement("button");
   calendar.innerHTML = icon("calendar-line");
   calendar.setAttribute("class", "datepicker__calendar-button");
   calendar.setAttribute("type", "button");
   calendar.setAttribute("aria-label", input.dataset.buttonDateLabel);
+  if (input.attributes.disabled) {
+    calendar.setAttribute("disabled", input.attributes.disabled);
+  };
 
   dateColumn.appendChild(date);
   dateColumn.appendChild(calendar);

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

@@ -1,4 +1,6 @@
 /* eslint-disable require-jsdoc */
+/* eslint max-lines: ["error", 310] */
+
 import icon from "src/decidim/refactor/moved/icon"
 import { changeHourDisplay, changeMinuteDisplay, formatDate, hourDisplay, minuteDisplay, formatTime, setHour, setMinute, updateTimeValue, updateInputValue } from "src/decidim/datepicker/datepicker_functions"
 import { timeKeyDownListener, timeBeforeInputListener } from "src/decidim/datepicker/datepicker_listeners";
@@ -14,12 +16,19 @@ export default function generateTimePicker(input, row, formats) {
   time.setAttribute("id", `${input.id}_time`);
   time.setAttribute("type", "text");
   time.setAttribute("aria-label", input.dataset.timeLabel);
+  if (input.attributes.disabled) {
+    time.setAttribute("disabled", input.attributes.disabled);
+  };
 
   const clock = document.createElement("button");
   clock.innerHTML = icon("time-line")
   clock.setAttribute("class", "datepicker__clock-button");
   clock.setAttribute("type", "button");
   clock.setAttribute("aria-label", input.dataset.buttonTimeLabel);
+  if (input.attributes.disabled) {
+    clock.setAttribute("disabled", input.attributes.disabled);
+  };
+
 
   timeColumn.appendChild(time);
   timeColumn.appendChild(clock);

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

@@ -70,16 +70,21 @@ const deprecate = (element, targetController, oldSyntax) => {
     return;
   }
 
-  console.warn(element)
   console.warn(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - data-controller="${targetController}" - ${window.location.href}`)
-  // eslint-disable-next-line no-alert
-  alert(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - data-controller="${targetController}"`)
+
+  if (typeof window.Decidim.dev !== "undefined" && window.Decidim.dev === true) {
+    // eslint-disable-next-line no-alert
+    alert(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - data-controller="${targetController}"`)
+  }
 }
 
 const deprecationMessage = (element, oldSyntax, newSyntax) => {
   console.warn(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - ${newSyntax}`)
-  // eslint-disable-next-line no-alert
-  alert(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - ${newSyntax}`)
+
+  if (typeof window.Decidim.dev !== "undefined" && window.Decidim.dev === true) {
+    // eslint-disable-next-line no-alert
+    alert(`[Decidim] ${oldSyntax} is deprecated. Please use the new version of this component - ${newSyntax}`)
+  }
 }
 
 window.deprecate = deprecate;

data/app/packs/src/decidim/map/controller/markers.js

@@ -67,7 +67,9 @@ export default class MapMarkersController extends MapController {
   }
 
   clearMarkers() {
-    this.map.removeLayer(this.markerClusters);
+    if (this.markerClusters !== null) {
+      this.map.removeLayer(this.markerClusters);
+    }
     this.markerClusters = new L.MarkerClusterGroup();
     this.map.addLayer(this.markerClusters);
   }

data/app/packs/src/decidim/refactor/moved/check_boxes_tree.js

@@ -116,6 +116,7 @@ export default class CheckBoxesTree {
     const indeterminateSiblings = totalCheckSiblings.filter((checkbox) => checkbox.indeterminate)
 
     if (checkedSiblings.length === 0 && indeterminateSiblings.length === 0) {
+      parentCheck.checked = false;
       parentCheck.indeterminate = false;
     } else if (checkedSiblings.length === totalCheckSiblings.length && indeterminateSiblings.length === 0) {
       parentCheck.checked = true;

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

@@ -1,13 +1,13 @@
-[data-controller="accordion"] [id*="panel"][aria-hidden="true"] {
+[data-controller*="accordion"] [id*="panel"][aria-hidden="true"] {
   display: none;
 }
 
-[data-controller="accordion"]
+[data-controller*="accordion"]
   [id*="comment"][class="comment-reply"][aria-hidden="true"] {
   display: none;
 }
 
-[data-controller="accordion"]
+[data-controller*="accordion"]
   [id*="comment"][class="comment-reply"][aria-hidden="false"] {
   display: block;
 }
@@ -57,7 +57,7 @@
     @apply mr-4;
   }
 
-  &-section.content-block__description[data-controller="accordion"] {
+  &-section.content-block__description[data-controller*="accordion"] {
     @apply pb-4 mb-4 text-md;
 
     padding-left: 1.85rem;

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

@@ -1,5 +1,11 @@
 .author {
-  @apply flex items-center [&>*:not(:first-child)]:pl-5 [&>*:not(:last-child)]:pr-6 divide-gray-3 divide-x text-sm text-gray-2;
+  @apply flex items-center divide-gray-3 divide-x text-sm text-gray-2;
+
+  a.author__container {
+    .author__name {
+      @apply underline text-secondary font-bold;
+    }
+  }
 
   &__container {
     @apply flex items-center gap-2.5 first:[&>*]:flex-none;
@@ -14,6 +20,10 @@
 
     &-container {
       @apply rounded-full overflow-hidden inline-block w-6 h-6 align-top;
+
+      &:focus-within {
+        @apply ring-2 ring-primary;
+      }
     }
 
     &-counter {
@@ -29,6 +39,10 @@
     @apply text-secondary font-semibold;
   }
 
+  &__badge svg {
+    @apply grid overflow-hidden place-items-center bg-primary rounded-full w-4 h-4 text-white fill-current;
+  }
+
   &__metadata {
     @apply flex items-center gap-1 text-gray-2 text-sm;
 

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

@@ -59,7 +59,11 @@
     }
 
     &-title {
-      @apply h4 text-secondary;
+      @apply h4;
+    }
+
+    a &-title {
+      @apply text-secondary;
 
       overflow: hidden;
       display: -webkit-box;

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

@@ -106,12 +106,9 @@
           @apply text-gray-2 mr-1;
         }
       }
-    }
 
-    &:hover,
-    &-hovered {
-      > .dropdown__button {
-        @apply text-white no-underline;
+      &:hover {
+        @apply text-white no-underline !bg-secondary;
 
         span {
           @apply text-white;
@@ -122,6 +119,26 @@
         }
       }
     }
+
+    &-opened {
+      > .dropdown__button {
+        @apply text-secondary no-underline;
+
+        span {
+          @apply text-secondary;
+        }
+
+        svg {
+          fill: rgb(var(--secondary-rgb) / var(--tw-bg-opacity)) !important;
+        }
+
+        &:hover {
+          svg {
+            fill: white !important;
+          }
+        }
+      }
+    }
   }
 
   &__bottom {

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

@@ -129,7 +129,7 @@
 
 /* overwrite default dropdowns */
 [data-target="dropdown-menu-filters"] {
-  @apply px-0 justify-start [&>span]:text-gray-2;
+  @apply px-0 justify-start [&>span]:text-gray-2 md:hidden;
 
   > svg {
     @apply h-4 w-4 text-gray;

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

@@ -4,6 +4,11 @@ footer {
 
     &__top {
       @apply hidden lg:flex flex-row gap-8 container py-10;
+
+      .prose a,
+      .prose strong {
+        @apply text-white;
+      }
     }
 
     &__down {

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

@@ -9,18 +9,18 @@
     &-container {
       @apply w-24 h-24 relative;
     }
+  }
+
+  &__details {
+    @apply pb-3 space-y-2;
 
     &-badge {
-      @apply absolute top-full right-0 -translate-y-full grid place-items-center w-6 h-6 rounded-full overflow-hidden bg-primary border border-white;
+      @apply flex items-center gap-1 text-sm text-gray-2;
 
       svg {
-        @apply w-4 h-4 text-white fill-current;
+        @apply w-4 h-4 inline-block bg-primary rounded-full text-white fill-current;
       }
     }
-  }
-
-  &__details {
-    @apply pb-3 space-y-2;
 
     &-data {
       @apply flex flex-wrap gap-x-6 gap-y-4;

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

@@ -84,7 +84,9 @@
     }
 
     .ProseMirror {
-      @apply relative p-2.5 outline-0 min-h-full prose max-w-none prose-headings:first:mt-0 prose-p:first:mt-0 prose-ul:first:mt-0 prose-ol:first:mt-0 prose-blockquote:first:mt-0 prose-pre:first:mt-0;
+      @apply relative p-2.5 outline-0 resize-y overflow-hidden prose max-w-none prose-headings:first:mt-0 prose-p:first:mt-0 prose-ul:first:mt-0 prose-ol:first:mt-0 prose-blockquote:first:mt-0 prose-pre:first:mt-0;
+
+      min-height: inherit;
 
       &.ProseMirror-focused,
       &.dialog-open {