Skip to content

fix: [Research Assistant] - PopUp not disappear after displaying message #667

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

Merged
merged 3 commits into from
Sep 17, 2025
Merged

fix: [Research Assistant] - PopUp not disappear after displaying message #667

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e79213d
bugfix
UtkarshMishra-Microsoft Sep 11, 2025
ecc67c1
Updated file
UtkarshMishra-Microsoft Sep 17, 2025
ab930de
UpdatedFile
UtkarshMishra-Microsoft Sep 17, 2025
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
96 changes: 64 additions & 32 deletions src/frontend/src/components/DraftDocumentsView/Card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,28 @@ export const ResearchTopicCard = (): JSX.Element => {
}

const generatedSection = await documentSectionGenerate(appStateContext?.state.researchTopic, documentSection)
if ((generatedSection?.body) != null && (generatedSection?.status) != 400) {
set_is_bad_request(false)
const response = await generatedSection.json()
return response.content
} else {
setTimeout(() => {
set_is_bad_request(true)
}, 2000)
if (!generatedSection) {
console.error('No response from /draft_document/generate_section')
set_is_bad_request(true)
return ''
}

// If backend rejected (e.g., unethical input), show message; do NOT try to parse JSON
if (!generatedSection.ok) {
console.error(`POST /draft_document/generate_section ${generatedSection.status} (Bad Request)`)
set_is_bad_request(true)
return ''
}

// 200 OK -> read text and TRY to parse JSON; if not JSON, treat as error but keep UI responsive
try {
const bodyText = await generatedSection.text()
const response = JSON.parse(bodyText)
// do NOT clear error here; success of one section must not hide an earlier failure
return response.content
} catch (e) {
console.error('Unexpected non-JSON response from /draft_document/generate_section', e)
set_is_bad_request(true)
return ''
}
}
Expand Down Expand Up @@ -105,26 +119,37 @@ export const ResearchTopicCard = (): JSX.Element => {
open={open}
onOpenChange={async (event, data) => {
setOpen(data.open)
if (!data.open) return

set_is_bad_request(false) // ← add this: start clean for this run

const documentSections = appStateContext?.state.documentSections ?? []
const newDocumentSectionContent = []
for (let i = 0; i < documentSections.length; i++) {
const section = documentSections[i]
newDocumentSectionContent.push(callGenerateSectionContent(section))
}
const newDocumentSections = await Promise.all(newDocumentSectionContent)
for (let i = 0; i < newDocumentSections.length; i++) {
if (newDocumentSections[i] === '') {
documentSections[i].content = newDocumentSections[i]
console.error('Error generating section content')
setOpen(false)
}else{
documentSections[i].content = newDocumentSections[i]
documentSections[i].metaPrompt = documentSectionPrompt(documentSections[i].title, appStateContext?.state.researchTopic ?? '')
const newDocumentSectionContent: Array<Promise<string>> = []

try {
for (let i = 0; i < documentSections.length; i++) {
const section = documentSections[i]
newDocumentSectionContent.push(callGenerateSectionContent(section))
}
const newDocumentSections = await Promise.all(newDocumentSectionContent)
for (let i = 0; i < newDocumentSections.length; i++) {
if (newDocumentSections[i] === '') {
documentSections[i].content = SystemErrMessage
console.error('Error generating section content')
} else {
documentSections[i].content = newDocumentSections[i]
documentSections[i].metaPrompt = documentSectionPrompt(documentSections[i].title, appStateContext?.state.researchTopic ?? '')
}
}
}

appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: documentSections })
setOpen(false)
appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: documentSections })
} catch (err) {
console.error('Generation failed:', err)
set_is_bad_request(true)
} finally {
// ALWAYS close the overlay
setOpen(false)
}
}}
>
<DialogTrigger disableButtonEnhancement>
Expand Down Expand Up @@ -170,22 +195,29 @@ export const Card = (props: CardProps) => {
const generatedSection = await documentSectionGenerate(appStateContext?.state.researchTopic || '', { ...section, metaPrompt: newPrompt })

const updatedDocumentSections = [...documentSections]
if (generatedSection && generatedSection.body && generatedSection?.status != 400) {
const response = await generatedSection.json()
const newContent = response.content
updatedDocumentSections[index].content = newContent
appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: updatedDocumentSections })
setLoading(false)
if (generatedSection && generatedSection.ok) {
try {
const bodyText = await generatedSection.text()
const response = JSON.parse(bodyText)
const newContent = response.content
updatedDocumentSections[index].content = newContent
appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: updatedDocumentSections })
} catch (e) {
console.error('Unexpected non-JSON 200 response from /draft_document/generate_section', e)
updatedDocumentSections[index].content = SystemErrMessage
appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: updatedDocumentSections })
}
} else if ((generatedSection?.body) != null && (generatedSection?.status) === 400){
console.error('Guardrail/Bad Request while generating section (Section card).')
updatedDocumentSections[index].content = SystemErrMessage
appStateContext?.dispatch({ type: 'UPDATE_DRAFT_DOCUMENTS_SECTIONS', payload: updatedDocumentSections })
setLoading(false)
}
} else {
console.error('Section information is undefined.')
}
} catch (error) {
console.error('Error generating section:', error)
} finally {
setLoading(false)
}
}
Expand Down