@kaspernj/api-maker 1.0.258 → 1.0.260

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.258",
+  "version": "1.0.260",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -75,6 +75,6 @@
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.5",
     "jest": "^29.0.1",
-    "jsdom": "^20.0.0"
+    "jsdom": "^21.0.0"
   }
 }

package/src/bootstrap/live-table.jsx

@@ -127,6 +127,7 @@ export default class ApiMakerBootstrapLiveTable extends React.PureComponent {
           noRecordsAvailableContent={noRecordsAvailableContent}
           noRecordsFoundContent={noRecordsFoundContent}
           onModelsLoaded={onModelsLoaded}
+          pagination
           preloads={preloads}
           select={select}
           selectColumns={selectColumns}

package/src/collection-loader.jsx

@@ -14,6 +14,7 @@ class CollectionLoader extends React.PureComponent {
     groupBy: ["id"],
     noRecordsAvailableContent: undefined,
     noRecordsFoundContent: undefined,
+    pagination: false,
     preloads: [],
     select: {}
   }
@@ -30,6 +31,7 @@ class CollectionLoader extends React.PureComponent {
     noRecordsAvailableContent: PropTypes.func,
     noRecordsFoundContent: PropTypes.func,
     onModelsLoaded: PropTypes.func,
+    pagination: PropTypes.bool.isRequired,
     paginateContent: PropTypes.func,
     preloads: PropTypes.array.isRequired,
     queryName: PropTypes.string,
@@ -140,7 +142,7 @@ class CollectionLoader extends React.PureComponent {
   }
 
   loadModels = async () => {
-    const {queryParams} = digs(this.props, "queryParams")
+    const {pagination, queryParams} = digs(this.props, "pagination", "queryParams")
     const {abilities, collection, groupBy, modelClass, onModelsLoaded, preloads, select, selectColumns} = this.props
     const {
       qParams,
@@ -156,26 +158,29 @@ class CollectionLoader extends React.PureComponent {
       "queryQName",
       "searchParams"
     )
-    const page = queryParams[queryPageName] || 1
-    let per = queryParams[queryPerKey] || 30
-
-    if (per == "all") {
-      per = 999_999_999
-    } else {
-      per = Number(per)
-    }
 
     let query = collection?.clone() || modelClass.ransack()
 
+    if (pagination) {
+      const page = queryParams[queryPageName] || 1
+      let per = queryParams[queryPerKey] || 30
+
+      if (per == "all") {
+        per = 999_999_999
+      } else {
+        per = Number(per)
+      }
+
+      query.page(page).per(per)
+    }
+
     if (groupBy) query = query.groupBy(...groupBy)
 
     query = query
       .ransack(qParams)
       .search(searchParams)
       .searchKey(queryQName)
-      .page(page)
       .pageKey(queryPageName)
-      .per(per)
       .perKey(queryPerKey)
       .preload(preloads)
       .select(select)

package/src/table/model-row.jsx

@@ -98,7 +98,7 @@ export default class ApiMakerBootStrapLiveTableModelRow extends React.PureCompon
     const {attribute} = digs(column, "attribute")
     const currentModelClass = this.props.modelClass
     const path = column.path || []
-
+    let value
     let currentModel = model
 
     if (path.length > 0) {
@@ -109,8 +109,7 @@ export default class ApiMakerBootStrapLiveTableModelRow extends React.PureCompon
     }
 
     if (!(attribute in currentModel)) throw new Error(`${currentModelClass.modelName().name} doesn't respond to ${attribute}`)
-
-    const value = currentModel[attribute]()
+    if (currentModel.isAttributeLoaded(attribute)) value = currentModel[attribute]()
 
     return this.presentColumnValue(value)
   }

package/src/table/table.jsx

@@ -177,6 +177,7 @@ class ApiMakerTable extends React.PureComponent {
             onModelsLoaded={onModelsLoaded}
             noRecordsAvailableContent={noRecordsAvailableContent}
             noRecordsFoundContent={noRecordsFoundContent}
+            pagination
             preloads={preload}
             select={selectCalculator({table: this})}
             selectColumns={selectColumns}