@projectcaluma/ember-core 14.5.1 → 14.7.0

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

@@ -9,6 +9,7 @@ import {
   task,
 } from "ember-concurrency";
 import { gql } from "graphql-tag";
+import { TrackedArray } from "tracked-built-ins";
 
 export default class BaseQuery {
   @queryManager apollo;
@@ -66,17 +67,7 @@ export default class BaseQuery {
   }
 
   get value() {
-    const Model = getOwner(this).factoryFor(
-      `caluma-query-model:${this.modelName}`,
-    ).class;
-
-    return this.items.map((item) => {
-      const instance = new Model(item);
-
-      setOwner(instance, getOwner(this));
-
-      return instance;
-    });
+    return this.items;
   }
 
   fetch(...args) {
@@ -98,7 +89,7 @@ export default class BaseQuery {
   *_fetch({ filter = [], order = [], queryOptions = {} } = {}) {
     yield this._fetchPage.cancelAll({ resetState: true });
 
-    this.items = [];
+    this.items = new TrackedArray();
 
     this.filter = filter;
     this.order = order;
@@ -131,13 +122,39 @@ export default class BaseQuery {
       ...this.queryOptions,
     });
 
-    this.items = yield this.processAll([
-      ...this.items,
-      ...(yield this.processNew(
-        data[this.dataKey].edges.map(({ node }) => node),
-      )),
-    ]);
+    const rawNewItems = data[this.dataKey].edges.map(({ node }) => node);
+
+    yield this.#parsePage(rawNewItems);
 
     return data;
   }
+
+  #createModel(item) {
+    const instance = new this.modelClass(item);
+    setOwner(instance, getOwner(this));
+    return instance;
+  }
+
+  async #parsePage(rawNewItems) {
+    const processedNewItems = await this.processNew(rawNewItems);
+    const rawExistingItems = this.items.map((model) => model.raw);
+
+    const allRawItems = [...processedNewItems, ...rawExistingItems];
+    const allProcessedItems = await this.processAll(allRawItems);
+
+    // Superficially check if `this.processAll` changed anything on the raw data
+    if (JSON.stringify(allRawItems) !== JSON.stringify(allProcessedItems)) {
+      // If so, we need to re-create the already existing models and reassign
+      // the `this.items` property in order to trigger a rerender for **all**
+      // items.
+      this.items = new TrackedArray(
+        allProcessedItems.map((i) => this.#createModel(i)),
+      );
+    } else {
+      // If not, only the newly added items need to be converted to models and
+      // added to the existing items in order to only trigger a partial rerender
+      // for the newly added items.
+      this.items.push(...processedNewItems.map((i) => this.#createModel(i)));
+    }
+  }
 }

package/addon/caluma-query/resource.js

@@ -51,7 +51,7 @@ export default class CalumaQueryResource extends Resource {
       event.preventDefault();
     }
 
-    this.query.fetchMore();
+    return this.query.fetchMore();
   }
 
   @action
@@ -60,7 +60,7 @@ export default class CalumaQueryResource extends Resource {
       event.preventDefault();
     }
 
-    this.query.refresh();
+    return this.query.refresh();
   }
 
   get value() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-core",
-  "version": "14.5.1",
+  "version": "14.7.0",
   "description": "Ember core addon for working with Caluma.",
   "keywords": [
     "ember-addon"
@@ -13,13 +13,11 @@
     "@babel/core": "^7.26.0",
     "@ember/string": "^3.1.1 || ^4.0.0",
     "@embroider/macros": "^1.16.10",
-    "@glimmer/tracking": "^1.1.2",
     "ember-apollo-client": "^5.0.0",
     "ember-auto-import": "^2.10.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
     "ember-concurrency": "^4.0.2",
-    "ember-fetch": "^8.1.2",
     "ember-inflector": "^4.0.3 || ^5.0.1",
     "ember-intl": "^7.1.1",
     "ember-modify-based-class-resource": "^1.1.1",
@@ -29,16 +27,18 @@
     "graphql-tag": "^2.12.6",
     "jexl": "^2.3.0",
     "lodash.clonedeep": "^4.5.0",
-    "slugify": "^1.6.6"
+    "slugify": "^1.6.6",
+    "tracked-built-ins": "^3.4.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@ember/optional-features": "2.2.0",
+    "@ember/optional-features": "2.3.0",
     "@ember/render-modifiers": "3.0.0",
     "@ember/test-helpers": "4.0.4",
     "@embroider/test-setup": "4.0.0",
-    "@embroider/util": "1.13.4",
-    "@faker-js/faker": "10.0.0",
+    "@embroider/util": "1.13.5",
+    "@faker-js/faker": "10.2.0",
     "@glimmer/component": "1.1.2",
+    "@glimmer/tracking": "1.1.2",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "6.1.0",
     "ember-cli-clean-css": "3.0.0",
@@ -56,12 +56,12 @@
     "ember-source-channel-url": "3.0.0",
     "ember-try": "4.0.0",
     "loader.js": "4.7.0",
-    "qunit": "2.24.1",
+    "qunit": "2.25.0",
     "qunit-dom": "3.5.0",
-    "sinon": "21.0.0",
-    "uikit": "3.23.13",
-    "webpack": "5.101.3",
-    "@projectcaluma/ember-testing": "14.5.1"
+    "sinon": "21.0.1",
+    "uikit": "3.25.6",
+    "webpack": "5.104.1",
+    "@projectcaluma/ember-testing": "14.7.0"
   },
   "peerDependencies": {
     "ember-data": "*",