@projectcaluma/ember-form 11.1.3 → 11.1.5

package/addon/components/cf-field.hbs

@@ -7,6 +7,7 @@
       }}"
     {{did-insert this.registerComponent}}
     {{will-destroy this.unregisterComponent}}
+    {{in-viewport onEnter=this.refreshDynamicOptions}}
   >
     {{#if this.labelVisible}}
       <CfField::Label @field={{@field}} />

package/addon/components/cf-field.js

@@ -91,4 +91,11 @@ export default class CfFieldComponent extends Component {
 
     return yield this.args.field.save.unlinked().perform();
   }
+
+  @action
+  refreshDynamicOptions() {
+    if (this.args.field.question.isDynamic) {
+      this.args.field.question.dynamicOptions.retry();
+    }
+  }
 }

package/addon/lib/question.js

@@ -1,8 +1,7 @@
 import { assert } from "@ember/debug";
 import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
-import { trackedTask } from "ember-resources/util/ember-concurrency";
+import { trackedFunction } from "ember-resources/util/function";
 import { cached } from "tracked-toolbox";
 
 import getDynamicOptions from "@projectcaluma/ember-form/gql/queries/dynamic-options.graphql";
@@ -51,18 +50,10 @@ export default class Question extends Base {
     return this.raw.slug;
   }
 
-  /**
-   * Load all dynamic options for this question
-   *
-   * @method loadDynamicOptions.perform
-   * @return {Object[]} The dynamic options
-   * @public
-   */
-  @dropTask
-  *loadDynamicOptions() {
+  dynamicOptions = trackedFunction(this, async () => {
     if (!this.isDynamic) return;
 
-    const [question] = yield this.apollo.query(
+    const [question] = await this.apollo.query(
       {
         query: getDynamicOptions,
         fetchPolicy: "network-only",
@@ -80,9 +71,7 @@ export default class Question extends Base {
       question.node.dynamicChoiceOptions ??
       question.node.dynamicMultipleChoiceOptions
     );
-  }
-
-  dynamicOptions = trackedTask(this, this.loadDynamicOptions, () => []);
+  });
 
   get dynamicChoiceOptions() {
     return this.dynamicOptions.value ?? [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "11.1.3",
+  "version": "11.1.5",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -18,7 +18,7 @@
     "@embroider/util": "^1.10.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.1.3",
+    "@projectcaluma/ember-core": "^11.1.5",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.6.1",
     "ember-autoresize-modifier": "^0.7.0",
@@ -44,11 +44,11 @@
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.7.0",
+    "@ember/test-helpers": "2.9.3",
     "@embroider/test-setup": "2.1.1",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.1.3",
-    "@projectcaluma/ember-workflow": "^11.1.3",
+    "@projectcaluma/ember-testing": "11.1.5",
+    "@projectcaluma/ember-workflow": "^11.1.5",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.11.0",
     "ember-cli-code-coverage": "2.0.0",
@@ -58,20 +58,21 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-load-initializers": "2.1.2",
-    "ember-qunit": "6.1.1",
+    "ember-qunit": "6.2.0",
     "ember-resolver": "10.0.0",
-    "ember-source": "4.11.0",
+    "ember-source": "4.12.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "miragejs": "0.1.47",
     "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
+    "uikit": "3.16.13",
     "uuid": "9.0.0",
     "webpack": "5.77.0"
   },
   "peerDependencies": {
-    "@projectcaluma/ember-workflow": "^11.1.3",
+    "@projectcaluma/ember-workflow": "^11.1.5",
     "ember-source": "^3.28.0 || ^4.0.0"
   },
   "peerDependenciesMeta": {