@projectcaluma/ember-core 9.1.0 → 10.0.2

package/addon/-private/possible-types.js

@@ -7,7 +7,6 @@ export default {
     "WorkItem",
     "Flow",
     "DynamicOption",
-    "CalculatedFloatQuestion",
     "Option",
     "TextQuestion",
     "StringAnswer",
@@ -30,13 +29,14 @@ export default {
     "StaticQuestion",
     "FileAnswer",
     "File",
+    "CalculatedFloatQuestion",
+    "ActionButtonQuestion",
     "SimpleTask",
     "CompleteWorkflowFormTask",
     "CompleteTaskFormTask",
   ],
   Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
   Question: [
-    "CalculatedFloatQuestion",
     "TextQuestion",
     "ChoiceQuestion",
     "MultipleChoiceQuestion",
@@ -50,6 +50,8 @@ export default {
     "FormQuestion",
     "FileQuestion",
     "StaticQuestion",
+    "CalculatedFloatQuestion",
+    "ActionButtonQuestion",
   ],
   Answer: [
     "StringAnswer",
@@ -60,4 +62,5 @@ export default {
     "TableAnswer",
     "FileAnswer",
   ],
+  DynamicQuestion: ["DynamicChoiceQuestion", "DynamicMultipleChoiceQuestion"],
 };

package/addon/caluma-query/queries/base.js

@@ -2,18 +2,19 @@ import { getOwner, setOwner } from "@ember/application";
 import { assert } from "@ember/debug";
 import { tracked } from "@glimmer/tracking";
 import { queryManager } from "ember-apollo-client";
-import gql from "graphql-tag";
+import {
+  enqueueTask,
+  lastValue,
+  restartableTask,
+  task,
+} from "ember-concurrency-decorators";
+import { gql } from "graphql-tag";
 
 export default class BaseQuery {
   @queryManager apollo;
 
   @tracked items = [];
 
-  @tracked totalCount = 0;
-  @tracked hasNextPage = true;
-
-  @tracked isLoading = true;
-
   constructor({
     pageSize = null,
     processNew = async (items) => items,
@@ -21,17 +22,13 @@ export default class BaseQuery {
     queryOptions = {},
   }) {
     this.pageSize = pageSize;
-    this.cursor = null;
-
     this.processNew = processNew;
     this.processAll = processAll;
     this.queryOptions = queryOptions;
   }
 
   get query() {
-    assert("`query` must be implemented on the model");
-
-    return "";
+    return assert("`query` must be implemented on the model");
   }
 
   get pagination() {
@@ -52,51 +49,20 @@ export default class BaseQuery {
     return factory.class;
   }
 
-  fetch({ filter = [], order = [], queryOptions = {} } = {}) {
-    this.items = [];
-    this.totalCount = 0;
-    this.hasNextPage = true;
-    this.cursor = null;
+  get isLoading() {
+    return this._fetch.isRunning || this._fetchMore.isRunning;
+  }
 
-    this.filter = filter;
-    this.order = order;
-    this.queryOptions = { ...(this.queryOptions ?? {}), ...queryOptions };
+  get totalCount() {
+    return this._data?.[this.dataKey].totalCount;
+  }
 
-    return this.fetchMore();
+  get hasNextPage() {
+    return this._data?.[this.dataKey].pageInfo.hasNextPage;
   }
 
-  async fetchMore() {
-    if (this.hasNextPage) {
-      this.isLoading = true;
-
-      const data = await this.apollo.query({
-        query: gql`
-          ${this.query}
-        `,
-        variables: {
-          filter: this.filter,
-          order: this.order,
-          pageSize: this.pageSize,
-          cursor: this.cursor,
-        },
-        fetchPolicy: "network-only",
-        ...this.queryOptions,
-      });
-
-      this.cursor = data[this.dataKey].pageInfo.endCursor;
-
-      this.hasNextPage = data[this.dataKey].pageInfo.hasNextPage;
-      this.totalCount = data[this.dataKey].totalCount;
-
-      const rawItems = data[this.dataKey].edges.map(({ node }) => node);
-
-      this.items = await this.processAll([
-        ...this.items,
-        ...(await this.processNew(rawItems)),
-      ]);
-
-      this.isLoading = false;
-    }
+  get cursor() {
+    return this._data?.[this.dataKey].pageInfo.endCursor;
   }
 
   get value() {
@@ -112,4 +78,59 @@ export default class BaseQuery {
       return instance;
     });
   }
+
+  fetch(...args) {
+    return this._fetch.perform(...args);
+  }
+
+  fetchMore(...args) {
+    return this._fetchMore.perform(...args);
+  }
+
+  @restartableTask
+  *_fetch({ filter = [], order = [], queryOptions = {} } = {}) {
+    yield this._fetchPage.cancelAll({ resetState: true });
+
+    this.items = [];
+
+    this.filter = filter;
+    this.order = order;
+    this.queryOptions = { ...(this.queryOptions ?? {}), ...queryOptions };
+
+    return yield this._fetchPage.linked().perform();
+  }
+
+  @enqueueTask
+  *_fetchMore() {
+    if (!this._data) return;
+
+    return yield this._fetchPage.linked().perform();
+  }
+
+  @lastValue("_fetchPage") _data;
+  @task
+  *_fetchPage() {
+    const data = yield this.apollo.query({
+      query: gql`
+        ${this.query}
+      `,
+      variables: {
+        filter: this.filter,
+        order: this.order,
+        pageSize: this.pageSize,
+        cursor: this.cursor,
+      },
+      fetchPolicy: "network-only",
+      ...this.queryOptions,
+    });
+
+    this.items = yield this.processAll([
+      ...this.items,
+      ...(yield this.processNew(
+        data[this.dataKey].edges.map(({ node }) => node)
+      )),
+    ]);
+
+    return data;
+  }
 }

package/addon/helpers/-resolver.js

@@ -20,6 +20,8 @@ export default class PrivateResolver extends Helper {
       ? identifiers[0]
       : identifiers;
 
+    if (!identifier) return null;
+
     // The parameter for the helper changed so we need to recompute and store
     // the new parameter to remember it at the next computation
     if (identifier !== this._identifier) {

package/addon/services/-scheduler.js

@@ -2,6 +2,7 @@ import { assert } from "@ember/debug";
 import { once } from "@ember/runloop";
 import Service, { inject as service } from "@ember/service";
 import { camelize } from "@ember/string";
+import { task } from "ember-concurrency";
 import { pluralize } from "ember-inflector";
 
 /**
@@ -9,23 +10,24 @@ import { pluralize } from "ember-inflector";
  *
  * @function typeResolver
  * @param {"group"|"user"} type The type of the objects to resolve
- * @returns {Function} The decorator function that returns a method descriptor to resolve the requested objects
+ * @returns {Function} The decorator function that returns an enqueued task to resolve the requested objects
  */
 function typeResolver(type) {
-  return function () {
-    return {
-      async value() {
-        const methodName = camelize(`resolve-${pluralize(type)}`);
-        const result = await this.calumaOptions[methodName]?.([
-          ...this[type].identifiers,
-        ]);
+  return task(function* () {
+    const identifiers = [...this[type].identifiers];
+    const callbacks = [...this[type].callbacks];
 
-        this[type].callbacks.forEach((callback) => callback(result));
+    this[type] = undefined;
 
-        this[type] = undefined;
-      },
-    };
-  };
+    if (!identifiers.length) return;
+
+    const methodName = camelize(`resolve-${pluralize(type)}`);
+    const result = yield this.calumaOptions[methodName]?.(identifiers);
+
+    yield Promise.all(callbacks.map((callback) => callback(result)));
+
+    return result;
+  }).enqueue();
 }
 
 export default class PrivateSchedulerService extends Service {
@@ -72,6 +74,6 @@ export default class PrivateSchedulerService extends Service {
       typeResolverName in this
     );
 
-    once(this, typeResolverName);
+    once(this[typeResolverName], "perform");
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "9.1.0",
+  "version": "10.0.2",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.4.16",
+    "@glimmer/tracking": "^1.0.4",
     "ember-apollo-client": "^3.2.0",
     "ember-auto-import": "^2.2.3",
     "ember-changeset-validations": "^3.16.0",
@@ -25,21 +26,23 @@
     "ember-fetch": "^8.0.4",
     "ember-intl": "^5.7.0",
     "graphql": "^15.6.1",
-    "graphql-tag": "^2.12.5",
+    "graphql-tag": "^2.12.6",
     "intersection-observer": "^0.12.0",
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
     "moment": "^2.29.1",
     "proxy-polyfill": "^0.3.2",
-    "slugify": "^1.6.1"
+    "slugify": "^1.6.2"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
+    "@ember/render-modifiers": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.47.1",
-    "@projectcaluma/ember-testing": "9.0.0",
+    "@embroider/test-setup": "0.47.2",
+    "@glimmer/component": "1.0.4",
+    "@projectcaluma/ember-testing": "10.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.3",
+    "ember-cli": "3.28.4",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -54,16 +57,16 @@
     "ember-resolver": "8.0.3",
     "ember-source": "3.28.6",
     "ember-source-channel-url": "3.0.0",
-    "ember-try": "1.4.0",
+    "ember-try": "2.0.0",
     "faker": "5.5.3",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.61.0"
+    "webpack": "5.64.1"
   },
   "engines": {
-    "node": "10.* || >= 12"
+    "node": "12.* || 14.* || >= 16"
   },
   "ember": {
     "edition": "octane"

package/translations/de.yaml

@@ -6,9 +6,10 @@ caluma:
         COMPLETED: "Erledigt"
         CANCELED: "Abgebrochen"
         SKIPPED: "Übersprungen"
-
+        SUSPENDED: "Pausiert"
     case:
       status:
         RUNNING: "In Bearbeitung"
         COMPLETED: "Abgeschlossen"
         CANCELED: "Abgebrochen"
+        SUSPENDED: "Pausiert"

package/translations/en.yaml

@@ -6,8 +6,10 @@ caluma:
         COMPLETED: "Completed"
         CANCELED: "Canceled"
         SKIPPED: "Skipped"
+        SUSPENDED: "Suspended"
     case:
       status:
         RUNNING: "Pending"
         COMPLETED: "Completed"
         CANCELED: "Canceled"
+        SUSPENDED: "Suspended"

package/translations/fr.yaml

@@ -6,9 +6,10 @@ caluma:
         COMPLETED: "Terminé"
         CANCELED: "Annulé"
         SKIPPED: "Sauté"
-
+        SUSPENDED: "En pause"
     case:
       status:
         RUNNING: "En cours"
         COMPLETED: "Terminé"
         CANCELED: "Annulé"
+        SUSPENDED: "En pause"