@projectcaluma/ember-form-builder 11.0.0-beta.8 → 11.0.0

package/addon/gql/mutations/save-dynamic-multiple-choice-question.graphql

@@ -9,6 +9,7 @@ mutation SaveDynamicMultipleChoiceQuestion(
       ...QuestionInfo
       ... on DynamicMultipleChoiceQuestion {
         dataSource
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-files-question.graphql

@@ -0,0 +1,14 @@
+#import QuestionInfo from '../fragments/question-info.graphql'
+
+mutation SaveFilesQuestion($input: SaveFilesQuestionInput!) {
+  saveFilesQuestion(input: $input) {
+    question {
+      id
+      ...QuestionInfo
+      ... on FilesQuestion {
+        hintText
+      }
+    }
+    clientMutationId
+  }
+}

package/addon/gql/mutations/save-float-question.graphql

@@ -8,6 +8,7 @@ mutation SaveFloatQuestion($input: SaveFloatQuestionInput!) {
       ... on FloatQuestion {
         floatMinValue: minValue
         floatMaxValue: maxValue
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-integer-question.graphql

@@ -8,6 +8,7 @@ mutation SaveIntegerQuestion($input: SaveIntegerQuestionInput!) {
       ... on IntegerQuestion {
         integerMinValue: minValue
         integerMaxValue: maxValue
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-multiple-choice-question.graphql

@@ -15,6 +15,7 @@ mutation SaveMultipleChoiceQuestion($input: SaveMultipleChoiceQuestionInput!) {
             }
           }
         }
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-table-question.graphql

@@ -10,6 +10,7 @@ mutation SaveTableQuestion($input: SaveTableQuestionInput!) {
           id
           slug
         }
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-text-question.graphql

@@ -8,6 +8,7 @@ mutation SaveTextQuestion($input: SaveTextQuestionInput!) {
       ... on TextQuestion {
         minLength
         maxLength
+        hintText
       }
     }
     clientMutationId

package/addon/gql/mutations/save-textarea-question.graphql

@@ -8,6 +8,7 @@ mutation SaveTextareaQuestion($input: SaveTextareaQuestionInput!) {
       ... on TextareaQuestion {
         minLength
         maxLength
+        hintText
       }
     }
     clientMutationId

package/addon/gql/queries/check-form-slug.graphql

@@ -1,5 +1,5 @@
 query CheckFormSlug($slug: String!) {
-  allForms(filter: [{ slug: $slug }]) {
+  allForms(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id

package/addon/gql/queries/check-question-slug.graphql

@@ -1,5 +1,5 @@
 query CheckQuestionSlug($slug: String!) {
-  allQuestions(filter: [{ slug: $slug }]) {
+  allQuestions(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id

package/addon/gql/queries/form-editor-general.graphql

@@ -1,7 +1,7 @@
 #import FormInfo from '../fragments/form-info.graphql'
 
 query FormEditorGeneral($slug: String!) {
-  allForms(filter: [{ slug: $slug }]) {
+  allForms(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id

package/addon/gql/queries/form-editor-question.graphql

@@ -1,8 +1,8 @@
 #import QuestionInfo from '../fragments/question-info.graphql'
-#import FieldQuestion, FieldTableQuestion, SimpleAnswer, SimpleQuestion from '../fragments/field.graphql'
+#import FieldQuestion, FieldTableQuestion, SimpleAnswer, SimpleQuestion from '@projectcaluma/ember-form/gql/fragments/field.graphql'
 
 query FormEditorQuestion($slug: String!) {
-  allQuestions(filter: [{ slug: $slug }]) {
+  allQuestions(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id
@@ -11,6 +11,7 @@ query FormEditorQuestion($slug: String!) {
           integerMaxValue: maxValue
           integerMinValue: minValue
           placeholder
+          hintText
           defaultAnswer {
             id
             integerValue: value
@@ -20,6 +21,7 @@ query FormEditorQuestion($slug: String!) {
           floatMaxValue: maxValue
           floatMinValue: minValue
           placeholder
+          hintText
           defaultAnswer {
             id
             floatValue: value
@@ -29,6 +31,7 @@ query FormEditorQuestion($slug: String!) {
           minLength
           maxLength
           placeholder
+          hintText
           defaultAnswer {
             id
             stringValue: value
@@ -52,12 +55,14 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             stringValue: value
           }
         }
         ... on DateQuestion {
+          hintText
           defaultAnswer {
             id
             dateValue: value
@@ -74,6 +79,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             listValue: value
@@ -90,6 +96,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             stringValue: value
@@ -97,9 +104,11 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on DynamicMultipleChoiceQuestion {
           dataSource
+          hintText
         }
         ... on DynamicChoiceQuestion {
           dataSource
+          hintText
         }
         ... on TableQuestion {
           rowForm {
@@ -115,6 +124,7 @@ query FormEditorQuestion($slug: String!) {
               }
             }
           }
+          hintText
           defaultAnswer {
             id
             tableValue: value {
@@ -151,6 +161,10 @@ query FormEditorQuestion($slug: String!) {
         }
         ... on CalculatedFloatQuestion {
           calcExpression
+          hintText
+        }
+        ... on FilesQuestion {
+          hintText
         }
         ... on ActionButtonQuestion {
           action

package/addon/gql/queries/search-form-question.graphql

@@ -1,12 +1,12 @@
 #import QuestionInfo from '../fragments/question-info.graphql'
 
-query SearchFormQuestion($slug: String!, $search: String, $archived: Boolean) {
-  allForms(filter: [{ slug: $slug }]) {
+query SearchFormQuestion($slug: String!, $search: String) {
+  allForms(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id
         slug
-        questions(search: $search, isArchived: $archived) {
+        questions(filter: [{ search: $search }]) {
           edges {
             node {
               id

package/addon/instance-initializers/form-builder-widget-overrides.js

@@ -0,0 +1,15 @@
+import DefaultTableComponent from "@projectcaluma/ember-form-builder/components/cfb-form-editor/question/default/table";
+
+export function initialize(appInstance) {
+  const options = appInstance.lookup("service:caluma-options");
+
+  options.registerComponentOverride({
+    component: "cfb-form-editor/question/default/table",
+    componentClass: DefaultTableComponent,
+    types: [],
+  });
+}
+
+export default {
+  initialize,
+};

package/addon/routes/edit/questions/edit.js

@@ -20,9 +20,10 @@ export default class EditQuestionsEditRoute extends Route {
       {
         query: gql`
           query QuestionLabel($slug: String!) {
-            allQuestions(slug: $slug) {
+            allQuestions(filter: [{ slugs: [$slug] }]) {
               edges {
                 node {
+                  id
                   label
                 }
               }

package/addon/routes/edit.js

@@ -20,7 +20,7 @@ export default class EditRoute extends Route {
       {
         query: gql`
           query FormName($slug: String!) {
-            allForms(slug: $slug) {
+            allForms(filter: [{ slugs: [$slug] }]) {
               edges {
                 node {
                   name

package/addon/templates/index.hbs

@@ -1 +1,8 @@
-<CfbFormList @onNewForm={{this.newForm}} @onEditForm={{this.editForm}} />
+<CfbFormList
+  @search={{this.search}}
+  @category={{this.category}}
+  @onNewForm={{this.newForm}}
+  @onEditForm={{this.editForm}}
+  @onUpdateSearch={{fn (mut this.search)}}
+  @onUpdateCategory={{fn (mut this.category)}}
+/>

package/addon/validations/question.js

@@ -9,6 +9,7 @@ import validateOptions from "../validators/options";
 
 import and from "@projectcaluma/ember-form-builder/utils/and";
 import or from "@projectcaluma/ember-form-builder/utils/or";
+import validateJexl from "@projectcaluma/ember-form-builder/validators/jexl";
 import validateSlug from "@projectcaluma/ember-form-builder/validators/slug";
 import validateType from "@projectcaluma/ember-form-builder/validators/type";
 
@@ -16,18 +17,24 @@ export default {
   label: and(validatePresence(true), validateLength({ max: 1024 })),
   slug: validateSlug(),
 
+  hintText: or(
+    validateType("FormQuestion", true),
+    validateType("StaticQuestion", true),
+    validateType("FilesQuestion", true),
+    validateLength({ max: 1024, allowBlank: true })
+  ),
   integerMinValue: or(
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ lt: "integerMaxValue" })
+      validateGtLt({ lt: "integerMaxValue", allowNone: true })
     )
   ),
   integerMaxValue: or(
     validateType("IntegerQuestion", false),
     and(
       validateNumber({ allowBlank: true, integer: true }),
-      validateGtLt({ gt: "integerMinValue" })
+      validateGtLt({ gt: "integerMinValue", allowNone: true })
     )
   ),
 
@@ -35,14 +42,14 @@ export default {
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ lt: "floatMaxValue" })
+      validateGtLt({ lt: "floatMaxValue", allowNone: true })
     )
   ),
   floatMaxValue: or(
     validateType("FloatQuestion", false),
     and(
       validateNumber({ allowBlank: true }),
-      validateGtLt({ gt: "floatMinValue" })
+      validateGtLt({ gt: "floatMinValue", allowNone: true })
     )
   ),
 
@@ -76,4 +83,6 @@ export default {
     validateType("FormQuestion", false),
     validatePresence(true)
   ),
+  isHidden: validateJexl(),
+  isRequired: validateJexl(),
 };

package/addon/validators/gt-lt.js

@@ -1,47 +1,26 @@
-import getMessages from "ember-changeset-validations/utils/get-messages";
-import buildMessage from "ember-changeset-validations/utils/validation-errors";
+import { validateNumber } from "ember-changeset-validations/validators";
 
-export default function validateGtLt(options = { gt: null, lt: null }) {
+export default function validateGtLt(options = {}) {
   return (key, newValue, oldValue, changes, content) => {
-    newValue = Number(newValue);
-
-    if (!newValue) {
-      return true;
-    }
-
-    const messages = getMessages();
     const data = { ...content, ...changes };
 
-    if (options.gt) {
-      const dependentValue = data[options.gt];
-
-      return dependentValue
-        ? Number(newValue) > Number(dependentValue) ||
-            buildMessage(key, {
-              type: "greaterThan",
-              value: newValue,
-              context: {
-                gt: messages.getDescriptionFor(options.gt),
-              },
-            })
-        : true;
-    }
+    const parsedOptions = Object.entries(options).reduce((parsed, [k, v]) => {
+      const value =
+        /^(g|l)t(e)?$/.test(k) && typeof v === "string" ? data[v] : v;
 
-    if (options.lt) {
-      const dependentValue = data[options.lt];
+      if (value) {
+        return { ...parsed, [k]: value };
+      }
 
-      return dependentValue
-        ? Number(newValue) < Number(dependentValue) ||
-            buildMessage(key, {
-              type: "lessThan",
-              value: newValue,
-              context: {
-                lt: messages.getDescriptionFor(options.lt),
-              },
-            })
-        : true;
-    }
+      return parsed;
+    }, {});
 
-    return true;
+    return validateNumber(parsedOptions)(
+      key,
+      newValue,
+      oldValue,
+      changes,
+      content
+    );
   };
 }

package/addon/validators/jexl.js

@@ -0,0 +1,49 @@
+import jexl from "jexl";
+
+const TRANSFORMS = [
+  "answer",
+  "mapby",
+  "debug",
+  "min",
+  "max",
+  "round",
+  "ceil",
+  "floor",
+  "sum",
+  "avg",
+  "stringify",
+];
+const BINARY_OPS = ["intersects"];
+
+const documentJexl = new jexl.Jexl();
+
+const noop = () => {};
+
+TRANSFORMS.forEach((transform) => documentJexl.addTransform(transform, noop));
+BINARY_OPS.forEach((binaryOp) => documentJexl.addBinaryOp(binaryOp, 0, noop));
+
+function parseError(error) {
+  const str = String(error)
+    .replace(/^Error:/, "") // Remove "Error:" prefix
+    .replace(/(of expression):.*$/, (_, match) => match) // Remove everything after "of expression"
+    .replace(/in expression:.*$/, "") // Remove "in expression: [expression]"
+    .replace(/\.$/g, "") // Remove trailing dot
+    .replace(/\s\s+/g, " ") // Remove double whitespace chars
+    .trim();
+
+  return str;
+}
+
+export default function validateJexl() {
+  return (key, newValue) => {
+    try {
+      if (newValue) {
+        documentJexl.evalSync(newValue);
+      }
+
+      return true;
+    } catch (error) {
+      return parseError(error);
+    }
+  };
+}

package/app/instance-initializers/form-builder-widget-overrides.js

@@ -0,0 +1,4 @@
+export {
+  default,
+  initialize,
+} from "@projectcaluma/ember-form-builder/instance-initializers/form-builder-widget-overrides";

package/app/styles/@projectcaluma/ember-form-builder.scss

@@ -3,7 +3,7 @@
 @import "../cfb-form-editor/question-list/item";
 @import "../cfb-form-editor/question";
 @import "../cfb-navigation";
-@import "../cfb-powerselect";
+@import "../cfb-uikit-powerselect";
 
 .cfb-pointer {
   cursor: pointer;
@@ -22,7 +22,7 @@
 .cfb-code-editor {
   font-family: $base-code-font-family;
   letter-spacing: normal;
-  height: 70px;
+  min-height: 70px;
   line-height: 16px;
   tab-size: 4;
 }

package/app/styles/_cfb-uikit-powerselect.scss

@@ -0,0 +1,2 @@
+@import "@projectcaluma/ember-core";
+@import "ember-power-select";

package/blueprints/@projectcaluma/ember-form-builder/index.js

@@ -10,7 +10,7 @@ module.exports = {
         { name: "@projectcaluma/ember-form" },
         { name: "ember-engines" },
         { name: "ember-math-helpers" },
-        { name: "ember-pikaday" },
+        { name: "ember-flatpickr" },
         { name: "ember-power-select" },
       ],
     });

package/config/environment.js

@@ -4,12 +4,5 @@ module.exports = function (environment) {
   return {
     modulePrefix: require("../package.json").name,
     environment,
-
-    "ember-validated-form": {
-      theme: "uikit",
-      defaults: {
-        label: "cfb-label",
-      },
-    },
   };
 };

package/index.js

@@ -11,8 +11,10 @@ module.exports = buildEngine({
   },
 
   included(...args) {
-    this._super.included.apply(this, args);
+    const app = this._findHost(this);
+
+    app.options["ember-validated-form"] = { theme: "uikit" };
 
-    this.import("node_modules/prismjs/themes/prism.css");
+    this._super.included.apply(this, args);
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.8",
+  "version": "11.0.0",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -10,83 +10,94 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all test:*",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
   "peerDependencies": {
-    "ember-engines": ">= 0.8"
+    "ember-engines": ">= 0.8",
+    "ember-source": "^3.28.0 || ^4.0.0"
   },
   "dependencies": {
-    "@ember/render-modifiers": "^2.0.4",
-    "@glimmer/component": "^1.0.4",
-    "@glimmer/tracking": "^1.0.4",
-    "@projectcaluma/ember-core": "^11.0.0-beta.4",
-    "@projectcaluma/ember-form": "^11.0.0-beta.11",
-    "codejar": "^3.5.0",
-    "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.4.0",
-    "ember-changeset": "^4.0.0-beta.4",
-    "ember-changeset-validations": "^4.0.0-beta.2",
+    "@ember/legacy-built-in-components": "^0.4.1",
+    "@ember/render-modifiers": "^2.0.5",
+    "@ember/string": "^3.0.1",
+    "@embroider/macros": "^1.10.0",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "@projectcaluma/ember-core": "^11.0.0",
+    "@projectcaluma/ember-form": "^11.0.0",
+    "codejar": "^3.6.0",
+    "ember-apollo-client": "~4.0.2",
+    "ember-auto-import": "^2.6.0",
+    "ember-changeset": "^4.1.2",
+    "ember-changeset-validations": "^4.1.1",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^2.2.1",
+    "ember-concurrency": "^2.3.7",
     "ember-engines-router-service": "^0.3.0",
-    "ember-fetch": "^8.1.1",
+    "ember-fetch": "^8.1.2",
+    "ember-flatpickr": "^3.2.3",
     "ember-intl": "^5.7.2",
-    "ember-math-helpers": "^2.18.1",
-    "ember-pikaday": "^4.0.0",
-    "ember-power-select": "^5.0.3",
-    "ember-resources": "^4.3.1",
+    "ember-math-helpers": "^3.0.0",
+    "ember-power-select": "^6.0.1",
+    "ember-resources": "^5.6.2",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^5.0.0",
-    "ember-validated-form": "^5.2.2",
+    "ember-uikit": "^6.1.1",
+    "ember-validated-form": "^6.1.2",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
-    "jexl": "^2.3.0",
-    "prismjs": "^1.26.0"
+    "highlight.js": "^11.7.0",
+    "highlightjs-jexl": "^0.0.5",
+    "jexl": "^2.3.0"
   },
-  "//": "TODO: remove ember-data when https://github.com/ember-engines/ember-engines/pull/794 is released",
+  "//": [
+    "TODO: remove obsolete dependency to `ember-data` which is only necessary",
+    "because @embroider/macros `dependencySatisfies` still resolves to `true`",
+    "even if the dependency is only present in the workspace (because of the",
+    "docs app) but not as direct dependency of the package."
+  ],
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "1.2.0",
-    "@faker-js/faker": "6.0.0-alpha.6",
-    "@projectcaluma/ember-testing": "11.0.0-beta.3",
+    "@ember/test-helpers": "2.7.0",
+    "@embroider/test-setup": "2.1.1",
+    "@faker-js/faker": "7.6.0",
+    "@projectcaluma/ember-testing": "11.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.5",
-    "ember-cli-code-coverage": "1.0.3",
-    "ember-cli-dependency-checker": "3.2.0",
+    "concurrently": "7.6.0",
+    "ember-autoresize-modifier": "^0.7.0",
+    "ember-cli": "4.9.2",
+    "ember-cli-code-coverage": "2.0.0",
+    "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.4.0",
+    "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "3.28.8",
-    "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.20",
-    "ember-export-application-global": "2.0.1",
+    "ember-data": "4.7.3",
+    "ember-engines": "0.8.23",
     "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "5.1.5",
-    "ember-resolver": "8.0.3",
-    "ember-source": "3.28.8",
+    "ember-qunit": "6.1.1",
+    "ember-resolver": "8.1.0",
+    "ember-source": "4.10.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
-    "npm-run-all": "4.1.5",
-    "qunit": "2.17.2",
+    "miragejs": "0.1.47",
+    "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "webpack": "5.69.0"
+    "webpack": "5.75.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config"
+    "configPath": "tests/dummy/config",
+    "before": [
+      "ember-validated-form"
+    ]
   }
 }