@projectcaluma/ember-form 11.0.0-beta.37 → 11.0.0-beta.39

package/addon/components/cf-content.js

@@ -158,7 +158,11 @@ export default class CfContentComponent extends Component {
 
     const raw = parseDocument({ ...answerDocument, form });
 
-    const document = new Document({ raw, owner });
+    const document = new Document({
+      raw,
+      owner,
+      dataSourceContext: this.args.context,
+    });
     const navigation = new Navigation({ document, owner });
 
     registerDestructor(this, () => {

package/addon/gql/queries/dynamic-options.graphql

@@ -1,11 +1,11 @@
-query DynamicOptions($question: String!) {
+query DynamicOptions($question: String!, $context: JSONString) {
   allQuestions(filter: [{ slugs: [$question] }], first: 1) {
     edges {
       node {
         id
         slug
         ... on DynamicChoiceQuestion {
-          dynamicChoiceOptions: options {
+          dynamicChoiceOptions: options(context: $context) {
             edges {
               node {
                 slug
@@ -15,7 +15,7 @@ query DynamicOptions($question: String!) {
           }
         }
         ... on DynamicMultipleChoiceQuestion {
-          dynamicMultipleChoiceOptions: options {
+          dynamicMultipleChoiceOptions: options(context: $context) {
             edges {
               node {
                 slug

package/addon/lib/document.js

@@ -18,7 +18,7 @@ const sum = (nums) => nums.reduce((num, base) => base + num, 0);
  * @class Document
  */
 export default class Document extends Base {
-  constructor({ raw, parentDocument, ...args }) {
+  constructor({ raw, parentDocument, dataSourceContext, ...args }) {
     assert(
       "A graphql document `raw` must be passed",
       raw?.__typename === "Document"
@@ -27,6 +27,7 @@ export default class Document extends Base {
     super({ raw, ...args });
 
     this.parentDocument = parentDocument;
+    this.dataSourceContext = dataSourceContext;
 
     this.pushIntoStore();
 
@@ -83,6 +84,13 @@ export default class Document extends Base {
    */
   fieldsets = [];
 
+  /**
+   * Context object for data sources
+   *
+   * @property {Object} dataSourceContext
+   */
+  dataSourceContext = null;
+
   /**
    * The primary key of the document.
    *

package/addon/lib/field.js

@@ -89,6 +89,8 @@ export default class Field extends Base {
         raw: this.raw.question,
         owner,
       });
+
+    this.question.dataSourceContext = this.document.dataSourceContext;
   }
 
   _createAnswer() {
@@ -545,18 +547,24 @@ export default class Field extends Base {
 
     const type = this.answer.raw.__typename;
 
+    const value = this.answer.serializedValue;
+    const input = {
+      question: this.question.slug,
+      document: this.document.uuid,
+    };
+
+    if (value !== null) {
+      input.value = value;
+    }
+
+    if (this.document.dataSourceContext) {
+      input.dataSourceContext = JSON.stringify(this.document.dataSourceContext);
+    }
+
     const response = yield this.apollo.mutate(
       {
         mutation: MUTATION_MAP[type],
-        variables: {
-          input: {
-            question: this.question.slug,
-            document: this.document.uuid,
-            ...(this.answer.serializedValue !== null
-              ? { value: this.answer.serializedValue }
-              : {}),
-          },
-        },
+        variables: { input },
       },
       `saveDocument${type}.answer`
     );

package/addon/lib/question.js

@@ -66,7 +66,12 @@ export default class Question extends Base {
       {
         query: getDynamicOptions,
         fetchPolicy: "network-only",
-        variables: { question: this.slug },
+        variables: {
+          question: this.slug,
+          context: this.dataSourceContext
+            ? JSON.stringify(this.dataSourceContext)
+            : null,
+        },
       },
       "allQuestions.edges"
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form",
-  "version": "11.0.0-beta.37",
+  "version": "11.0.0-beta.39",
   "description": "Ember addon for rendering Caluma forms.",
   "keywords": [
     "ember-addon"
@@ -15,11 +15,11 @@
   },
   "dependencies": {
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.9.0",
+    "@embroider/macros": "^1.10.0",
     "@embroider/util": "^1.9.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
-    "@projectcaluma/ember-core": "^11.0.0-beta.37",
+    "@projectcaluma/ember-core": "^11.0.0-beta.39",
     "ember-apollo-client": "~4.0.2",
     "ember-auto-import": "^2.4.3",
     "ember-autoresize-modifier": "^0.6.0",
@@ -46,10 +46,10 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.7.0",
-    "@embroider/test-setup": "1.8.3",
+    "@embroider/test-setup": "2.0.0",
     "@faker-js/faker": "7.6.0",
-    "@projectcaluma/ember-testing": "11.0.0-beta.37",
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.37",
+    "@projectcaluma/ember-testing": "11.0.0-beta.39",
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.39",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "4.8.0",
     "ember-cli-code-coverage": "1.0.3",
@@ -74,7 +74,7 @@
     "webpack": "5.75.0"
   },
   "peerDependencies": {
-    "@projectcaluma/ember-workflow": "^11.0.0-beta.37"
+    "@projectcaluma/ember-workflow": "^11.0.0-beta.39"
   },
   "peerDependenciesMeta": {
     "@projectcaluma/ember-workflow": {