@projectcaluma/ember-form-builder 12.7.0 → 12.9.0

package/addon/components/cfb-code-editor.hbs

@@ -4,11 +4,14 @@
   <div class="uk-form-controls">
     <div
       name={{@name}}
-      class="uk-textarea cfb-code-editor {{concat 'language-' @language}}"
+      class="uk-textarea cfb-code-editor
+        {{concat 'language-' @language}}
+        {{if @isValid 'uk-form-success'}}
+        {{if @isInvalid 'uk-form-danger'}}"
       {{did-insert this.didInsertNode}}
       {{will-destroy this.willDestroyNode}}
       {{autoresize mode="height"}}
-      {{on "blur" @setDirty}}
+      {{on "blur" this.onBlur}}
     ></div>
   </div>
 

package/addon/components/cfb-code-editor.js

@@ -6,6 +6,8 @@ import hljs from "highlight.js/lib/core";
 import json from "highlight.js/lib/languages/json";
 import markdown from "highlight.js/lib/languages/markdown";
 import jexl from "highlightjs-jexl/src/languages/jexl";
+import isEqual from "lodash.isequal";
+import "highlight.js/styles/github.css";
 
 hljs.configure({ ignoreUnescapedHTML: true });
 
@@ -15,14 +17,15 @@ hljs.registerLanguage("jexl", jexl);
 
 export default class CfbCodeEditorComponent extends Component {
   _editor = null;
-  _cursor = null;
   _lastValue = this.args.value;
 
-  get value() {
-    const value = this.args.value;
-
-    if (this.args.language === "json" && typeof value === "object") {
-      return JSON.stringify(value?.unwrap?.() ?? value, null, 2);
+  get stringValue() {
+    if (this.args.language === "json" && typeof this.args.value === "object") {
+      return JSON.stringify(
+        this.args.value?.unwrap?.() ?? this.args.value,
+        null,
+        2,
+      );
     }
 
     return this.args.value;
@@ -30,10 +33,6 @@ export default class CfbCodeEditorComponent extends Component {
 
   @action
   onUpdate(value) {
-    if (this._lastValue === value) return;
-
-    this._cursor = this._editor.save();
-
     if (this.args.language === "json") {
       try {
         value = JSON.parse(value);
@@ -42,20 +41,23 @@ export default class CfbCodeEditorComponent extends Component {
       }
     }
 
+    if (isEqual(this._lastValue, value)) return;
+
     this._lastValue = value;
     this.args.update(value);
   }
 
   @action
   updateCode() {
-    if (this._lastValue === this.value) return;
+    if (isEqual(this._lastValue, this.args.value)) return;
 
-    this._editor.updateCode(this.value, false);
+    this._editor.updateCode(this.stringValue, false);
+  }
 
-    if (this._cursor) {
-      this._editor.restore(this._cursor);
-      this._cursor = null;
-    }
+  @action
+  onBlur() {
+    this._editor.updateCode(this.stringValue);
+    this.args.setDirty();
   }
 
   @action
@@ -66,7 +68,7 @@ export default class CfbCodeEditorComponent extends Component {
     });
 
     // set initial value
-    this._editor.updateCode(this.value);
+    this._editor.updateCode(this.stringValue);
 
     // register update method
     this._editor.onUpdate(this.onUpdate);

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.hbs

@@ -0,0 +1,50 @@
+{{#if this.otherForms}}
+  <a
+    ...attributes
+    href="#"
+    {{on "click" (fn (mut this.modalVisible) true)}}
+    data-test-show-question-usage-modal-link
+  >
+    {{this.title}}
+  </a>
+{{/if}}
+
+<UkModal
+  @visible={{this.modalVisible}}
+  @stack={{true}}
+  @onHide={{fn (mut this.modalVisible) false}}
+  data-test-question-usage-modal
+  as |modal|
+>
+  <modal.header>
+    {{t "caluma.form-builder.question.usage.references-heading"}}
+  </modal.header>
+  <modal.body>
+    <ul class="uk-list uk-list-divider">
+      {{#each this.forms.value as |form|}}
+        <li data-test-question-form-item={{form.node.slug}}>
+          <div class="uk-flex uk-flex-middle">
+            <span class="uk-width-expand">
+              <LinkTo @route="edit" @model={{form.node.slug}}>
+                {{form.node.name}}
+              </LinkTo>
+            </span>
+
+            {{#if form.node.isArchived}}
+              <UkBadge>
+                {{t "caluma.form-builder.form.isArchived"}}
+              </UkBadge>
+            {{/if}}
+
+            {{#unless form.node.isPublished}}
+              <UkBadge class="uk-margin-small-left">
+                {{t "caluma.form-builder.question.usage.not-published"}}
+              </UkBadge>
+            {{/unless}}
+          </div>
+          <div class="uk-text-muted uk-text-small">{{form.node.slug}}</div>
+        </li>
+      {{/each}}
+    </ul>
+  </modal.body>
+</UkModal>

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

@@ -0,0 +1,58 @@
+import { inject as service } from "@ember/service";
+import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { queryManager } from "ember-apollo-client";
+import { trackedFunction } from "ember-resources/util/function";
+
+import allFormsForQuestionQuery from "@projectcaluma/ember-form-builder/gql/queries/all-forms-for-question.graphql";
+
+export default class CfbFormEditorQuestionUsage extends Component {
+  @service intl;
+  @queryManager apollo;
+
+  @tracked modalVisible = false;
+  @tracked _forms = null;
+
+  get title() {
+    return this.intl.t("caluma.form-builder.question.usage.title", {
+      n: this.otherForms,
+      // for highlighting the number we use the <b> tag
+      htmlSafe: true,
+    });
+  }
+
+  get otherForms() {
+    return this.forms.value?.length - 1 ?? 0;
+  }
+
+  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.slug,
+          },
+          fetchPolicy: "no-cache",
+        },
+        "allForms.edges",
+      );
+
+      this._forms = forms; // cache the result
+
+      return forms;
+    } catch (error) {
+      console.error(error);
+      return { value: [] };
+    }
+  });
+}

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,9 +425,14 @@
           @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
+          @slug={{changeset-get f.model "slug"}}
+          class="uk-flex-last"
+        />
 
-      <div class="uk-text-right">
         <f.submit
           @disabled={{f.loading}}
           @label={{t "caluma.form-builder.global.save"}}

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

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

package/addon/gql/queries/all-forms-for-question.graphql

@@ -0,0 +1,13 @@
+query AllFormsForQuestion($slug: String!) {
+  allForms(filter: [{ questions: [$slug] }]) {
+    edges {
+      node {
+        id
+        slug
+        name
+        isArchived
+        isPublished
+      }
+    }
+  }
+}

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/app/components/cfb-form-editor/question-usage.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "12.7.0",
+  "version": "12.9.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -10,16 +10,16 @@
   "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",
-    "@embroider/macros": "^1.13.3",
+    "@embroider/macros": "^1.13.4",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
     "codejar": "^4.2.0",
     "ember-apollo-client": "~4.0.2",
-    "ember-auto-import": "^2.7.0",
+    "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,14 +36,16 @@
     "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",
     "highlightjs-jexl": "^0.0.5",
     "jexl": "^2.3.0",
+    "lodash.isequal": "^4.5.0",
     "uikit": "^3.17.11",
-    "@projectcaluma/ember-core": "^12.7.0",
-    "@projectcaluma/ember-form": "^12.7.0"
+    "@projectcaluma/ember-core": "^12.9.0",
+    "@projectcaluma/ember-form": "^12.9.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -71,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",
@@ -79,7 +81,7 @@
     "qunit": "2.20.0",
     "qunit-dom": "3.0.0",
     "webpack": "5.89.0",
-    "@projectcaluma/ember-testing": "12.7.0"
+    "@projectcaluma/ember-testing": "12.9.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",

package/translations/de.yaml

@@ -134,6 +134,11 @@ caluma:
 
       hideLabel: "Label verstecken"
 
+      usage:
+        title: "Diese Frage wird in {n,plural, =1 {<b>einem</b> Formular} other {<b>#</b> Formularen}} verwendet."
+        references-heading: "Alle Verweise auf diese Frage"
+        not-published: "nicht publiziert"
+
     options:
       delete: "Option löschen"
       archive: "Option archivieren (verstecken)"

package/translations/en.yaml

@@ -134,6 +134,11 @@ caluma:
 
       hideLabel: "Hide label"
 
+      usage:
+        title: "This question is used in {n,plural, =1 {<b>another</b> form} other {<b>#</b> other forms}}"
+        references-heading: "All references of this question"
+        not-published: "not published"
+
     options:
       delete: "Delete option"
       archive: "Archive (hide) option"

package/translations/fr.yaml

@@ -134,6 +134,11 @@ caluma:
 
       hideLabel: "Cacher l'étiquette"
 
+      usage:
+        title: "Cette question est {n,plural, =1 {utilisé sous <b>une</b> forme} other {utilisé sous <b>#</b> formes}}."
+        references-heading: "Toutes les références à cette question"
+        not-published: "non publié"
+
     options:
       delete: "Supprimer l'option"
       archive: "Archiver (masquer) l'option"