Skip to content

Commit e6bac5f

Browse files
committed
chore: apply functional review feedback
- Removed collapsing all tree nodes when pressing Rahmen - Ignored ESLint a11y rules covered by PrimeVue - Added selected styles to the Rahmen router link RISDEV-6266
1 parent 9207457 commit e6bac5f

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

frontend/src/views/expression/metadata-editor/ExpressionMetadataEditor.view.vue

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import RisEmptyState from "@/components/controls/RisEmptyState.vue"
33
import RisHeader from "@/components/controls/RisHeader.vue"
44
import RisLoadingSpinner from "@/components/controls/RisLoadingSpinner.vue"
55
import { useEliPathParameter } from "@/composables/useEliPathParameter"
6-
import { ComputedRef, computed, ref, watch, nextTick } from "vue"
6+
import { ComputedRef, computed, ref, watch } from "vue"
77
import RisErrorCallout from "@/components/controls/RisErrorCallout.vue"
88
import Tree from "primevue/tree"
99
import ChevronUpIcon from "~icons/ic/baseline-keyboard-arrow-up"
@@ -62,16 +62,6 @@ const mapElement = (el: TabelOfContentsItem): TreeNode => ({
6262
6363
const treeNodes: ComputedRef<TreeNode[]> = elementLinks
6464
65-
const collapseAllNodes = async () => {
66-
expandedKeys.value = { ...{} }
67-
await nextTick()
68-
}
69-
70-
const handleRahmenClick = async () => {
71-
await collapseAllNodes()
72-
selectionKeys.value = {}
73-
}
74-
7565
const toggleNode = (node: TreeNode) => {
7666
if (expandedKeys.value[node.key]) {
7767
const newExpandedKeys = { ...expandedKeys.value }
@@ -136,9 +126,8 @@ const handleNodeSelect = (node: TreeNode) => {
136126
<!-- Frame link -->
137127
<router-link
138128
:to="{ name: 'ExpressionMetadataEditorRahmen' }"
139-
class="px-16 py-8 hover:bg-blue-200 hover:underline focus:bg-blue-200 focus:underline"
140-
exact-active-class="font-bold underline bg-blue-200"
141-
@click="handleRahmenClick"
129+
class="flex w-full justify-start border-l-4 border-transparent px-20 py-10 hover:bg-blue-200 hover:underline focus:bg-blue-200 focus:underline focus-visible:outline focus-visible:outline-4 focus-visible:outline-offset-4 focus-visible:outline-blue-800"
130+
exact-active-class="font-bold underline bg-blue-200 border-l-blue-800"
142131
>
143132
Rahmen
144133
</router-link>
@@ -182,16 +171,17 @@ const handleNodeSelect = (node: TreeNode) => {
182171
>
183172
{{ node.data.primaryLabel }}
184173
</router-link>
185-
186-
<button
174+
<!-- eslint-disable vuejs-accessibility/click-events-have-key-events -->
175+
<!-- eslint-disable vuejs-accessibility/no-static-element-interactions -->
176+
<span
187177
v-else
188178
class="w-full overflow-hidden truncate text-ellipsis"
189179
:title="node.data.primaryLabel"
190180
tabindex="-1"
191181
@click="toggleNode(node)"
192182
>
193183
{{ node.data.primaryLabel }}
194-
</button>
184+
</span>
195185

196186
<router-link
197187
v-if="node.data.secondaryLabel"

0 commit comments

Comments
 (0)