From 8d26b5a8977a99875ad57990439c71ef8deb219c Mon Sep 17 00:00:00 2001
From: psjakubowska <psedlak-jakubowska@gitlab.com>
Date: Thu, 6 Mar 2025 12:20:10 +0100
Subject: [PATCH] Make sure aside has its implicit complementary role
Because of nesting inside a section tag, the aside lost
its implicit aria role. Moving it up the tree, closer to
main tag retains it role and fixes accessibility error.
Changelog: fixed
---
.../branch_rules/components/view/index.vue | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
index a677529cc19d..f987c3728627 100644
--- a/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
+++ b/app/assets/javascripts/projects/settings/branch_rules/components/view/index.vue
@@ -455,6 +455,20 @@ export default {
<gl-loading-icon v-if="$apollo.loading" size="lg" />
<div v-else-if="!branchRule && !isPredefinedRule">{{ $options.i18n.noData }}</div>
<div v-else>
+ <access-levels-drawer
+ :is-open="isAllowedToMergeDrawerOpen || isAllowedToPushAndMergeDrawerOpen"
+ :roles="accessLevelsDrawerData.roles"
+ :users="accessLevelsDrawerData.users"
+ :groups="accessLevelsDrawerData.groups"
+ :deploy-keys="accessLevelsDrawerData.deployKeys"
+ :is-loading="isRuleUpdating"
+ :group-id="groupId"
+ :title="accessLevelsDrawerTitle"
+ :is-push-access-levels="isAllowedToPushAndMergeDrawerOpen"
+ @editRule="onEditAccessLevels"
+ @close="closeAccessLevelsDrawer"
+ />
+
<crud-component :title="$options.i18n.ruleTarget" data-testid="rule-target-card">
<template #actions>
<gl-button
@@ -523,20 +537,6 @@ export default {
@edit="openAllowedToPushAndMergeDrawer"
/>
- <access-levels-drawer
- :is-open="isAllowedToMergeDrawerOpen || isAllowedToPushAndMergeDrawerOpen"
- :roles="accessLevelsDrawerData.roles"
- :users="accessLevelsDrawerData.users"
- :groups="accessLevelsDrawerData.groups"
- :deploy-keys="accessLevelsDrawerData.deployKeys"
- :is-loading="isRuleUpdating"
- :group-id="groupId"
- :title="accessLevelsDrawerTitle"
- :is-push-access-levels="isAllowedToPushAndMergeDrawerOpen"
- @editRule="onEditAccessLevels"
- @close="closeAccessLevelsDrawer"
- />
-
<!-- Force push -->
<protection-toggle
v-if="hasPushAccessLevelSet"
--
GitLab