From a44fc608e282efa8ae31380c51a9b4f2d610f216 Mon Sep 17 00:00:00 2001
From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com>
Date: Tue, 7 Jul 2026 18:01:07 +0200
Subject: [PATCH 1/3] Remove unused aria-describedby

---
 resources/js/components/LoginTabLocal.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/js/components/LoginTabLocal.vue b/resources/js/components/LoginTabLocal.vue
index b8882a7ba..95b4fe57f 100644
--- a/resources/js/components/LoginTabLocal.vue
+++ b/resources/js/components/LoginTabLocal.vue
@@ -11,7 +11,6 @@
           :disabled="props.loading"
           autocomplete="email"
           :placeholder="props.emailLabel"
-          aria-describedby="email-help-block"
           :invalid="
             props.errors !== null &&
             props.errors.email &&
@@ -34,7 +33,6 @@
           fluid
           :disabled="props.loading"
           :placeholder="props.passwordLabel"
-          aria-describedby="password-help-block"
           :invalid="
             props.errors !== null &&
             props.errors.password &&
@@ -43,7 +41,6 @@
         />
         <Button
           v-if="settingsStore.getSetting('user.password_change_allowed')"
-          id="password-help-block"
           as="router-link"
           link
           class="self-start p-0"

From 3145b027b0d7dcb6f110d90c01ba9121c4647571 Mon Sep 17 00:00:00 2001
From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com>
Date: Tue, 7 Jul 2026 18:04:42 +0200
Subject: [PATCH 2/3] Fix broken aria-describedby

---
 resources/js/components/SettingsRoomTypesDeleteButton.vue | 2 +-
 resources/js/views/AdminRoomTypesView.vue                 | 6 +++++-
 resources/js/views/AdminServersView.vue                   | 2 +-
 resources/js/views/AdminSettings.vue                      | 8 ++++----
 resources/js/views/AdminUsersNew.vue                      | 6 +++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/SettingsRoomTypesDeleteButton.vue b/resources/js/components/SettingsRoomTypesDeleteButton.vue
index 3950cde36..83761ad6d 100644
--- a/resources/js/components/SettingsRoomTypesDeleteButton.vue
+++ b/resources/js/components/SettingsRoomTypesDeleteButton.vue
@@ -49,7 +49,6 @@
           option-group-children="items"
           option-value="value"
           option-label="text"
-          aria-describedby="replacement-help"
           :pt="{
             listContainer: {
               'data-test': 'replacement-room-type-dropdown-items',
@@ -59,6 +58,7 @@
             },
             optionGroup: 'p-0',
             label: {
+              'aria-describedby': 'replacement-help',
               autofocus: true,
             },
           }"
diff --git a/resources/js/views/AdminRoomTypesView.vue b/resources/js/views/AdminRoomTypesView.vue
index d4a6369ba..a07aac35f 100644
--- a/resources/js/views/AdminRoomTypesView.vue
+++ b/resources/js/views/AdminRoomTypesView.vue
@@ -249,7 +249,11 @@
                   input-id="restrict"
                   :invalid="formErrors.fieldInvalid('restrict')"
                   :disabled="isBusy || modelLoadingError || viewOnly"
-                  aria-describedby="restrict-help"
+                  :pt="{
+                    input: {
+                      'aria-describedby': 'restrict-help',
+                    },
+                  }"
                 />
               </div>
               <FormError :errors="formErrors.fieldError('restrict')" />
diff --git a/resources/js/views/AdminServersView.vue b/resources/js/views/AdminServersView.vue
index 042da2b6e..6b6d7b8be 100644
--- a/resources/js/views/AdminServersView.vue
+++ b/resources/js/views/AdminServersView.vue
@@ -138,6 +138,7 @@
         <fieldset
           class="field grid grid-cols-12 gap-4"
           data-test="strength-field"
+          aria-describedby="strength-help"
         >
           <legend class="col-span-12 md:col-span-4 md:mb-0">
             {{ $t("admin.servers.strength") }}
@@ -150,7 +151,6 @@
               :disabled="isBusy || modelLoadingError || viewOnly"
               :invalid="formErrors.fieldInvalid('strength')"
               :stars="10"
-              aria-describedby="strength-help"
               class="flex justify-between rounded-border border border-surface-300 px-6 py-3 dark:border-surface-600"
               data-test="strength-rating"
               :pt="{
diff --git a/resources/js/views/AdminSettings.vue b/resources/js/views/AdminSettings.vue
index d407b3527..983855312 100644
--- a/resources/js/views/AdminSettings.vue
+++ b/resources/js/views/AdminSettings.vue
@@ -893,7 +893,7 @@
                   :disabled="disabled"
                   aria-labelledby="room-personalized-link-expiration-label"
                   :pt="{
-                    input: {
+                    label: {
                       'aria-describedby':
                         'room-personalized-link-expiration-help',
                     },
@@ -943,7 +943,7 @@
                   :disabled="disabled"
                   aria-labelledby="room-auto-delete-deadline-period-label"
                   :pt="{
-                    input: {
+                    label: {
                       'aria-describedby':
                         'room-auto-delete-deadline-period-help',
                     },
@@ -991,7 +991,7 @@
                   :disabled="disabled"
                   aria-labelledby="room-auto-delete-inactive-period-label"
                   :pt="{
-                    input: {
+                    label: {
                       'aria-describedby':
                         'room-auto-delete-inactive-period-help',
                     },
@@ -1041,7 +1041,7 @@
                   :disabled="disabled"
                   aria-labelledby="room-auto-delete-never-used-period-label"
                   :pt="{
-                    input: {
+                    label: {
                       'aria-describedby':
                         'room-auto-delete-never-used-period-help',
                     },
diff --git a/resources/js/views/AdminUsersNew.vue b/resources/js/views/AdminUsersNew.vue
index ffcda3fe3..06301be52 100644
--- a/resources/js/views/AdminUsersNew.vue
+++ b/resources/js/views/AdminUsersNew.vue
@@ -141,7 +141,11 @@
                   input-id="generate_password"
                   :invalid="formErrors.fieldInvalid('generate_password')"
                   :disabled="isBusy"
-                  aria-describedby="generate_password-help"
+                  :pt="{
+                    input: {
+                      'aria-describedby': 'generate_password-help',
+                    },
+                  }"
                 />
               </div>
               <FormError :errors="formErrors.fieldError('generate_password')" />

From 95d50b5fd3602eb36dcbcbcbf2d015b83fc97098 Mon Sep 17 00:00:00 2001
From: Samuel Weirich <4281791+SamuelWei@users.noreply.github.com>
Date: Tue, 7 Jul 2026 18:23:45 +0200
Subject: [PATCH 3/3] Add/Fix labels for select elements

---
 lang/en/app.php                                       |  4 ++++
 lang/en/rooms.php                                     |  1 +
 resources/js/components/RoomTabFiles.vue              | 11 +++++++++--
 resources/js/components/RoomTabHistory.vue            |  8 +++++++-
 resources/js/components/RoomTabMembers.vue            | 11 +++++++++--
 resources/js/components/RoomTabPersonalizedLinks.vue  | 11 +++++++++--
 resources/js/components/RoomTabRecordings.vue         | 11 +++++++++--
 .../js/components/SettingsRoomTypesDeleteButton.vue   |  4 ++--
 resources/js/views/RoomsIndex.vue                     |  6 ++++--
 9 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/lang/en/app.php b/lang/en/app.php
index 07e5cd083..8d3ab6f3c 100644
--- a/lang/en/app.php
+++ b/lang/en/app.php
@@ -69,6 +69,7 @@
         'streaming_meeting_not_running' => 'The meeting is not running.',
         'streaming_not_enabled_for_current_meeting_error' => 'Streaming is not enabled for the current meeting.',
     ],
+    'filter' => 'Filter',
     'filter_no_results' => 'No results found',
     'firstname' => 'Firstname',
     'flash' => [
@@ -143,6 +144,9 @@
     'server_pool' => 'Server pool',
     'server_pools' => 'Server pools',
     'servers' => 'Server',
+    'sort_by' => 'Sort by',
+    'sort_ascending' => 'Sort ascending',
+    'sort_descending' => 'Sort descending',
     'streaming' => 'Streaming',
     'time_formats' => [
         'day' => 'Day',
diff --git a/lang/en/rooms.php b/lang/en/rooms.php
index b52923000..3c4edce23 100644
--- a/lang/en/rooms.php
+++ b/lang/en/rooms.php
@@ -157,6 +157,7 @@
     ],
     'index' => [
         'filter' => 'Filter',
+        'filter_by_room_type' => 'Filter by room type',
         'no_favorites' => 'No rooms marked as favorites',
         'no_rooms_selected' => 'No rooms selected',
         'only_favorites' => 'Only show favorites',
diff --git a/resources/js/components/RoomTabFiles.vue b/resources/js/components/RoomTabFiles.vue
index 192525117..188739506 100644
--- a/resources/js/components/RoomTabFiles.vue
+++ b/resources/js/components/RoomTabFiles.vue
@@ -65,7 +65,7 @@
         </search>
         <div class="flex flex-col gap-2 lg:flex-row">
           <InputGroup v-if="userPermissions.can('manageSettings', props.room)">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-filter"></i>
             </InputGroupAddon>
             <Select
@@ -75,6 +75,7 @@
               option-label="name"
               option-value="value"
               data-test="filter-dropdown"
+              :aria-label="$t('app.filter')"
               :pt="{
                 listContainer: {
                   'data-test': 'filter-dropdown-items',
@@ -88,7 +89,7 @@
           </InputGroup>
 
           <InputGroup data-test="sorting-type-inputgroup">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-sort"></i>
             </InputGroupAddon>
             <Select
@@ -98,6 +99,7 @@
               option-label="name"
               option-value="value"
               data-test="sorting-type-dropdown"
+              :aria-label="$t('app.sort_by')"
               :pt="{
                 listContainer: {
                   'data-test': 'sorting-type-dropdown-items',
@@ -116,6 +118,11 @@
                     ? 'fa-solid fa-arrow-up-short-wide'
                     : 'fa-solid fa-arrow-down-wide-short'
                 "
+                :aria-label="
+                  sortOrder === 1
+                    ? $t('app.sort_ascending')
+                    : $t('app.sort_descending')
+                "
                 severity="secondary"
                 text
                 class="rounded-l-none"
diff --git a/resources/js/components/RoomTabHistory.vue b/resources/js/components/RoomTabHistory.vue
index c4efa78e0..7bdb2e7ea 100644
--- a/resources/js/components/RoomTabHistory.vue
+++ b/resources/js/components/RoomTabHistory.vue
@@ -11,7 +11,7 @@
       >
         <div class="flex gap-2">
           <InputGroup class="w-auto" data-test="sorting-type-inputgroup">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-sort"></i>
             </InputGroupAddon>
             <Select
@@ -21,6 +21,7 @@
               :options="sortFields"
               option-label="name"
               option-value="value"
+              :aria-label="$t('app.sort_by')"
               :pt="{
                 listContainer: {
                   'data-test': 'sorting-type-dropdown-items',
@@ -39,6 +40,11 @@
                     ? 'fa-solid fa-arrow-up-short-wide'
                     : 'fa-solid fa-arrow-down-wide-short'
                 "
+                :aria-label="
+                  sortOrder === 1
+                    ? $t('app.sort_ascending')
+                    : $t('app.sort_descending')
+                "
                 severity="secondary"
                 text
                 class="rounded-l-none"
diff --git a/resources/js/components/RoomTabMembers.vue b/resources/js/components/RoomTabMembers.vue
index fe95e047b..ac993eaf4 100644
--- a/resources/js/components/RoomTabMembers.vue
+++ b/resources/js/components/RoomTabMembers.vue
@@ -22,7 +22,7 @@
         </search>
         <div class="flex flex-col gap-2 lg:flex-row">
           <InputGroup>
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-filter"></i>
             </InputGroupAddon>
             <Select
@@ -32,6 +32,7 @@
               :options="filterOptions"
               option-label="name"
               option-value="value"
+              :aria-label="$t('app.filter')"
               :pt="{
                 listContainer: {
                   'data-test': 'filter-dropdown-items',
@@ -45,7 +46,7 @@
           </InputGroup>
 
           <InputGroup data-test="sorting-type-inputgroup">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-sort"></i>
             </InputGroupAddon>
             <Select
@@ -55,6 +56,7 @@
               :options="sortFields"
               option-label="name"
               option-value="value"
+              :aria-label="$t('app.sort_by')"
               :pt="{
                 listContainer: {
                   'data-test': 'sorting-type-dropdown-items',
@@ -73,6 +75,11 @@
                     ? 'fa-solid fa-arrow-up-short-wide'
                     : 'fa-solid fa-arrow-down-wide-short'
                 "
+                :aria-label="
+                  sortOrder === 1
+                    ? $t('app.sort_ascending')
+                    : $t('app.sort_descending')
+                "
                 severity="secondary"
                 text
                 class="rounded-l-none"
diff --git a/resources/js/components/RoomTabPersonalizedLinks.vue b/resources/js/components/RoomTabPersonalizedLinks.vue
index 5ceb25ef7..4625d9323 100644
--- a/resources/js/components/RoomTabPersonalizedLinks.vue
+++ b/resources/js/components/RoomTabPersonalizedLinks.vue
@@ -22,7 +22,7 @@
         </search>
         <div class="flex flex-col gap-2 lg:flex-row">
           <InputGroup>
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-filter"></i>
             </InputGroupAddon>
             <Select
@@ -32,6 +32,7 @@
               :options="filterOptions"
               option-label="name"
               option-value="value"
+              :aria-label="$t('app.filter')"
               :pt="{
                 listContainer: {
                   'data-test': 'filter-dropdown-items',
@@ -45,7 +46,7 @@
           </InputGroup>
 
           <InputGroup data-test="sorting-type-inputgroup">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-sort"></i>
             </InputGroupAddon>
             <Select
@@ -55,6 +56,7 @@
               :options="sortFields"
               option-label="name"
               option-value="value"
+              :aria-label="$t('app.sort_by')"
               :pt="{
                 listContainer: {
                   'data-test': 'sorting-type-dropdown-items',
@@ -73,6 +75,11 @@
                     ? 'fa-solid fa-arrow-up-short-wide'
                     : 'fa-solid fa-arrow-down-wide-short'
                 "
+                :aria-label="
+                  sortOrder === 1
+                    ? $t('app.sort_ascending')
+                    : $t('app.sort_descending')
+                "
                 severity="secondary"
                 text
                 class="rounded-l-none"
diff --git a/resources/js/components/RoomTabRecordings.vue b/resources/js/components/RoomTabRecordings.vue
index 2802ece93..63b695d42 100644
--- a/resources/js/components/RoomTabRecordings.vue
+++ b/resources/js/components/RoomTabRecordings.vue
@@ -22,7 +22,7 @@
         </search>
         <div class="flex flex-col gap-2 lg:flex-row">
           <InputGroup v-if="userPermissions.can('manageSettings', props.room)">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-filter"></i>
             </InputGroupAddon>
             <Select
@@ -32,6 +32,7 @@
               option-label="name"
               option-value="value"
               data-test="filter-dropdown"
+              :aria-label="$t('app.filter')"
               :pt="{
                 listContainer: {
                   'data-test': 'filter-dropdown-items',
@@ -45,7 +46,7 @@
           </InputGroup>
 
           <InputGroup data-test="sorting-type-inputgroup">
-            <InputGroupAddon>
+            <InputGroupAddon aria-hidden="true">
               <i class="fa-solid fa-sort"></i>
             </InputGroupAddon>
             <Select
@@ -55,6 +56,7 @@
               option-label="name"
               option-value="value"
               data-test="sorting-type-dropdown"
+              :aria-label="$t('app.sort_by')"
               :pt="{
                 listContainer: {
                   'data-test': 'sorting-type-dropdown-items',
@@ -73,6 +75,11 @@
                     ? 'fa-solid fa-arrow-up-short-wide'
                     : 'fa-solid fa-arrow-down-wide-short'
                 "
+                :aria-label="
+                  sortOrder === 1
+                    ? $t('app.sort_ascending')
+                    : $t('app.sort_descending')
+                "
                 severity="secondary"
                 text
                 class="rounded-l-none"
diff --git a/resources/js/components/SettingsRoomTypesDeleteButton.vue b/resources/js/components/SettingsRoomTypesDeleteButton.vue
index 83761ad6d..33d621398 100644
--- a/resources/js/components/SettingsRoomTypesDeleteButton.vue
+++ b/resources/js/components/SettingsRoomTypesDeleteButton.vue
@@ -29,12 +29,11 @@
       class="field flex flex-col gap-2"
       data-test="replacement-room-type-field"
     >
-      <label for="replacement-room-type">{{
+      <label id="replacement-room-type-label">{{
         $t("admin.room_types.delete.replacement")
       }}</label>
       <InputGroup>
         <Select
-          id="replacement-room-type"
           v-model.number="replacement"
           data-test="replacement-room-type-dropdown"
           :disabled="
@@ -49,6 +48,7 @@
           option-group-children="items"
           option-value="value"
           option-label="text"
+          aria-labelledby="replacement-room-type-label"
           :pt="{
             listContainer: {
               'data-test': 'replacement-room-type-dropdown-items',
diff --git a/resources/js/views/RoomsIndex.vue b/resources/js/views/RoomsIndex.vue
index 1f1996177..78652919a 100644
--- a/resources/js/views/RoomsIndex.vue
+++ b/resources/js/views/RoomsIndex.vue
@@ -126,7 +126,7 @@
               v-if="!onlyShowFavorites"
               data-test="room-type-inputgroup"
             >
-              <InputGroupAddon>
+              <InputGroupAddon aria-hidden="true">
                 <i class="fa-solid fa-tag"></i>
               </InputGroupAddon>
               <InputGroupAddon
@@ -150,6 +150,7 @@
                 option-group-label="index"
                 option-group-children="items"
                 option-value="id"
+                :aria-label="$t('rooms.index.filter_by_room_type')"
                 :pt="{
                   listContainer: {
                     'data-test': 'room-type-dropdown-items',
@@ -187,7 +188,7 @@
 
             <!--dropdown for sorting type (on small devices only shown, when filter menu is open)-->
             <InputGroup>
-              <InputGroupAddon>
+              <InputGroupAddon aria-hidden="true">
                 <i class="fa-solid fa-sort"></i>
               </InputGroupAddon>
               <Select
@@ -197,6 +198,7 @@
                 :options="sortingTypes"
                 option-label="label"
                 option-value="type"
+                :aria-label="$t('app.sort_by')"
                 :pt="{
                   listContainer: {
                     'data-test': 'sorting-type-dropdown-items',