muffin-admin 4.0.0 → 6.0.0

package/dist/types.d.ts

@@ -2,7 +2,7 @@ export type TID = string | number;
 export type TProps = {
     [key: string]: any;
 };
-export type TAdminType = "action-form" | "admin" | "appbar" | "auth-provider" | "auth-storage-get" | "auth-storage-set" | "create" | "create-inputs" | "create-toolbar" | "dashboard" | "dashboard-actions" | "dashboard-content" | "data-provider" | "edit" | "edit-actions" | "edit-inputs" | "edit-toolbar" | "layout" | "list" | "list-toolbar" | "list-grid" | "list-grid-buttons" | "list-filters" | "list-fields" | "list-bulk-actions" | "locale" | "loginpage" | "resource" | "show" | "show-actions" | "show-toolbar" | "show-fields" | "show-links";
+export type TAdminType = "action-form" | "admin" | "appbar" | "auth-provider" | "auth-storage-get" | "auth-storage-set" | "create" | "create-toolbar" | "create-inputs" | "dashboard" | "dashboard-actions" | "dashboard-content" | "data-provider" | "edit" | "edit-actions" | "edit-toolbar" | "edit-inputs" | "layout" | "list" | "list-actions" | "list-toolbar" | "list-grid" | "list-grid-buttons" | "list-filters" | "list-fields" | "locale" | "loginpage" | "resource" | "show" | "show-actions" | "show-toolbar" | "show-fields" | "show-links";
 export type TAdminPath = [type: TAdminType, ...ids: string[]];
 export type AdminAction = {
     view?: ("show" | "edit" | "list" | "bulk")[];
@@ -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": "4.0.0",
+  "version": "6.0.0",
   "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>
   )
 }
 
@@ -50,7 +61,7 @@ setupAdmin(["list-filters"], buildRA)
 function MuffinListDatagrid() {
   const { name, list } = useMuffinResourceOpts()
   const { fields, edit, show } = list
-  const BulkActions = findBuilder(["list-bulk-actions", name])
+  const BulkActions = findBuilder(["list-actions", name])
   return (
     <DatagridConfigurable
       rowClick={show ? "show" : edit ? "edit" : false}
@@ -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-bulk-actions"], MuffinListBulkActions)
+setupAdmin(["list-actions"], MuffinListActions)
+
+function MuffinPagination() {
+  return null
+}

package/src/dataprovider.ts

@@ -24,7 +24,14 @@ 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) }
+      return {
+        data,
+        total: parseInt(headers.get("x-total"), 10),
+        pageInfo: {
+          hasPreviousPage: pagination.page > 1,
+          hasNextPage: data.length === pagination.perPage,
+        },
+      }
     },
 
     getOne: async (resource: string, { id }: { id: TID }) => {

package/src/types.ts

@@ -12,24 +12,24 @@ export type TAdminType =
   | "auth-storage-get"
   | "auth-storage-set"
   | "create"
-  | "create-inputs"
   | "create-toolbar"
+  | "create-inputs"
   | "dashboard"
   | "dashboard-actions"
   | "dashboard-content"
   | "data-provider"
   | "edit"
   | "edit-actions"
-  | "edit-inputs"
   | "edit-toolbar"
+  | "edit-inputs"
   | "layout"
   | "list"
+  | "list-actions"
   | "list-toolbar"
   | "list-grid"
   | "list-grid-buttons"
   | "list-filters"
   | "list-fields"
-  | "list-bulk-actions"
   | "locale"
   | "loginpage"
   | "resource"
@@ -54,7 +54,7 @@ export type AdminAction = {
 }
 
 export type AdminField = [string, { source: string }]
-export type AdminInput = [string, { required: boolean; source: string; [key: string]: any }]
+export type AdminInput = [string, { required: boolean; source: string;[key: string]: any }]
 
 export type AdminShowLink = {
   label: string
@@ -85,14 +85,15 @@ export type AdminResourceProps = {
   actions: AdminAction[]
   create: AdminInput[] | false
   edit:
-    | {
-        inputs: AdminInput[]
-        remove?: boolean
-      }
-    | false
+  | {
+    inputs: AdminInput[]
+    remove?: boolean
+  }
+  | false
   list: {
     limit: number
     limitMax: number
+    limitTotal: boolean
     create: boolean
     filters: AdminInput[]
     fields: AdminField[]