fix(form): don't refetch dynamic options on validation

projectcaluma · Mar 11, 2022 · 27061c6 · 27061c6
1 parent cf54bf5
commit 27061c6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/packages/form/addon/lib/field.js b/packages/form/addon/lib/field.js
@@ -83,18 +83,12 @@ export default class Field extends Base {
   _createQuestion() {
     const owner = getOwner(this);
 
-    const question =
+    this.question =
       this.calumaStore.find(`Question:${this.raw.question.slug}`) ||
       new (owner.factoryFor("caluma-model:question").class)({
         raw: this.raw.question,
         owner,
       });
-
-    if (question.isDynamic) {
-      question.loadDynamicOptions.perform();
-    }
-
-    this.question = question;
   }
 
   _createAnswer() {
@@ -783,8 +777,6 @@ export default class Field extends Base {
    * @private
    */
   async _validateDynamicChoiceQuestion() {
-    await this.question.loadDynamicOptions.perform();
-
     return validate("inclusion", this.answer.value, {
       in: (this.options || []).map(({ slug }) => slug),
     });
@@ -805,8 +797,6 @@ export default class Field extends Base {
       return true;
     }
 
-    await this.question.loadDynamicOptions.perform();
-
     return value.map((value) => {
       return validate("inclusion", value, {
         in: (this.options || []).map(({ slug }) => slug),

diff --git a/packages/form/addon/lib/question.js b/packages/form/addon/lib/question.js
@@ -1,7 +1,8 @@
 import { assert } from "@ember/debug";
 import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
-import { dropTask, lastValue } from "ember-concurrency";
+import { dropTask } from "ember-concurrency";
+import { useTask } from "ember-resources";
 import { cached } from "tracked-toolbox";
 
 import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/dynamic-options.graphql";
@@ -71,13 +72,20 @@ export default class Question extends Base {
     );
 
     return (
-      question.node.dynamicChoiceOptions ||
+      question.node.dynamicChoiceOptions ??
       question.node.dynamicMultipleChoiceOptions
     );
   }
 
-  @lastValue("loadDynamicOptions") dynamicChoiceOptions;
-  @lastValue("loadDynamicOptions") dynamicMultipleChoiceOptions;
+  dynamicOptions = useTask(this, this.loadDynamicOptions, () => []);
+
+  get dynamicChoiceOptions() {
+    return this.dynamicOptions.value ?? [];
+  }
+
+  get dynamicMultipleChoiceOptions() {
+    return this.dynamicOptions.value ?? [];
+  }
 
   /**
    * Whether the question is a single choice question