feat(form): add option to enable number separator widget by default

projectcaluma · Mar 26, 2024 · dfc3fa0 · dfc3fa0
1 parent 0e0d1e7
commit dfc3fa0
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 15 deletions.
diff --git a/packages/-ember-caluma/app/services/caluma-options.js b/packages/-ember-caluma/app/services/caluma-options.js
@@ -29,6 +29,8 @@ export default class CustomCalumaOptionsService extends CalumaOptionsService {
     this.currentGroupId = 1;
   }
 
+  alwaysUseNumberSeparatorWidget = true;
+
   distribution = {
     inquiry: {
       answer: {

diff --git a/packages/-ember-caluma/mirage/scenarios/default.js b/packages/-ember-caluma/mirage/scenarios/default.js
@@ -48,7 +48,6 @@ export default function (server) {
     minValue: 0,
     maxValue: null,
     hintText: null,
-    meta: { widgetOverride: "cf-field/input/number-separator" },
   });
   server.create("question", {
     slug: "height",

diff --git a/packages/core/addon/services/caluma-options.js b/packages/core/addon/services/caluma-options.js
@@ -31,6 +31,8 @@ export default class CalumaOptionsService extends Service {
       : null;
   }
 
+  alwaysUseNumberSeparatorWidget = false;
+
   /**
    * Registers a new component override.
    *

diff --git a/packages/form/addon/components/cf-field-value.hbs b/packages/form/addon/components/cf-field-value.hbs
@@ -21,14 +21,7 @@
       @onClick={{fn this.download file.id}}
     />
   {{/each}}
-{{else if
-  (and
-    @field.answer.value
-    (eq
-      @field.question.raw.meta.widgetOverride "cf-field/input/number-separator"
-    )
-  )
-}}
+{{else if (and @field.answer.value @field.question.useNumberSeparatorWidget)}}
   {{format-number @field.answer.value maximumFractionDigits=20}}
 {{else}}
   {{@field.answer.value}}

diff --git a/packages/form/addon/helpers/get-widget.js b/packages/form/addon/helpers/get-widget.js
@@ -35,10 +35,16 @@ export default class GetWidgetHelper extends Helper {
 
   compute(params, { default: defaultWidget = "cf-field/input" }) {
     for (const obj of params) {
-      const widget = obj?.raw?.meta?.widgetOverride;
+      let widget = obj?.raw?.meta?.widgetOverride;
+
+      if (obj?.useNumberSeparatorWidget) {
+        widget = "cf-field/input/number-separator";
+      }
+
       if (!widget) {
         continue;
       }
+
       const override =
         widget &&
         this.calumaOptions

diff --git a/packages/form/addon/lib/question.js b/packages/form/addon/lib/question.js
@@ -1,4 +1,5 @@
 import { assert } from "@ember/debug";
+import { inject as service } from "@ember/service";
 import { camelize } from "@ember/string";
 import { queryManager } from "ember-apollo-client";
 import { trackedFunction } from "reactiveweb/function";
@@ -17,6 +18,8 @@ const getValue = (answer) => {
  * @class Question
  */
 export default class Question extends Base {
+  @service calumaOptions;
+
   @queryManager apollo;
 
   constructor({ raw, ...args }) {
@@ -174,4 +177,16 @@ export default class Question extends Base {
 
     return value;
   }
+
+  get useNumberSeparatorWidget() {
+    return (
+      this.raw.meta.widgetOverride === "cf-field/input/number-separator" ||
+      (this.calumaOptions.alwaysUseNumberSeparatorWidget &&
+        [
+          "IntegerQuestion",
+          "FloatQuestion",
+          "CalculatedFloatQuestion",
+        ].includes(this.raw.__typename))
+    );
+  }
 }
diff --git a/packages/form/tests/integration/components/cf-field-value-test.js b/packages/form/tests/integration/components/cf-field-value-test.js
@@ -134,16 +134,13 @@ module("Integration | Component | cf-field-value", function (hooks) {
     assert.dom(this.element).hasText(file.name);
   });
 
-  test("it numbers using the number-separator widget override", async function (assert) {
+  test("it renders numbers using the number-separator widget override", async function (assert) {
     setLocale(["de-ch", "de"]);
 
     this.field = {
       questionType: "FloatQuestion",
       question: {
-        raw: {
-          __typename: "FloatQuestion",
-          meta: { widgetOverride: "cf-field/input/number-separator" },
-        },
+        useNumberSeparatorWidget: true,
       },
       answer: {
         value: 1111111.111111,