decidim-core 0.31.2 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24b967768820d8eb01abd435e318b7a869af854b0f374ca54c54a6dddbdddb6
-  data.tar.gz: f4374ee02ae0c5c9a580c8ad1c371c6552719be39b40e22cdf3d37018464950c
+  metadata.gz: 2c6e0e725b51232026afe0dfeb5bdf73eeaf07f88d346202d4854ef47c093908
+  data.tar.gz: ee494f4ab056b6f6debfe4590b885178eb39351e516efb9d98f174eab52b4a1e
 SHA512:
-  metadata.gz: a4baebaa527bd42897989aee6feeb29b4bf2773872b3bb7f8379a230111a94f0ee8565e15b02599fb6a1c20bb83a24feed96707448eecc70b866d74a8dd34bec
-  data.tar.gz: 47436bb0abfd556afcebe781b153aaaa9e960653be07fdf19486f11d82bfc40b61472dc24cfbc397838b19638a395bbad3dc3af8e1d791b2277412b3b56e719d
+  metadata.gz: d01d66392ab3be5f859ac9791375a83f9d810abd6ee909af6b1e8cf5d833da3a20806e8eed83c05142013d7c9166a12c31fa2ec128b6b4c9a61d8a5e34e7caba
+  data.tar.gz: '09c6891b8ab26cde54ead3bb2f0876c4cd04c88d3309c1855c3afce7c11297bfb95cf3d07e8dbabafa67a390882503f7b0595f4574f01c90050847392b217d31'

data/README.md

@@ -1,24 +1,14 @@
-# Decidim
+# decidim-core
 
 Core functionality in Decidim. Every single decidim functionality depends on this gem.
 
 ## Usage
 
-You will be using indirectly on any decidim application.
+This module will be using indirectly on any decidim application.
 
 ## Installation
 
-Add `decidim` to your `Gemfile` and you will be using it:
-
-```ruby
-gem 'decidim'
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this feature.
 
 ## Users
 

data/app/cells/decidim/amendable/amend_button_card/show.erb

@@ -1,5 +1,5 @@
-<li role="menuitem" class="dropdown__item">
-  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button" do %>
+<li role="presentation" class="dropdown__item">
+  <%= action_authorized_link_to :amend, new_amend_path, resource: model, data: { "redirect_url" => new_amend_path }, id: "amend-button", class: "dropdown__button", role: "menuitem" do %>
     <span><%= t("button", scope: "decidim.amendments.amendable", model_name: nil) %></span>
     <%= icon "pencil-line" %>
   <% end %>

data/app/cells/decidim/amendable/amend_button_card_cell.rb

@@ -7,7 +7,7 @@ module Decidim
       def show
         return unless amendments_enabled? && model.amendable?
         return unless current_component.current_settings.amendment_creation_enabled
-        return unless can_participate_in_private_space?
+        return unless can_participate_in_restricted_space?
 
         render
       end

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/card_metadata_cell.rb

@@ -29,7 +29,7 @@ module Decidim
       return unless show_space?
 
       {
-        text: decidim_escape_translated(participatory_space.title),
+        text: translated_attribute(participatory_space.title),
         icon: resource_type_icon_key(participatory_space.class),
         url: Decidim::ResourceLocatorPresenter.new(participatory_space).path
       }

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/announcement_settings_form/show.erb

@@ -0,0 +1,5 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :announcement, label:, required: true %>
+  </div>
+<% end %>

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentBlocks
+    class AnnouncementSettingsFormCell < Decidim::ViewModel
+      alias form model
+
+      def content_block
+        options[:content_block]
+      end
+
+      def label
+        I18n.t("decidim.content_blocks.announcement.body")
+      end
+    end
+  end
+end

data/app/cells/decidim/content_blocks/cta_settings_form/show.erb

@@ -4,6 +4,6 @@
   <%= settings_fields.translated :text_field, :description, label: t("decidim.content_blocks.cta_settings_form.description") %>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image") %>
 <% end %>

data/app/cells/decidim/content_blocks/hero_settings_form/show.erb

@@ -14,7 +14,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>

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_content_banner_settings_form/show.erb

@@ -20,7 +20,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t(".background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>

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

@@ -19,10 +19,14 @@ module Decidim
         @list_cell ||= cell(
           list_cell_path,
           published_components.one? ? published_components.first : published_components,
-          **model.settings.to_h, see_all_path:
+          **model.settings.to_h, **extra_list_cell_options, see_all_path:
         )
       end
 
+      def extra_list_cell_options
+        {}
+      end
+
       def see_all_path; end
     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/content_blocks/how_to_participate/show.erb

@@ -37,7 +37,7 @@
       </div>
     </div>
   </div>
-  <%= link_to decidim.pages_path, class: "button button__sm md:button__lg button__secondary mt-6" do %>
+  <%= link_to decidim.pages_path(), class: "button button__sm md:button__lg button__secondary mt-6" do %>
     <%= t("more_info", scope: "decidim.pages.home.extended", resource_name: current_organization_name) %>
     <%= icon "arrow-right-line", class: "fill-current" %>
   <% end %>

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

@@ -8,7 +8,7 @@ module Decidim
       end
 
       def html_content
-        translated_attribute(model.settings.html_content).html_safe
+        decidim_sanitize_editor_admin(translated_attribute(model.settings.html_content))
       end
     end
   end

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

@@ -3,8 +3,6 @@
 module Decidim
   module ContentBlocks
     class ParticipatorySpaceAnnouncementCell < BaseCell
-      delegate :announcement, to: :resource
-
       def show
         return if announcement_cell.blank_content?
 
@@ -12,7 +10,7 @@ module Decidim
       end
 
       def announcement_cell
-        @announcement_cell ||= cell("decidim/announcement", announcement)
+        @announcement_cell ||= cell("decidim/announcement", model.settings.announcement)
       end
     end
   end

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

@@ -27,12 +27,8 @@ module Decidim
         decidim_escape_translated(resource.subtitle)
       end
 
-      # If it is called from the landing page content block, use the background image defined there
-      # Else, use the banner image defined in the space (for assemblies)
       def image_path
-        return model.images_container.attached_uploader(:background_image).url if model.respond_to?(:images_container)
-
-        attached_uploader(:banner_image).url
+        model.images_container.attached_uploader(:background_image).url
       end
 
       def has_cta?

data/app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb

@@ -8,7 +8,7 @@
   </div>
 <% end %>
 
-<% form.fields_for :images, form.object.images do |images_fields| %>
+<% form.fields_for :images, content_block.images_container do |images_fields| %>
   <div class="row column">
     <%= images_fields.upload :background_image, label: t("decidim.content_blocks.cta_settings_form.background_image"), button_class: "button button__sm button__transparent-secondary" %>
   </div>

data/app/cells/decidim/content_blocks/static_page/section_cell.rb

@@ -5,7 +5,7 @@ module Decidim
     module StaticPage
       class SectionCell < Decidim::ViewModel
         def content
-          translated_attribute(model.settings.content).html_safe
+          decidim_sanitize_editor_admin(translated_attribute(model.settings.content))
         end
       end
     end

data/app/cells/decidim/content_blocks/static_page/section_settings_form/show.erb

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :content, label: %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :content, label: %>
+  </div>
 <% end %>

data/app/cells/decidim/content_blocks/static_page/summary_cell.rb

@@ -5,7 +5,7 @@ module Decidim
     module StaticPage
       class SummaryCell < Decidim::ViewModel
         def content
-          translated_attribute(model.settings.summary).html_safe
+          decidim_sanitize_editor_admin(translated_attribute(model.settings.summary))
         end
       end
     end

data/app/cells/decidim/content_blocks/static_page/summary_settings_form/show.erb

@@ -1,3 +1,5 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :summary, label: %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :summary, label: %>
+  </div>
 <% end %>

data/app/cells/decidim/content_blocks/static_page/two_pane_section_cell.rb

@@ -5,11 +5,11 @@ module Decidim
     module StaticPage
       class TwoPaneSectionCell < Decidim::ViewModel
         def left_column
-          translated_attribute(model.settings.left_column).html_safe
+          decidim_sanitize_editor_admin(translated_attribute(model.settings.left_column))
         end
 
         def right_column
-          translated_attribute(model.settings.right_column).html_safe
+          decidim_sanitize_editor_admin(translated_attribute(model.settings.right_column))
         end
       end
     end

data/app/cells/decidim/content_blocks/static_page/two_pane_section_settings_form/show.erb

@@ -1,4 +1,6 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.translated :editor, :left_column, label: label_left_column %>
-  <%= settings_fields.translated :editor, :right_column, label: label_right_column %>
+  <div class="row column">
+    <%= settings_fields.translated :editor, :left_column, label: label_left_column %>
+    <%= settings_fields.translated :editor, :right_column, label: label_right_column %>
+  </div>
 <% end %>

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

@@ -13,12 +13,12 @@
       <%= icon "close-line", class: "cookies__category-toggle-icon" %>
     </label>
 
-    <div id="accordion-trigger-<%= category[:slug] %>" data-controls="accordion-panel-<%= category[:slug] %>" aria-labelledby="accordion-title-<%= category[:slug] %>">
-      <h3 id="accordion-title-<%= category[:slug] %>" class="cookies__category-trigger-title">
-        <%= category[:title] %>
-      </h3>
+    <h3 id="accordion-title-<%= category[:slug] %>" class="cookies__category-trigger-title">
+      <%= category[:title] %>
+    </h3>
 
-      <span>
+    <div id="accordion-trigger-<%= category[:slug] %>" role="group" data-controls="accordion-panel-<%= category[:slug] %>" aria-labelledby="accordion-title-<%= category[:slug] %>">
+      <span aria-hidden="true">
         <%= icon "arrow-down-s-line", class: "cookies__category-trigger-arrow" %>
         <%= icon "arrow-up-s-line", class: "cookies__category-trigger-arrow" %>
       </span>
@@ -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/{participatory_space_private_user → member}/show.erb

@@ -1,13 +1,13 @@
-<div class="profile__user">
+<%= link_to profile_url, class: "profile__user" do %>
   <div class="profile__user-avatar-container">
-    <div class="<%= has_profile? ? "profile__user-avatar" : "profile__user-avatar !border-0" %>">
-      <%= image_tag(has_profile? ? model.avatar_url(:big) : model.non_user_avatar_path, alt: "member-avatar") %>
+    <div class="profile__user-avatar">
+      <%= image_tag(model.avatar_url(:big), alt: "member-avatar") %>
     </div>
   </div>
   <div>
-    <div class="<%= has_profile? ? "profile__user-name" : "profile__user-name !no-underline" %>">
+    <span class="profile__user-name">
       <%= name %>
-    </div>
+    </span>
     <% if nickname.present? %>
       <span class="profile__user-nick block">
         <%= nickname %>
@@ -20,4 +20,4 @@
       </span>
     </div>
   </div>
-</div>
+<% end %>

data/app/cells/decidim/{participatory_space_private_user_cell.rb → member_cell.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   # This cell renders the card for an instance of an Assembly member
-  class ParticipatorySpacePrivateUserCell < Decidim::ViewModel
+  class MemberCell < Decidim::ViewModel
     property :name
     property :role
     property :nickname
@@ -10,10 +10,6 @@ module Decidim
 
     private
 
-    def has_profile?
-      model.profile_url.present?
-    end
-
     def role_translated
       decidim_html_escape(decidim_sanitize(translated_attribute(role)))
     end

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

@@ -1,12 +1,12 @@
 <div class="participatory-space__nav-container">
-  <button id="dropdown-trigger-participatory-space" data-controller="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-scroll-to-menu="true">
+  <button id="dropdown-trigger-participatory-space" data-controller="dropdown" data-target="dropdown-menu-participatory-space" data-auto-close="true" data-scroll-to-menu="true" data-add-aria-roles="false" data-open-md="true">
     <span><%= t("decidim.searches.filters.jump_to") %></span>
     <%= icon "arrow-down-s-line" %>
     <%= icon "arrow-up-s-line" %>
   </button>
-  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav" aria-hidden="true">
+  <ul id="dropdown-menu-participatory-space" class="participatory-space__nav">
     <% model.each do |item| %>
-      <li role="menuitem">
+      <li>
         <%= link_to item[:url], class: "participatory-space__nav-item" do %>
           <%= decidim_escape_translated(item[:name]) %>
           <%= icon "arrow-right-line" %>

data/app/cells/decidim/onboarding_action_message_cell.rb

@@ -8,6 +8,7 @@ module Decidim
   #
   class OnboardingActionMessageCell < Decidim::ViewModel
     include ActiveLinkTo
+    include Decidim::ActiveLinkToHelper
 
     alias user model
 

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

@@ -20,4 +20,4 @@
   </div>
 </div>
 <p class="profile__description"><%= description %></p>
-<%= render_hook(:user_profile_bottom) %>
+<%= cell "decidim/profile_member_of", model %>

data/app/cells/decidim/profile_cell.rb

@@ -7,6 +7,7 @@ module Decidim
     include Decidim::AriaSelectedLinkToHelper
     include Decidim::ViewHooksHelper
     include ActiveLinkTo
+    include Decidim::ActiveLinkToHelper
 
     delegate :current_organization, :current_user, to: :controller
     delegate :avatar_url, :nickname, :personal_url, :followers_count, :users_followings, :officialized_as, to: :presented_profile

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

@@ -0,0 +1,13 @@
+<div class="profile__description">
+  <div class="font-semibold"><%= t("member_of", scope: "decidim.participatory_space.pages.user_profile.member_of") %></div>
+  <% shown = false %>
+  <% sorted_types.each do |type| %>
+    <% spaces = grouped_members[type].map(&:participatory_space).sort_by { |s| translated_attribute(s.title) } %>
+    <% spaces.each do |space| %>
+      <%= "&nbsp;&#183;&nbsp;".html_safe if shown %>
+      <% path = Decidim::EngineRouter.main_proxy(space).public_send("#{type.demodulize.underscore}_path", space) %>
+      <%= link_to decidim_escape_translated(space.title), path, class: "hover:underline" %>
+      <% shown = true %>
+    <% end %>
+  <% end %>
+</div>

data/app/cells/decidim/profile_member_of_cell.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ProfileMemberOfCell < Decidim::ViewModel
+    include Decidim::Core::Engine.routes.url_helpers
+
+    def members
+      @members ||= Decidim::ParticipatorySpace::Member.where(user:)
+                                                      .includes(:participatory_space)
+                                                      .published
+                                                      .select { |m| m.participatory_space.present? && m.participatory_space.published? }
+                                                      .sort_by { |m| translated_attribute(m.participatory_space.title) }
+    end
+
+    def show
+      return unless members.any?
+
+      render
+    end
+
+    private
+
+    def user
+      model
+    end
+
+    def grouped_members
+      @grouped_members ||= members.group_by(&:participatory_space_type)
+    end
+
+    def sorted_types
+      @sorted_types ||= grouped_members.keys.sort_by { |k| k.split("::").last.downcase }
+    end
+  end
+end

data/app/cells/decidim/report_button/already_reported_modal.erb

@@ -1,7 +1,7 @@
 <%= decidim_modal id: modal_id, class: "flag-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+    <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
         <p class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.already_reported") %></p>

data/app/cells/decidim/report_button/flag_modal.erb

@@ -2,7 +2,7 @@
   <%= decidim_form_for report_form, builder:, url: report_path, method: :post, html: { id: nil, data: { controller: "report-form" } } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p id="dialog-desc-<%= modal_id %>" class="flag-modal__form-description"><%= t("decidim.shared.flag_modal.description") %></p>

data/app/cells/decidim/report_user_button/already_reported_modal.erb

@@ -1,7 +1,7 @@
 <%= decidim_modal id: modal_id, class: "flag-user-modal" do %>
   <div data-dialog-container>
     <%= icon "flag-line" %>
-    <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+    <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
     <div>
       <div class="form__wrapper flag-modal__form">
         <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.already_reported") %></p>

data/app/cells/decidim/report_user_button/flag_modal.erb

@@ -2,7 +2,7 @@
   <%= decidim_form_for report_form, builder:, url: report_path, method: :post, html: { id: nil, data: { controller: "report-form" } } do |f| %>
     <div data-dialog-container>
       <%= icon "flag-line" %>
-      <h2 tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
+      <h2 id="dialog-title-<%= modal_id %>" tabindex="-1" data-dialog-title><%= t("decidim.shared.flag_user_modal.title") %></h2>
       <div>
         <div class="form__wrapper flag-modal__form">
           <p class="flag-modal__form-description"><%= t("decidim.shared.flag_user_modal.description") %></p>

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

@@ -10,8 +10,8 @@
   </button>
   <ul id="dropdown-menu-resource">
     <% resource_types.each do |resource_type| %>
-      <li role="menuitem">
-        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}" do %>
+      <li role="presentation">
+        <%= link_to filter_url(resource_type[0]), class: "filter#{" is-active" if filter_param == resource_type[0]}", role: "menuitem" do %>
           <span class="sr-only"><%= resource_type[1] %></span>
           <%= text_with_resource_icon(*resource_type) %>
         <% end %>

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

@@ -1,6 +1,6 @@
 <%= decidim_modal id: "socialShare", class: "share-modal" do %>
   <div data-dialog-container>
-    <h2 tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
+    <h2 id="dialog-title-socialShare" tabindex="-1" data-dialog-title><%= t("share", scope: "decidim.shared.share_modal") %></h2>
 
     <div>