Skip to content

fix: adjust order to save extra questions and values #787

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
tomrndom wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: adjust order to save extra questions and values #787

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7defa5b
fix: adjust order to save extra questions and values to avoid mixed m…
tomrndom Feb 9, 2026
1e171cc
fix: only close popup if there's no error on saving values
tomrndom Feb 12, 2026
194723f
fix: adjust promises on extra question save
tomrndom Mar 4, 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
35 changes: 25 additions & 10 deletions src/components/forms/sponsor-general-form/extra-questions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,35 @@ const SponsorExtraQuestions = ({

const handleSubmitExtraQuestion = (extraQuestion) => {
const { valuesToSave, ...extraQuestionToSave } = extraQuestion;
saveSponsorExtraQuestion(extraQuestionToSave).then((eq) => {
// after save question, check if values needs to be saved
if (valuesToSave && valuesToSave.length > 0) {
const extraQuestionId = extraQuestionToSave.id || eq.id;

const hasValues = valuesToSave && valuesToSave.length > 0;

if (!hasValues) {
saveSponsorExtraQuestion(extraQuestionToSave).then(() =>
handleCloseExtraQuestionPopup()
);
return;
}

if (!extraQuestionToSave.id) {
saveSponsorExtraQuestion(extraQuestionToSave).then((eq) => {
const saveValuePromises = valuesToSave.map((value) =>
saveSponsorExtraQuestionValue(extraQuestionId, value)
saveSponsorExtraQuestionValue(eq.id, value)
);
Promise.all(saveValuePromises).finally(() =>
Promise.all(saveValuePromises).then(() =>
handleCloseExtraQuestionPopup()
);
} else {
handleCloseExtraQuestionPopup();
}
});
});
return;
}

const saveValuePromises = valuesToSave.map((value) =>
saveSponsorExtraQuestionValue(extraQuestionToSave.id, value)
);

Promise.all(saveValuePromises)
.then(() => saveSponsorExtraQuestion(extraQuestionToSave))
.then(() => handleCloseExtraQuestionPopup());
};

const columns = [
Expand Down