Skip to content

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

Chore/minor qol improvements to queue operations (#44169)

Joshen Lim6e0fbbd2f4cc
diff --git a/apps/studio/components/grid/components/footer/operations/SaveQueueActionBar.tsx b/apps/studio/components/grid/components/footer/operations/SaveQueueActionBar.tsx
index 158dd38a5d0..b0b4de1a89b 100644
--- a/apps/studio/components/grid/components/footer/operations/SaveQueueActionBar.tsx
+++ b/apps/studio/components/grid/components/footer/operations/SaveQueueActionBar.tsx
@@ -2,10 +2,18 @@ import { useOperationQueueActions } from 'components/grid/hooks/useOperationQueu
import { useOperationQueueShortcuts } from 'components/grid/hooks/useOperationQueueShortcuts'
import { useIsQueueOperationsEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { AnimatePresence, motion } from 'framer-motion'
-import { useEffect, useState } from 'react'
+import { Eye, MoreVertical, Trash } from 'lucide-react'
import { createPortal } from 'react-dom'
import { useTableEditorStateSnapshot } from 'state/table-editor'
-import { Button } from 'ui'
+import {
+ Button,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+ KeyboardShortcut,
+} from 'ui'
import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'
import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'
@@ -48,24 +56,10 @@ export const SaveQueueActionBar = () => {
}}
>
<div className="flex items-center gap-x-12 pl-4 pr-2 py-2 bg-surface-100 border rounded-lg shadow-lg">
+ <p className="text-xs text-foreground-light max-w-40 truncate">
+ {operationCount} pending change{operationCount !== 1 ? 's' : ''}
+ </p>
<div className="flex items-center gap-x-2">
- <span className="text-xs text-foreground-light max-w-40 truncate">
- {operationCount} pending change{operationCount !== 1 ? 's' : ''}
- </span>
- <Button
- type="default"
- size="tiny"
- disabled={isSaving}
- onClick={() => snap.toggleViewOperationQueue()}
- >
- Review{' '}
- <span className="text-[10px] text-foreground/40 ml-1.5">{`${modKey}.`}</span>
- </Button>
- </div>
- <div className="flex items-center gap-x-2">
- <Button type="default" onClick={confirmOnClose} disabled={isSaving}>
- Cancel
- </Button>
<Button
size="tiny"
type="primary"
@@ -76,6 +70,35 @@ export const SaveQueueActionBar = () => {
Save
<span className="text-[10px] text-foreground/40 ml-1.5">{`${modKey}S`}</span>
</Button>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ type="outline"
+ className="w-7"
+ icon={<MoreVertical />}
+ aria-label="More options"
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent className="w-40">
+ <DropdownMenuItem
+ className="justify-between"
+ onClick={() => snap.toggleViewOperationQueue()}
+ >
+ <div className="flex items-center gap-x-2">
+ <Eye size={14} />
+ <span>Review</span>
+ </div>
+ <KeyboardShortcut keys={['Meta', '.']} />
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem onClick={confirmOnClose}>
+ <div className="flex items-center gap-x-2">
+ <Trash size={14} />
+ <span>Discard</span>
+ </div>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
</div>
</div>
</motion.div>
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/AddRowOperationItem.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/AddRowOperationItem.tsx
index 637cc986b6e..2cf02b0adee 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/AddRowOperationItem.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/AddRowOperationItem.tsx
@@ -62,7 +62,7 @@ export const AddRowOperationItem = ({
</div>
<ButtonTooltip
type="text"
- aria-label="Revert change"
+ aria-label="Discard change"
className="w-7"
icon={<Undo2 />}
onClick={handleDelete}
@@ -70,7 +70,7 @@ export const AddRowOperationItem = ({
content: {
side: 'left',
align: 'end',
- text: 'Revert change',
+ text: 'Discard change',
},
}}
/>
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/DeleteRowOperationItem.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/DeleteRowOperationItem.tsx
index 4ad7e893ebd..29a77987932 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/DeleteRowOperationItem.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/DeleteRowOperationItem.tsx
@@ -62,7 +62,7 @@ export const DeleteRowOperationItem = ({
</div>
<ButtonTooltip
type="text"
- aria-label="Revert change"
+ aria-label="Discard change"
className="w-7"
icon={<Undo2 />}
onClick={handleDelete}
@@ -70,7 +70,7 @@ export const DeleteRowOperationItem = ({
content: {
side: 'left',
align: 'end',
- text: 'Revert change',
+ text: 'Discard change',
},
}}
/>
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationItem.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationItem.tsx
index 0e65c097a9f..78e3ae35885 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationItem.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationItem.tsx
@@ -59,7 +59,7 @@ export const OperationItem = ({ operationId, tableId, content }: OperationItemPr
</div>
<ButtonTooltip
type="text"
- aria-label="Revert change"
+ aria-label="Discard change"
className="px-1.5"
icon={<Undo2 />}
onClick={handleDelete}
@@ -67,7 +67,7 @@ export const OperationItem = ({ operationId, tableId, content }: OperationItemPr
content: {
side: 'left',
align: 'end',
- text: 'Revert change',
+ text: 'Discard change',
},
}}
/>
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationQueueSidePanel.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationQueueSidePanel.tsx
index 5d154be3307..6b459d98f6c 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationQueueSidePanel.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/OperationQueueSidePanel/OperationQueueSidePanel.tsx
@@ -63,7 +63,7 @@ export const OperationQueueSidePanel = () => {
onClick={confirmOnClose}
disabled={isSaving || operations.length === 0}
>
- Cancel
+ Discard
</Button>
<Button
onClick={handleSave}
diff --git a/e2e/studio/features/queue-table-operations.spec.ts b/e2e/studio/features/queue-table-operations.spec.ts
index 5aaab455bc3..ce99a915eb4 100644
--- a/e2e/studio/features/queue-table-operations.spec.ts
+++ b/e2e/studio/features/queue-table-operations.spec.ts
@@ -14,6 +14,14 @@ const enableQueueOperations = async (page: Page) => {
}, QUEUE_OPERATIONS_KEY)
}
+const openQueueDropdownAndClick = async (page: Page, itemName: string) => {
+ await page.getByRole('button', { name: 'More options' }).click()
+ await page.getByRole('menuitem', { name: itemName }).click()
+}
+
+const clickReview = async (page: Page) => openQueueDropdownAndClick(page, 'Review')
+const clickDiscard = async (page: Page) => openQueueDropdownAndClick(page, 'Discard')
+
test.describe('Queue Table Operations', () => {
test.beforeEach(async ({ page, ref }) => {
const loadPromise = waitForTableToLoad(page, ref)
@@ -56,7 +64,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('1 pending change')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('Pending changes')).toBeVisible()
@@ -101,9 +109,8 @@ test.describe('Queue Table Operations', () => {
await page.keyboard.press('Enter')
await expect(page.getByText('1 pending change')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
- await page.getByRole('button', { name: 'Cancel', exact: true }).click()
+ await clickDiscard(page)
const confirmDialog = page.getByRole('alertdialog')
await expect(confirmDialog.getByRole('heading', { name: 'Unsaved changes' })).toBeVisible()
@@ -143,17 +150,14 @@ test.describe('Queue Table Operations', () => {
await page.keyboard.press('Enter')
await expect(page.getByText('1 pending change')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
- await page.getByRole('button', { name: 'Cancel', exact: true }).click()
+ await clickDiscard(page)
const confirmDialog = page.getByRole('alertdialog')
await expect(confirmDialog.getByRole('heading', { name: 'Unsaved changes' })).toBeVisible()
await confirmDialog.getByRole('button', { name: 'Keep editing' }).click()
- const sidePanel = page.getByRole('dialog')
- await expect(sidePanel.getByText('Pending changes')).toBeVisible()
- await expect(sidePanel.getByText('1 operation')).toBeVisible()
+ await expect(page.getByText('1 pending change')).toBeVisible()
})
test('row inserts are queued and can be saved', async ({ page, ref }) => {
@@ -186,7 +190,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByRole('gridcell', { name: 'new row value' })).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('Pending changes')).toBeVisible()
@@ -231,7 +235,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('2 pending changes')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('2 operations')).toBeVisible()
@@ -276,10 +280,10 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('2 pending changes')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
- const removeButtons = sidePanel.getByRole('button', { name: 'Revert change' })
+ const removeButtons = sidePanel.getByRole('button', { name: 'Discard change' })
await removeButtons.last().click()
await expect(sidePanel.getByText('1 operation')).toBeVisible()
@@ -323,7 +327,7 @@ test.describe('Queue Table Operations', () => {
await page.keyboard.press('ControlOrMeta+.')
await expect(page.getByRole('dialog')).not.toBeVisible()
- await expect(page.getByRole('button', { name: /Review/ })).toBeVisible()
+ await expect(page.getByText('pending change')).toBeVisible()
await page.keyboard.press('ControlOrMeta+s')
await expect(page.getByText('Changes saved successfully')).toBeVisible()
@@ -519,7 +523,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('1 pending change')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('Pending changes')).toBeVisible()
@@ -560,8 +564,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('1 pending change')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
- await page.getByRole('button', { name: 'Cancel', exact: true }).click()
+ await clickDiscard(page)
const confirmDialog = page.getByRole('alertdialog')
await expect(confirmDialog.getByRole('heading', { name: 'Unsaved changes' })).toBeVisible()
@@ -611,7 +614,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('3 pending changes')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('3 operations')).toBeVisible()
await expect(sidePanel.getByText('1 row deletion')).toBeVisible()
@@ -667,7 +670,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByText('2 pending changes')).toBeVisible()
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('2 operations')).toBeVisible()
@@ -740,7 +743,7 @@ test.describe('Queue Table Operations', () => {
await expect(page.getByRole('gridcell', { name: 'Jones' })).toBeVisible()
// Review the queued operations
- await page.getByRole('button', { name: /Review/ }).click()
+ await clickReview(page)
const sidePanel = page.getByRole('dialog')
await expect(sidePanel.getByText('2 cell edits')).toBeVisible()
diff --git a/packages/ui/src/components/KeyboardShortcut/KeyboardShortcut.tsx b/packages/ui/src/components/KeyboardShortcut/KeyboardShortcut.tsx
index f9f3a241b18..edaae0b754d 100644
--- a/packages/ui/src/components/KeyboardShortcut/KeyboardShortcut.tsx
+++ b/packages/ui/src/components/KeyboardShortcut/KeyboardShortcut.tsx
@@ -24,7 +24,7 @@ export const KeyboardShortcut = ({ keys }: { keys: string[] }) => {
<span
className={cn(
['Shift', 'Ctrl'].includes(key) ? 'px-1.5 py-0.5' : 'w-[23px] h-[23px]',
- 'border border-foreground-lightest',
+ 'border border-control',
'rounded flex items-center justify-center cursor-default'
)}
key={key}