@projectcaluma/ember-form-builder 12.8.0 → 12.9.0

package/addon/components/cfb-form-editor/cfb-advanced-settings.hbs

@@ -0,0 +1,16 @@
+<UkButton
+  @color="link"
+  @onClick={{toggle-action "showAdvanced" this}}
+  class="uk-flex uk-flex-middle uk-margin"
+>
+  {{#if this.showAdvanced}}
+    <UkIcon @icon="triangle-down" />
+  {{else}}
+    <UkIcon @icon="triangle-right" />
+  {{/if}}
+  {{t "caluma.form-builder.question.advancedSettings"}}
+</UkButton>
+
+{{#if this.showAdvanced}}
+  {{yield}}
+{{/if}}

package/addon/components/cfb-form-editor/cfb-advanced-settings.js

@@ -0,0 +1,6 @@
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+
+export default class CfbFormEditorCfbAdvancedSettings extends Component {
+  @tracked showAdvanced = false;
+}

package/addon/components/cfb-form-editor/general.hbs

@@ -49,6 +49,14 @@
       @renderComponent={{component "cfb-toggle-switch" size="small"}}
     />
 
+    <CfbFormEditor::CfbAdvancedSettings>
+      <f.input
+        @label={{t "caluma.form-builder.question.meta"}}
+        @name="meta"
+        @renderComponent={{component "cfb-code-editor" language="json"}}
+      />
+    </CfbFormEditor::CfbAdvancedSettings>
+
     <div class="uk-text-right">
       <f.submit
         @disabled={{f.loading}}

package/addon/components/cfb-form-editor/general.js

@@ -58,6 +58,8 @@ export default class CfbFormEditorGeneral extends Component {
 
   @dropTask
   *submit(changeset) {
+    const rawMeta = changeset.get("meta");
+
     try {
       const form = yield this.apollo.mutate(
         {
@@ -69,6 +71,7 @@ export default class CfbFormEditorGeneral extends Component {
               description: changeset.get("description"),
               isArchived: changeset.get("isArchived"),
               isPublished: changeset.get("isPublished"),
+              meta: JSON.stringify(rawMeta?.unwrap?.() ?? rawMeta),
             },
           },
         },

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

@@ -11,6 +11,7 @@ export default class CfbFormEditorQuestionUsage extends Component {
   @queryManager apollo;
 
   @tracked modalVisible = false;
+  @tracked _forms = null;
 
   get title() {
     return this.intl.t("caluma.form-builder.question.usage.title", {
@@ -25,18 +26,29 @@ export default class CfbFormEditorQuestionUsage extends Component {
   }
 
   forms = trackedFunction(this, async () => {
+    if (!this.args.slug) {
+      // The shown question hasn't completely loaded yet
+      return [];
+    }
+    if (this._forms) {
+      // we have already fetched the forms previously
+      return this._forms;
+    }
+
     try {
       const forms = await this.apollo.query(
         {
           query: allFormsForQuestionQuery,
           variables: {
-            slug: this.args.model.slug,
+            slug: this.args.slug,
           },
           fetchPolicy: "no-cache",
         },
         "allForms.edges",
       );
 
+      this._forms = forms; // cache the result
+
       return forms;
     } catch (error) {
       console.error(error);

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

@@ -384,20 +384,7 @@
         @renderComponent={{component "cfb-toggle-switch" size="small"}}
       />
 
-      <UkButton
-        @color="link"
-        @onClick={{toggle-action "showAdvanced" this}}
-        class="uk-flex uk-flex-middle uk-margin"
-      >
-        {{#if this.showAdvanced}}
-          <UkIcon @icon="triangle-down" />
-        {{else}}
-          <UkIcon @icon="triangle-right" />
-        {{/if}}
-        {{t "caluma.form-builder.question.advancedSettings"}}
-      </UkButton>
-
-      {{#if this.showAdvanced}}
+      <CfbFormEditor::CfbAdvancedSettings>
         {{#if (has-question-type f.model "action-button")}}
           <f.input
             @name="validateOnEnter"
@@ -438,10 +425,13 @@
           @name="meta"
           @renderComponent={{component "cfb-code-editor" language="json"}}
         />
-      {{/if}}
+      </CfbFormEditor::CfbAdvancedSettings>
 
       <div class="uk-flex uk-flex-between uk-flex-middle uk-flex-row-reverse">
-        <CfbFormEditor::QuestionUsage @model={{f.model}} class="uk-flex-last" />
+        <CfbFormEditor::QuestionUsage
+          @slug={{changeset-get f.model "slug"}}
+          class="uk-flex-last"
+        />
 
         <f.submit
           @disabled={{f.loading}}

package/addon/gql/fragments/form-info.graphql

@@ -5,4 +5,5 @@ fragment FormInfo on Form {
   description
   isArchived
   isPublished
+  meta
 }

package/app/components/cfb-form-editor/cfb-advanced-settings.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-form-builder/components/cfb-form-editor/cfb-advanced-settings";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "12.8.0",
+  "version": "12.9.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -10,7 +10,7 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "dependencies": {
-    "@babel/core": "^7.23.6",
+    "@babel/core": "^7.23.7",
     "@ember/legacy-built-in-components": "^0.5.0",
     "@ember/render-modifiers": "^2.1.0",
     "@ember/string": "^3.1.1",
@@ -19,7 +19,7 @@
     "@glimmer/tracking": "^1.1.2",
     "codejar": "^4.2.0",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.7.1",
+    "ember-auto-import": "^2.7.2",
     "ember-changeset": "^4.1.2",
     "ember-changeset-validations": "^4.1.1",
     "ember-cli-babel": "^8.2.0",
@@ -28,7 +28,7 @@
     "ember-concurrency": "^3.1.1",
     "ember-engines-router-service": "^0.5.0",
     "ember-fetch": "^8.1.2",
-    "ember-flatpickr": "^4.0.0",
+    "ember-flatpickr": "^6.0.0",
     "ember-intl": "^6.4.0",
     "ember-math-helpers": "^4.0.0",
     "ember-power-select": "^7.2.0",
@@ -36,6 +36,7 @@
     "ember-test-selectors": "^6.0.0",
     "ember-uikit": "^9.0.0",
     "ember-validated-form": "^7.0.0",
+    "flatpickr": "^4.6.13",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "highlight.js": "^11.9.0",
@@ -43,8 +44,8 @@
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",
     "uikit": "^3.17.11",
-    "@projectcaluma/ember-form": "^12.8.0",
-    "@projectcaluma/ember-core": "^12.8.0"
+    "@projectcaluma/ember-core": "^12.9.0",
+    "@projectcaluma/ember-form": "^12.9.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -72,7 +73,7 @@
     "ember-load-initializers": "2.1.2",
     "ember-qunit": "8.0.2",
     "ember-resolver": "11.0.1",
-    "ember-source": "5.5.0",
+    "ember-source": "5.6.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "3.0.0",
     "loader.js": "4.7.0",
@@ -80,7 +81,7 @@
     "qunit": "2.20.0",
     "qunit-dom": "3.0.0",
     "webpack": "5.89.0",
-    "@projectcaluma/ember-testing": "12.8.0"
+    "@projectcaluma/ember-testing": "12.9.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",