@projectcaluma/ember-form-builder 11.0.0-beta.12 → 11.0.0-beta.15

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.15](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.14...@projectcaluma/ember-form-builder-v11.0.0-beta.15) (2022-08-02)
+
+
+### Features
+
+* **analytics:** adds analytics module for caluma ([#1655](https://github.com/projectcaluma/ember-caluma/issues/1655)) ([9573abe](https://github.com/projectcaluma/ember-caluma/commit/9573abe95cd39cb1467113026f2ab7773c3c9143))
+
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.14](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.13...@projectcaluma/ember-form-builder-v11.0.0-beta.14) (2022-06-09)
+
+
+### Features
+
+* **caluma:** use new filter syntax of caluma ([7a00c03](https://github.com/projectcaluma/ember-caluma/commit/7a00c03a103933d9e48dd88adb7382441a298742))
+
+
+### BREAKING CHANGES
+
+* **caluma:** `ember-caluma` now requires Caluma version >=
+8.0.0-beta.6
+
+# [@projectcaluma/ember-form-builder-v11.0.0-beta.13](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.12...@projectcaluma/ember-form-builder-v11.0.0-beta.13) (2022-05-09)
+
+
+### Bug Fixes
+
+* **deps:** update ember-engines ([5aa5300](https://github.com/projectcaluma/ember-caluma/commit/5aa530074ea7dc08267d8ccc411eb1538537a1b5))
+* **resources:** fix deprecations of ember-resources ([7a84c5c](https://github.com/projectcaluma/ember-caluma/commit/7a84c5c78d5b28f7b5393c64722907728dd5f42b))
+
 # [@projectcaluma/ember-form-builder-v11.0.0-beta.12](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-form-builder-v11.0.0-beta.11...@projectcaluma/ember-form-builder-v11.0.0-beta.12) (2022-04-07)
 
 

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

@@ -4,7 +4,7 @@ import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { timeout, restartableTask, dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { trackedTask } from "ember-resources/util/ember-concurrency";
 
 import FormValidations from "../../validations/form";
 
@@ -25,7 +25,7 @@ export default class CfbFormEditorGeneral extends Component {
     return this._data.value?.[0]?.node;
   }
 
-  _data = useTask(this, this.fetchData, () => [this.args.slug]);
+  _data = trackedTask(this, this.fetchData, () => [this.args.slug]);
 
   @restartableTask
   *fetchData() {

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

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { dropTask } from "ember-concurrency";
-import { useTask } from "ember-resources";
+import { trackedTask } from "ember-resources/util/ember-concurrency";
 
 import allFormatValidatorsQuery from "@projectcaluma/ember-form-builder/gql/queries/all-format-validators.graphql";
 
@@ -21,7 +21,7 @@ export default class CfbFormEditorQuestionValidation extends Component {
     );
   }
 
-  _validators = useTask(this, this.fetchFormatValidators, () => []);
+  _validators = trackedTask(this, this.fetchFormatValidators, () => []);
 
   @dropTask
   *fetchFormatValidators() {

package/addon/gql/mutations/add-form-question.graphql

@@ -6,7 +6,7 @@ mutation AddFormQuestion($input: AddFormQuestionInput!, $search: String) {
     form {
       id
       ...FormInfo
-      questions(search: $search) {
+      questions(filter: [{ search: $search }]) {
         edges {
           node {
             id

package/addon/gql/mutations/remove-form-question.graphql

@@ -6,7 +6,7 @@ mutation RemoveFormQuestion($input: RemoveFormQuestionInput!, $search: String) {
     form {
       id
       ...FormInfo
-      questions(search: $search) {
+      questions(filter: [{ search: $search }]) {
         edges {
           node {
             id

package/addon/gql/mutations/reorder-form-questions.graphql

@@ -9,7 +9,7 @@ mutation ReorderFormQuestions(
     form {
       id
       ...FormInfo
-      questions(search: $search) {
+      questions(filter: [{ search: $search }]) {
         edges {
           node {
             id

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

@@ -2,7 +2,7 @@
 #import FieldQuestion, FieldTableQuestion, SimpleAnswer, SimpleQuestion from '../fragments/field.graphql'
 
 query FormEditorQuestion($slug: String!) {
-  allQuestions(filter: [{ slug: $slug }]) {
+  allQuestions(filter: [{ slugs: [$slug] }]) {
     edges {
       node {
         id

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/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/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;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "11.0.0-beta.12",
+  "version": "11.0.0-beta.15",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -20,69 +20,74 @@
   "dependencies": {
     "@ember/render-modifiers": "^2.0.4",
     "@ember/string": "^3.0.0",
-    "@embroider/macros": "^1.5.0",
-    "@glimmer/component": "^1.1.1",
-    "@glimmer/tracking": "^1.1.1",
-    "@projectcaluma/ember-core": "^11.0.0-beta.6",
-    "@projectcaluma/ember-form": "^11.0.0-beta.17",
+    "@embroider/macros": "^1.8.3",
+    "@glimmer/component": "^1.1.2",
+    "@glimmer/tracking": "^1.1.2",
+    "@projectcaluma/ember-core": "^11.0.0-beta.8",
+    "@projectcaluma/ember-form": "^11.0.0-beta.21",
     "codejar": "^3.6.0",
-    "ember-apollo-client": "^4.0.2",
-    "ember-auto-import": "^2.4.1",
-    "ember-changeset": "^4.0.0",
-    "ember-changeset-validations": "^4.0.0",
+    "ember-apollo-client": "~4.0.2",
+    "ember-auto-import": "^2.4.2",
+    "ember-changeset": "^4.1.0",
+    "ember-changeset-validations": "^4.1.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.1.0",
     "ember-composable-helpers": "^5.0.0",
     "ember-concurrency": "^2.2.1",
     "ember-engines-router-service": "^0.3.0",
     "ember-fetch": "^8.1.1",
     "ember-intl": "^5.7.2",
-    "ember-math-helpers": "^2.18.1",
+    "ember-math-helpers": "^2.18.2",
     "ember-pikaday": "^4.0.0",
     "ember-power-select": "^5.0.4",
-    "ember-resources": "^4.4.0",
+    "ember-resources": "^5.0.2",
     "ember-test-selectors": "^6.0.0",
-    "ember-uikit": "^5.1.1",
+    "ember-uikit": "^5.1.3",
     "ember-validated-form": "^5.3.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
-    "highlight.js": "^11.5.0",
+    "highlight.js": "^11.6.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.7.0",
-    "@embroider/test-setup": "1.5.0",
-    "@faker-js/faker": "6.1.2",
-    "@projectcaluma/ember-testing": "11.0.0-beta.6",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.8.3",
+    "@faker-js/faker": "7.3.0",
+    "@projectcaluma/ember-testing": "11.0.0-beta.9",
     "broccoli-asset-rev": "3.0.0",
     "ember-autoresize-modifier": "^0.5.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
-    "ember-cli-dependency-checker": "3.2.0",
+    "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "3.0.0-alpha.2",
+    "ember-cli-mirage": "3.0.0-alpha.3",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-data": "3.28.9",
+    "ember-data": "3.28.10",
     "ember-disable-prototype-extensions": "1.1.3",
-    "ember-engines": "0.8.20",
+    "ember-engines": "0.8.22",
     "ember-export-application-global": "2.0.1",
     "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-source": "3.28.9",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
-    "miragejs": "0.1.43",
+    "miragejs": "0.1.45",
     "npm-run-all": "4.1.5",
-    "qunit": "2.18.1",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "webpack": "5.71.0"
+    "webpack": "5.73.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/app/styles/_cfb-powerselect.scss

@@ -1,31 +0,0 @@
-// Backgrounds
-$ember-power-select-selected-background: lighten(
-  $global-secondary-background,
-  25%
-) !default;
-$ember-power-select-highlighted-background: lighten(
-  $ember-power-select-selected-background,
-  25%
-) !default;
-$ember-power-select-multiple-selection-background-color: $ember-power-select-selected-background !default;
-
-// Texts
-$ember-power-select-highlighted-color: #ffffff !default;
-$ember-power-select-multiple-selection-color: #ffffff !default;
-
-.ember-power-select-option[aria-selected="true"] {
-  color: $ember-power-select-highlighted-color;
-}
-
-// Borders
-$ember-power-select-focus-outline: 0 !default;
-$ember-power-select-border-color: $global-border !default;
-$ember-power-select-default-border-radius: 0 !default;
-$ember-power-select-multiple-option-border-color: $ember-power-select-border-color !default;
-
-// Other
-$ember-power-select-line-height: 38px !default;
-$ember-power-select-multiple-option-padding: 0 8px !default;
-$ember-power-select-multiple-option-line-height: 32px !default;
-
-@import "ember-power-select";