@kaspernj/api-maker 1.0.255 → 1.0.257

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.255",
+  "version": "1.0.257",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/base-model.mjs

@@ -33,6 +33,15 @@ export default class BaseModel {
     return result
   }
 
+  static hasAttribute(attributeName) {
+    const attributes = digg(this.modelClassData(), "attributes")
+    const lowerCaseAttributeName = inflection.underscore(attributeName)
+
+    if (lowerCaseAttributeName in attributes) return true
+
+    return false
+  }
+
   static modelClassData() {
     throw new Error("modelClassData should be overriden by child")
   }

package/src/table/model-row.jsx

@@ -9,19 +9,20 @@ import PropTypes from "prop-types"
 
 export default class ApiMakerBootStrapLiveTableModelRow extends React.PureComponent {
   static propTypes = {
+    cacheKey: PropTypes.string.isRequired,
     model: PropTypes.object.isRequired,
     liveTable: PropTypes.object.isRequired,
     preparedColumns: PropTypes.array
   }
 
-  modelCallbackArgs = this._modelCallbackArgs()
-
   render() {
-    const {model} = digs(this.props, "model")
+    const {cacheKey, model} = digs(this.props, "cacheKey", "model")
     const {modelClass} = digs(this.props.liveTable.props, "modelClass")
     const {actionsContent, columnsContent, destroyEnabled, editModelPath, viewModelPath} = digg(this, "props", "liveTable", "props")
     const {columns} = digg(this, "props", "liveTable", "shape")
 
+    this.modelCallbackArgs = this._modelCallbackArgs() // 'model' can change so this needs to be re-cached for every render
+
     let editPath, viewPath
 
     if (editModelPath && model.can("edit")) editPath = editModelPath(this.modelCallbackArgs)

package/src/table/select-calculator.mjs

@@ -21,6 +21,13 @@ class SelectCalculator {
     if (!select[className].includes(primaryKeyColumnName)) select[className].push(primaryKeyColumnName)
 
 
+    // Ensure 'updatedAt' is selected if defined as an attribute, because it is used for cacheKey and updates in the table
+    if (modelClass.hasAttribute("updatedAt")) {
+      if (!(className in select)) select[className] = []
+      if (!select[className].includes("updatedAt")) select[className].push("updatedAt")
+    }
+
+
     // Ensure columns used for columns are loaded
     for (const preparedColumn of preparedColumns) {
       const {column} = digs(preparedColumn, "column")

package/src/table/table.jsx

@@ -137,7 +137,7 @@ class ApiMakerTable extends React.PureComponent {
 
   render () {
     const {modelClass, noRecordsAvailableContent, noRecordsFoundContent} = digs(this.props, "modelClass", "noRecordsAvailableContent", "noRecordsFoundContent")
-    const {collection, defaultParams, selectColumns} = this.props
+    const {collection, defaultParams, onModelsLoaded, selectColumns} = this.props
     const {
       overallCount,
       preload,
@@ -174,6 +174,7 @@ class ApiMakerTable extends React.PureComponent {
             collection={collection}
             component={this}
             modelClass={modelClass}
+            onModelsLoaded={onModelsLoaded}
             noRecordsAvailableContent={noRecordsAvailableContent}
             noRecordsFoundContent={noRecordsFoundContent}
             preloads={preload}
@@ -328,8 +329,13 @@ class ApiMakerTable extends React.PureComponent {
     const {filterSubmitLabel} = this.props
     const {qParams} = digs(this.shape, "qParams")
 
+    console.log({qParams})
+
     return (
       <form className="live-table--filter-form" onSubmit={this.onFilterFormSubmit} ref={filterFormRef}>
+        {"s" in qParams &&
+          <input name="s" type="hidden" value={qParams.s} />
+        }
         {filterContent({
           onFilterChanged: submitFilter,
           onFilterChangedWithDelay: submitFilterDebounce,
@@ -404,6 +410,7 @@ class ApiMakerTable extends React.PureComponent {
           {models.map((model) =>
             <ModelRow
               breakPoint={breakPoint}
+              cacheKey={model.cacheKey()}
               columnComponent={this.columnComponent()}
               key={model.id()}
               liveTable={this}