@kaspernj/api-maker 1.0.136 → 1.0.139

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.136",
+  "version": "1.0.139",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -34,6 +34,24 @@
     "eslint-find-rules": "eslint-find-rules",
     "test": "jest"
   },
+  "dependencies": {
+    "@rails/actioncable": ">= 6.1.0",
+    "clone-deep": ">= 4.0.1",
+    "debounce": ">= 1.2.1",
+    "diggerize": ">= 1.0.4",
+    "epic-locks": ">= 1.0.1",
+    "form-data-objectizer": ">= 1.0.0",
+    "form-serialize": ">= 0.7.2",
+    "format-number": ">= 3.0.0",
+    "inflection": ">= 1.12.0",
+    "js-money": ">= 0.6.3",
+    "numberable": ">= 1.0.0",
+    "object-to-formdata": ">= 4.1.0",
+    "qs": ">= 6.9.3",
+    "replaceall": ">= 0.1.6",
+    "strftime": ">= 0.10.0",
+    "wake-event": ">= 0.0.1"
+  },
   "peerDependencies": {
     "prop-types": "^15.7.2",
     "prop-types-exact": ">= 1.2.0",
@@ -55,23 +73,5 @@
     "i18n-on-steroids": "^1.0.2",
     "jest": "^27.0.6",
     "jsdom": "^19.0.0"
-  },
-  "dependencies": {
-    "@rails/actioncable": ">= 6.1.0",
-    "clone-deep": ">= 4.0.1",
-    "debounce": ">= 1.2.1",
-    "diggerize": ">= 1.0.4",
-    "epic-locks": ">= 1.0.1",
-    "form-data-objectizer": ">= 1.0.0",
-    "form-serialize": ">= 0.7.2",
-    "format-number": ">= 3.0.0",
-    "inflection": ">= 1.12.0",
-    "js-money": ">= 0.6.3",
-    "numberable": ">= 1.0.0",
-    "object-to-formdata": ">= 4.1.0",
-    "qs": ">= 6.9.3",
-    "replaceall": ">= 0.1.6",
-    "strftime": ">= 0.10.0",
-    "wake-event": ">= 0.0.1"
   }
 }

package/src/commands-pool.cjs

@@ -126,7 +126,7 @@ module.exports = class ApiMakerCommandsPool {
         const commandData = currentPool[parseInt(commandId, 10)]
         const responseType = commandResponse.type
 
-        if (commandResponseData) {
+        if (commandResponseData && typeof commandResponseData == "object") {
           const bugReportUrl = dig(commandResponseData, "bug_report_url")
 
           if (bugReportUrl) {

package/src/config.js

@@ -0,0 +1,15 @@
+class ApiMakerConfig {
+  getCurrenciesCollection() {
+    if (!this._currenciesCollection) throw new Error("Currencies collection hasn't been set")
+
+    return this._currenciesCollection
+  }
+
+  setCurrenciesCollection(newCurrenciesCollection) {
+    this._currenciesCollection = newCurrenciesCollection
+  }
+}
+
+const apiMakerConfig = new ApiMakerConfig()
+
+export default apiMakerConfig

package/src/event-updated.jsx

@@ -20,11 +20,6 @@ export default class ApiMakerEventUpdated extends React.PureComponent {
     onUpdated: PropTypes.func.isRequired
   })
 
-  constructor (props) {
-    super(props)
-    this.onConnected = this.onConnected.bind(this)
-  }
-
   componentDidMount () {
     this.connect()
   }
@@ -35,17 +30,17 @@ export default class ApiMakerEventUpdated extends React.PureComponent {
     }
 
     if (this.onConnectedListener) {
-      this.connectUpdated.events.removeListener("connected", this.onConnected)
+      this.connectUpdated.events.removeListener("connected", this.props.onConnected)
     }
   }
 
   connect () {
     const {model, onConnected} = this.props
 
-    this.connectUpdated = ModelEvents.connectUpdated(model, (...args) => this.onUpdated(...args))
+    this.connectUpdated = ModelEvents.connectUpdated(model, this.onUpdated)
 
     if (onConnected) {
-      this.connectUpdated.events.addListener("connected", this.onConnected)
+      this.onConnectedListener = this.connectUpdated.events.addListener("connected", this.props.onConnected)
     }
   }
 
@@ -61,11 +56,7 @@ export default class ApiMakerEventUpdated extends React.PureComponent {
     return this.debounceInstance
   }
 
-  onConnected () {
-    this.props.onConnected()
-  }
-
-  onUpdated (...args) {
+  onUpdated = (...args) => {
     if (!this.props.active) {
       return
     }

package/src/model-load-wrapper.jsx

@@ -1,3 +1,4 @@
+import EventUpdated from "./event-updated"
 import Params from "./params.cjs"
 import React from "react"
 
@@ -26,6 +27,7 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     const {modelId} = digs(this.state, "modelId")
     const query = await ModelClass.ransack({id_eq: modelId})
 
+    if (args.abilities) query.abilities(args.abilities)
     if (args.preload) query.preload(args.preload)
     if (args.select) query.select(args.select)
 
@@ -52,7 +54,14 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     wrappedComponentProps[`${this.camelizedLower}Id`] = modelId
 
     return (
-      <WrappedComponent {...wrappedComponentProps} {...this.props} />
+      <>
+        {model && args.eventUpdated &&
+          <EventUpdated model={model} onUpdated={digg(this, "onUpdated")} />
+        }
+        <WrappedComponent {...wrappedComponentProps} {...this.props} />
+      </>
     )
   }
+
+  onUpdated = () => this.loadExistingModel()
 }

package/src/routes.cjs

@@ -3,6 +3,8 @@ const inflection = require("inflection")
 
 module.exports = class ApiMakerRoutes {
   constructor ({jsRoutes, locale, routeDefinitions}) {
+    if (!jsRoutes) throw new Error("'jsRoutes' wasn't given")
+
     this.jsRoutes = jsRoutes
     this.routeDefinitions = routeDefinitions
 

package/src/serializer.cjs

@@ -16,7 +16,13 @@ module.exports = class Serializer {
   }
 
   serializeArgument (arg) {
-    if (typeof arg == "function" && arg.apiMakerType == "BaseModel") {
+    if (typeof arg == "object" && arg.constructor.apiMakerType == "BaseModel") {
+      return {
+        api_maker_type: "model",
+        model_class_name: digg(arg.modelClassData(), "name"),
+        model_id: arg.id()
+      }
+    } else if (typeof arg == "function" && arg.apiMakerType == "BaseModel") {
       return {
         api_maker_type: "resource",
         name: digg(arg.modelClassData(), "name")