@projectcaluma/ember-form-builder 9.0.1 → 9.0.2

package/addon/components/cfb-form-editor/question/default.js

@@ -45,6 +45,10 @@ export default class CfbFormEditorQuestionDefault extends RenderComponent {
       delete raw.options;
     }
 
+    if (this.model.__typename === "TableQuestion") {
+      raw.meta = { widgetOverride: "cfb-form-editor/question/default/table" };
+    }
+
     return raw;
   }
 
@@ -80,6 +84,26 @@ export default class CfbFormEditorQuestionDefault extends RenderComponent {
       question: this.question,
     };
 
+    if (answer?.tableValue?.length) {
+      answer.tableValue = answer.tableValue.map((doc) => ({
+        ...doc,
+        form: doc.form
+          ? {
+              ...doc.form,
+              questions: {
+                edges: doc.form.questions.edges.map((edge) => ({
+                  node: {
+                    ...edge.node,
+                    isHidden: "false",
+                    isRequired: "false",
+                  },
+                })),
+              },
+            }
+          : null,
+      }));
+    }
+
     const document = getOwner(this)
       .factoryFor("caluma-model:document")
       .create({

package/addon/components/cfb-form-editor/question-list/item.hbs

@@ -44,7 +44,7 @@
         data-test-edit-question
         href="#"
         class="uk-width-auto uk-margin-small-right uk-text-bold"
-        {{on "click" (fn (optional @on-edit-question) @question)}}
+        {{on "click" (fn this.editQuestion @question)}}
       >
         {{@question.slug}}
         {{#if @question.isArchived}}({{t
@@ -71,9 +71,7 @@
         class="uk-width-expand uk-margin-small-right uk-text-small uk-text-truncate"
         {{on
           "click"
-          (fn
-            (optional @on-click-form) (or @question.subForm @question.rowForm)
-          )
+          (fn this.clickForm (or @question.subForm @question.rowForm))
         }}
       >
         {{or @question.subForm.name @question.rowForm.name}}

package/addon/components/cfb-form-editor/question-list/item.js

@@ -1,3 +1,4 @@
+import { action } from "@ember/object";
 import { guidFor } from "@ember/object/internals";
 import Component from "@glimmer/component";
 import jexl from "jexl";
@@ -48,4 +49,16 @@ export default class CfbFormEditorQuestionListItem extends Component {
       (hasQuestionType(question, "form") || hasQuestionType(question, "table"))
     );
   }
+
+  @action
+  editQuestion(question, e) {
+    e.preventDefault();
+    this.args["on-edit-question"]?.(question);
+  }
+
+  @action
+  clickForm(form, e) {
+    e.preventDefault();
+    this.args["on-click-form"]?.(form);
+  }
 }

package/addon/components/cfb-form-editor/question-list.hbs

@@ -62,12 +62,7 @@
         <a
           href="#"
           data-test-new-question
-          {{on
-            "click"
-            (queue
-              (fn (optional @on-create-question)) (fn this.setMode "reorder")
-            )
-          }}
+          {{on "click" this.createNewQuestion}}
         >
           {{t "caluma.form-builder.question.create"}}
         </a>
@@ -105,8 +100,8 @@
       {{/each}}
       {{#if (and this.hasNextPage (eq this.mode "add"))}}
         <li class="uk-text-center cfb-pointer"><a
-            {{on "click" (perform this.questionTask)}}
             href="#"
+            {{on "click" (perform this.questionTask)}}
           >{{t "caluma.form-builder.question.loadMore"}}</a></li>
       {{/if}}
     {{/if}}

package/addon/components/cfb-form-editor/question-list.js

@@ -51,9 +51,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
   @lastValue("questionTask") questionTaskValue = [];
   @restartableTask
   *questionTask(event) {
-    if (event?.preventDefault) {
-      event.preventDefault();
-    }
+    event?.preventDefault?.();
 
     const mode = this.mode;
     const search = mode !== "reorder" ? this.search : "";
@@ -235,4 +233,12 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
     this._resetParameters();
     this.questionTask.perform();
   }
+
+  @action
+  createNewQuestion(e) {
+    e.preventDefault();
+
+    this.args["on-create-question"]?.();
+    this.setMode("reorder");
+  }
 }

package/addon/components/cfb-form-list.js

@@ -43,7 +43,9 @@ export default class ComponentsCfbFormListComponent extends Component {
   }
 
   @action
-  loadMoreForms() {
+  loadMoreForms(e) {
+    e.preventDefault();
+
     this.formsQuery.fetchMore();
   }
 

package/blueprints/@projectcaluma/ember-form-builder/index.js

@@ -8,13 +8,10 @@ module.exports = {
       packages: [
         { name: "@projectcaluma/ember-core" },
         { name: "@projectcaluma/ember-form" },
-        { name: "ember-changeset" },
-        { name: "ember-composable-helpers" },
         { name: "ember-engines" },
         { name: "ember-math-helpers" },
         { name: "ember-pikaday" },
         { name: "ember-power-select" },
-        { name: "ember-validated-form" },
       ],
     });
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -18,8 +18,8 @@
     "@ember/render-modifiers": "^1.0.2",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "9.0.0",
-    "@projectcaluma/ember-form": "9.0.1",
+    "@projectcaluma/ember-core": "9.0.1",
+    "@projectcaluma/ember-form": "9.0.2",
     "codejar": "^3.5.0",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.2.0",
@@ -31,17 +31,17 @@
     "ember-concurrency": "^2.1.2",
     "ember-concurrency-decorators": "^2.0.3",
     "ember-fetch": "^8.0.4",
-    "ember-math-helpers": "^2.16.0",
+    "ember-math-helpers": "^2.17.3",
     "ember-pikaday": "^3.0.0",
     "ember-power-select": "^4.1.6",
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^4.0.0",
     "ember-validated-form": "^3.0.3",
-    "graphql": "^15.5.3",
+    "graphql": "^15.6.0",
     "graphql-tag": "^2.12.5",
     "jexl": "^2.3.0",
     "moment": "^2.29.1",
-    "prismjs": "^1.24.1"
+    "prismjs": "^1.25.0"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
@@ -69,9 +69,9 @@
     "faker": "5.5.3",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
-    "qunit": "2.17.1",
+    "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.52.1"
+    "webpack": "5.53.0"
   },
   "engines": {
     "node": "10.* || >= 12"