decidim-core 0.32.0.rc3 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8c0eaf7af52859f34c0b152525144104d544b91f8a5ba49173b2f25530709c
-  data.tar.gz: c1d8019a4006489b276e3d2ca8c5c6f194890035369ab69a7c7e358376f16fae
+  metadata.gz: 50d3683adf392d4b4b2900c05d390051d922759af5aca3a012a0e2d6b1db501a
+  data.tar.gz: 6c44f0977cb804af860603ede5ad244515e6cc92d57071cfe594f687ee1c2a96
 SHA512:
-  metadata.gz: 88f9cdca14f469d2fe61ca88c3ba56f8e44586a951be4de8a3faa3f9de1d75b982f8b0db9023052470118f8f47c4d327eecf4687a568f636a18a6c85cfacd874
-  data.tar.gz: de42f147191cad92bd9b25c908a4526aaa317313e44603828b59ec0f40e9360f1a9cc8e046b64ed226b9c1585cdca4b213f271380e003d43936b813ebef6160f
+  metadata.gz: '097e493989f0f1cdc7d260ba099d36810cb0f85266165a122a39aab7a7befe35560b6efa701c7672541c9016c06cacf455521a9e927fcc1e791bc9caec2d8bcf'
+  data.tar.gz: f9df0bd52556860de3d48910823fa559a6a0614eb6aaf7cd335c7e9362659a0ccdcc6be27f84f90d20da6e08f8fb6d6935132bafca33ffaf8d2053f25a015461

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/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/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/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/packs/src/decidim/controllers/main_menu/controller.js

@@ -2,6 +2,14 @@ import { Controller } from "@hotwired/stimulus"
 
 const OPEN_DELAY_MS = 50
 
+const FOCUSABLE_SELECTORS = "a[href],button:not([disabled]),input:not([disabled]),select:not([disabled]),textarea:not([disabled]),[tabindex]:not([tabindex='-1'])"
+
+const getFocusableElements = (container) => {
+  return Array.from(container.querySelectorAll(FOCUSABLE_SELECTORS)).filter(
+    (el) => el.offsetParent !== null
+  );
+}
+
 /**
  * Main menu dropdown controller and traps page scroll while the menu is open.
  *
@@ -24,6 +32,7 @@ export default class extends Controller {
     this.handleButtonClick = this.handleButtonClick.bind(this)
     this.handleKeydown = this.handleKeydown.bind(this)
     this.handleCloseButtonClick = this.handleCloseButtonClick.bind(this)
+    this.focusTrapHandler = this.focusTrapHandler.bind(this)
 
     this.menuButton.addEventListener("click", this.handleButtonClick)
     this.menuContainer.addEventListener("click", this.handleContainerClick)
@@ -96,6 +105,23 @@ export default class extends Controller {
     return this.menuContainer.getAttribute("aria-hidden") === "true"
   }
 
+  focusTrapHandler(event) {
+    if (event.key !== "Tab") {
+      return;
+    }
+    const focusable = getFocusableElements(this.menuContainer);
+    if (focusable.length === 0) {
+      return;
+    }
+    if (event.shiftKey && document.activeElement === focusable[0]) {
+      event.preventDefault();
+      focusable[focusable.length - 1].focus({ preventScroll: true });
+    } else if (!event.shiftKey && document.activeElement === focusable[focusable.length - 1]) {
+      event.preventDefault();
+      focusable[0].focus({ preventScroll: true });
+    }
+  }
+
   openMenu() {
     if (typeof this.previousBodyOverflow === "undefined") {
       this.previousBodyOverflow = document.body.style.overflow;
@@ -104,9 +130,16 @@ export default class extends Controller {
     this.element.setAttribute("aria-expanded", "true")
     this.menuContainer.setAttribute("aria-hidden", "false")
     this.menuContainer.setAttribute("aria-modal", "true")
+    this.menuContainer.addEventListener("keydown", this.focusTrapHandler)
+
+    const focusable = getFocusableElements(this.menuContainer);
+    if (focusable.length > 0) {
+      focusable[0].focus({ preventScroll: true });
+    }
   }
 
   closeMenu() {
+    this.menuContainer.removeEventListener("keydown", this.focusTrapHandler)
     document.body.style.overflow = this.previousBodyOverflow ?? ""
     this.element.setAttribute("aria-expanded", "false")
     this.menuContainer.setAttribute("aria-hidden", "true")

data/app/packs/src/decidim/controllers/main_menu/main_menu.test.js

@@ -20,6 +20,8 @@ describe("MainMenuController", () => {
         Menu
       </button>
       <div id="main-menu-container" aria-hidden="true">
+        <a href="/link">Link</a>
+        <button>Action</button>
         <div id="main-menu-item"></div>
       </div>
       <button id="main-menu-close">Close</button>
@@ -165,6 +167,81 @@ describe("MainMenuController", () => {
     })
   })
 
+  describe("focusTrapHandler", () => {
+    beforeEach(() => {
+      jest.spyOn(HTMLElement.prototype, "offsetParent", "get").mockReturnValue(menuContainer)
+      controller.openMenu()
+    })
+
+    afterEach(() => {
+      controller.closeMenu()
+    })
+
+    it("focuses the first focusable element when menu opens", () => {
+      const focusable = menuContainer.querySelectorAll("a[href], button:not([disabled])")
+      const firstEl = focusable[0]
+      expect(document.activeElement).toBe(firstEl)
+    })
+
+    it("cycles focus to first element when Tab is pressed on last focusable element", () => {
+      const focusable = menuContainer.querySelectorAll("a[href], button:not([disabled])")
+      expect(focusable.length).toBeGreaterThan(1)
+      const lastEl = focusable[focusable.length - 1]
+      const firstEl = focusable[0]
+
+      lastEl.focus()
+      const event = new KeyboardEvent("keydown", { key: "Tab", bubbles: true })
+      jest.spyOn(event, "preventDefault")
+      jest.spyOn(firstEl, "focus")
+
+      menuContainer.dispatchEvent(event)
+
+      expect(event.preventDefault).toHaveBeenCalled()
+      expect(firstEl.focus).toHaveBeenCalledWith({ preventScroll: true })
+    })
+
+    it("cycles focus to last element when Shift+Tab is pressed on first focusable element", () => {
+      const focusable = menuContainer.querySelectorAll("a[href], button:not([disabled])")
+      expect(focusable.length).toBeGreaterThan(1)
+      const firstEl = focusable[0]
+      const lastEl = focusable[focusable.length - 1]
+
+      firstEl.focus()
+      const event = new KeyboardEvent("keydown", { key: "Tab", shiftKey: true, bubbles: true })
+      jest.spyOn(event, "preventDefault")
+      jest.spyOn(lastEl, "focus")
+
+      menuContainer.dispatchEvent(event)
+
+      expect(event.preventDefault).toHaveBeenCalled()
+      expect(lastEl.focus).toHaveBeenCalledWith({ preventScroll: true })
+    })
+
+    it("does nothing when a non-Tab key is pressed", () => {
+      const event = new KeyboardEvent("keydown", { key: "Enter", bubbles: true })
+      jest.spyOn(event, "preventDefault")
+
+      menuContainer.dispatchEvent(event)
+
+      expect(event.preventDefault).not.toHaveBeenCalled()
+    })
+
+    it("does nothing when there are no focusable elements", () => {
+      controller.closeMenu()
+      menuContainer.innerHTML = ""
+      controller.openMenu()
+
+      const event = new KeyboardEvent("keydown", { key: "Tab", bubbles: true })
+      expect(() => menuContainer.dispatchEvent(event)).not.toThrow()
+    })
+
+    it("removes the keydown handler when menu is closed", () => {
+      const spy = jest.spyOn(menuContainer, "removeEventListener")
+      controller.closeMenu()
+      expect(spy).toHaveBeenCalledWith("keydown", controller.focusTrapHandler)
+    })
+  })
+
   describe("disconnect", () => {
     it("removes listeners and closes the menu if open", () => {
       const buttonSpy = jest.spyOn(menuButton, "removeEventListener")