decidim-core 0.32.0.rc3 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8c0eaf7af52859f34c0b152525144104d544b91f8a5ba49173b2f25530709c
-  data.tar.gz: c1d8019a4006489b276e3d2ca8c5c6f194890035369ab69a7c7e358376f16fae
+  metadata.gz: 2c6e0e725b51232026afe0dfeb5bdf73eeaf07f88d346202d4854ef47c093908
+  data.tar.gz: ee494f4ab056b6f6debfe4590b885178eb39351e516efb9d98f174eab52b4a1e
 SHA512:
-  metadata.gz: 88f9cdca14f469d2fe61ca88c3ba56f8e44586a951be4de8a3faa3f9de1d75b982f8b0db9023052470118f8f47c4d327eecf4687a568f636a18a6c85cfacd874
-  data.tar.gz: de42f147191cad92bd9b25c908a4526aaa317313e44603828b59ec0f40e9360f1a9cc8e046b64ed226b9c1585cdca4b213f271380e003d43936b813ebef6160f
+  metadata.gz: d01d66392ab3be5f859ac9791375a83f9d810abd6ee909af6b1e8cf5d833da3a20806e8eed83c05142013d7c9166a12c31fa2ec128b6b4c9a61d8a5e34e7caba
+  data.tar.gz: '09c6891b8ab26cde54ead3bb2f0876c4cd04c88d3309c1855c3afce7c11297bfb95cf3d07e8dbabafa67a390882503f7b0595f4574f01c90050847392b217d31'

data/app/cells/decidim/author_cell.rb

@@ -31,10 +31,6 @@ module Decidim
       render unless current_user == model
     end
 
-    def perform_caching?
-      true
-    end
-
     def raw_model
       model.try(:__getobj__) || model
     end

data/app/cells/decidim/comments_button_cell.rb

@@ -23,7 +23,9 @@ module Decidim
     end
 
     def path
-      "#add-comment-anchor"
+      return "#add-comment-anchor" if current_user
+
+      nil
     end
 
     def text
@@ -37,5 +39,11 @@ module Decidim
     def button_classes
       "button button__sm button__transparent-secondary add-comment-mobile"
     end
+
+    def html_options
+      return {} if current_user
+
+      { data: { "dialog-open": "loginModal" } }
+    end
   end
 end

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

@@ -32,7 +32,7 @@ module Decidim
       private
 
       def render?
-        required_keys = [:title, :short_description, :action_button_title, :action_button_subtitle, :action_button_url]
+        required_keys = [:title, :action_button_title, :action_button_subtitle, :action_button_url]
         required_keys.all? { |key| model.settings.public_send(key).present? }
       end
     end

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

@@ -28,7 +28,7 @@ module Decidim
       private
 
       def cache_hash
-        [I18n.locale, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
+        [I18n.locale, model.cache_key_with_version, highlighted_spaces.map(&:cache_key_with_version)].join(Decidim.cache_key_separator)
       end
 
       def section_class

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

@@ -30,39 +30,26 @@
     <p><%= category[:description] %></p>
 
     <% if category[:items].present? %>
-    <div>
-      <div class="cookies__category-panel__tr">
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.type") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.name") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.service") %>
-        </div>
-        <div class="cookies__category-panel__th">
-          <%= t("layouts.decidim.data_consent.details.columns.description") %>
-        </div>
-      </div>
-
-      <% category[:items].each do |item| %>
-        <div class="cookies__category-panel__tr">
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= item[:name] %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %>
-          </div>
-          <div class="cookies__category-panel__td">
-            <%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %>
-          </div>
-        </div>
-      <% end %>
-    </div>
+    <table>
+      <thead>
+        <tr>
+          <th><%= t("layouts.decidim.data_consent.details.columns.type") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.name") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.service") %></th>
+          <th><%= t("layouts.decidim.data_consent.details.columns.description") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% category[:items].each do |item| %>
+          <tr>
+            <td><%= t("layouts.decidim.data_consent.details.types.#{item[:type]}") %></td>
+            <td><%= item[:name] %></td>
+            <td><%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.service") %></td>
+            <td><%= t("layouts.decidim.data_consent.details.items.#{item[:name]}.description") %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
     <% end %>
   </div>
 </div>

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

@@ -1,8 +1,5 @@
-<nav role="navigation" aria-label="<%= t("layouts.decidim.footer.help") %>">
-  <h2 class="h4 mb-4"><%= t("layouts.decidim.footer.help") %></h2>
-  <ul class="space-y-4 break-inside-avoid">
-    <% topics.each do |topic| %>
-      <%= topic_item(topic, class: "font-semibold underline") %>
-    <% end %>
-  </ul>
-</nav>
+<ul>
+  <% topics.each do |topic| %>
+    <%= topic_item(topic, class: "font-semibold underline") %>
+  <% end %>
+</ul>

data/app/cells/decidim/share_widget/qr_code_modal.erb

@@ -2,7 +2,7 @@
   <div data-dialog-container>
     <div data-dialog-title>
       <%= icon "qr-code-line" %>
-      <h2 tabindex="-1"><%= t("decidim.share_widget.qr_code") %></h2>
+      <h2 id="dialog-title-qr-code-dialog" tabindex="-1"><%= t("decidim.share_widget.qr_code") %></h2>
     </div>
     <div class="content">
       <div>

data/app/commands/decidim/destroy_account.rb

@@ -15,7 +15,7 @@ module Decidim
     def call
       return broadcast(:invalid) unless @form.valid?
 
-      Decidim::User.transaction do
+      with_events(with_transaction: true) do
         destroy_user_account!
         destroy_user_identities
         destroy_follows
@@ -110,5 +110,16 @@ module Decidim
         space_manifest.invoke_on_destroy_account(current_user)
       end
     end
+
+    # We use memoization in this particular email, as we want to have the data available before the actual anonymization
+    def event_arguments
+      @event_arguments ||= {
+        user_id: current_user.id,
+        user_email: current_user.email,
+        user_name: current_user.name,
+        locale: current_user.locale,
+        organization: current_user.organization
+      }
+    end
   end
 end

data/app/commands/decidim/multiple_attachments_methods.rb

@@ -5,16 +5,16 @@ module Decidim
     private
 
     def build_attachments
-      @documents = []
-      @form.add_documents.compact_blank.each do |attachment|
+      @attachments = []
+      @form.add_attachments.compact_blank.each do |attachment|
         if attachment.is_a?(Hash) && attachment.has_key?(:id)
           update_attachment_title_for(attachment)
           next
         end
 
-        @documents << Attachment.new(
+        @attachments << Attachment.new(
           title: title_for(attachment),
-          attached_to: @attached_to || documents_attached_to,
+          attached_to: @attached_to || attachments_attached_to,
           file: signed_id_for(attachment),
           content_type: content_type_for(attachment)
         )
@@ -26,11 +26,11 @@ module Decidim
     end
 
     def attachments_invalid?
-      @documents.each do |document|
-        next if document.valid? || !document.errors.has_key?(:file)
+      @attachments.each do |attachment|
+        next if attachment.valid? || !attachment.errors.has_key?(:file)
 
-        document.errors[:file].each do |error|
-          @form.errors.add(:add_documents, error)
+        attachment.errors[:file].each do |error|
+          @form.errors.add(:add_attachments, error)
         end
 
         return true
@@ -41,37 +41,38 @@ module Decidim
 
     def create_attachments(first_weight: 0)
       weight = first_weight
-      # Add the weights first to the old documents
-      document_ids = keep_ids
-      Decidim::Attachment.where(id: document_ids).each do |document|
-        document.update!(weight:)
+      # Add the weights first to the old attachments
+      attachment_ids = keep_ids
+      Decidim::Attachment.where(id: attachment_ids).each do |attachment|
+        attachment.update!(weight:)
         weight += 1
       end
-      @documents.map! do |document|
-        document.weight = weight
-        document.attached_to = documents_attached_to
-        document.save!
+      @attachments.map! do |attachment|
+        attachment.weight = weight
+        attachment.attached_to = attachments_attached_to
+        attachment.save!
         weight += 1
-        @form.documents << document
+        @form.attachments << attachment
       end
     end
 
-    def document_cleanup!(include_all_attachments: false)
-      documents = include_all_attachments ? documents_attached_to.attachments.with_attached_file : documents_attached_to.documents
+    def attachment_cleanup!(include_all_attachments: false)
+      attachments = include_all_attachments ? attachments_attached_to.attachments.with_attached_file : attachments_attached_to.attachments
 
-      documents.each do |document|
-        document.destroy! unless keep_ids.include?(document.id)
+      attachments.each do |attachment|
+        attachment.destroy! unless keep_ids.include?(attachment.id)
       end
 
-      documents_attached_to.reload
-      documents_attached_to.instance_variable_set(:@documents, nil)
+      attachments_attached_to.reload
+      attachments_attached_to.instance_variable_set(:@attachments, nil)
+      attachments_attached_to.instance_variable_set(:@photos, nil)
     end
 
     def process_attachments?
-      @form.add_documents.any?
+      @form.add_attachments.any?
     end
 
-    def documents_attached_to
+    def attachments_attached_to
       return @attached_to if @attached_to.present?
       return form.current_organization if form.respond_to?(:current_organization)
 
@@ -101,8 +102,8 @@ module Decidim
     end
 
     def keep_ids
-      documents_array = Array(@form.documents)
-      documents_array.map do |doc|
+      attachments_array = Array(@form.attachments)
+      attachments_array.map do |doc|
         case doc
         when Decidim::Attachment
           doc.id

data/app/helpers/decidim/menu_helper.rb

@@ -55,10 +55,8 @@ module Decidim
       @footer_menu ||= ::Decidim::FooterMenuPresenter.new(
         :menu,
         self,
-        element_class: "font-semibold underline",
         active_class: "is-active",
         role: false,
-        container_options: { class: "space-y-4 break-inside-avoid" },
         label: t("layouts.decidim.footer.decidim_title")
       )
     end

data/app/jobs/decidim/process_inactive_participant_job.rb

@@ -31,13 +31,6 @@ module Decidim
     end
 
     def process_remove_user(user)
-      email = user.email
-      name = user.name
-      locale = user.locale
-      organization = user.organization
-
-      ParticipantsAccountMailer.removal_notification(email, name, locale, organization).deliver_later
-
       Decidim::DestroyAccount.call(
         Decidim::DeleteAccountForm.from_params(
           delete_reason: I18n.t("decidim.account.destroy.inactive_account_removal_reason", inactivity_period: Decidim.delete_inactive_users_after_days)

data/app/mailers/decidim/delete_user_mailer.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  class DeleteUserMailer < ApplicationMailer
+    # This email is being sent when a user deletes his own account, or when the user was inactive for too long.
+    def delete(user_email:, user_name:, locale:, organization:)
+      I18n.with_locale(locale) do
+        @user_name = user_name
+        @organization = organization
+        mail(to: user_email, subject: I18n.t("decidim.delete_user_mailer.subject"))
+      end
+    end
+  end
+end

data/app/mailers/decidim/participants_account_mailer.rb

@@ -18,21 +18,5 @@ module Decidim
         mail(to: user.email, subject:)
       end
     end
-
-    # Notify user about account removal due to inactivity
-    def removal_notification(email, name, locale, organization)
-      @email = email
-      @user_name = name
-      @organization = organization
-
-      I18n.with_locale(locale) do
-        subject = I18n.t(
-          "decidim.participants_account_mailer.removal_notification.subject",
-          organization_name: organization_name(@organization)
-        )
-
-        mail(to: email, subject:)
-      end
-    end
   end
 end

data/app/models/decidim/user.rb

@@ -21,8 +21,8 @@ module Decidim
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :trackable, :lockable,
-           :decidim_validatable, :decidim_newsletterable, :jwt_authenticatable,
-           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys, jwt_revocation_strategy: Decidim::Api::JwtDenylist,
+           :decidim_validatable, :decidim_newsletterable,
+           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
     devise :rememberable if Decidim.enable_remember_me