Merge remote-tracking branch 'parent/main' into upstream-20240906

app/views/admin/announcements/_announcement.html.haml

@@ -1,4 +1,4 @@
-.announcements-list__item
+.announcements-list__item{ id: dom_id(announcement) }
   = link_to edit_admin_announcement_path(announcement), class: 'announcements-list__item__title' do
     = truncate(announcement.text)
 

app/views/invites/_invite.html.haml

@@ -1,4 +1,4 @@
-%tr
+%tr{ id: dom_id(invite) }
   %td
     .input-copy
       .input-copy__wrapper

app/views/oauth/authorized_applications/index.html.haml

@@ -7,7 +7,7 @@
 
 .applications-list
   - @applications.each do |application|
-    .applications-list__item
+    .applications-list__item{ id: dom_id(application) }
       - if application.website.present?
         = link_to application.name, application.website, target: '_blank', rel: 'noopener noreferrer', class: 'announcements-list__item__title'
       - else

app/views/settings/imports/index.html.haml

@@ -23,7 +23,7 @@
       = f.input :mode,
                 as: :radio_buttons,
                 collection_wrapper_tag: 'ul',
-                collection: Import::MODES,
+                collection: Form::Import::MODES,
                 item_wrapper_tag: 'li',
                 label_method: ->(mode) { safe_join([I18n.t("imports.modes.#{mode}"), content_tag(:span, I18n.t("imports.modes.#{mode}_long"), class: 'hint')]) }
 
@@ -46,7 +46,7 @@
           %th= t('imports.failures')
       %tbody
         - @recent_imports.each do |import|
-          %tr
+          %tr{ id: dom_id(import) }
             %td= t("imports.types.#{import.type}")
             %td
               - if import.state_unconfirmed?