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 dataset rename open while saving (#44715)

Winoren4057aa682bc2
diff --git a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
index 240f3ee6a90..3112b4858b7 100644
--- a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
@@ -4,6 +4,7 @@ import userEvent from '@testing-library/user-event'
import { IndexingType } from '@/app/components/datasets/create/step-two'
import { ChunkingMode, DataSourceType } from '@/models/datasets'
import { PermissionLevel } from '@/models/permission'
+import { createDeferred } from '@/test/deferred'
import { mockEmojiData, renderWithEmoji as render } from '@/test/emoji-picker'
import { createDatasetFixture } from '@/test/fixtures/dataset'
import RenameDatasetModal from '../index'
@@ -116,6 +117,32 @@ describe('RenameDatasetModal', () => {
mockUpdateDatasetSetting.mockResolvedValue(createMockDataset())
})
+ it('keeps a pending rename open and preserves the draft for retry after failure', async () => {
+ const user = userEvent.setup()
+ const pending = createDeferred<ReturnType<typeof createMockDataset>>()
+ mockUpdateDatasetSetting.mockReturnValueOnce(pending.promise)
+ render(<RenameDatasetModal {...defaultProps} />)
+ const name = screen.getByRole('textbox', { name: 'datasetSettings.form.name' })
+ await user.clear(name)
+ await user.type(name, 'Retry this rename{Enter}')
+ await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
+ await user.click(screen.getByRole('button', { name: /operation\.close$/ }))
+ await user.keyboard('{Escape}')
+ expect(defaultProps.onOpenChange).not.toHaveBeenCalled()
+ expect(defaultProps.onSuccess).not.toHaveBeenCalled()
+ await act(async () => pending.reject(new Error('offline')))
+ await waitFor(() => expect(mockToast.error).toHaveBeenCalled())
+ expect(name).toHaveValue('Retry this rename')
+ expect(defaultProps.onOpenChange).not.toHaveBeenCalled()
+ await user.click(screen.getByRole('button', { name: 'common.operation.save' }))
+ await waitFor(() => expect(defaultProps.onOpenChange).toHaveBeenCalledExactlyOnceWith(false))
+ expect(defaultProps.onSuccess).toHaveBeenCalledOnce()
+ expect(mockUpdateDatasetSetting).toHaveBeenCalledTimes(2)
+ expect(mockUpdateDatasetSetting).toHaveBeenLastCalledWith(
+ expect.objectContaining({ body: expect.objectContaining({ name: 'Retry this rename' }) }),
+ )
+ })
+
describe('User Interactions', () => {
it('should call onOpenChange when cancel button is clicked', async () => {
const user = userEvent.setup()
diff --git a/web/app/components/datasets/rename-modal/index.tsx b/web/app/components/datasets/rename-modal/index.tsx
index c2507d5774f..81d847a3727 100644
--- a/web/app/components/datasets/rename-modal/index.tsx
+++ b/web/app/components/datasets/rename-modal/index.tsx
@@ -50,25 +50,44 @@ const RenameDatasetModal = ({
onOpenChange,
dataset,
onSuccess,
-}: RenameDatasetModalProps) => (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className="w-130">
- <RenameDatasetForm
- dataset={dataset}
- onSuccess={onSuccess}
- onClose={() => onOpenChange(false)}
- />
- </DialogContent>
- </Dialog>
-)
+}: RenameDatasetModalProps) => {
+ const [loading, setLoading] = useState(false)
+ return (
+ <Dialog
+ open={open}
+ onOpenChange={(nextOpen, details) => {
+ if (!nextOpen && loading) {
+ details.cancel()
+ return
+ }
+ onOpenChange(nextOpen)
+ }}
+ >
+ <DialogContent className="w-130">
+ <RenameDatasetForm
+ dataset={dataset}
+ loading={loading}
+ onLoadingChange={setLoading}
+ onSuccess={onSuccess}
+ onClose={() => onOpenChange(false)}
+ />
+ </DialogContent>
+ </Dialog>
+ )
+}
function RenameDatasetForm({
dataset,
onSuccess,
onClose,
-}: Pick<RenameDatasetModalProps, 'dataset' | 'onSuccess'> & { onClose: () => void }) {
+ loading,
+ onLoadingChange,
+}: Pick<RenameDatasetModalProps, 'dataset' | 'onSuccess'> & {
+ onClose: () => void
+ loading: boolean
+ onLoadingChange: (loading: boolean) => void
+}) {
const { t } = useTranslation(['common', 'datasetSettings'])
- const [loading, setLoading] = useState(false)
const [name, setName] = useState<string>(dataset.name)
const [description, setDescription] = useState(dataset.description ?? '')
const externalKnowledgeId = dataset.external_knowledge_info?.external_knowledge_id
@@ -90,12 +109,13 @@ function RenameDatasetForm({
setAppIcon(icon)
}, [])
const onConfirm = useCallback(async () => {
+ if (loading) return
if (!name.trim()) {
toast.error(t(($) => $['form.nameError'], { ns: 'datasetSettings' }))
return
}
try {
- setLoading(true)
+ onLoadingChange(true)
const body: DatasetUpdatePayload = {
name,
description,
@@ -119,7 +139,7 @@ function RenameDatasetForm({
} catch {
toast.error(t(($) => $['actionMsg.modifiedUnsuccessfully'], { ns: 'common' }))
} finally {
- setLoading(false)
+ onLoadingChange(false)
}
}, [
appIcon,
@@ -128,6 +148,8 @@ function RenameDatasetForm({
externalKnowledgeApiId,
externalKnowledgeId,
name,
+ loading,
+ onLoadingChange,
onClose,
onSuccess,
t,
@@ -142,7 +164,10 @@ function RenameDatasetForm({
>
<DialogHeader>
<DialogTitle>{t(($) => $.title, { ns: 'datasetSettings' })}</DialogTitle>
- <DialogHeaderCloseButton aria-label={t(($) => $['operation.close'], { ns: 'common' })} />
+ <DialogHeaderCloseButton
+ disabled={loading}
+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+ />
</DialogHeader>
<DialogBody>
<IconPicker value={appIcon} onValueChange={handleSelectAppIcon}>
@@ -186,7 +211,7 @@ function RenameDatasetForm({
</Field>
</DialogBody>
<DialogFooter>
- <Button type="button" onClick={onClose}>
+ <Button type="button" disabled={loading} onClick={onClose}>
{t(($) => $['operation.cancel'], { ns: 'common' })}
</Button>
<Button type="submit" loading={loading} variant="primary">