@kaspernj/api-maker 1.0.192 → 1.0.195

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.192",
+  "version": "1.0.195",
   "description": "",
   "main": "index.js",
   "repository": {

package/src/base-error.cjs

@@ -5,11 +5,15 @@ class BaseError extends Error {
   constructor (message, args = {}) {
     let messageToUse = message
 
-    if (typeof args.response == "object" && dig(args, "response", "errors")) {
-      if (message) {
-        messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
-      } else {
-        messageToUse = errorMessages(args).join(". ")
+    if ("addResponseErrorsToErrorMessage" in args && !args.addResponseErrorsToErrorMessage) {
+      messageToUse = message
+    } else {
+      if (typeof args.response == "object" && dig(args, "response", "errors")) {
+        if (message) {
+          messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
+        } else {
+          messageToUse = errorMessages(args).join(". ")
+        }
       }
     }
 
@@ -17,8 +21,7 @@ class BaseError extends Error {
     this.args = args
 
     // Maintains proper stack trace for where our error was thrown (only available on V8)
-    if (Error.captureStackTrace)
-      Error.captureStackTrace(this, BaseError)
+    if (Error.captureStackTrace) Error.captureStackTrace(this, BaseError)
   }
 
   errorMessages () {

package/src/base-model.cjs

@@ -311,7 +311,7 @@ class BaseModel {
   }
 
   static parseValidationErrors ({error, model, options}) {
-    if (!(error instanceof CustomError)) return
+    if (!(error instanceof ValidationError)) return
     if (!error.args.response.validation_errors) return
 
     const validationErrors = new ValidationErrors({

package/src/collection-loader.jsx

@@ -14,6 +14,7 @@ import {LocationChanged} from "on-location-changed/src/location-changed-componen
 export default class CollectionLoader extends React.PureComponent {
   static defaultProps = {
     destroyEnabled: true,
+    groupBy: ["id"],
     noRecordsAvailableContent: undefined,
     noRecordsFoundContent: undefined,
     preloads: [],
@@ -100,9 +101,9 @@ export default class CollectionLoader extends React.PureComponent {
     const {abilities, collection, groupBy, modelClass, onModelsLoaded, preloads, select, selectColumns} = this.props
     const {qParams, queryPageName, queryQName} = digs(this.shape, "qParams", "queryPageName", "queryQName")
 
-    let query = collection?.clone() || modelClass
+    let query = collection?.clone() || modelClass.ransack()
 
-    if (groupBy) query = query.groupBy(groupBy)
+    if (groupBy) query = query.groupBy(...groupBy)
 
     query = query
       .ransack(qParams)

package/src/link.jsx

@@ -17,7 +17,7 @@ export default class Link extends React.PureComponent {
     if (!e.defaultPrevented && !e.ctrlKey && !e.metaKey) {
       e.preventDefault()
 
-      const history = global.apiMakerConfigGlobal?.history
+      const history = globalThis.apiMakerConfigGlobal?.history
 
       if (!history) throw new Error("History hasn't been set in the API maker configuration")
 

package/src/validation-error.cjs

@@ -1,9 +1,13 @@
-const CustomError = require("./custom-error.cjs")
+const BaseError = require("./base-error.cjs")
 const inflection = require("inflection")
 
-class ValidationError extends CustomError {
+class ValidationError extends BaseError {
   constructor (validationErrors, args) {
-    super(validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage(), args)
+    const errorMessage = validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage()
+    const forwardedArgs = {addResponseErrorsToErrorMessage: false}
+    const newArgs = Object.assign({}, args, forwardedArgs)
+
+    super(errorMessage, newArgs)
     this.validationErrors = validationErrors
   }
 

package/src/validation-errors.cjs

@@ -96,8 +96,7 @@ class ValidationErrors {
     return this.validationErrors
   }
 
-  getValidationErrorsForInput (args) {
-    const {attribute, inputName, onMatchValidationError} = args
+  getValidationErrorsForInput ({attribute, inputName, onMatchValidationError}) {
     const validationErrors = this.validationErrors.filter((validationError) => {
       if (onMatchValidationError) {
         return onMatchValidationError(validationError)