@projectcaluma/ember-form-builder 14.7.0 → 14.7.1

package/addon/components/cfb-form-editor/copy-modal.js

@@ -5,7 +5,7 @@ import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { Changeset } from "ember-changeset";
 import lookupValidator from "ember-changeset-validations";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import copyFormMutation from "@projectcaluma/ember-form-builder/gql/mutations/copy-form.graphql";
 import validations from "@projectcaluma/ember-form-builder/validations/form";
@@ -32,10 +32,9 @@ export default class CfbFormEditorCopyModal extends Component {
     this.visible = !this.visible;
   }
 
-  @dropTask
-  *submit(changeset) {
+  submit = task({ drop: true }, async (changeset) => {
     try {
-      yield this.apollo.mutate(
+      await this.apollo.mutate(
         {
           mutation: copyFormMutation,
           variables: {
@@ -59,5 +58,5 @@ export default class CfbFormEditorCopyModal extends Component {
         this.intl.t("caluma.form-builder.notification.form.create.error"),
       );
     }
-  }
+  });
 }

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

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { restartableTask, dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import FormValidations from "../../validations/form";
@@ -23,10 +23,7 @@ export default class CfbFormEditorGeneral extends Component {
     return this._data.value?.[0]?.node;
   }
 
-  _data = trackedTask(this, this.fetchData, () => [this.args.slug]);
-
-  @restartableTask
-  *fetchData() {
+  fetchData = task({ restartable: true }, async () => {
     if (!this.args.slug) {
       return [
         {
@@ -40,7 +37,7 @@ export default class CfbFormEditorGeneral extends Component {
       ];
     }
 
-    return yield this.apollo.watchQuery(
+    return await this.apollo.watchQuery(
       {
         query: formEditorGeneralQuery,
         variables: { slug: this.args.slug },
@@ -48,7 +45,9 @@ export default class CfbFormEditorGeneral extends Component {
       },
       "allForms.edges",
     );
-  }
+  });
+
+  _data = trackedTask(this, this.fetchData, () => [this.args.slug]);
 
   get prefix() {
     return this.calumaOptions.namespace
@@ -56,12 +55,11 @@ export default class CfbFormEditorGeneral extends Component {
       : "";
   }
 
-  @dropTask
-  *submit(changeset) {
+  submit = task({ drop: true }, async (changeset) => {
     const rawMeta = changeset.get("meta");
 
     try {
-      const form = yield this.apollo.mutate(
+      const form = await this.apollo.mutate(
         {
           mutation: saveFormMutation,
           variables: {
@@ -96,7 +94,7 @@ export default class CfbFormEditorGeneral extends Component {
         ),
       );
     }
-  }
+  });
 
   @action
   updateName(value, changeset) {

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

@@ -4,7 +4,7 @@ import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
 import { Changeset } from "ember-changeset";
 import lookupValidator from "ember-changeset-validations";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import slugify from "@projectcaluma/ember-core/utils/slugify";
 import saveChoiceQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/save-choice-question.graphql";
@@ -26,10 +26,9 @@ export default class CfbFormEditorQuestionOptions extends Component {
     return this.args.value.every((row) => row.get("id") !== undefined);
   }
 
-  @dropTask
-  *reorderOptions(slugs) {
+  reorderOptions = task({ drop: true }, async (slugs) => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: TYPES[this.args.model.__typename],
         variables: {
           input: {
@@ -52,7 +51,7 @@ export default class CfbFormEditorQuestionOptions extends Component {
         ),
       );
     }
-  }
+  });
 
   @action
   addRow() {

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

@@ -2,7 +2,7 @@ import { action } from "@ember/object";
 import { underscore } from "@ember/string";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import allFormatValidatorsQuery from "@projectcaluma/ember-form-builder/gql/queries/all-format-validators.graphql";
@@ -36,15 +36,14 @@ export default class CfbFormEditorQuestionValidation extends Component {
     );
   }
 
-  _validators = trackedTask(this, this.fetchFormatValidators, () => []);
-
-  @dropTask
-  *fetchFormatValidators() {
-    return yield this.apollo.watchQuery(
+  fetchFormatValidators = task({ drop: true }, async () => {
+    return await this.apollo.watchQuery(
       { query: allFormatValidatorsQuery, fetchPolicy: "cache-and-network" },
       "allFormatValidators.edges",
     );
-  }
+  });
+
+  _validators = trackedTask(this, this.fetchFormatValidators, () => []);
 
   @action
   updateValidators(value) {

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

@@ -5,12 +5,7 @@ import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import {
-  timeout,
-  enqueueTask,
-  lastValue,
-  restartableTask,
-} from "ember-concurrency";
+import { timeout, task } from "ember-concurrency";
 import UIkit from "uikit";
 
 import addFormQuestionMutation from "@projectcaluma/ember-form-builder/gql/mutations/add-form-question.graphql";
@@ -48,9 +43,11 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
     this.questionTask.perform();
   }
 
-  @lastValue("questionTask") questionTaskValue = [];
-  @restartableTask
-  *questionTask(event) {
+  get questionTaskValue() {
+    return this.questionTask.lastSuccessful?.value ?? [];
+  }
+
+  questionTask = task({ restartable: true }, async (event) => {
     event?.preventDefault?.();
 
     const mode = this.mode;
@@ -61,12 +58,12 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       // no timeout
     } else {
       if (search) {
-        yield timeout(500);
+        await timeout(500);
       }
     }
 
     if (mode === "add" && this.hasNextPage) {
-      const questions = yield this.apollo.watchQuery(
+      const questions = await this.apollo.watchQuery(
         {
           query: searchQuestionQuery,
           variables: {
@@ -88,7 +85,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       return this.items;
     }
 
-    return yield this.apollo.watchQuery(
+    return await this.apollo.watchQuery(
       {
         query: searchFormQuestionQuery,
         variables: {
@@ -99,12 +96,11 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
       },
       "allForms.edges",
     );
-  }
+  });
 
-  @restartableTask
-  *reorderQuestions(slugs) {
+  reorderQuestions = task({ restartable: true }, async (slugs) => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: reorderFormQuestionsMutation,
         variables: {
           input: {
@@ -127,12 +123,11 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
         ),
       );
     }
-  }
+  });
 
-  @enqueueTask
-  *addQuestion(question) {
+  addQuestion = task({ enqueue: true }, async (question) => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: addFormQuestionMutation,
         variables: {
           input: {
@@ -159,12 +154,11 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
         this.intl.t("caluma.form-builder.notification.form.add-question.error"),
       );
     }
-  }
+  });
 
-  @enqueueTask
-  *removeQuestion(question) {
+  removeQuestion = task({ enqueue: true }, async (question) => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: removeFormQuestionMutation,
         variables: {
           input: {
@@ -189,7 +183,7 @@ export default class ComponentsCfbFormEditorQuestionList extends Component {
         ),
       );
     }
-  }
+  });
 
   _handleMoved({ detail: [sortable] }) {
     const children = [...sortable.$el.children];

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

@@ -7,7 +7,7 @@ import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import Changeset from "ember-changeset";
 import lookupValidator from "ember-changeset-validations";
-import { dropTask, restartableTask, task } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import { hasQuestionType } from "@projectcaluma/ember-core/helpers/has-question-type";
 import slugify from "@projectcaluma/ember-core/utils/slugify";
@@ -85,8 +85,7 @@ export default class CfbFormEditorQuestion extends Component {
 
   @tracked changeset;
 
-  @restartableTask
-  *data() {
+  data = task({ restartable: true }, async () => {
     if (!this.args.slug) {
       return A([
         {
@@ -122,7 +121,7 @@ export default class CfbFormEditorQuestion extends Component {
       ]);
     }
 
-    return yield this.apollo.watchQuery(
+    return await this.apollo.watchQuery(
       {
         query: formEditorQuestionQuery,
         variables: { slug: this.args.slug },
@@ -130,11 +129,10 @@ export default class CfbFormEditorQuestion extends Component {
       },
       "allQuestions.edges",
     );
-  }
+  });
 
-  @restartableTask
-  *availableForms() {
-    const forms = yield this.apollo.watchQuery(
+  availableForms = task({ restartable: true }, async () => {
+    const forms = await this.apollo.watchQuery(
       {
         query: formListQuery,
         variables: {
@@ -151,11 +149,10 @@ export default class CfbFormEditorQuestion extends Component {
     return forms
       .filter((edge) => edge.node.slug !== this.args.form)
       .map((edge) => edge.node);
-  }
+  });
 
-  @restartableTask
-  *availableDataSources() {
-    const dataSources = yield this.apollo.watchQuery(
+  availableDataSources = task({ restartable: true }, async () => {
+    const dataSources = await this.apollo.watchQuery(
       { query: allDataSourcesQuery, fetchPolicy: "cache-and-network" },
       "allDataSources.edges",
     );
@@ -165,7 +162,7 @@ export default class CfbFormEditorQuestion extends Component {
         __typename: undefined,
       };
     });
-  }
+  });
 
   get possibleTypes() {
     return Object.keys(TYPES).map((value) => ({
@@ -367,9 +364,8 @@ export default class CfbFormEditorQuestion extends Component {
     };
   }
 
-  @task
-  *saveOptions(changeset) {
-    yield Promise.all(
+  saveOptions = task(async (changeset) => {
+    await Promise.all(
       (changeset.get("options") || [])
         .filter((option) => option.get("isDirty"))
         .map(async (option) => {
@@ -381,10 +377,9 @@ export default class CfbFormEditorQuestion extends Component {
           });
         }),
     );
-  }
+  });
 
-  @task
-  *saveDefaultAnswer(question, changeset) {
+  saveDefaultAnswer = task(async (question, changeset) => {
     if (!changeset.get("defaultAnswer")) {
       return;
     }
@@ -413,17 +408,16 @@ export default class CfbFormEditorQuestion extends Component {
       input.value = value;
     }
 
-    yield this.apollo.mutate({ mutation, variables: { input } });
-  }
+    await this.apollo.mutate({ mutation, variables: { input } });
+  });
 
-  @dropTask
-  *submit(changeset) {
+  submit = task({ drop: true }, async (changeset) => {
     try {
-      yield this.saveOptions.perform(changeset);
+      await this.saveOptions.perform(changeset);
 
       const typename = changeset.get("__typename");
       const input = this.getInput(changeset);
-      const question = yield this.apollo.mutate(
+      const question = await this.apollo.mutate(
         {
           mutation: TYPES[typename],
           variables: { input },
@@ -431,11 +425,11 @@ export default class CfbFormEditorQuestion extends Component {
         `save${typename}.question`,
       );
 
-      yield this.saveDefaultAnswer.perform(question, changeset);
+      await this.saveDefaultAnswer.perform(question, changeset);
 
       if (!this.args.slug) {
         // This is a new question which must be added to the form after creating it
-        yield this.apollo.mutate({
+        await this.apollo.mutate({
           mutation: addFormQuestionMutation,
           variables: {
             input: {
@@ -458,7 +452,7 @@ export default class CfbFormEditorQuestion extends Component {
         this.intl.t("caluma.form-builder.notification.question.save.error"),
       );
     }
-  }
+  });
 
   @action
   async fetchData() {

package/addon/components/cfb-form-list.js

@@ -1,7 +1,7 @@
 import { inject as service } from "@ember/service";
 import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
-import { timeout, restartableTask } from "ember-concurrency";
+import { timeout, task } from "ember-concurrency";
 
 import { useCalumaQuery } from "@projectcaluma/ember-core/caluma-query";
 import { allForms } from "@projectcaluma/ember-core/caluma-query/queries";
@@ -57,15 +57,14 @@ export default class ComponentsCfbFormListComponent extends Component {
     return [isArchived, isPublished, search].filter(Boolean) || null;
   }
 
-  @restartableTask
-  *search(event) {
+  search = task({ restartable: true }, async (event) => {
     /* istanbul ignore next */
     if (macroCondition(isTesting())) {
       // no timeout
     } else {
-      yield timeout(500);
+      await timeout(500);
     }
 
     this.args.onUpdateSearch(event.target.value);
-  }
+  });
 }

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

@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
 import { queryManager } from "ember-apollo-client";
-import { lastValue, dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";
@@ -11,12 +11,12 @@ export default class EditQuestionsEditRoute extends Route {
   @queryManager apollo;
 
   @navigationTitle
-  @lastValue("fetchLabel")
-  title;
+  get title() {
+    return this.fetchLabel.lastSuccessful?.value;
+  }
 
-  @dropTask
-  *fetchLabel(slug) {
-    const [question] = yield this.apollo.query(
+  fetchLabel = task({ drop: true }, async (slug) => {
+    const [question] = await this.apollo.query(
       {
         query: gql`
           query QuestionLabel($slug: String!) {
@@ -36,7 +36,7 @@ export default class EditQuestionsEditRoute extends Route {
     );
 
     return question?.node.label;
-  }
+  });
 
   beforeModel() {
     const { question_slug: slug } = this.paramsFor(this.routeName);

package/addon/routes/edit.js

@@ -1,7 +1,7 @@
 import Route from "@ember/routing/route";
 import { inject as service } from "@ember/service";
 import { queryManager } from "ember-apollo-client";
-import { lastValue, dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { gql } from "graphql-tag";
 
 import { navigationTitle } from "@projectcaluma/ember-form-builder/decorators";
@@ -11,12 +11,12 @@ export default class EditRoute extends Route {
   @queryManager apollo;
 
   @navigationTitle
-  @lastValue("fetchName")
-  title;
+  get title() {
+    return this.fetchName.lastSuccessful?.value;
+  }
 
-  @dropTask
-  *fetchName(slug) {
-    const [form] = yield this.apollo.query(
+  fetchName = task({ drop: true }, async (slug) => {
+    const [form] = await this.apollo.query(
       {
         query: gql`
           query FormName($slug: String!) {
@@ -35,7 +35,7 @@ export default class EditRoute extends Route {
     );
 
     return form?.node.name;
-  }
+  });
 
   beforeModel() {
     const { form_slug: slug } = this.paramsFor(this.routeName);

package/addon/validators/slug.js

@@ -7,7 +7,7 @@ import {
   validateLength,
   validateFormat,
 } from "ember-changeset-validations/validators";
-import { timeout, restartableTask, didCancel } from "ember-concurrency";
+import { timeout, task, didCancel } from "ember-concurrency";
 
 import checkFormSlugQuery from "@projectcaluma/ember-form-builder/gql/queries/check-form-slug.graphql";
 import checkOptionSlugQuery from "@projectcaluma/ember-form-builder/gql/queries/check-option-slug.graphql";
@@ -68,19 +68,18 @@ export class SlugUniquenessValidator {
     );
   }
 
-  @restartableTask
-  *_validate(slug, context) {
+  _validate = task({ restartable: true }, async (slug, context) => {
     /* istanbul ignore next */
     if (macroCondition(isTesting())) {
       // no timeout
     } else {
-      yield timeout(500);
+      await timeout(500);
     }
 
     let count = Infinity;
 
     try {
-      const response = yield this.apollo.query({
+      const response = await this.apollo.query({
         query: this.queries[this.type],
         variables:
           this.type === "option"
@@ -105,7 +104,7 @@ export class SlugUniquenessValidator {
     this.cache[this.type][slug] = isUnique;
 
     return isUnique;
-  }
+  });
 }
 
 export default function slugValidation({ type, maxLength = 127 }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-form-builder",
-  "version": "14.7.0",
+  "version": "14.7.1",
   "description": "Ember engine for building Caluma forms.",
   "keywords": [
     "ember-addon",
@@ -23,7 +23,7 @@
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-composable-helpers": "^5.0.0",
-    "ember-concurrency": "^4.0.2",
+    "ember-concurrency": "^4.0.2 || ^5.1.0",
     "ember-engines-router-service": "^0.6.0",
     "ember-flatpickr": "^8.0.1",
     "ember-intl": "^7.1.1",
@@ -44,8 +44,8 @@
     "lodash.isequal": "^4.5.0",
     "reactiveweb": "^1.3.0",
     "uikit": "^3.22.0",
-    "@projectcaluma/ember-core": "^14.7.0",
-    "@projectcaluma/ember-form": "^14.7.0"
+    "@projectcaluma/ember-core": "^14.7.1",
+    "@projectcaluma/ember-form": "^14.7.1"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -83,7 +83,7 @@
     "qunit-dom": "3.5.0",
     "sinon": "21.0.1",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.0"
+    "@projectcaluma/ember-testing": "14.7.1"
   },
   "peerDependencies": {
     "ember-engines": "^0.11.0",