@kaspernj/api-maker 1.0.286 → 1.0.288

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.286",
+  "version": "1.0.288",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@rails/actioncable": ">= 6.1.0",
     "clone-deep": ">= 4.0.1",
-    "debounce": ">= 1.2.1",
+    "debounce": ">= 2.0.0",
     "diggerize": ">= 1.0.5",
     "epic-locks": ">= 1.0.2",
     "form-data-objectizer": ">= 1.0.0",
@@ -76,6 +76,6 @@
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.7",
     "jest": "^29.0.1",
-    "jsdom": "^22.0.0"
+    "jsdom": "^23.0.0"
   }
 }

package/src/bootstrap/live-table.jsx

@@ -2,7 +2,7 @@ import Card from "./card"
 import classNames from "classnames"
 import Collection from "../collection"
 import CollectionLoader from "../collection-loader"
-import {debounce} from "debounce"
+import debounce from "debounce"
 import {digg, digs} from "diggerize"
 import instanceOfClassName from "../instance-of-class-name"
 import ModelRow from "./live-table/model-row"

package/src/cache-key-generator.mjs

@@ -39,13 +39,24 @@ export default class CacheKeyGenerator {
     for (const relationshipType in model.relationships) {
       this.recordModelType(relationshipType)
 
-      for (const anotherModel of model.relationships[relationshipType]) {
-        if (this.isModelRecorded(relationshipType, anotherModel)) {
+      const loadedRelationship = model.relationships[relationshipType]
+
+      if (Array.isArray(loadedRelationship)) { // has_many
+        for (const anotherModel of loadedRelationship) {
+          if (this.isModelRecorded(relationshipType, anotherModel)) {
+            continue
+          }
+
+          this.recordModel(relationshipType, anotherModel)
+          this.fillModels(anotherModel)
+        }
+      } else if (loadedRelationship) { // belongs_to, has_one
+        if (this.isModelRecorded(relationshipType, loadedRelationship)) {
           continue
         }
 
-        this.recordModel(relationshipType, anotherModel)
-        this.fillModels(anotherModel)
+        this.recordModel(relationshipType, loadedRelationship)
+        this.fillModels(loadedRelationship)
       }
     }
 

package/src/collection-loader.jsx

@@ -1,5 +1,5 @@
 import Collection from "./collection"
-import {debounce} from "debounce"
+import debounce from "debounce"
 import {digg, digs} from "diggerize"
 import EventCreated from "./event-created"
 import EventDestroyed from "./event-destroyed"
@@ -87,6 +87,8 @@ class CollectionLoader extends React.PureComponent {
       changed = true
     } else if (prevProps.queryParams[querySName] != this.props.queryParams[querySName]) {
       changed = true
+    } else if (prevProps.collection != this.props.collection) {
+      changed = true
     }
 
     if (changed) {

package/src/devise.mjs

@@ -12,8 +12,9 @@ export default class ApiMakerDevise {
   }
 
   static current () {
-    if (!globalThis.currentApiMakerDevise)
-    globalThis.currentApiMakerDevise = new ApiMakerDevise()
+    if (!globalThis.currentApiMakerDevise) {
+      globalThis.currentApiMakerDevise = new ApiMakerDevise()
+    }
 
     return globalThis.currentApiMakerDevise
   }

package/src/inputs/input-wrapper.jsx

@@ -151,7 +151,7 @@ const inputWrapper = (WrapperComponentClass, wrapperOptions = {}) => {
     label() {
       if ("label" in this.props) {
         return this.props.label
-      } else if (this.props.model) {
+      } else if (this.props.attribute && this.props.model) {
         return this.props.model.modelClass().humanAttributeName(this.props.attribute)
       }
     }

package/src/table/table.jsx

@@ -4,7 +4,7 @@ import classNames from "classnames"
 import Collection from "../collection"
 import CollectionLoader from "../collection-loader"
 import columnVisible from "./column-visible.mjs"
-import {debounce} from "debounce"
+import debounce from "debounce"
 import {digg, digs} from "diggerize"
 import Filters from "./filters"
 import * as inflection from "inflection"

package/src/with-collection.jsx

@@ -1,4 +1,4 @@
-import {debounce} from "debounce"
+import debounce from "debounce"
 import {digg, digs} from "diggerize"
 import EventCreated from "./event-created"
 import EventDestroyed from "./event-destroyed"