@projectcaluma/ember-analytics 14.7.0 → 14.8.0

package/addon/components/ca-field-form.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 { enqueueTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import CaToggleSwitchComponent from "@projectcaluma/ember-analytics/components/ca-toggle-switch";
 import saveAnalyticsField from "@projectcaluma/ember-analytics/tasks/save-analytics-field";
@@ -27,7 +27,9 @@ export default class CaFieldFormComponent extends Component {
   @tracked isValueField = false;
   @tracked showForm = false;
 
-  @enqueueTask saveField = saveAnalyticsField;
+  saveField = task({ enqueue: true }, async (input) =>
+    saveAnalyticsField(input),
+  );
 
   toggleComponent = CaToggleSwitchComponent;
 

package/addon/components/ca-field-select.js

@@ -4,7 +4,7 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { restartableTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import getAvailableFieldsForFieldQuery from "@projectcaluma/ember-analytics/gql/queries/get-available-fields-for-field.graphql";
 
@@ -71,14 +71,13 @@ export default class CaFieldSelectComponent extends Component {
     this.args.onSelect(this._selectedOption);
   }
 
-  @restartableTask
-  *fetchOptions() {
+  fetchOptions = task({ restartable: true }, async () => {
     try {
       if (
         !this.fetchedFor ||
         (!this.isRoot && this.fetchedFor !== this.args.parentPath)
       ) {
-        const options = yield this.apollo.query(
+        const options = await this.apollo.query(
           {
             query: getAvailableFieldsForFieldQuery,
             fetchPolicy: "no-cache",
@@ -98,7 +97,7 @@ export default class CaFieldSelectComponent extends Component {
         this.intl.t("caluma.analytics.notification.fetch-error"),
       );
     }
-  }
+  });
 
   firstSegment(path) {
     if (!path) return "";

package/addon/components/ca-field-selector-list/ca-field-alias-input.js

@@ -1,16 +1,15 @@
 import { macroCondition, isTesting } from "@embroider/macros";
 import Component from "@glimmer/component";
-import { restartableTask, timeout } from "ember-concurrency";
+import { task, timeout } from "ember-concurrency";
 
 export default class CaFieldSelectorListCaFieldAliasInputComponent extends Component {
-  @restartableTask
-  *debounceInput(event) {
+  debounceInput = task({ restartable: true }, async (event) => {
     if (macroCondition(isTesting())) {
       // no timeout
     } else {
-      yield timeout(500);
+      await timeout(500);
     }
 
-    yield this.args.onInput(event.target.value);
-  }
+    await this.args.onInput(event.target.value);
+  });
 }

package/addon/components/ca-field-selector-list/ca-field-function-select.js

@@ -1,6 +1,5 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
@@ -12,19 +11,12 @@ export default class CaFieldSelectorListCaFieldFunctionSelectComponent extends C
   @service notification;
   @service intl;
 
-  @tracked aggregationFunctions = trackedTask(
-    this,
-    this.getAggregationFunctions,
-    () => [this.args.field, this.args.tableSlug],
-  );
-
-  @task
-  *getAggregationFunctions() {
+  getAggregationFunctions = task(async () => {
     try {
       // Get the base path without the field so we can fetch the necessary fields later on.
       const pathList = this.args.field.dataSource.split(".");
       const prefix = pathList.slice(0, -1).join(".");
-      const options = yield this.apollo.query(
+      const options = await this.apollo.query(
         {
           query: getAvailableFieldsForFieldQuery,
           variables: {
@@ -45,5 +37,10 @@ export default class CaFieldSelectorListCaFieldFunctionSelectComponent extends C
         this.intl.t("caluma.analytics.notification.fetch-error"),
       );
     }
-  }
+  });
+
+  aggregationFunctions = trackedTask(this, this.getAggregationFunctions, () => [
+    this.args.field,
+    this.args.tableSlug,
+  ]);
 }

package/addon/components/ca-field-selector-list.js

@@ -3,7 +3,7 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager, getObservable } from "ember-apollo-client";
-import { enqueueTask, restartableTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import removeAnalyticsFieldMutation from "@projectcaluma/ember-analytics/gql/mutations/remove-analytics-field.graphql";
 import reorderAnalyticsFieldsMutation from "@projectcaluma/ember-analytics/gql/mutations/reorder-analytics-fields.graphql";
@@ -14,7 +14,10 @@ export default class CaFieldSelectorListComponent extends Component {
   @service notification;
   @service intl;
 
-  @enqueueTask saveField = saveAnalyticsField;
+  saveField = task({ enqueue: true }, async (input) =>
+    saveAnalyticsField(input),
+  );
+
   @tracked _fields;
 
   get fields() {
@@ -40,28 +43,26 @@ export default class CaFieldSelectorListComponent extends Component {
     });
   }
 
-  @enqueueTask
-  *removeAnalyticsField(id) {
+  removeAnalyticsField = task({ enqueue: true }, async (id) => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: removeAnalyticsFieldMutation,
         variables: { input: { id } },
       });
       const observableQuery = getObservable(this.args.analyticsTable);
-      yield observableQuery.refetch();
+      await observableQuery.refetch();
     } catch (error) {
       console.error(error);
       this.notification.danger(
         this.intl.t("caluma.analytics.notification.delete-error"),
       );
     }
-  }
+  });
 
-  @restartableTask
-  *reorderFields(fields) {
+  reorderFields = task({ restartable: true }, async (fields) => {
     this._fields = fields;
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: reorderAnalyticsFieldsMutation,
         variables: {
           input: {
@@ -80,5 +81,5 @@ export default class CaFieldSelectorListComponent extends Component {
         this.intl.t("caluma.analytics.notification.reorder-error"),
       );
     }
-  }
+  });
 }

package/addon/components/ca-filter-modal.js

@@ -3,7 +3,7 @@ import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { enqueueTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import UkButtonComponent from "ember-uikit/components/uk-button";
 
 import saveAnalyticsField from "@projectcaluma/ember-analytics/tasks/save-analytics-field";
@@ -17,7 +17,9 @@ export default class CaFilterModalComponent extends Component {
   @tracked newFilter;
   @tracked filters;
 
-  @enqueueTask saveField = saveAnalyticsField;
+  saveField = task({ enqueue: true }, async (input) =>
+    saveAnalyticsField(input),
+  );
 
   buttonComponent = UkButtonComponent;
 

package/addon/components/ca-report-builder.js

@@ -1,7 +1,7 @@
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
 import { queryManager } from "ember-apollo-client";
-import { dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
 
 import saveAnalyticsTableMutation from "@projectcaluma/ember-analytics/gql/mutations/save-analytics-table.graphql";
 
@@ -29,8 +29,7 @@ export default class CaReportBuilderComponent extends Component {
     ];
   }
 
-  @dropTask
-  *createTable() {
+  createTable = task({ drop: true }, async () => {
     try {
       this.args.analyticsTable.execute();
       const data = this.args.analyticsTable.data;
@@ -39,7 +38,7 @@ export default class CaReportBuilderComponent extends Component {
         name: data.name,
         startingObject: data.startingObject,
       };
-      yield this.apollo.mutate(
+      await this.apollo.mutate(
         {
           mutation: saveAnalyticsTableMutation,
           fetchPolicy: "network-only",
@@ -49,7 +48,7 @@ export default class CaReportBuilderComponent extends Component {
         },
         "saveAnalyticsTable.analyticsTable",
       );
-      yield this.args.onAdd?.(
+      await this.args.onAdd?.(
         this.args.analyticsTable.slug,
         this.args.analyticsTable.startingObject,
       );
@@ -60,5 +59,5 @@ export default class CaReportBuilderComponent extends Component {
         this.intl.t(`caluma.analytics.notification.create-error`),
       );
     }
-  }
+  });
 }

package/addon/components/ca-report-preview.js

@@ -2,7 +2,6 @@ import { action } from "@ember/object";
 import { next } from "@ember/runloop";
 import { inject as service } from "@ember/service";
 import Component from "@glimmer/component";
-import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
@@ -15,13 +14,10 @@ export default class CaReportPreviewComponent extends Component {
   @service notification;
   @service intl;
 
-  @tracked data = trackedTask(this, this.fetchData, () => [this.args.slug]);
-
-  @task
-  *fetchData() {
+  fetchData = task(async () => {
     if (this.args.slug) {
       try {
-        const result = yield this.apollo.watchQuery(
+        const result = await this.apollo.watchQuery(
           {
             query: getAnalyticsResultsQuery,
             fetchPolicy: "no-cache",
@@ -60,7 +56,9 @@ export default class CaReportPreviewComponent extends Component {
       }
     }
     return null;
-  }
+  });
+
+  data = trackedTask(this, this.fetchData, () => [this.args.slug]);
 
   @action
   exportTable() {

package/addon/controllers/reports/edit/index.js

@@ -1,6 +1,5 @@
 import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
-import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
 import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
@@ -12,6 +11,6 @@ export default class ReportsEditIndexController extends Controller {
   @service notification;
   @queryManager apollo;
 
-  @task getTable = getAnalyticsTable;
-  @tracked data = trackedTask(this, this.getTable, () => [this.model]);
+  getTable = task(async (slug) => getAnalyticsTable(slug));
+  data = trackedTask(this, this.getTable, () => [this.model]);
 }

package/addon/controllers/reports/edit.js

@@ -1,8 +1,7 @@
 import Controller from "@ember/controller";
 import { inject as service } from "@ember/service";
-import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import { dropTask, task } from "ember-concurrency";
+import { task } from "ember-concurrency";
 import { trackedTask } from "reactiveweb/ember-concurrency";
 
 import removeAnalyticsTableMutation from "@projectcaluma/ember-analytics/gql/mutations/remove-analytics-table.graphql";
@@ -14,17 +13,16 @@ export default class ReportsEditController extends Controller {
   @service router;
   @queryManager apollo;
 
-  @task getTable = getAnalyticsTable;
-  @tracked data = trackedTask(this, this.getTable, () => [this.model]);
+  getTable = task(async (slug) => getAnalyticsTable(slug));
+  data = trackedTask(this, this.getTable, () => [this.model]);
 
   get currentRoute() {
     return this.router.currentRouteName.split(".").pop();
   }
 
-  @dropTask
-  *deleteTable() {
+  deleteTable = task({ drop: true }, async () => {
     try {
-      yield this.apollo.mutate({
+      await this.apollo.mutate({
         mutation: removeAnalyticsTableMutation,
         fetchPolicy: "network-only",
         variables: {
@@ -40,5 +38,5 @@ export default class ReportsEditController extends Controller {
         this.intl.t(`caluma.analytics.notification.delete-error`),
       );
     }
-  }
+  });
 }

package/addon/tasks/get-analytics-table.js

@@ -1,8 +1,8 @@
 import getAnalyticsTableQuery from "@projectcaluma/ember-analytics/gql/queries/get-analytics-table.graphql";
 
-export default function* getAnalyticsTable(slug) {
+export default async function getAnalyticsTable(slug) {
   try {
-    return yield this.apollo.watchQuery(
+    return await this.apollo.watchQuery(
       {
         query: getAnalyticsTableQuery,
         fetchPolicy: "cache-and-network",

package/addon/tasks/save-analytics-field.js

@@ -1,8 +1,8 @@
 import saveAnalyticsFieldMutation from "@projectcaluma/ember-analytics/gql/mutations/save-analytics-field.graphql";
 
-export default function* (input) {
+export default async function (input) {
   try {
-    const mutation = yield this.apollo.mutate({
+    const mutation = await this.apollo.mutate({
       mutation: saveAnalyticsFieldMutation,
       variables: { input },
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-analytics",
-  "version": "14.7.0",
+  "version": "14.8.0",
   "description": "Ember addon for Caluma analytics.",
   "keywords": [
     "ember-addon",
@@ -20,7 +20,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-intl": "^7.1.1",
     "ember-load-initializers": "^2.1.2 || ^3.0.1",
@@ -33,7 +33,7 @@
     "graphql": "^15.10.1",
     "reactiveweb": "^1.3.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
-    "@projectcaluma/ember-core": "^14.7.0"
+    "@projectcaluma/ember-core": "^14.8.0"
   },
   "//": [
     "TODO: remove obsolete dependency to `ember-data` which is only necessary",
@@ -71,7 +71,7 @@
     "sass": "1.97.3",
     "uikit": "3.25.6",
     "webpack": "5.104.1",
-    "@projectcaluma/ember-testing": "14.7.0"
+    "@projectcaluma/ember-testing": "14.8.0"
   },
   "peerDependency": {
     "ember-engines": "^0.11.0",