@kaspernj/api-maker 1.0.294 → 1.0.296

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.294",
+  "version": "1.0.296",
   "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/bootstrap/sort-link.jsx

@@ -12,6 +12,7 @@ class ApiMakerBootstrapSortLink extends PureComponent {
   static propTypes = {
     attribute: PropTypes.string.isRequired,
     className: PropTypes.string,
+    defaultParams: PropTypes.object,
     linkComponent: PropTypes.object,
     onChanged: PropTypes.func,
     query: PropTypes.object.isRequired,
@@ -51,7 +52,7 @@ class ApiMakerBootstrapSortLink extends PureComponent {
 
   render () {
     const LinkComponent = this.linkComponent()
-    const {attribute, className, linkComponent, onChanged, query, queryParams, title, ...restProps} = this.props
+    const {attribute, className, defaultParams, linkComponent, onChanged, query, queryParams, title, ...restProps} = this.props
 
     return (
       <>
@@ -83,10 +84,15 @@ class ApiMakerBootstrapSortLink extends PureComponent {
   }
 
   qParams() {
+    const {defaultParams} = this.props
     const {queryParams} = digs(this.props, "queryParams")
     const {searchKey} = digs(this, "searchKey")
 
-    if (searchKey in queryParams) return JSON.parse(queryParams[searchKey])
+    if (searchKey in queryParams) {
+      return JSON.parse(queryParams[searchKey])
+    } else if (defaultParams) {
+      return {...defaultParams}
+    }
 
     return {}
   }

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

@@ -195,6 +195,9 @@ class ApiMakerTable extends React.PureComponent {
 
     return (
       <div className={this.className()}>
+        <div>
+          queryQName: {this.shape.queryQName}
+        </div>
         {preload !== undefined &&
           <CollectionLoader
             abilities={this.abilitiesToLoad()}
@@ -540,6 +543,7 @@ class ApiMakerTable extends React.PureComponent {
   rowComponent = () => this.responsiveComponent("tr")
 
   headersContentFromColumns () {
+    const {defaultParams} = this.props
     const {preparedColumns, query} = digs(this.shape, "preparedColumns", "query")
     const ColumnInHeadComponent = this.columnInHeadComponent()
 
@@ -551,7 +555,7 @@ class ApiMakerTable extends React.PureComponent {
         {...this.columnProps(column)}
       >
         {tableSettingColumn.hasSortKey() && query &&
-          <SortLink attribute={tableSettingColumn.sortKey()} query={query} title={this.headerLabelForColumn(column)} />
+          <SortLink attribute={tableSettingColumn.sortKey()} defaultParams={defaultParams} query={query} title={this.headerLabelForColumn(column)} />
         }
         {(!tableSettingColumn.hasSortKey() || !query) &&
           this.headerLabelForColumn(column)