Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(web): keep metadata deletion open on failure (#44830)

Winoren4513971d4c42
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
index c1ce353aa4d..4676366675f 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
@@ -1,8 +1,9 @@
import type { BuiltInMetadataItem, MetadataItemWithValueLength } from '../../types'
-import { screen, waitFor, within } from '@testing-library/react'
+import { act, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { describe, expect, it, vi } from 'vite-plus/test'
import { renderWithConsoleQuery as render } from '@/test/console/query-data'
+import { createDeferred } from '@/test/deferred'
import { DataType } from '../../types'
import DatasetMetadataDrawer from '../dataset-metadata-drawer'
@@ -154,6 +155,35 @@ describe('DatasetMetadataDrawer', () => {
await waitFor(() => expect(defaultProps.onRemove).toHaveBeenCalledExactlyOnceWith('2'))
})
+ it('keeps the delete confirmation open while pending and after a failure', async () => {
+ const user = userEvent.setup()
+ const request = createDeferred<void>()
+ const onRemove = vi.fn().mockReturnValueOnce(request.promise).mockResolvedValueOnce(undefined)
+ render(<DatasetMetadataDrawer {...defaultProps} onRemove={onRemove} />)
+ await user.click(screen.getAllByRole('button', { name: 'common.operation.remove' })[1]!)
+ const dialog = await screen.findByRole('alertdialog')
+ const confirm = within(dialog).getByRole('button', { name: 'common.operation.confirm' })
+ const cancel = within(dialog).getByRole('button', { name: 'common.operation.cancel' })
+
+ await user.click(confirm)
+ expect(confirm).toHaveAttribute('aria-disabled', 'true')
+ expect(cancel).toBeDisabled()
+ await user.click(confirm)
+ await user.keyboard('{Escape}')
+ expect(screen.getByRole('alertdialog')).toBeVisible()
+ expect(onRemove).toHaveBeenCalledExactlyOnceWith('2')
+
+ await act(async () => request.reject(new Error('delete failed')))
+ await waitFor(() => expect(confirm).not.toHaveAttribute('aria-disabled', 'true'))
+ expect(screen.getByRole('alertdialog')).toBeVisible()
+ expect(mockToastNotify).not.toHaveBeenCalled()
+
+ await user.click(confirm)
+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())
+ expect(onRemove).toHaveBeenCalledTimes(2)
+ expect(mockToastNotify).toHaveBeenCalledTimes(1)
+ })
+
it.each([false, true])(
'requests the opposite built-in setting when enabled=%s',
async (enabled) => {
diff --git a/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
index b98635f4cf5..00f686a69d0 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
@@ -64,7 +64,7 @@ type ItemProps = {
disabled?: boolean
payload: MetadataItemWithValueLength
onRename?: () => void
- onDelete?: () => void
+ onDelete?: () => Promise<void>
}
const Item: FC<ItemProps> = ({ readonly, disabled, payload, onRename, onDelete }) => {
const { t } = useTranslation(['common', 'dataset'])
@@ -77,10 +77,19 @@ const Item: FC<ItemProps> = ({ readonly, disabled, payload, onRename, onDelete }
const deleteBtnRef = useRef<HTMLButtonElement>(null)
const isDeleteHovering = useHover(deleteBtnRef)
const deleteActionsRef = useRef<AlertDialogActions>(null)
- const handleDelete = useCallback(() => {
- deleteActionsRef.current?.close()
- onDelete?.()
- }, [onDelete])
+ const [isDeleting, setIsDeleting] = useState(false)
+ const handleDelete = useCallback(async () => {
+ if (isDeleting) return
+ setIsDeleting(true)
+ try {
+ await onDelete?.()
+ deleteActionsRef.current?.close()
+ } catch {
+ // The owner reports the failure; keep the dialog open so the user can retry.
+ } finally {
+ setIsDeleting(false)
+ }
+ }, [isDeleting, onDelete])
return (
<div
@@ -120,7 +129,12 @@ const Item: FC<ItemProps> = ({ readonly, disabled, payload, onRename, onDelete }
>
<span className="i-ri-edit-line size-4" aria-hidden="true" />
</IconButton>
- <AlertDialog actionsRef={deleteActionsRef}>
+ <AlertDialog
+ actionsRef={deleteActionsRef}
+ onOpenChange={(open, details) => {
+ if (!open && isDeleting && details.reason !== 'imperative-action') details.cancel()
+ }}
+ >
<AlertDialogTrigger
ref={deleteBtnRef}
render={
@@ -146,10 +160,10 @@ const Item: FC<ItemProps> = ({ readonly, disabled, payload, onRename, onDelete }
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancelButton>
+ <AlertDialogCancelButton disabled={isDeleting}>
{t(($) => $['operation.cancel'], { ns: 'common' })}
</AlertDialogCancelButton>
- <AlertDialogConfirmButton onClick={handleDelete}>
+ <AlertDialogConfirmButton loading={isDeleting} onClick={handleDelete}>
{t(($) => $['operation.confirm'], { ns: 'common' })}
</AlertDialogConfirmButton>
</AlertDialogFooter>