@kaspernj/api-maker 1.0.293 → 1.0.295

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.293",
+  "version": "1.0.295",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -76,6 +76,6 @@
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.7",
     "jest": "^29.0.1",
-    "jsdom": "^23.0.0"
+    "jsdom": "^24.0.0"
   }
 }

package/src/collection-loader.jsx

@@ -5,6 +5,7 @@ import EventCreated from "./event-created"
 import EventDestroyed from "./event-destroyed"
 import EventUpdated from "./event-updated"
 import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
 import React from "react"
 import withQueryParams from "on-location-changed/src/with-query-params"
 
@@ -19,13 +20,14 @@ class CollectionLoader extends React.PureComponent {
     select: {}
   }
 
-  static propTypes = {
+  static propTypes = PropTypesExact({
     abilities: PropTypes.object,
     appHistory: PropTypes.object,
     className: PropTypes.string,
     collection: PropTypes.instanceOf(Collection),
     component: PropTypes.object,
     defaultParams: PropTypes.object,
+    destroyEnabled: PropTypes.bool.isRequired,
     groupBy: PropTypes.array,
     modelClass: PropTypes.func.isRequired,
     noRecordsAvailableContent: PropTypes.func,
@@ -34,10 +36,12 @@ class CollectionLoader extends React.PureComponent {
     pagination: PropTypes.bool.isRequired,
     paginateContent: PropTypes.func,
     preloads: PropTypes.array.isRequired,
+    queryMethod: PropTypes.func,
     queryName: PropTypes.string,
+    queryParams: PropTypes.object,
     select: PropTypes.object,
     selectColumns: PropTypes.object
-  }
+  })
 
   shape = digg(this, "props", "component", "shape")
 
@@ -145,7 +149,7 @@ class CollectionLoader extends React.PureComponent {
 
   loadModels = async () => {
     const {pagination, queryParams} = digs(this.props, "pagination", "queryParams")
-    const {abilities, collection, groupBy, modelClass, onModelsLoaded, preloads, select, selectColumns} = this.props
+    const {abilities, collection, groupBy, modelClass, onModelsLoaded, preloads, queryMethod, select, selectColumns} = this.props
     const {
       qParams,
       queryPageName,
@@ -190,7 +194,14 @@ class CollectionLoader extends React.PureComponent {
     if (abilities) query = query.abilities(abilities)
     if (selectColumns) query = query.selectColumns(selectColumns)
 
-    const result = await query.result()
+    let result
+
+    if (queryMethod) {
+      result = await queryMethod({query})
+    } else {
+      result = await query.result()
+    }
+
     const models = result.models()
 
     if (onModelsLoaded) {

package/src/super-admin/config-reader.jsx

@@ -10,7 +10,7 @@ export default class ApiMakerSuperAdminConfigReader {
       modelConfig = require(`super-admin/model-configs/${modelNameCamelized}`).default
     } catch (error) {
       if (error.message.includes("Cannot find module")) {
-        console.log(`No model-config for ${modelClass.modelClassData().name}`)
+        console.debug(`No model-config for ${modelClass.modelClassData().name}`)
       } else {
         throw error
       }

package/src/super-admin/model-class-table.jsx

@@ -1,5 +1,6 @@
 import ConfigReader from "./config-reader"
 import {digg, digs} from "diggerize"
+import * as inflection from "inflection"
 import Params from "../params"
 import PropTypes from "prop-types"
 import React from "react"
@@ -34,7 +35,7 @@ export default class ApiMakerSuperAdminModelClassTable extends React.PureCompone
   }
 
   viewModelPath = (args) => {
-    const argName = digg(this.props.modelClass.modelClassData(), "camelizedLower")
+    const argName = inflection.camelize(digg(this.props.modelClass.modelClassData(), "name"), true)
     const model = digg(args, argName)
 
     return Params.withParams({

package/src/table/select-calculator.mjs

@@ -14,7 +14,7 @@ class SelectCalculator {
 
 
     // Ensure the primary key column is loader for the primary model class
-    const className = digg(modelClass.modelClassData(), "className")
+    const className = digg(modelClass.modelClassData(), "name")
     const primaryKeyColumnName = modelClass.primaryKey()
 
     if (!(className in select)) select[className] = []

package/src/table/table.jsx

@@ -69,6 +69,7 @@ class ApiMakerTable extends React.PureComponent {
     paginateContent: PropTypes.func,
     paginationComponent: PropTypes.func,
     preloads: PropTypes.array.isRequired,
+    queryMethod: PropTypes.func,
     queryName: PropTypes.string,
     select: PropTypes.object,
     selectColumns: PropTypes.object,
@@ -157,7 +158,7 @@ class ApiMakerTable extends React.PureComponent {
 
   render () {
     const {modelClass, noRecordsAvailableContent, noRecordsFoundContent} = digs(this.props, "modelClass", "noRecordsAvailableContent", "noRecordsFoundContent")
-    const {collection, currentUser, defaultParams, onModelsLoaded, selectColumns} = this.props
+    const {collection, currentUser, defaultParams, onModelsLoaded, queryMethod, selectColumns} = this.props
     const {
       overallCount,
       preload,
@@ -206,6 +207,7 @@ class ApiMakerTable extends React.PureComponent {
             noRecordsFoundContent={noRecordsFoundContent}
             pagination
             preloads={preload}
+            queryMethod={queryMethod}
             select={selectCalculator({table: this})}
             selectColumns={selectColumns}
           />
@@ -293,6 +295,7 @@ class ApiMakerTable extends React.PureComponent {
       paginateContent,
       paginationComponent,
       preloads,
+      queryMethod,
       queryName,
       select,
       selectColumns,