Skip to content

fix(ui): persist follow-up prompt defaults #6126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xsfX20 wants to merge 3 commits into
base: main
Choose a base branch
from
+45 −41
Open

fix(ui): persist follow-up prompt defaults #6126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
204b2b2
fix(ui): persist follow-up prompt defaults
xsfX20 Apr 2, 2026
1843e51
fix(ui): allow zero-valued follow-up settings
xsfX20 Apr 2, 2026
48a0e37
refactor(ui): simplify follow-up prompt nullish checks
xsfX20 Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 45 additions & 41 deletions packages/ui/src/ui-component/extended/FollowUpPrompts.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,35 @@ const FollowUpPrompts = ({ dialogProps }) => {
const [chatbotConfig, setChatbotConfig] = useState({})
const [selectedProvider, setSelectedProvider] = useState('none')

const getProviderInputKey = (inputParam) => (inputParam.name === 'credential' ? 'credentialId' : inputParam.name)

const getProviderInputValue = (config, providerName, inputParam) => {
const providerConfig = config?.[providerName] ?? {}
const key = getProviderInputKey(inputParam)
const value = providerConfig[key]

return value != null && value !== '' ? value : inputParam.default
}

const withProviderDefaults = (config, providerName) => {
if (!providerName || providerName === 'none' || !followUpPromptsOptions[providerName]) {
return config
}

const providerConfig = { ...(config?.[providerName] ?? {}) }
followUpPromptsOptions[providerName].inputs.forEach((inputParam) => {
const key = getProviderInputKey(inputParam)
if ((providerConfig[key] == null || providerConfig[key] === '') && inputParam.default !== undefined) {
providerConfig[key] = inputParam.default
}
})

return {
...config,
[providerName]: providerConfig
}
}

const handleChange = (key, value) => {
setFollowUpPromptsConfig({
...followUpPromptsConfig,
Expand Down Expand Up @@ -350,35 +379,23 @@ const FollowUpPrompts = ({ dialogProps }) => {
}

const onSave = async () => {
// TODO: saving without changing the prompt will not save the prompt
try {
const normalizedFollowUpPromptsConfig = withProviderDefaults(followUpPromptsConfig, selectedProvider)
let value = {
followUpPrompts: { status: followUpPromptsConfig.status }
followUpPrompts: { status: normalizedFollowUpPromptsConfig.status }
}
chatbotConfig.followUpPrompts = value.followUpPrompts

// if the prompt is not set, save the default prompt
const selectedProvider = followUpPromptsConfig.selectedProvider

if (selectedProvider && followUpPromptsConfig[selectedProvider] && followUpPromptsOptions[selectedProvider]) {
if (!followUpPromptsConfig[selectedProvider].prompt) {
followUpPromptsConfig[selectedProvider].prompt = followUpPromptsOptions[selectedProvider].inputs.find(
(input) => input.name === 'prompt'
)?.default
}

if (!followUpPromptsConfig[selectedProvider].temperature) {
followUpPromptsConfig[selectedProvider].temperature = followUpPromptsOptions[selectedProvider].inputs.find(
(input) => input.name === 'temperature'
)?.default
}
const nextChatbotConfig = {
...chatbotConfig,
followUpPrompts: value.followUpPrompts
}

const saveResp = await chatflowsApi.updateChatflow(dialogProps.chatflow.id, {
chatbotConfig: JSON.stringify(chatbotConfig),
followUpPrompts: JSON.stringify(followUpPromptsConfig)
chatbotConfig: JSON.stringify(nextChatbotConfig),
followUpPrompts: JSON.stringify(normalizedFollowUpPromptsConfig)
})
if (saveResp.data) {
setChatbotConfig(nextChatbotConfig)
setFollowUpPromptsConfig(normalizedFollowUpPromptsConfig)
enqueueSnackbar({
message: 'Follow-up Prompts configuration saved',
options: {
Expand Down Expand Up @@ -433,12 +450,8 @@ const FollowUpPrompts = ({ dialogProps }) => {
const provider = followUpPromptsOptions[selectedProvider]
for (let inputParam of provider.inputs) {
if (!inputParam.optional) {
const param = inputParam.name === 'credential' ? 'credentialId' : inputParam.name
if (
!followUpPromptsConfig[selectedProvider] ||
!followUpPromptsConfig[selectedProvider][param] ||
followUpPromptsConfig[selectedProvider][param] === ''
) {
const value = getProviderInputValue(followUpPromptsConfig, selectedProvider, inputParam)
if (value == null || value === '') {
return true
}
}
Expand Down Expand Up @@ -550,12 +563,7 @@ const FollowUpPrompts = ({ dialogProps }) => {
key={`${selectedProvider}-${inputParam.name}`}
inputParam={inputParam}
onChange={(newValue) => setValue(newValue, selectedProvider, inputParam.name)}
value={
followUpPromptsConfig[selectedProvider] &&
followUpPromptsConfig[selectedProvider][inputParam.name]
? followUpPromptsConfig[selectedProvider][inputParam.name]
: inputParam.default ?? ''
}
value={getProviderInputValue(followUpPromptsConfig, selectedProvider, inputParam) ?? ''}
/>
)}

Expand All @@ -570,10 +578,8 @@ const FollowUpPrompts = ({ dialogProps }) => {
inputParams: followUpPromptsOptions[selectedProvider].inputs
}}
value={
followUpPromptsConfig[selectedProvider] &&
followUpPromptsConfig[selectedProvider][inputParam.name]
? followUpPromptsConfig[selectedProvider][inputParam.name]
: inputParam.default ?? 'choose an option'
getProviderInputValue(followUpPromptsConfig, selectedProvider, inputParam) ??
'choose an option'
}
onSelect={(newValue) => setValue(newValue, selectedProvider, inputParam.name)}
/>
Expand All @@ -587,10 +593,8 @@ const FollowUpPrompts = ({ dialogProps }) => {
options={inputParam.options}
onSelect={(newValue) => setValue(newValue, selectedProvider, inputParam.name)}
value={
followUpPromptsConfig[selectedProvider] &&
followUpPromptsConfig[selectedProvider][inputParam.name]
? followUpPromptsConfig[selectedProvider][inputParam]
: inputParam.default ?? 'choose an option'
getProviderInputValue(followUpPromptsConfig, selectedProvider, inputParam) ??
'choose an option'
}
/>
)}
Expand Down