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.

refactor(web): open system model settings from a dialog trigger (#43961)

Codada982c56b1fdd4
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
index c2f99512fc3..b39b4db0b44 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/__tests__/index.spec.tsx
@@ -162,18 +162,30 @@ describe('SystemModel', () => {
})
it('should open dialog when button is clicked', async () => {
+ const user = userEvent.setup()
render(<SystemModel {...defaultProps} />)
const button = screen.getByRole('button', { name: /system model settings/i })
- fireEvent.click(button)
- await waitFor(() => {
- expect(screen.getByText(/system reasoning model/i)).toBeInTheDocument()
- })
+ expect(button).toHaveAttribute('aria-haspopup', 'dialog')
+ expect(button).toHaveAttribute('aria-expanded', 'false')
+
+ await user.click(button)
+ expect(
+ await screen.findByRole('dialog', { name: 'Default Model Settings' }),
+ ).toBeInTheDocument()
+ expect(button).toHaveAttribute('aria-expanded', 'true')
+
+ await user.click(screen.getByRole('button', { name: 'Cancel' }))
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ expect(button).toHaveAttribute('aria-expanded', 'false')
})
it('opens the dialog from URL state', async () => {
render(<SystemModel {...defaultProps} />, { searchParams: '?dialog=system-models' })
expect(await screen.findByRole('button', { name: /save/i })).toBeInTheDocument()
+ expect(
+ screen.getByRole('button', { name: /system model settings/i, hidden: true }),
+ ).toHaveAttribute('aria-expanded', 'true')
expect(mockModelListQuery).toHaveBeenCalledWith(
expect.objectContaining({
queryKey: consoleQuery.workspaces.current.models.modelTypes.byModelType.get.queryKey({
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
index beedd8a03f1..b743849872e 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
@@ -2,7 +2,13 @@ import type { FC } from 'react'
import type { DefaultModel, DefaultModelResponse } from '../declarations'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
-import { Dialog, DialogClose, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
+import {
+ Dialog,
+ DialogClose,
+ DialogContent,
+ DialogTitle,
+ DialogTrigger,
+} from '@langgenius/dify-ui/dialog'
import { IconButton } from '@langgenius/dify-ui/icon-button'
import { Infotip, InfotipContent, InfotipTrigger } from '@langgenius/dify-ui/infotip'
import { useQuery } from '@tanstack/react-query'
@@ -232,13 +238,11 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
}
return (
- <>
- <Button
+ <Dialog open={open} onOpenChange={handleOpenChange}>
+ <DialogTrigger
+ render={<Button variant={notConfigured ? 'primary' : 'secondary'} size="small" />}
className={cn('relative', className)}
- variant={notConfigured ? 'primary' : 'secondary'}
- size="small"
disabled={isLoading}
- onClick={() => setManuallyOpen(true)}
>
{isLoading ? (
<span className="i-ri-loader-2-line size-3.5 animate-spin" />
@@ -246,176 +250,169 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
<span className="i-ri-brain-2-line size-3.5" />
)}
{t(($) => $['modelProvider.systemModelSettings'], { ns: 'modelProvider' })}
- </Button>
- <Dialog open={open} onOpenChange={handleOpenChange}>
- <DialogContent
+ </DialogTrigger>
+ <DialogContent
+ render={
+ <form
+ onSubmit={(event) => {
+ event.preventDefault()
+ void handleSave()
+ }}
+ />
+ }
+ backdropProps={{ forceRender: true }}
+ className="flex max-h-[calc(100dvh-2rem)] w-120 max-w-120 flex-col overflow-hidden rounded-2xl p-0"
+ >
+ <DialogClose
render={
- <form
- onSubmit={(event) => {
- event.preventDefault()
- void handleSave()
- }}
- />
+ <IconButton
+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+ size="lg"
+ className="absolute top-5 right-5"
+ >
+ <span aria-hidden className="i-ri-close-line size-4" />
+ </IconButton>
}
- backdropProps={{ forceRender: true }}
- className="flex max-h-[calc(100dvh-2rem)] w-120 max-w-120 flex-col overflow-hidden rounded-2xl p-0"
- >
- <DialogClose
- render={
- <IconButton
- aria-label={t(($) => $['operation.close'], { ns: 'common' })}
- size="lg"
- className="absolute top-5 right-5"
- >
- <span aria-hidden className="i-ri-close-line size-4" />
- </IconButton>
- }
- />
- <div className="shrink-0 px-6 pt-6 pr-14 pb-3">
- <DialogTitle className="title-2xl-semi-bold text-text-primary">
- {t(($) => $['modelProvider.systemModelSettingsTitle'], { ns: 'modelProvider' })}
- </DialogTitle>
- <p className="mt-1 system-xs-regular text-text-tertiary">
- {t(($) => $['modelProvider.systemModelSettingsDesc'], { ns: 'modelProvider' })}
- </p>
- </div>
- <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
- {isSystemModelListLoading ? (
- <div
- role="status"
- aria-label={t(($) => $.loading, { ns: 'common' })}
- className="flex h-full min-h-48 items-center justify-center"
- >
- <span
- aria-hidden
- className="i-ri-loader-2-line size-5 animate-spin text-text-tertiary"
- />
- </div>
- ) : (
- <div className="flex flex-col gap-4">
- <div className="flex flex-col gap-1">
- {renderModelLabel(
- 'modelProvider.systemReasoningModel.key',
- 'modelProvider.systemReasoningModel.tip',
- )}
- <div>
- <ModelSelector
- {...getResetProps(
- ModelTypeEnum.textGeneration,
- 'modelProvider.systemReasoningModel.key',
- )}
- value={currentTextGenerationDefaultModel}
- models={textGenerationModelList}
- hideProviderSettingsFooter={hideProviderSettingsFooter}
- onOpenMarketplace={onOpenMarketplace}
- onConfigureEmptyState={() => handleOpenChange(false)}
- showModelMeta={false}
- onValueChange={(model) =>
- handleChangeDefaultModel(ModelTypeEnum.textGeneration, model)
- }
- />
- </div>
+ />
+ <div className="shrink-0 px-6 pt-6 pr-14 pb-3">
+ <DialogTitle className="title-2xl-semi-bold text-text-primary">
+ {t(($) => $['modelProvider.systemModelSettingsTitle'], { ns: 'modelProvider' })}
+ </DialogTitle>
+ <p className="mt-1 system-xs-regular text-text-tertiary">
+ {t(($) => $['modelProvider.systemModelSettingsDesc'], { ns: 'modelProvider' })}
+ </p>
+ </div>
+ <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+ {isSystemModelListLoading ? (
+ <div
+ role="status"
+ aria-label={t(($) => $.loading, { ns: 'common' })}
+ className="flex h-full min-h-48 items-center justify-center"
+ >
+ <span
+ aria-hidden
+ className="i-ri-loader-2-line size-5 animate-spin text-text-tertiary"
+ />
+ </div>
+ ) : (
+ <div className="flex flex-col gap-4">
+ <div className="flex flex-col gap-1">
+ {renderModelLabel(
+ 'modelProvider.systemReasoningModel.key',
+ 'modelProvider.systemReasoningModel.tip',
+ )}
+ <div>
+ <ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.textGeneration,
+ 'modelProvider.systemReasoningModel.key',
+ )}
+ value={currentTextGenerationDefaultModel}
+ models={textGenerationModelList}
+ hideProviderSettingsFooter={hideProviderSettingsFooter}
+ onOpenMarketplace={onOpenMarketplace}
+ onConfigureEmptyState={() => handleOpenChange(false)}
+ showModelMeta={false}
+ onValueChange={(model) =>
+ handleChangeDefaultModel(ModelTypeEnum.textGeneration, model)
+ }
+ />
</div>
- <div className="flex flex-col gap-1">
- {renderModelLabel(
- 'modelProvider.embeddingModel.key',
- 'modelProvider.embeddingModel.tip',
- )}
- <div>
- <ModelSelector
- {...getResetProps(
- ModelTypeEnum.textEmbedding,
- 'modelProvider.embeddingModel.key',
- )}
- value={currentEmbeddingsDefaultModel}
- models={embeddingModelList}
- hideProviderSettingsFooter={hideProviderSettingsFooter}
- onOpenMarketplace={onOpenMarketplace}
- onConfigureEmptyState={() => handleOpenChange(false)}
- showModelMeta={false}
- onValueChange={(model) =>
- handleChangeDefaultModel(ModelTypeEnum.textEmbedding, model)
- }
- />
- </div>
+ </div>
+ <div className="flex flex-col gap-1">
+ {renderModelLabel(
+ 'modelProvider.embeddingModel.key',
+ 'modelProvider.embeddingModel.tip',
+ )}
+ <div>
+ <ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.textEmbedding,
+ 'modelProvider.embeddingModel.key',
+ )}
+ value={currentEmbeddingsDefaultModel}
+ models={embeddingModelList}
+ hideProviderSettingsFooter={hideProviderSettingsFooter}
+ onOpenMarketplace={onOpenMarketplace}
+ onConfigureEmptyState={() => handleOpenChange(false)}
+ showModelMeta={false}
+ onValueChange={(model) =>
+ handleChangeDefaultModel(ModelTypeEnum.textEmbedding, model)
+ }
+ />
</div>
- <div className="flex flex-col gap-1">
- {renderModelLabel(
- 'modelProvider.rerankModel.key',
- 'modelProvider.rerankModel.tip',
- )}
- <div>
- <ModelSelector
- {...getResetProps(ModelTypeEnum.rerank, 'modelProvider.rerankModel.key')}
- value={currentRerankDefaultModel}
- models={rerankModelList}
- hideProviderSettingsFooter={hideProviderSettingsFooter}
- onOpenMarketplace={onOpenMarketplace}
- onConfigureEmptyState={() => handleOpenChange(false)}
- showModelMeta={false}
- onValueChange={(model) =>
- handleChangeDefaultModel(ModelTypeEnum.rerank, model)
- }
- />
- </div>
+ </div>
+ <div className="flex flex-col gap-1">
+ {renderModelLabel('modelProvider.rerankModel.key', 'modelProvider.rerankModel.tip')}
+ <div>
+ <ModelSelector
+ {...getResetProps(ModelTypeEnum.rerank, 'modelProvider.rerankModel.key')}
+ value={currentRerankDefaultModel}
+ models={rerankModelList}
+ hideProviderSettingsFooter={hideProviderSettingsFooter}
+ onOpenMarketplace={onOpenMarketplace}
+ onConfigureEmptyState={() => handleOpenChange(false)}
+ showModelMeta={false}
+ onValueChange={(model) => handleChangeDefaultModel(ModelTypeEnum.rerank, model)}
+ />
</div>
- <div className="flex flex-col gap-1">
- {renderModelLabel(
- 'modelProvider.speechToTextModel.key',
- 'modelProvider.speechToTextModel.tip',
- )}
- <div>
- <ModelSelector
- {...getResetProps(
- ModelTypeEnum.speech2text,
- 'modelProvider.speechToTextModel.key',
- )}
- value={currentSpeech2textDefaultModel}
- models={speech2textModelList}
- hideProviderSettingsFooter={hideProviderSettingsFooter}
- onOpenMarketplace={onOpenMarketplace}
- onConfigureEmptyState={() => handleOpenChange(false)}
- showModelMeta={false}
- onValueChange={(model) =>
- handleChangeDefaultModel(ModelTypeEnum.speech2text, model)
- }
- />
- </div>
+ </div>
+ <div className="flex flex-col gap-1">
+ {renderModelLabel(
+ 'modelProvider.speechToTextModel.key',
+ 'modelProvider.speechToTextModel.tip',
+ )}
+ <div>
+ <ModelSelector
+ {...getResetProps(
+ ModelTypeEnum.speech2text,
+ 'modelProvider.speechToTextModel.key',
+ )}
+ value={currentSpeech2textDefaultModel}
+ models={speech2textModelList}
+ hideProviderSettingsFooter={hideProviderSettingsFooter}
+ onOpenMarketplace={onOpenMarketplace}
+ onConfigureEmptyState={() => handleOpenChange(false)}
+ showModelMeta={false}
+ onValueChange={(model) =>
+ handleChangeDefaultModel(ModelTypeEnum.speech2text, model)
+ }
+ />
</div>
- <div className="flex flex-col gap-1">
- {renderModelLabel('modelProvider.ttsModel.key', 'modelProvider.ttsModel.tip')}
- <div>
- <ModelSelector
- {...getResetProps(ModelTypeEnum.tts, 'modelProvider.ttsModel.key')}
- value={currentTTSDefaultModel}
- models={ttsModelList}
- hideProviderSettingsFooter={hideProviderSettingsFooter}
- onOpenMarketplace={onOpenMarketplace}
- onConfigureEmptyState={() => handleOpenChange(false)}
- showModelMeta={false}
- onValueChange={(model) => handleChangeDefaultModel(ModelTypeEnum.tts, model)}
- />
- </div>
+ </div>
+ <div className="flex flex-col gap-1">
+ {renderModelLabel('modelProvider.ttsModel.key', 'modelProvider.ttsModel.tip')}
+ <div>
+ <ModelSelector
+ {...getResetProps(ModelTypeEnum.tts, 'modelProvider.ttsModel.key')}
+ value={currentTTSDefaultModel}
+ models={ttsModelList}
+ hideProviderSettingsFooter={hideProviderSettingsFooter}
+ onOpenMarketplace={onOpenMarketplace}
+ onConfigureEmptyState={() => handleOpenChange(false)}
+ showModelMeta={false}
+ onValueChange={(model) => handleChangeDefaultModel(ModelTypeEnum.tts, model)}
+ />
</div>
</div>
- )}
- </div>
- <div className="flex h-19 shrink-0 items-center justify-end gap-2 px-6 pt-5 pb-6">
- <Button className="min-w-18" onClick={() => handleOpenChange(false)}>
- {t(($) => $['operation.cancel'], { ns: 'common' })}
- </Button>
- <Button
- className="min-w-18"
- variant="primary"
- type="submit"
- disabled={!canManageSystemDefaultModel || isSystemModelListLoading}
- >
- {t(($) => $['operation.save'], { ns: 'common' })}
- </Button>
- </div>
- </DialogContent>
- </Dialog>
- </>
+ </div>
+ )}
+ </div>
+ <div className="flex h-19 shrink-0 items-center justify-end gap-2 px-6 pt-5 pb-6">
+ <Button className="min-w-18" onClick={() => handleOpenChange(false)}>
+ {t(($) => $['operation.cancel'], { ns: 'common' })}
+ </Button>
+ <Button
+ className="min-w-18"
+ variant="primary"
+ type="submit"
+ disabled={!canManageSystemDefaultModel || isSystemModelListLoading}
+ >
+ {t(($) => $['operation.save'], { ns: 'common' })}
+ </Button>
+ </div>
+ </DialogContent>
+ </Dialog>
)
}