Skip to content
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

Jump to bottom

fix(jexl): don't consider the value of hidden fields in JEXL expr. #198

Merged
merged 1 commit into from
May 6, 2019
Merged

fix(jexl): don't consider the value of hidden fields in JEXL expr. #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions addon/lib/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,21 @@ export default EmberObject.extend({
}),

findAnswer(slugWithPath) {
const result = this.findField(slugWithPath);
return result && result.answer.value;
const field = this.findField(slugWithPath);
if (!field || !field.answer) {
return null;
}

// Multiple choice questions should return an empty array if there is no answer
// otherwise `intersects` operator breaks
const emptyValue =
field.question.__typename == "MultipleChoiceQuestion" ? [] : null;

if (field.answer.value && !field.question.hidden) {
return field.answer.value;
}

return emptyValue;
},

findField(slugWithPath) {
Expand Down
14 changes: 8 additions & 6 deletions addon/lib/question.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ export default EmberObject.extend({
* @return {Boolean}
*/
hiddenTask: task(function*() {
let hidden = this.dependsOn.some(
field =>
field.question.hidden ||
field.answer.value === null ||
field.answer.value === undefined
);
let hidden =
this.dependsOn.length &&
this.dependsOn.every(
field =>
field.question.hidden ||
field.answer.value === null ||
field.answer.value === undefined
);

hidden =
hidden || (yield this.field.document.questionJexl.eval(this.isHidden));
Expand Down
25 changes: 11 additions & 14 deletions tests/unit/lib/document-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module("Unit | Library | document", function(hooks) {
slug: "question-2",
label: "Question 2",
isRequired: "false",
isHidden: "'question-1'|answer == 'magic'",
isHidden: "!('question-1'|answer == 'show-question-2')",
__typename: "TextQuestion"
}
},
Expand All @@ -52,7 +52,8 @@ module("Unit | Library | document", function(hooks) {
slug: "question-3",
label: "Question 3",
isRequired: "false",
isHidden: "'question-2'|answer == 'Harry Potter'",
isHidden:
"!('question-1'|answer == 'show-question-3' || 'question-2'|answer == 'show-question-3')",
__typename: "TextQuestion"
}
}
Expand Down Expand Up @@ -84,8 +85,8 @@ module("Unit | Library | document", function(hooks) {

test("it recomputes isHidden on value change of dependency", async function(assert) {
assert.expect(1);
await this.setFieldValue("question-1", "foo");
await this.setFieldValue("question-2", "Harry Potter");
await this.setFieldValue("question-1", "show-question-2");
await this.setFieldValue("question-2", "foo");
assert.deepEqual(this.getDocumentHiddenState(), [
["question-1", false],
["question-2", false],
Expand All @@ -94,26 +95,22 @@ module("Unit | Library | document", function(hooks) {
});

test("it recomputes isHidden on isHidden change of dependency", async function(assert) {
assert.expect(3);
await this.setFieldValue("question-1", "foo");
await this.setFieldValue("question-2", "bar");
assert.expect(2);
await this.setFieldValue("question-1", "show-question-2");
await this.setFieldValue("question-2", "show-question-3");
assert.deepEqual(this.getDocumentHiddenState(), [
["question-1", false],
["question-2", false],
["question-3", false]
]);
await this.setFieldValue("question-1", "magic");
await this.setFieldValue("question-1", "foo");

// since question 2 is hidden, it's value is not considered in question 3's jexl.
assert.deepEqual(this.getDocumentHiddenState(), [
["question-1", false],
["question-2", true],
["question-3", true]
]);
await this.setFieldValue("question-1", "foo");
assert.deepEqual(this.getDocumentHiddenState(), [
["question-1", false],
["question-2", false],
["question-3", false]
]);
});

test("can do cross-form path traversal", async function(assert) {
Expand Down