@projectcaluma/ember-core 11.0.0-beta.4 → 11.0.0-beta.7

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+# [@projectcaluma/ember-core-v11.0.0-beta.7](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.6...@projectcaluma/ember-core-v11.0.0-beta.7) (2022-05-09)
+
+
+### Bug Fixes
+
+* **resources:** fix deprecations of ember-resources ([7a84c5c](https://github.com/projectcaluma/ember-caluma/commit/7a84c5c78d5b28f7b5393c64722907728dd5f42b))
+
+# [@projectcaluma/ember-core-v11.0.0-beta.6](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.5...@projectcaluma/ember-core-v11.0.0-beta.6) (2022-03-23)
+
+
+### Bug Fixes
+
+* **embroider:** add missing dependency on @ember/string ([3a6e6bb](https://github.com/projectcaluma/ember-caluma/commit/3a6e6bb39a8c1a40a2ae00b3d4ea00606a755e25))
+
+# [@projectcaluma/ember-core-v11.0.0-beta.5](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.4...@projectcaluma/ember-core-v11.0.0-beta.5) (2022-03-11)
+
+
+### Bug Fixes
+
+* **core:** ensure only language code of the locale is passed to slugify ([02e4506](https://github.com/projectcaluma/ember-caluma/commit/02e45064b9171de85af5b9e1a890d5207a6ec252))
+* **core:** handle null values in raw dates ([9c73d0b](https://github.com/projectcaluma/ember-caluma/commit/9c73d0b3853b154b5edc84bcf2c1227ffb825116)), closes [#1826](https://github.com/projectcaluma/ember-caluma/issues/1826)
+* **distribution:** fix sorting after group names in navigation ([2299d3b](https://github.com/projectcaluma/ember-caluma/commit/2299d3b0e265204ab6747dbdc6a8b64fc22f247f))
+
+
+### Features
+
+* **form:** support passing component override classes ([9409c7c](https://github.com/projectcaluma/ember-caluma/commit/9409c7cb5901dcdffec1c0294046da64b74b9922))
+
 # [@projectcaluma/ember-core-v11.0.0-beta.4](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.3...@projectcaluma/ember-core-v11.0.0-beta.4) (2022-02-07)
 
 

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

@@ -1,44 +1,31 @@
 export default {
-  Node: [
-    "Workflow",
-    "Form",
-    "Document",
-    "Case",
-    "WorkItem",
-    "Flow",
-    "DynamicOption",
-    "Option",
+  Question: [
     "TextQuestion",
-    "StringAnswer",
     "ChoiceQuestion",
     "MultipleChoiceQuestion",
-    "ListAnswer",
     "DynamicChoiceQuestion",
     "DynamicMultipleChoiceQuestion",
     "TextareaQuestion",
     "FloatQuestion",
-    "FloatAnswer",
     "IntegerQuestion",
-    "IntegerAnswer",
     "DateQuestion",
-    "DateAnswer",
     "TableQuestion",
-    "TableAnswer",
     "FormQuestion",
     "FileQuestion",
     "StaticQuestion",
-    "FileAnswer",
-    "File",
     "CalculatedFloatQuestion",
     "ActionButtonQuestion",
-    "SimpleTask",
-    "CompleteWorkflowFormTask",
-    "CompleteTaskFormTask",
   ],
-  Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
-  Question: [
+  Node: [
     "TextQuestion",
+    "Form",
+    "Document",
+    "Case",
+    "Workflow",
+    "Flow",
+    "WorkItem",
     "ChoiceQuestion",
+    "Option",
     "MultipleChoiceQuestion",
     "DynamicChoiceQuestion",
     "DynamicMultipleChoiceQuestion",
@@ -50,17 +37,33 @@ export default {
     "FormQuestion",
     "FileQuestion",
     "StaticQuestion",
+    "StringAnswer",
+    "ListAnswer",
+    "IntegerAnswer",
+    "FloatAnswer",
+    "DateAnswer",
+    "TableAnswer",
+    "FileAnswer",
+    "File",
     "CalculatedFloatQuestion",
     "ActionButtonQuestion",
+    "SimpleTask",
+    "CompleteWorkflowFormTask",
+    "CompleteTaskFormTask",
+    "AnalyticsTable",
+    "AvailableField",
+    "AnalyticsField",
+    "DynamicOption",
   ],
   Answer: [
     "StringAnswer",
     "ListAnswer",
-    "FloatAnswer",
     "IntegerAnswer",
+    "FloatAnswer",
     "DateAnswer",
     "TableAnswer",
     "FileAnswer",
   ],
+  Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
   DynamicQuestion: ["DynamicChoiceQuestion", "DynamicMultipleChoiceQuestion"],
 };

package/addon/caluma-query/index.js

@@ -1,13 +1,9 @@
 import { getOwner, setOwner } from "@ember/application";
-import { useResource } from "ember-resources";
 
 import CalumaQueryResource from "@projectcaluma/ember-core/caluma-query/resource";
 
 export function useCalumaQuery(destroyable, query, thunk) {
-  return useResource(destroyable, CalumaQueryResource, () => ({
-    query,
-    ...thunk(),
-  }));
+  return CalumaQueryResource.from(destroyable, () => ({ query, ...thunk() }));
 }
 
 export default function calumaQuery({ query, options = {} }) {

package/addon/caluma-query/models/index.js

@@ -13,9 +13,10 @@ export function uuidAttr(target, name) {
 export function dateAttr(target, name) {
   return {
     get() {
-      const date = new Date(this.raw[name]);
+      const raw = this.raw[name];
+      const date = raw ? new Date(raw) : null;
 
-      return !isNaN(date) ? date : null;
+      return raw && !isNaN(date) ? date : null;
     },
     set(value) {
       if (!isNaN(value)) {

package/addon/caluma-query/resource.js

@@ -1,47 +1,48 @@
 import { getOwner, setOwner } from "@ember/application";
-import { destroy } from "@ember/destroyable";
+import { destroy, registerDestructor } from "@ember/destroyable";
 import { action } from "@ember/object";
 import { tracked } from "@glimmer/tracking";
-import { LifecycleResource } from "ember-resources";
+import { Resource } from "ember-resources/core";
 
-export default class CalumaQueryResource extends LifecycleResource {
-  @tracked query;
-
-  setup() {
-    const { query, options, queryArgs } = this._parsedArgs;
-
-    this.query = query(options);
-    setOwner(this.query, getOwner(this));
+const MUTABLE_OPTIONS = [
+  "pageSize",
+  "processAll",
+  "processNew",
+  "queryOptions",
+];
 
-    this.query.fetch(queryArgs);
-  }
+export default class CalumaQueryResource extends Resource {
+  @tracked query;
 
-  update() {
-    this._updateOptions();
+  didSetup = false;
 
-    this.query.fetch(this._parsedArgs.queryArgs);
-  }
+  constructor(owner, args) {
+    super(owner, args);
 
-  teardown() {
-    destroy(this.query);
+    registerDestructor(this, () => {
+      destroy(this.query);
+    });
   }
 
-  get _parsedArgs() {
-    const { query, options = {}, ...queryArgs } = this.args.named;
-
-    return { query, options, queryArgs };
-  }
+  modify(_, { options = {}, query, ...args }) {
+    if (!this.didSetup) {
+      // initialize the caluma query with the given options
+      this.query = query(options);
+      setOwner(this.query, getOwner(this));
 
-  _updateOptions() {
-    ["pageSize", "processAll", "processNew", "queryOptions"].forEach(
-      (optionKey) => {
-        const option = this._parsedArgs.options[optionKey];
+      this.didSetup = true;
+    } else {
+      // update changed options on the caluma query
+      MUTABLE_OPTIONS.forEach((optionKey) => {
+        const option = options[optionKey];
 
         if (option !== undefined && option !== this.query[optionKey]) {
           this.query[optionKey] = option;
         }
-      }
-    );
+      });
+    }
+
+    this.query.fetch(args);
   }
 
   @action

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 { tracked } from "@glimmer/tracking";
 import { task } from "ember-concurrency";
 import { pluralize } from "ember-inflector";
 
@@ -14,25 +15,46 @@ import { pluralize } from "ember-inflector";
  */
 function typeResolver(type) {
   return task(function* () {
-    const identifiers = [...this[type].identifiers];
-    const callbacks = [...this[type].callbacks];
+    const identifiers = [...(this[type]?.identifiers ?? [])];
+    const callbacks = [...(this[type]?.callbacks ?? [])];
 
     this[type] = undefined;
 
     if (!identifiers.length) return;
 
+    const cached = this[`${type}Cache`];
+    const uncachedIdentifiers = identifiers.filter(
+      (identifier) =>
+        !cached
+          .map((resolved) =>
+            String(resolved[this.calumaOptions[`${type}IdentifierProperty`]])
+          )
+          .includes(String(identifier))
+    );
+
     const methodName = camelize(`resolve-${pluralize(type)}`);
-    const result = yield this.calumaOptions[methodName]?.(identifiers);
+    const result = uncachedIdentifiers.length
+      ? yield this.calumaOptions[methodName]?.(uncachedIdentifiers)
+      : [];
+
+    const allResults = [...cached, ...(result?.toArray?.() ?? result ?? [])];
 
-    yield Promise.all(callbacks.map((callback) => callback(result)));
+    if (result?.length) {
+      this[`${type}Cache`] = allResults;
+    }
+
+    yield Promise.all(callbacks.map((callback) => callback(allResults)));
 
-    return result;
+    return allResults;
   }).enqueue();
 }
 
 export default class PrivateSchedulerService extends Service {
   @service calumaOptions;
 
+  @tracked groupCache = [];
+  @tracked userCache = [];
+
   @typeResolver("group") resolveGroup;
   @typeResolver("user") resolveUser;
 

package/addon/services/caluma-options.js

@@ -18,33 +18,6 @@ export default class CalumaOptionsService extends Service {
 
   @tracked currentGroupId;
 
-  constructor(...args) {
-    super(...args);
-
-    this.registerComponentOverride({
-      label: this.intl.t(
-        "caluma.form-builder.question.widgetOverrides.powerselect"
-      ),
-      component: "cf-field/input/powerselect",
-      types: [
-        "ChoiceQuestion",
-        "MultipleChoiceQuestion",
-        "DynamicChoiceQuestion",
-        "DynamicMultipleChoiceQuestion",
-      ],
-    });
-
-    this.registerComponentOverride({
-      label: this.intl.t("caluma.form-builder.question.widgetOverrides.hidden"),
-      component: "cf-field/input/hidden",
-    });
-
-    this.registerComponentOverride({
-      component: "cfb-form-editor/question/default/table",
-      types: [],
-    });
-  }
-
   _namespace = null;
   _overrides = {};
 

package/addon/utils/slugify.js

@@ -7,6 +7,6 @@ export default function (value, { locale = null } = {}) {
   return slugify(value, {
     lower: true,
     strict: true,
-    locale,
+    locale: locale?.split("-")[0].toLowerCase(),
   }).substr(0, 127);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "11.0.0-beta.4",
+  "version": "11.0.0-beta.7",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -14,17 +14,18 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.8",
-    "@glimmer/tracking": "^1.0.4",
-    "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.4.0",
+    "@apollo/client": "^3.6.2",
+    "@ember/string": "^3.0.0",
+    "@glimmer/tracking": "^1.1.2",
+    "ember-apollo-client": "^4.0.2",
+    "ember-auto-import": "^2.4.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
-    "ember-concurrency": "^2.2.0",
+    "ember-concurrency": "^2.2.1",
     "ember-fetch": "^8.1.1",
     "ember-inflector": "^4.0.2",
     "ember-intl": "^5.7.2",
-    "ember-resources": "^4.3.1",
+    "ember-resources": "^4.7.1",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
@@ -34,17 +35,18 @@
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/render-modifiers": "2.0.4",
-    "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "1.0.0",
-    "@faker-js/faker": "6.0.0-alpha.5",
-    "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "11.0.0-beta.2",
+    "@ember/test-helpers": "2.7.0",
+    "@embroider/test-setup": "1.6.0",
+    "@embroider/util": "^1.6.0",
+    "@faker-js/faker": "6.3.1",
+    "@glimmer/component": "1.1.2",
+    "@projectcaluma/ember-testing": "11.0.0-beta.7",
     "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",
+    "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-disable-prototype-extensions": "1.1.3",
@@ -53,14 +55,14 @@
     "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",
     "npm-run-all": "4.1.5",
-    "qunit": "2.17.2",
+    "qunit": "2.19.1",
     "qunit-dom": "2.0.0",
-    "webpack": "5.68.0"
+    "webpack": "5.72.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"