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): guard external API deletion while pending (#44788)

Winorenbfe4c174a63e
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index ffdccb09b16..09eccebd9a1 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -2777,11 +2777,6 @@
"count": 2
}
},
- "web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx": {
- "better-tailwindcss/enforce-logical-properties": {
- "count": 1
- }
- },
"web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx": {
"better-tailwindcss/enforce-logical-properties": {
"count": 4
diff --git a/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx b/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
index f4d20c835fd..16d53fca21c 100644
--- a/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/external-api/external-knowledge-api-card/__tests__/index.spec.tsx
@@ -174,6 +174,32 @@ it('deletes a confirmed API and removes its card after refreshing the list', asy
expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
})
+it('keeps deletion pending in the dialog and prevents duplicate requests', async () => {
+ const user = userEvent.setup()
+ const request = createDeferred<{ result: string }>()
+ vi.mocked(deleteExternalAPI).mockReturnValueOnce(request.promise)
+ getApis.mockResolvedValue(listResponse([]))
+ setup()
+ await user.click(remove())
+ 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()
+ expect(deleteExternalAPI).toHaveBeenCalledTimes(1)
+
+ await user.click(confirm)
+ await user.keyboard('{Escape}')
+ expect(screen.getByRole('alertdialog')).toBeVisible()
+ expect(deleteExternalAPI).toHaveBeenCalledTimes(1)
+
+ await act(async () => request.resolve({ result: 'success' }))
+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())
+ expect(screen.queryByText(api.name)).not.toBeInTheDocument()
+})
+
it('cancels deletion without changing the list', async () => {
const user = userEvent.setup()
setup()
diff --git a/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx b/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
index 615889b6125..736b8035c4d 100644
--- a/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
+++ b/web/app/components/datasets/external-api/external-knowledge-api-card/index.tsx
@@ -37,6 +37,7 @@ const ExternalKnowledgeAPICard: React.FC<ExternalKnowledgeAPICardProps> = ({
}) => {
const { setShowExternalKnowledgeAPIModal } = useModalContext()
const [showConfirm, setShowConfirm] = useState(false)
+ const [isDeleting, setIsDeleting] = useState(false)
const [isHovered, setIsHovered] = useState(false)
const [usageCount, setUsageCount] = useState(0)
const queryClient = useQueryClient()
@@ -96,21 +97,24 @@ const ExternalKnowledgeAPICard: React.FC<ExternalKnowledgeAPICardProps> = ({
}
const handleConfirmDelete = async () => {
- if (!canManageExternalKnowledgeApi) return
+ if (!canManageExternalKnowledgeApi || isDeleting) return
+ setIsDeleting(true)
try {
await deleteExternalAPI({ apiTemplateId: api.id })
setShowConfirm(false)
await queryClient.invalidateQueries({ queryKey: externalKnowledgeApiQueryKey })
} catch (error) {
console.error('Error deleting external knowledge API:', error)
+ } finally {
+ setIsDeleting(false)
}
}
return (
<>
<div
- className={`flex items-start self-stretch rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg p-2 pl-3 ${isHovered ? 'border-state-destructive-border bg-state-destructive-hover' : ''}`}
+ className={`flex items-start self-stretch rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg p-2 ps-3 ${isHovered ? 'border-state-destructive-border bg-state-destructive-hover' : ''}`}
>
<div className="flex grow flex-col items-start justify-center gap-1.5 py-1">
<div className="flex items-center gap-1 self-stretch text-text-secondary">
@@ -145,7 +149,13 @@ const ExternalKnowledgeAPICard: React.FC<ExternalKnowledgeAPICardProps> = ({
</div>
)}
</div>
- <AlertDialog open={showConfirm} onOpenChange={(open) => !open && setShowConfirm(false)}>
+ <AlertDialog
+ open={showConfirm}
+ onOpenChange={(open, details) => {
+ if (!open && isDeleting) details.cancel()
+ else setShowConfirm(open)
+ }}
+ >
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>
@@ -160,10 +170,10 @@ const ExternalKnowledgeAPICard: React.FC<ExternalKnowledgeAPICardProps> = ({
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
- <AlertDialogCancelButton>
+ <AlertDialogCancelButton disabled={isDeleting}>
{t(($) => $['operation.cancel'], { ns: 'common' })}
</AlertDialogCancelButton>
- <AlertDialogConfirmButton onClick={handleConfirmDelete}>
+ <AlertDialogConfirmButton loading={isDeleting} onClick={handleConfirmDelete}>
{t(($) => $['operation.confirm'], { ns: 'common' })}
</AlertDialogConfirmButton>
</AlertDialogFooter>