@projectcaluma/ember-core 11.0.0-beta.3 → 11.0.0-beta.6

package/CHANGELOG.md

@@ -1,3 +1,38 @@
+# [@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)
+
+
+### Bug Fixes
+
+* **core:** remove usage of moment and remove momentAttr for models ([92f3651](https://github.com/projectcaluma/ember-caluma/commit/92f365114900fe9f9ad5b49c9e9eed97b25991b5))
+
+
+### BREAKING CHANGES
+
+* **core:** The `momentAttr` decorator for models was replaced with
+a `dateAttr` that returns a plain JS date object. Predefined date
+attributes on models are now JS dates instead of moment objects.
+
 # [@projectcaluma/ember-core-v11.0.0-beta.3](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-core-v11.0.0-beta.2...@projectcaluma/ember-core-v11.0.0-beta.3) (2022-02-03)
 
 

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

@@ -1,15 +1,15 @@
 import { inject as service } from "@ember/service";
 
 import CalumaQueryModel, {
-  momentAttr,
+  dateAttr,
 } from "@projectcaluma/ember-core/caluma-query/models/index";
 
 export default class CaseModel extends CalumaQueryModel {
   @service intl;
 
-  @momentAttr createdAt;
-  @momentAttr modifiedAt;
-  @momentAttr closedAt;
+  @dateAttr createdAt;
+  @dateAttr modifiedAt;
+  @dateAttr closedAt;
 
   get status() {
     return this.intl.t(`caluma.caluma-query.case.status.${this.raw.status}`);

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

@@ -1,5 +1,4 @@
 import cloneDeep from "lodash.clonedeep";
-import moment from "moment";
 
 import { decodeId } from "@projectcaluma/ember-core/helpers/decode-id";
 
@@ -11,15 +10,16 @@ export function uuidAttr(target, name) {
   };
 }
 
-export function momentAttr(target, name) {
+export function dateAttr(target, name) {
   return {
     get() {
-      const date = moment(this.raw[name]);
+      const raw = this.raw[name];
+      const date = raw ? new Date(raw) : null;
 
-      return date.isValid() ? date : null;
+      return raw && !isNaN(date) ? date : null;
     },
     set(value) {
-      if (value.isValid()) {
+      if (!isNaN(value)) {
         this.raw[name] = value.toISOString();
       }
     },

package/addon/caluma-query/models/work-item.js

@@ -1,16 +1,16 @@
 import { inject as service } from "@ember/service";
 
 import CalumaQueryModel, {
-  momentAttr,
+  dateAttr,
 } from "@projectcaluma/ember-core/caluma-query/models/index";
 
 export default class WorkItemModel extends CalumaQueryModel {
   @service intl;
 
-  @momentAttr createdAt;
-  @momentAttr modifiedAt;
-  @momentAttr closedAt;
-  @momentAttr deadline;
+  @dateAttr createdAt;
+  @dateAttr modifiedAt;
+  @dateAttr closedAt;
+  @dateAttr deadline;
 
   get status() {
     return this.intl.t(

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/blueprints/@projectcaluma/ember-core/index.js

@@ -10,6 +10,6 @@ module.exports = {
         { name: "ember-intl" },
         { name: "ember-uikit" },
       ],
-    }).then(() => this.addPackagesToProject([{ name: "moment" }]));
+    });
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "11.0.0-beta.3",
+  "version": "11.0.0-beta.6",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -14,38 +14,39 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.8",
+    "@apollo/client": "^3.5.10",
+    "@ember/string": "^3.0.0",
     "@glimmer/tracking": "^1.0.4",
-    "ember-apollo-client": "^3.2.0",
+    "ember-apollo-client": "^4.0.2",
     "ember-auto-import": "^2.4.0",
     "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.2.0",
+    "ember-resources": "^4.4.0",
     "graphql": "^15.8.0",
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
-    "moment": "^2.29.1",
     "slugify": "^1.6.5"
   },
   "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",
+    "@embroider/test-setup": "1.5.0",
+    "@embroider/util": "^1.5.0",
+    "@faker-js/faker": "6.0.0",
     "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "11.0.0-beta.1",
+    "@projectcaluma/ember-testing": "11.0.0-beta.5",
     "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-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "2.4.0",
+    "ember-cli-mirage": "3.0.0-alpha.2",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
     "ember-disable-prototype-extensions": "1.1.3",
@@ -59,9 +60,9 @@
     "ember-try": "2.0.0",
     "loader.js": "4.7.0",
     "npm-run-all": "4.1.5",
-    "qunit": "2.17.2",
+    "qunit": "2.18.0",
     "qunit-dom": "2.0.0",
-    "webpack": "5.68.0"
+    "webpack": "5.70.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"