@kaspernj/api-maker 1.0.259 → 1.0.261

package/package.json

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

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

@@ -117,7 +117,7 @@ export default class ApiMakerBootStrapLiveTableModelRow extends React.PureCompon
   _modelCallbackArgs () {
     const {model} = digs(this.props, "model")
     const modelArgName = inflection.camelize(this.props.liveTable.props.modelClass.modelClassData().name, true)
-    const modelCallbackArgs = {}
+    const modelCallbackArgs = {model}
 
     modelCallbackArgs[modelArgName] = model
 

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}