muffin-admin 5.0.0 → 6.0.1

package/dist/types.d.ts

@@ -57,6 +57,7 @@ export type AdminResourceProps = {
     list: {
         limit: number;
         limitMax: number;
+        limitTotal: boolean;
         create: boolean;
         filters: AdminInput[];
         fields: AdminField[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "5.0.0",
+  "version": "6.0.1",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/MuffinResourceList.tsx

@@ -9,6 +9,7 @@ import {
   EditButton,
   ExportButton,
   FilterButton,
+  InfiniteList,
   List,
   Pagination,
   SelectColumnsButton,
@@ -22,12 +23,12 @@ import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
 export function MuffinList({ children }: PropsWithChildren) {
   const { name, list } = useMuffinResourceOpts()
-  const { limit, limitMax, filters, sort } = list
+  const { limit, limitMax, limitTotal, filters, sort } = list
 
   const DataGrid = findBuilder(["list-grid", name])
   const Toolbar = findBuilder(["list-toolbar", name])
 
-  return (
+  return limitTotal ? (
     <List
       sort={sort}
       perPage={limit}
@@ -40,6 +41,16 @@ export function MuffinList({ children }: PropsWithChildren) {
       {children}
       <DataGrid />
     </List>
+  ) : (
+    <InfiniteList
+      sort={sort}
+      perPage={limit}
+      actions={<Toolbar />}
+      filters={buildAdmin(["list-filters", name], filters)}
+    >
+      {children}
+      <DataGrid />
+    </InfiniteList>
   )
 }
 
@@ -96,7 +107,7 @@ function MuffinListToolbar() {
 }
 setupAdmin(["list-toolbar"], MuffinListToolbar)
 
-function MuffinListBulkActions() {
+function MuffinListActions() {
   const {
     actions: baseActions = [],
     list: { remove },
@@ -113,4 +124,8 @@ function MuffinListBulkActions() {
   )
 }
 
-setupAdmin(["list-actions"], MuffinListBulkActions)
+setupAdmin(["list-actions"], MuffinListActions)
+
+function MuffinPagination() {
+  return null
+}

package/src/dataprovider.ts

@@ -24,7 +24,17 @@ export function MuffinDataprovider(apiUrl: string) {
         query.sort = order == "ASC" ? field : `-${field}`
       }
       const { headers, data } = await request(resource, { query })
-      return { data, total: parseInt(headers.get("x-total"), 10) }
+      if (pagination)
+        return {
+          data,
+          total: parseInt(headers.get("x-total"), 10),
+          pageInfo: {
+            hasPreviousPage: pagination.page > 1,
+            hasNextPage: data.length === pagination.perPage,
+          },
+        }
+
+      return { data }
     },
 
     getOne: async (resource: string, { id }: { id: TID }) => {

package/src/types.ts

@@ -93,6 +93,7 @@ export type AdminResourceProps = {
   list: {
     limit: number
     limitMax: number
+    limitTotal: boolean
     create: boolean
     filters: AdminInput[]
     fields: AdminField[]