@projectcaluma/ember-form-builder 12.12.0 → 12.14.0

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

@@ -1,6 +1,6 @@
 <UkButton
   @color="link"
-  @onClick={{toggle-action "showAdvanced" this}}
+  @onClick={{this.toggleAdvanced}}
   class="uk-flex uk-flex-middle uk-margin"
 >
   {{#if this.showAdvanced}}

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

@@ -1,6 +1,20 @@
+import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
-
 export default class CfbFormEditorCfbAdvancedSettings extends Component {
   @tracked showAdvanced = false;
+
+  constructor(owner, args) {
+    super(owner, args);
+
+    this.showAdvanced =
+      JSON.parse(localStorage.getItem("showAdvanced")) ?? false;
+  }
+
+  @action
+  toggleAdvanced() {
+    this.showAdvanced = !this.showAdvanced;
+
+    localStorage.setItem("showAdvanced", this.showAdvanced);
+  }
 }

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

@@ -41,7 +41,11 @@
       <a
         data-test-edit-question
         href="#"
-        class="uk-width-auto uk-margin-small-right uk-text-bold"
+        class={{if
+          this.isActive
+          "uk-width-auto uk-margin-small-right uk-text-bold"
+          "uk-width-auto uk-margin-small-right"
+        }}
         {{on "click" (fn this.editQuestion @question)}}
       >
         {{@question.slug}}
@@ -51,7 +55,11 @@
       </a>
     {{else}}
       <span
-        class="uk-width-auto uk-margin-small-right uk-text-bold"
+        class={{if
+          this.isActive
+          "uk-width-auto uk-margin-small-right uk-text-bold"
+          "uk-width-auto uk-margin-small-right"
+        }}
       >{{@question.slug}}</span>
     {{/if}}
 

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

@@ -1,11 +1,14 @@
 import { action } from "@ember/object";
 import { guidFor } from "@ember/object/internals";
+import { service } from "@ember/service";
 import Component from "@glimmer/component";
 import jexl from "jexl";
 
 import { hasQuestionType } from "@projectcaluma/ember-core/helpers/has-question-type";
 
 export default class CfbFormEditorQuestionListItem extends Component {
+  @service router;
+
   get elementId() {
     return guidFor(this);
   }
@@ -48,6 +51,14 @@ export default class CfbFormEditorQuestionListItem extends Component {
     );
   }
 
+  get isActive() {
+    // we can't access this.router.applicationRouter.currentRoute.queryParams
+    // because it is non-reactive
+    return this.router.currentURL?.endsWith(
+      `/questions/${this.args.question.slug}`,
+    );
+  }
+
   @action
   editQuestion(question, e) {
     e.preventDefault();

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

@@ -35,7 +35,7 @@
         @name="__typename"
         @required={{true}}
         @disabled={{not (is-empty @slug)}}
-        @on-update={{changeset-set f.model "__typename"}}
+        @on-update={{this.updateType}}
       />
 
       <f.input
@@ -428,10 +428,12 @@
       </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"
-        />
+        {{#unless this.isNew}}
+          <CfbFormEditor::QuestionUsage
+            @slug={{changeset-get f.model "slug"}}
+            class="uk-flex-last"
+          />
+        {{/unless}}
 
         <f.submit
           @disabled={{f.loading}}

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

@@ -195,6 +195,10 @@ export default class CfbFormEditorQuestion extends Component {
     return this.data.lastSuccessful?.value?.[0]?.node;
   }
 
+  get isNew() {
+    return !this.changeset.get("id");
+  }
+
   get prefix() {
     return this.calumaOptions.namespace
       ? `${this.calumaOptions.namespace}-`
@@ -497,6 +501,30 @@ export default class CfbFormEditorQuestion extends Component {
     }
   }
 
+  @action
+  updateType(value, changeset) {
+    changeset.set("__typename", value);
+
+    const defaultWidget = "cf-field/input/number-separator";
+    const currentWidget = changeset.get("meta.widgetOverride");
+    const isViableType = [
+      "IntegerQuestion",
+      "FloatQuestion",
+      "CalculatedFloatQuestion",
+    ].includes(value);
+
+    if (this.calumaOptions.useNumberSeparatorWidgetAsDefault) {
+      if (isViableType && !currentWidget) {
+        // Set the default widget as override if the question type is viable for
+        // it and there is no widget selected yet
+        changeset.set("meta.widgetOverride", defaultWidget);
+      } else if (!isViableType && currentWidget === defaultWidget) {
+        // Remove default widget for non viable question types
+        changeset.set("meta.widgetOverride", undefined);
+      }
+    }
+  }
+
   @action
   updateSubForm(value, changeset) {
     changeset.set("subForm.slug", value.slug);

package/addon/templates/edit/questions/edit.hbs

@@ -1,5 +1,4 @@
 <CfbFormEditor::Question
   @slug={{@model.questionSlug}}
   @form={{@model.formSlug}}
-  @onAfterSubmit={{this.afterSubmit}}
 />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "12.12.0",
+  "version": "12.14.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -42,10 +42,10 @@
     "highlightjs-jexl": "^0.0.5",
     "jexl": "^2.3.0",
     "lodash.isequal": "^4.5.0",
-    "reactiveweb": "^1.2.2",
+    "reactiveweb": "^1.2.3",
     "uikit": "^3.19.2",
-    "@projectcaluma/ember-core": "^12.12.0",
-    "@projectcaluma/ember-form": "^12.12.0"
+    "@projectcaluma/ember-core": "^12.14.0",
+    "@projectcaluma/ember-form": "^12.14.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -56,7 +56,7 @@
   "devDependencies": {
     "@ember/optional-features": "2.1.0",
     "@ember/test-helpers": "3.3.0",
-    "@embroider/test-setup": "3.0.3",
+    "@embroider/test-setup": "4.0.0",
     "@faker-js/faker": "8.4.1",
     "broccoli-asset-rev": "3.0.0",
     "ember-autoresize-modifier": "0.7.0",
@@ -79,9 +79,9 @@
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",
     "qunit": "2.20.1",
-    "qunit-dom": "3.0.0",
+    "qunit-dom": "3.1.2",
     "webpack": "5.91.0",
-    "@projectcaluma/ember-testing": "12.12.0"
+    "@projectcaluma/ember-testing": "12.14.0"
   },
   "peerDependencies": {
     "ember-engines": "^0.9.0",

package/addon/controllers/edit/questions/edit.js

@@ -1,12 +0,0 @@
-import Controller from "@ember/controller";
-import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
-
-export default class EditQuestionsEditController extends Controller {
-  @service router;
-
-  @action
-  afterSubmit() {
-    this.router.transitionTo("edit");
-  }
-}