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): reset test-email sender state when reopening the modal (#41515)

Xiyuan Chenb71dcb825321
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
index 75fc62c4dd7..459f1d591f2 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
@@ -11,6 +11,7 @@ import { toast } from '@langgenius/dify-ui/toast'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { fireEvent, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
import { useStore as useAppStore } from '@/app/components/app/store'
import { HooksStoreContext } from '@/app/components/workflow/hooks-store/provider'
import { createHooksStore } from '@/app/components/workflow/hooks-store/store'
@@ -135,6 +136,26 @@ const createConfig = (overrides: Partial<EmailConfig> = {}): EmailConfig => ({
...overrides,
})
+const TestEmailSenderHarness = () => {
+ const [open, setOpen] = useState(true)
+
+ return (
+ <>
+ <button type="button" onClick={() => setOpen(true)}>
+ Open test email sender
+ </button>
+ <EmailSenderModal
+ nodeId="human-node"
+ deliveryId="delivery-1"
+ open={open}
+ onOpenChange={setOpen}
+ jumpToEmailConfigModal={vi.fn()}
+ config={createConfig({ body: '' })}
+ />
+ </>
+ )
+}
+
const createFormInput = (overrides: Partial<ParagraphFormInput> = {}): FormInputItem => ({
type: InputVarType.paragraph,
output_variable_name: 'user_name',
@@ -251,6 +272,70 @@ describe('human-input/delivery-method/test-email-sender', () => {
expect(handleOpenChange).toHaveBeenCalledWith(false)
})
+ it('should start a fresh session after closing and reopening', async () => {
+ const user = userEvent.setup()
+ const { requests } = setupFetch()
+ renderWithProviders(<TestEmailSenderHarness />)
+
+ await user.click(
+ screen.getByRole('button', {
+ name: 'workflow.nodes.humanInput.deliveryMethod.emailSender.send',
+ }),
+ )
+ expect(
+ await screen.findByText('workflow.nodes.humanInput.deliveryMethod.emailSender.done'),
+ ).toBeInTheDocument()
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.ok' }))
+ await waitFor(() => {
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ })
+ await user.click(screen.getByRole('button', { name: 'Open test email sender' }))
+
+ expect(
+ screen.getByRole('button', {
+ name: 'workflow.nodes.humanInput.deliveryMethod.emailSender.send',
+ }),
+ ).toBeInTheDocument()
+ expect(
+ screen.queryByText('workflow.nodes.humanInput.deliveryMethod.emailSender.done'),
+ ).not.toBeInTheDocument()
+
+ await user.click(
+ screen.getByRole('button', {
+ name: 'workflow.nodes.humanInput.deliveryMethod.emailSender.send',
+ }),
+ )
+ await waitFor(() => {
+ expect(
+ requests.filter(
+ (request) => request.method === 'POST' && request.url.endsWith('/delivery-test'),
+ ),
+ ).toHaveLength(2)
+ })
+ })
+
+ it('should stay open when clicking outside the dialog', async () => {
+ const user = userEvent.setup()
+ const handleOpenChange = vi.fn()
+
+ renderWithProviders(
+ <EmailSenderModal
+ nodeId="human-node"
+ deliveryId="delivery-1"
+ open
+ onOpenChange={handleOpenChange}
+ jumpToEmailConfigModal={vi.fn()}
+ config={createConfig({ body: '' })}
+ />,
+ )
+
+ await user.click(document.body)
+
+ expect(screen.getByRole('dialog')).toBeInTheDocument()
+ expect(handleOpenChange).not.toHaveBeenCalled()
+ })
+
it('should submit variables referenced by dynamic select option sources', async () => {
const user = userEvent.setup()
const { requests } = setupFetch()
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
index 86f772b15e7..5d730e134cc 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
@@ -45,6 +45,8 @@ type EmailSenderModalProps = {
availableNodes?: Node[]
}
+type EmailSenderContentProps = Omit<EmailSenderModalProps, 'open'>
+
const getOriginVar = (valueSelector: string[], list: NodeOutPutVar[]) => {
const targetVar = list.find((item) => item.nodeId === valueSelector[0])
if (!targetVar) return undefined
@@ -117,10 +119,9 @@ const formatEmailSenderInputs = (
}
}
-const EmailSenderModal = ({
+const EmailSenderContent = ({
nodeId,
deliveryId,
- open,
onOpenChange,
jumpToEmailConfigModal,
config,
@@ -128,7 +129,7 @@ const EmailSenderModal = ({
formInputs,
nodesOutputVars = [],
availableNodes = [],
-}: EmailSenderModalProps) => {
+}: EmailSenderContentProps) => {
const { t } = useTranslation()
const { data: userProfileEmail } = useSuspenseQuery({
...userProfileQueryOptions(),
@@ -258,142 +259,49 @@ const EmailSenderModal = ({
if (done) {
return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent>
- <div className="space-y-2">
- <DialogTitle className="title-2xl-semi-bold text-text-primary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.done`], { ns: 'workflow' })}
- </DialogTitle>
- {debugEnabled && (
- <div className="system-md-regular text-text-secondary">
- <Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugDone`]}
- ns="workflow"
- components={{
- email: <span className="system-md-semibold text-text-secondary"></span>,
- }}
- values={{ email: userProfileEmail }}
- />
- </div>
- )}
- {!debugEnabled && onlyWholeTeam && (
- <div className="system-md-regular text-text-secondary">
- <Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone2`]}
- ns="workflow"
- components={{
- team: <span className="system-md-medium text-text-secondary"></span>,
- }}
- values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
- />
- </div>
- )}
- {!debugEnabled && onlySpecificUsers && (
- <div className="system-md-regular text-text-secondary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone3`], {
- ns: 'workflow',
- })}
- </div>
- )}
- {!debugEnabled && combinedRecipients && (
- <div className="system-md-regular text-text-secondary">
- <Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone1`]}
- ns="workflow"
- components={{
- team: <span className="system-md-medium text-text-secondary"></span>,
- }}
- values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
- />
- </div>
- )}
- </div>
- {(onlySpecificUsers || combinedRecipients) && !debugEnabled && (
- <div className="mt-4">
- <EmailInput
- disabled
- email={userProfileEmail}
- value={config?.recipients?.items}
- list={accounts}
- onDelete={noop}
- onSelect={noop}
- onAdd={noop}
- />
- </div>
- )}
- <div className="mt-6 flex flex-row-reverse gap-2">
- <Button variant="primary" className="w-18" onClick={() => onOpenChange(false)}>
- {t(($) => $['operation.ok'], { ns: 'common' })}
- </Button>
- </div>
- </DialogContent>
- </Dialog>
- )
- }
-
- return (
- <Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent>
- <DialogClose
- render={
- <IconButton
- aria-label={t(($) => $['operation.close'], { ns: 'common' })}
- size="lg"
- className="absolute inset-e-6 top-6"
- >
- <span aria-hidden className="i-ri-close-line size-4" />
- </IconButton>
- }
- />
- <div className="space-y-1 pr-8">
+ <>
+ <div className="space-y-2">
<DialogTitle className="title-2xl-semi-bold text-text-primary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.title`], { ns: 'workflow' })}
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.done`], { ns: 'workflow' })}
</DialogTitle>
{debugEnabled && (
- <>
- <div className="system-sm-regular text-text-secondary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugModeTip`], {
- ns: 'workflow',
- })}
- </div>
- <div className="system-sm-regular text-text-secondary">
- <Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugModeTip2`]}
- ns="workflow"
- components={{
- email: <span className="system-sm-semibold text-text-primary"></span>,
- }}
- values={{ email: userProfileEmail }}
- />
- </div>
- </>
+ <div className="system-md-regular text-text-secondary">
+ <Trans
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugDone`]}
+ ns="workflow"
+ components={{
+ email: <span className="system-md-semibold text-text-secondary"></span>,
+ }}
+ values={{ email: userProfileEmail }}
+ />
+ </div>
)}
{!debugEnabled && onlyWholeTeam && (
- <div className="system-sm-regular text-text-secondary">
+ <div className="system-md-regular text-text-secondary">
<Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip2`]}
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone2`]}
ns="workflow"
components={{
- team: <span className="system-sm-semibold text-text-primary"></span>,
+ team: <span className="system-md-medium text-text-secondary"></span>,
}}
values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
/>
</div>
)}
{!debugEnabled && onlySpecificUsers && (
- <div className="system-sm-regular text-text-secondary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip3`], {
+ <div className="system-md-regular text-text-secondary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone3`], {
ns: 'workflow',
})}
</div>
)}
{!debugEnabled && combinedRecipients && (
- <div className="system-sm-regular text-text-secondary">
+ <div className="system-md-regular text-text-secondary">
<Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip1`]}
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamDone1`]}
ns="workflow"
components={{
- team: <span className="system-sm-semibold text-text-primary"></span>,
+ team: <span className="system-md-medium text-text-secondary"></span>,
}}
values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
/>
@@ -401,94 +309,193 @@ const EmailSenderModal = ({
)}
</div>
{(onlySpecificUsers || combinedRecipients) && !debugEnabled && (
+ <div className="mt-4">
+ <EmailInput
+ disabled
+ email={userProfileEmail}
+ value={config?.recipients?.items}
+ list={accounts}
+ onDelete={noop}
+ onSelect={noop}
+ onAdd={noop}
+ />
+ </div>
+ )}
+ <div className="mt-6 flex flex-row-reverse gap-2">
+ <Button variant="primary" className="w-18" onClick={() => onOpenChange(false)}>
+ {t(($) => $['operation.ok'], { ns: 'common' })}
+ </Button>
+ </div>
+ </>
+ )
+ }
+
+ return (
+ <>
+ <DialogClose
+ render={
+ <IconButton
+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+ size="lg"
+ className="absolute inset-e-6 top-6"
+ >
+ <span aria-hidden className="i-ri-close-line size-4" />
+ </IconButton>
+ }
+ />
+ <div className="space-y-1 pr-8">
+ <DialogTitle className="title-2xl-semi-bold text-text-primary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.title`], { ns: 'workflow' })}
+ </DialogTitle>
+ {debugEnabled && (
<>
- <div className="mt-4">
- <EmailInput
- disabled
- email={userProfileEmail}
- value={config?.recipients?.items}
- list={accounts}
- onDelete={noop}
- onSelect={noop}
- onAdd={noop}
- />
+ <div className="system-sm-regular text-text-secondary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugModeTip`], {
+ ns: 'workflow',
+ })}
</div>
- <div className="mt-1 system-xs-regular text-text-tertiary">
+ <div className="system-sm-regular text-text-secondary">
<Trans
- i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.tip`]}
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.debugModeTip2`]}
ns="workflow"
components={{
- strong: (
- <button
- type="button"
- onClick={jumpToEmailConfigModal}
- className="inline cursor-pointer border-none bg-transparent p-0 text-left system-xs-regular text-text-accent"
- />
- ),
+ email: <span className="system-sm-semibold text-text-primary"></span>,
}}
+ values={{ email: userProfileEmail }}
/>
</div>
</>
)}
- {/* vars */}
- {generatedInputs.length > 0 && (
- <>
- <div>
- <Divider className="mt-4! mb-2! h-px! w-12! bg-divider-regular" />
- </div>
- <div className="py-2">
- <button
- type="button"
- aria-expanded={!collapsed}
- className="group flex h-6 cursor-pointer items-center border-none bg-transparent p-0 text-left"
- onClick={() => setCollapsed(!collapsed)}
- >
- <div className="mr-1 system-sm-semibold-uppercase text-text-secondary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.vars`], { ns: 'workflow' })}
- </div>
- <RiArrowRightSFill
- className={cn(
- 'size-4 text-text-quaternary group-hover:text-text-primary',
- !collapsed && 'rotate-90',
- )}
- aria-hidden
- />
- </button>
- <div className="system-xs-regular text-text-tertiary">
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.varsTip`], {
- ns: 'workflow',
- })}
+ {!debugEnabled && onlyWholeTeam && (
+ <div className="system-sm-regular text-text-secondary">
+ <Trans
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip2`]}
+ ns="workflow"
+ components={{
+ team: <span className="system-sm-semibold text-text-primary"></span>,
+ }}
+ values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
+ />
+ </div>
+ )}
+ {!debugEnabled && onlySpecificUsers && (
+ <div className="system-sm-regular text-text-secondary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip3`], {
+ ns: 'workflow',
+ })}
+ </div>
+ )}
+ {!debugEnabled && combinedRecipients && (
+ <div className="system-sm-regular text-text-secondary">
+ <Trans
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.wholeTeamTip1`]}
+ ns="workflow"
+ components={{
+ team: <span className="system-sm-semibold text-text-primary"></span>,
+ }}
+ values={{ team: currentWorkspace.name.replace(/'/g, '’') }}
+ />
+ </div>
+ )}
+ </div>
+ {(onlySpecificUsers || combinedRecipients) && !debugEnabled && (
+ <>
+ <div className="mt-4">
+ <EmailInput
+ disabled
+ email={userProfileEmail}
+ value={config?.recipients?.items}
+ list={accounts}
+ onDelete={noop}
+ onSelect={noop}
+ onAdd={noop}
+ />
+ </div>
+ <div className="mt-1 system-xs-regular text-text-tertiary">
+ <Trans
+ i18nKey={($) => $[`${i18nPrefix}.deliveryMethod.emailSender.tip`]}
+ ns="workflow"
+ components={{
+ strong: (
+ <button
+ type="button"
+ onClick={jumpToEmailConfigModal}
+ className="inline cursor-pointer border-none bg-transparent p-0 text-left system-xs-regular text-text-accent"
+ />
+ ),
+ }}
+ />
+ </div>
+ </>
+ )}
+ {/* vars */}
+ {generatedInputs.length > 0 && (
+ <>
+ <div>
+ <Divider className="mt-4! mb-2! h-px! w-12! bg-divider-regular" />
+ </div>
+ <div className="py-2">
+ <button
+ type="button"
+ aria-expanded={!collapsed}
+ className="group flex h-6 cursor-pointer items-center border-none bg-transparent p-0 text-left"
+ onClick={() => setCollapsed(!collapsed)}
+ >
+ <div className="mr-1 system-sm-semibold-uppercase text-text-secondary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.vars`], { ns: 'workflow' })}
</div>
- {!collapsed && (
- <div className="mt-3 space-y-4">
- {generatedInputs.map((variable, index) => (
- <div key={variable.variable} className="mb-4 last-of-type:mb-0">
- <FormItem
- autoFocus={index === 0}
- payload={variable}
- value={inputs[variable.variable]}
- onChange={(v) => handleValueChange(variable.variable, v)}
- />
- </div>
- ))}
- </div>
- )}
+ <RiArrowRightSFill
+ className={cn(
+ 'size-4 text-text-quaternary group-hover:text-text-primary',
+ !collapsed && 'rotate-90',
+ )}
+ aria-hidden
+ />
+ </button>
+ <div className="system-xs-regular text-text-tertiary">
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.varsTip`], {
+ ns: 'workflow',
+ })}
</div>
- </>
- )}
- <div className="mt-6 flex flex-row-reverse gap-2">
- <Button
- disabled={sendingEmail || !confirmChecked}
- loading={sendingEmail}
- variant="primary"
- onClick={handleConfirm}
- >
- {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.send`], { ns: 'workflow' })}
- </Button>
- <Button className="w-18" onClick={() => onOpenChange(false)}>
- {t(($) => $['operation.cancel'], { ns: 'common' })}
- </Button>
- </div>
+ {!collapsed && (
+ <div className="mt-3 space-y-4">
+ {generatedInputs.map((variable, index) => (
+ <div key={variable.variable} className="mb-4 last-of-type:mb-0">
+ <FormItem
+ autoFocus={index === 0}
+ payload={variable}
+ value={inputs[variable.variable]}
+ onChange={(v) => handleValueChange(variable.variable, v)}
+ />
+ </div>
+ ))}
+ </div>
+ )}
+ </div>
+ </>
+ )}
+ <div className="mt-6 flex flex-row-reverse gap-2">
+ <Button
+ disabled={sendingEmail || !confirmChecked}
+ loading={sendingEmail}
+ variant="primary"
+ onClick={handleConfirm}
+ >
+ {t(($) => $[`${i18nPrefix}.deliveryMethod.emailSender.send`], { ns: 'workflow' })}
+ </Button>
+ <Button className="w-18" onClick={() => onOpenChange(false)}>
+ {t(($) => $['operation.cancel'], { ns: 'common' })}
+ </Button>
+ </div>
+ </>
+ )
+}
+
+const EmailSenderModal = ({ open, onOpenChange, ...props }: EmailSenderModalProps) => {
+ return (
+ <Dialog open={open} onOpenChange={onOpenChange} disablePointerDismissal>
+ <DialogContent>
+ <EmailSenderContent {...props} onOpenChange={onOpenChange} />
</DialogContent>
</Dialog>
)