Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix: ESLint errors relating to accessibility in database section (#49638)

ChloeGarciaMillerand8d4a16beeaca
diff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx
index 884ca841a2d..ab4f843df76 100644
--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx
+++ b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx
@@ -2,7 +2,18 @@ import { useSortable } from '@dnd-kit/sortable'
import { CSS } from '@dnd-kit/utilities'
import { GripVertical, Trash } from 'lucide-react'
import type { Control, FieldPath, FieldValues } from 'react-hook-form'
-import { Button, FormControl, FormField, FormItem, FormLabel, FormMessage, Input } from 'ui'
+import {
+ Button,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+ Input,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
interface EnumeratedTypeValueRowProps<
TFieldValues extends FieldValues = FieldValues,
@@ -58,14 +69,22 @@ const EnumeratedTypeValueRow = <TFieldValues extends FieldValues>({
<GripVertical size={16} strokeWidth={1.5} />
</button>
<Input {...inputField} className="w-full" />
- <Button
- variant="default"
- size="small"
- disabled={isDisabled}
- icon={<Trash strokeWidth={1.5} size={16} />}
- className="px-2"
- onClick={() => onRemoveValue()}
- />
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="default"
+ size="small"
+ disabled={isDisabled}
+ icon={<Trash strokeWidth={1.5} size={16} />}
+ className="px-2"
+ onClick={() => onRemoveValue()}
+ aria-label="Remove value"
+ // Tooltip repeats the label; the description would read the name twice
+ aria-describedby={undefined}
+ />
+ </TooltipTrigger>
+ <TooltipContent side="bottom">Remove value</TooltipContent>
+ </Tooltip>
</div>
</FormControl>
<FormMessage className="ml-6" />
diff --git a/apps/studio/components/interfaces/Database/Functions/CreateFunction/FunctionEditor.tsx b/apps/studio/components/interfaces/Database/Functions/CreateFunction/FunctionEditor.tsx
index 5543dc30f6a..efefb13a2b7 100644
--- a/apps/studio/components/interfaces/Database/Functions/CreateFunction/FunctionEditor.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/CreateFunction/FunctionEditor.tsx
@@ -44,6 +44,9 @@ export const FunctionEditor = ({
)}
onClick={() => setFocused(!focused)}
icon={focused ? <Minimize2 /> : <Maximize2 />}
+ aria-label={focused ? 'Minimize editor' : 'Maximize editor'}
+ // Tooltip repeats the label; the description would read the name twice
+ aria-describedby={undefined}
/>
</TooltipTrigger>
<TooltipContent side="bottom">
diff --git a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
index ba9e7d8b7fd..26b7cd98c54 100644
--- a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx
@@ -30,6 +30,9 @@ import {
SheetFooter,
SheetSection,
Switch,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import z from 'zod'
@@ -536,12 +539,20 @@ const FormFieldArgs = ({ readonly }: FormFieldConfigParamsProps) => {
/>
{!readonly && (
- <Button
- variant="default"
- icon={<Trash size={12} />}
- onClick={() => remove(index)}
- className="h-[34px] w-[34px]"
- />
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <Button
+ variant="default"
+ icon={<Trash size={12} />}
+ onClick={() => remove(index)}
+ className="h-[34px] w-[34px]"
+ aria-label="Remove argument"
+ // Tooltip repeats the label; the description would read the name twice
+ aria-describedby={undefined}
+ />
+ </TooltipTrigger>
+ <TooltipContent side="bottom">Remove </TooltipContent>
+ </Tooltip>
)}
</div>
)
diff --git a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
index fe681e49113..11cc3e43f7f 100644
--- a/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
+++ b/apps/studio/components/interfaces/Database/Hooks/HooksList/HookList.tsx
@@ -12,6 +12,9 @@ import {
DropdownMenuItem,
DropdownMenuSeparator,
DropdownMenuTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
} from 'ui'
import Table from '@/components/to-be-cleaned/Table'
@@ -97,9 +100,21 @@ export const HookList = ({ schema, filterString }: HookListProps) => {
<div className="flex justify-end gap-4">
{canUpdateWebhook ? (
<DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="default" className="px-1" icon={<MoreVertical />} />
- </DropdownMenuTrigger>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="default"
+ className="px-1"
+ icon={<MoreVertical />}
+ aria-label={`${x.name} actions`}
+ // Tooltip repeats the label; the description would read the name twice
+ aria-describedby={undefined}
+ />
+ </DropdownMenuTrigger>
+ </TooltipTrigger>
+ <TooltipContent side="bottom">More options</TooltipContent>
+ </Tooltip>
<DropdownMenuContent side="left">
<>
diff --git a/apps/studio/components/interfaces/Database/Privileges/PrivilegesTable.tsx b/apps/studio/components/interfaces/Database/Privileges/PrivilegesTable.tsx
index b96bdf8a1a6..3949c9380b9 100644
--- a/apps/studio/components/interfaces/Database/Privileges/PrivilegesTable.tsx
+++ b/apps/studio/components/interfaces/Database/Privileges/PrivilegesTable.tsx
@@ -1,4 +1,4 @@
-import { Switch } from 'ui'
+import { Label, Switch } from 'ui'
import {
ALL_PRIVILEGE_TYPES,
@@ -51,13 +51,17 @@ const PrivilegesTable = ({
</Table.th>,
...ALL_PRIVILEGE_TYPES.map((privilege) => {
const checked = tableCheckedStates[privilege]
+ const switchThId = `privilege-th-${privilege}`
return (
<Table.th key={`header-${privilege}`}>
<div className="inline-flex items-center gap-2">
- <span>{privilege.charAt(0) + privilege.slice(1).toLowerCase()}</span>
+ <Label htmlFor={switchThId}>
+ {privilege.charAt(0) + privilege.slice(1).toLowerCase()}
+ </Label>
<Switch
+ id={switchThId}
checked={checked}
onCheckedChange={() => {
toggleTablePrivilege(privilege)
@@ -88,6 +92,7 @@ const PrivilegesTable = ({
{COLUMN_PRIVILEGE_TYPES.includes(privilege as any) && (
<div className="ml-5 inline-flex">
<Switch
+ aria-label={`${privilege} privilege for ${column.column_name}`}
checked={checked}
onCheckedChange={() => {
toggleColumnPrivilege(column.column_id, privilege)
diff --git a/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx b/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
index 2474a0e9548..56e36575c72 100644
--- a/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
+++ b/apps/studio/components/interfaces/Database/Publications/PublicationsList.tsx
@@ -202,6 +202,7 @@ export const PublicationsList = () => {
{publicationEvents.map((event) => (
<TableCell key={event.key}>
<Switch
+ aria-label={`${event.event} for ${x.name}`}
size="small"
checked={(x as any)[event.key]}
disabled={!canUpdatePublications}
diff --git a/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx b/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
index 37c70b887a4..a3160dea5cf 100644
--- a/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
+++ b/apps/studio/components/interfaces/Database/Tables/ColumnList.tsx
@@ -24,6 +24,7 @@ import {
cn,
DropdownMenu,
DropdownMenuContent,
+ DropdownMenuItem,
DropdownMenuTrigger,
Table,
TableBody,
@@ -50,7 +51,6 @@ import { ConstraintToken } from './ConstraintToken'
import { displayColumnType } from '@/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils'
import { AlertError } from '@/components/ui/AlertError'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
-import { DropdownMenuItemTooltip } from '@/components/ui/DropdownMenuItemTooltip'
import { NoSearchResults } from '@/components/ui/NoSearchResults'
import { useTableEditorQuery } from '@/data/table-editor/table-editor-query'
import { isTableLike } from '@/data/table-editor/table-editor-types'
@@ -143,9 +143,6 @@ export const ColumnList = ({
PermissionAction.TENANT_SQL_ADMIN_WRITE,
'columns'
)
- const deleteColumnTooltipText = !canUpdateColumns
- ? 'Additional permissions required to delete column'
- : undefined
return (
<div className="space-y-4">
@@ -379,28 +376,34 @@ export const ColumnList = ({
Edit
</ButtonTooltip>
<DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="default"
- className="px-1"
- icon={<MoreVertical />}
- />
- </DropdownMenuTrigger>
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <DropdownMenuTrigger asChild>
+ <Button
+ aria-label={`Delete ${column.name} column`}
+ // Tooltip repeats the label; the description would read the name twice
+ aria-describedby={undefined}
+ variant="default"
+ className="px-1"
+ icon={<MoreVertical />}
+ />
+ </DropdownMenuTrigger>
+ </TooltipTrigger>
+ <TooltipContent side="bottom">
+ {!canUpdateColumns
+ ? 'Additional permissions required to delete column'
+ : `Delete ${column.name} column`}
+ </TooltipContent>
+ </Tooltip>
<DropdownMenuContent side="bottom" align="end" className="w-32">
- <DropdownMenuItemTooltip
+ <DropdownMenuItem
disabled={!canUpdateColumns}
onClick={() => onDeleteColumn(column)}
className="gap-x-2"
- tooltip={{
- content: {
- side: 'left',
- text: deleteColumnTooltipText,
- },
- }}
>
<Trash size={12} />
<p>Delete column</p>
- </DropdownMenuItemTooltip>
+ </DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>