fix: remove jexl logic and hide toggle (#233)

projectcaluma · May 14, 2019 · 9627dec · 9627dec
1 parent 2f5a197
commit 9627dec
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/addon/components/cfb-form-editor/question.js b/addon/components/cfb-form-editor/question.js
@@ -189,6 +189,16 @@ export default Component.extend(ComponentQueryManager, {
     return namespace ? `${namespace}-` : "";
   }),
 
+  requiredIsVisible: computed("changeset.{__typename,isRequired}", function() {
+    const isRequired = this.changeset.get("isRequired");
+    const typename = this.changeset.get("__typename");
+
+    return (
+      (isRequired === "true" || isRequired === "false") &&
+      typename !== "StaticQuestion"
+    );
+  }),
+
   _getIntegerQuestionInput(changeset) {
     return {
       isRequired: changeset.get("isRequired"),

diff --git a/addon/components/cfb-jexl-boolean-toggle-switch.js b/addon/components/cfb-jexl-boolean-toggle-switch.js
@@ -1,28 +1,16 @@
 import RenderComponent from "ember-validated-form/components/validated-input/-themes/uikit/render";
 import layout from "../templates/components/cfb-jexl-boolean-toggle-switch";
-import jexl from "jexl";
-import { reads } from "@ember/object/computed";
-import { task } from "ember-concurrency";
 import { computed } from "@ember/object";
 
 export default RenderComponent.extend({
   layout,
 
   didReceiveAttrs() {
     this._super(...arguments);
-
-    this.get("_boolValue").perform();
   },
 
-  boolValue: reads("_boolValue.lastSuccessful.value"),
-
-  _boolValue: task(function*() {
-    return yield jexl.eval(this.get("value"));
-  }),
-
-  disabled: computed("value", function() {
-    const value = this.get("value");
-    return !(value === "true" || value === "false");
+  boolValue: computed("value", function() {
+    return this.get("value") === "true";
   }),
 
   actions: {

diff --git a/addon/templates/components/cfb-form-editor/question.hbs b/addon/templates/components/cfb-form-editor/question.hbs
@@ -76,7 +76,7 @@
           {{/if}}
         </div>
 
-        {{#if (not-eq f.model.__typename "StaticQuestion")}}
+        {{#if requiredIsVisible}}
           <div class="uk-width-auto uk-flex">
             {{f.input
               name="isRequired"