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

package/addon/caluma-query/index.js

@@ -1,4 +1,14 @@
 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(),
+  }));
+}
 
 export default function calumaQuery({ query, options = {} }) {
   return function (_, name) {

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,71 @@
+import { getOwner, setOwner } from "@ember/application";
+import { destroy } from "@ember/destroyable";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
+import { LifecycleResource } from "ember-resources";
+
+export default class CalumaQueryResource extends LifecycleResource {
+  @tracked query;
+
+  setup() {
+    const { query, options, queryArgs } = this._parsedArgs;
+
+    this.query = query(options);
+    setOwner(this.query, getOwner(this));
+
+    this.query.fetch(queryArgs);
+  }
+
+  update() {
+    this._updateOptions();
+
+    this.query.fetch(this._parsedArgs.queryArgs);
+  }
+
+  teardown() {
+    destroy(this.query);
+  }
+
+  get _parsedArgs() {
+    const { query, options = {}, ...queryArgs } = this.args.named;
+
+    return { query, options, queryArgs };
+  }
+
+  _updateOptions() {
+    ["pageSize", "processAll", "processNew", "queryOptions"].forEach(
+      (optionKey) => {
+        const option = this._parsedArgs.options[optionKey];
+
+        if (option !== undefined && option !== this.query[optionKey]) {
+          this.query[optionKey] = option;
+        }
+      }
+    );
+  }
+
+  @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/{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/validator.js

@@ -2,7 +2,7 @@ import { assert } from "@ember/debug";
 import Service from "@ember/service";
 import { isEmpty } from "@ember/utils";
 import { queryManager } from "ember-apollo-client";
-import { enqueueTask } from "ember-concurrency-decorators";
+import { enqueueTask } from "ember-concurrency";
 
 import allFormatValidatorsQuery from "@projectcaluma/ember-core/gql/queries/all-format-validators.graphql";
 

package/app/services/apollo.js

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

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"
-      );
-    }
-  },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "10.1.0",
+  "version": "11.0.0-beta.1",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -19,31 +19,29 @@
     "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-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
     "ember-concurrency": "^2.2.0",
-    "ember-concurrency-decorators": "^2.0.3",
     "ember-fetch": "^8.0.4",
     "ember-inflector": "^4.0.2",
-    "ember-intl": "^5.7.0",
-    "graphql": "^15.6.1",
+    "ember-intl": "^5.7.2",
+    "ember-resources": "^4.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",
+    "@embroider/test-setup": "0.49.0",
     "@glimmer/component": "1.0.4",
-    "@projectcaluma/ember-testing": "10.0.0",
+    "@projectcaluma/ember-testing": "10.1.0",
     "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-inject-live-reload": "2.1.0",
@@ -73,6 +71,7 @@
     "edition": "octane"
   },
   "ember-addon": {
-    "configPath": "tests/dummy/config"
+    "configPath": "tests/dummy/config",
+    "after": "ember-apollo-client"
   }
 }

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;
-  }
-}

package/app/helpers/get-widget.js

@@ -1,4 +0,0 @@
-export {
-  default,
-  getWidget,
-} from "@projectcaluma/ember-core/helpers/get-widget";