@projectcaluma/ember-core 10.1.0 → 11.0.0-beta.24

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",
+    "FilesQuestion",
     "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",
@@ -48,19 +35,35 @@ export default {
     "DateQuestion",
     "TableQuestion",
     "FormQuestion",
-    "FileQuestion",
+    "FilesQuestion",
     "StaticQuestion",
+    "StringAnswer",
+    "ListAnswer",
+    "IntegerAnswer",
+    "FloatAnswer",
+    "DateAnswer",
+    "TableAnswer",
+    "FilesAnswer",
+    "File",
     "CalculatedFloatQuestion",
     "ActionButtonQuestion",
+    "SimpleTask",
+    "CompleteWorkflowFormTask",
+    "CompleteTaskFormTask",
+    "AnalyticsTable",
+    "AvailableField",
+    "AnalyticsField",
+    "DynamicOption",
   ],
   Answer: [
     "StringAnswer",
     "ListAnswer",
-    "FloatAnswer",
     "IntegerAnswer",
+    "FloatAnswer",
     "DateAnswer",
     "TableAnswer",
-    "FileAnswer",
+    "FilesAnswer",
   ],
+  Task: ["SimpleTask", "CompleteWorkflowFormTask", "CompleteTaskFormTask"],
   DynamicQuestion: ["DynamicChoiceQuestion", "DynamicMultipleChoiceQuestion"],
 };

package/addon/caluma-query/index.js

@@ -1,5 +1,11 @@
 import { getOwner, setOwner } from "@ember/application";
 
+import CalumaQueryResource from "@projectcaluma/ember-core/caluma-query/resource";
+
+export function useCalumaQuery(destroyable, query, thunk) {
+  return CalumaQueryResource.from(destroyable, () => ({ query, ...thunk() }));
+}
+
 export default function calumaQuery({ query, options = {} }) {
   return function (_, name) {
     const privateKey = `__${name}`;

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/caluma-query/queries/base.js

@@ -7,7 +7,7 @@ import {
   lastValue,
   restartableTask,
   task,
-} from "ember-concurrency-decorators";
+} from "ember-concurrency";
 import { gql } from "graphql-tag";
 
 export default class BaseQuery {

package/addon/caluma-query/resource.js

@@ -0,0 +1,72 @@
+import { getOwner, setOwner } from "@ember/application";
+import { destroy, registerDestructor } from "@ember/destroyable";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { Resource } from "ember-resources/core";
+
+const MUTABLE_OPTIONS = [
+  "pageSize",
+  "processAll",
+  "processNew",
+  "queryOptions",
+];
+
+export default class CalumaQueryResource extends Resource {
+  @tracked query;
+
+  didSetup = false;
+
+  constructor(owner, args) {
+    super(owner, args);
+
+    registerDestructor(this, () => {
+      destroy(this.query);
+    });
+  }
+
+  modify(_, { options = {}, query, ...args }) {
+    if (!this.didSetup) {
+      // initialize the caluma query with the given options
+      this.query = query(options);
+      setOwner(this.query, getOwner(this));
+
+      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
+  fetchMore(event) {
+    if (event instanceof Event) {
+      event.preventDefault();
+    }
+
+    this.query.fetchMore();
+  }
+
+  get value() {
+    return this.query.value;
+  }
+
+  get hasNextPage() {
+    return this.query.hasNextPage;
+  }
+
+  get totalCount() {
+    return this.query.totalCount;
+  }
+
+  get isLoading() {
+    return this.query.isLoading;
+  }
+}

package/addon/helpers/has-question-type.js

@@ -7,7 +7,9 @@ import { dasherize } from "@ember/string";
 const parse = (raw) => dasherize(raw.replace("Question", ""));
 
 export function hasQuestionType(obj, ...expected) {
-  return expected.map(parse).includes(parse(obj?.__typename || ""));
+  return expected
+    .map(parse)
+    .includes(parse((obj?.raw?.__typename ?? obj?.__typename) || ""));
 }
 
 export default helper(([obj, ...expected]) =>

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/{mixins/caluma-apollo-service-mixin.js → services/apollo.js}

@@ -1,12 +1,12 @@
 import { InMemoryCache, defaultDataIdFromObject } from "@apollo/client/cache";
 import { setContext } from "@apollo/client/link/context";
-import Mixin from "@ember/object/mixin";
 import { inject as service } from "@ember/service";
+import ApolloService from "ember-apollo-client/services/apollo";
 
 import possibleTypes from "@projectcaluma/ember-core/-private/possible-types";
 
-export default Mixin.create({
-  intl: service(),
+export default class CalumaApolloService extends ApolloService {
+  @service intl;
 
   cache() {
     return new InMemoryCache({
@@ -17,10 +17,10 @@ export default Mixin.create({
           _id: obj.slug || obj._id,
         }),
     });
-  },
+  }
 
-  link(...args) {
-    const httpLink = this._super(...args);
+  link() {
+    const httpLink = super.link();
 
     const localeLink = setContext((request, context) => ({
       ...context,
@@ -32,5 +32,5 @@ export default Mixin.create({
     }));
 
     return localeLink.concat(httpLink);
-  },
-});
+  }
+}

package/addon/services/caluma-options.js

@@ -1,3 +1,4 @@
+import { assert } from "@ember/debug";
 import Service, { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
 
@@ -17,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 = {};
 
@@ -109,4 +83,10 @@ export default class CalumaOptionsService extends Service {
       [this.userNameProperty]: identifier,
     }));
   }
+
+  fetchTypedGroups(/* types, search */) {
+    assert(
+      "`fetchTypedGroups` must be implemented on the Caluma options service"
+    );
+  }
 }

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/app/services/apollo.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-core/services/apollo";

package/app/styles/@projectcaluma/ember-core.scss

@@ -0,0 +1 @@
+@import "../cc-uikit-powerselect";

package/app/styles/_cc-uikit-powerselect.scss

@@ -0,0 +1,31 @@
+@import "ember-uikit/variables-theme";
+
+// Backgrounds
+$ember-power-select-selected-background: lighten(
+  $global-secondary-background,
+  25%
+) !default;
+$ember-power-select-highlighted-background: lighten(
+  $ember-power-select-selected-background,
+  25%
+) !default;
+$ember-power-select-multiple-selection-background-color: $ember-power-select-selected-background !default;
+
+// Texts
+$ember-power-select-highlighted-color: #ffffff !default;
+$ember-power-select-multiple-selection-color: #ffffff !default;
+
+.ember-power-select-option[aria-selected="true"] {
+  color: $ember-power-select-highlighted-color;
+}
+
+// Borders
+$ember-power-select-focus-outline: 0 !default;
+$ember-power-select-border-color: $global-border !default;
+$ember-power-select-default-border-radius: 0 !default;
+$ember-power-select-multiple-option-border-color: $ember-power-select-border-color !default;
+
+// Other
+$ember-power-select-line-height: 38px !default;
+$ember-power-select-multiple-option-padding: 0 8px !default;
+$ember-power-select-multiple-option-line-height: 32px !default;

package/app/utils/jexl.js

@@ -0,0 +1 @@
+export { default } from "@projectcaluma/ember-core/utils/jexl";

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/index.js

@@ -1,30 +1,5 @@
 "use strict";
 
-const DEFAULT_OPTIONS = {
-  includeProxyPolyfill: true,
-  includeIntersectionObserverPolyfill: true,
-};
-
 module.exports = {
-  name: require("./package").name,
-
-  _getOptions() {
-    const app = this._findHost();
-
-    return Object.assign({}, DEFAULT_OPTIONS, app.options["ember-caluma"]);
-  },
-
-  included(...args) {
-    this._super.included.apply(this, args);
-
-    if (this._getOptions().includeProxyPolyfill) {
-      this.import("node_modules/proxy-polyfill/proxy.min.js");
-    }
-
-    if (this._getOptions().includeIntersectionObserverPolyfill) {
-      this.import(
-        "node_modules/intersection-observer/intersection-observer.js"
-      );
-    }
-  },
+  name: require("./package.json").name,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "10.1.0",
+  "version": "11.0.0-beta.24",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -14,40 +14,40 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.6",
-    "@glimmer/tracking": "^1.0.4",
-    "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.2.3",
-    "ember-changeset-validations": "^3.16.0",
-    "ember-cli-babel": "^7.26.6",
-    "ember-cli-htmlbars": "^6.0.1",
-    "ember-concurrency": "^2.2.0",
-    "ember-concurrency-decorators": "^2.0.3",
-    "ember-fetch": "^8.0.4",
+    "@apollo/client": "^3.6.9",
+    "@ember/string": "^3.0.0",
+    "@glimmer/tracking": "^1.1.2",
+    "ember-apollo-client": "~4.0.2",
+    "ember-auto-import": "^2.4.2",
+    "ember-cli-babel": "^7.26.11",
+    "ember-cli-htmlbars": "^6.1.0",
+    "ember-concurrency": "^2.3.2",
+    "ember-fetch": "^8.1.2",
     "ember-inflector": "^4.0.2",
-    "ember-intl": "^5.7.0",
-    "graphql": "^15.6.1",
+    "ember-intl": "^5.7.2",
+    "ember-resources": "^5.2.1",
+    "ember-uikit": "^5.1.3",
+    "graphql": "^15.8.0",
     "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.3"
+    "slugify": "^1.6.5"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/render-modifiers": "2.0.2",
-    "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.48.1",
-    "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "10.0.0",
+    "@ember/render-modifiers": "2.0.4",
+    "@ember/test-helpers": "2.8.1",
+    "@embroider/test-setup": "1.8.3",
+    "@embroider/util": "^1.8.3",
+    "@faker-js/faker": "7.4.0",
+    "@glimmer/component": "1.1.2",
+    "@projectcaluma/ember-testing": "11.0.0-beta.24",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.4",
+    "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.2.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",
@@ -56,15 +56,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",
-    "faker": "5.5.3",
     "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.65.0"
+    "webpack": "5.74.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
@@ -73,6 +72,7 @@
     "edition": "octane"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config"
+    "configPath": "tests/dummy/config",
+    "after": "ember-apollo-client"
   }
 }

package/addon/gql/queries/all-format-validators.graphql

@@ -1,12 +0,0 @@
-query AllFormatValidators {
-  allFormatValidators {
-    edges {
-      node {
-        slug
-        name
-        regex
-        errorMsg
-      }
-    }
-  }
-}

package/addon/helpers/get-widget.js

@@ -1,50 +0,0 @@
-import Helper from "@ember/component/helper";
-import { warn } from "@ember/debug";
-import { inject as service } from "@ember/service";
-
-/**
- * Helper for getting the right widget.
- *
- * This helper expects n objects as positional parameters. It checks if the
- * object has a widget override in it's metadata. If one exists it checks if
- * said widget was registered in the caluma options service and then returns
- * the widget name. If it doesn't have a valid widget, the next object will be
- * checked. If no object returns a valid widget, the passed default widget will
- * be used.
- *
- * ```hbs
- * {{component (get-widget field.question someobject default="cf-form") foo=bar}}
- * ```
- *
- * @function getWidget
- * @param {Array} params
- * @param {Object} [options]
- * @param {String} [options.default]
- */
-export default class GetWidgetHelper extends Helper {
-  @service calumaOptions;
-
-  compute(params, { default: defaultWidget = "cf-field/input" }) {
-    for (const obj of params) {
-      const widget = obj?.meta?.widgetOverride;
-      if (!widget) {
-        continue;
-      }
-      const override =
-        widget &&
-        this.calumaOptions
-          .getComponentOverrides()
-          .find(({ component }) => component === widget);
-
-      warn(
-        `Widget override "${widget}" is not registered. Please register it by calling \`calumaOptions.registerComponentOverride\``,
-        override,
-        { id: "ember-caluma.unregistered-override" }
-      );
-
-      if (override) return widget;
-    }
-
-    return defaultWidget;
-  }
-}