Skip to content

fix(calc-questions): always calculate calculated answer if possible #2874

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix(calc-questions): always calculate calculated answer if possible #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8b06a4
fix(calc-questions): always calculate calculated answer if possible
winged Jan 14, 2025
9f410c1
fix(jexl): correct behaviour of the answer transform in more situations
winged Jan 14, 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
15 changes: 12 additions & 3 deletions packages/form/addon/lib/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,16 +271,25 @@ export default class Document extends Base {
findAnswer(slug, defaultValue) {
const field = this.findField(slug);

const hasDefault = !(defaultValue === undefined);

if (!field) {
if (defaultValue === undefined) {
if (!hasDefault) {
throw new Error(`Field for question \`${slug}\` could not be found`);
}

return defaultValue;
}

if (field.hidden || [undefined, null].includes(field.value)) {
return (defaultValue ?? field.question.isMultipleChoice) ? [] : null;
const emptyValue =
field.question.isTable || field.question.isMultipleChoice ? [] : null;

if (field.hidden) {
return emptyValue;
}

if ([undefined, null].includes(field.value)) {
return hasDefault ? defaultValue : emptyValue;
}

if (field.question.isTable) {
Expand Down
5 changes: 1 addition & 4 deletions packages/form/addon/lib/field.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,10 +274,7 @@ export default class Field extends Base {
*/
@cached
get calculatedValue() {
if (
!this.question.isCalculated ||
!this.calculatedDependencies.every((field) => !field.hidden)
) {
if (!this.question.isCalculated) {
return null;
}

Expand Down
Loading