muffin-admin 2.8.2 → 2.9.1

package/package.json

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

package/src/MuffinResourceEdit.tsx

@@ -11,7 +11,6 @@ import {
 import { buildRA } from "./buildRA"
 import { ActionButton } from "./buttons"
 import { useMuffinAdminOpts, useMuffinResourceOpts } from "./hooks"
-import { AdminAction } from "./types"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
 export function MuffinResourceEdit() {
@@ -21,11 +20,11 @@ export function MuffinResourceEdit() {
   const { edit, name } = useMuffinResourceOpts()
   if (!edit) return null
 
-  const { actions, inputs, remove, ...opts } = edit
-  const Actions = findBuilder(["edit-actions", name])
+  const { inputs, remove } = edit
+  const Actions = findBuilder(["edit-actions", name]) as unknown as any
 
   return (
-    <Edit actions={<Actions actions={actions} />} mutationMode={mutationMode} {...opts}>
+    <Edit actions={<Actions />} mutationMode={mutationMode}>
       <SimpleForm
         toolbar={
           <Toolbar>
@@ -48,7 +47,10 @@ export function MuffinResourceEdit() {
 
 setupAdmin(["edit"], MuffinResourceEdit)
 
-function MuffinResourceEditActions({ actions }: { actions: AdminAction[] }) {
+function MuffinResourceEditActions() {
+  const { edit } = useMuffinResourceOpts()
+  if (!edit) return null
+  const { actions = [] } = edit
   return (
     <TopToolbar>
       {actions.map((props, idx) => (

package/src/MuffinResourceList.tsx

@@ -1,33 +1,44 @@
 import sortBy from "lodash/sortBy"
 import uniq from "lodash/uniq"
-import { BulkDeleteButton, Datagrid, EditButton, List, ListActions, Pagination } from "react-admin"
+import {
+  BulkDeleteButton,
+  CreateButton,
+  DatagridConfigurable,
+  EditButton,
+  ExportButton,
+  FilterButton,
+  List,
+  Pagination,
+  SelectColumnsButton,
+  TopToolbar,
+} from "react-admin"
 import { buildRA } from "./buildRA"
 import { BulkActionButton } from "./buttons"
 import { useMuffinResourceOpts } from "./hooks"
-import { AdminAction } from "./types"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
 export function MuffinResourceList() {
   const { name, list } = useMuffinResourceOpts()
-  const { fields, create, edit, show, limit, limitMax, filters, actions, remove, sort } = list
+  const { fields, edit, show, limit, limitMax, filters, sort } = list
 
   const Actions = findBuilder(["list-actions", name])
+  const BulkActions = findBuilder(["list-bulk-actions", name])
 
   return (
     <List
       sort={sort}
       perPage={limit}
-      actions={<ListActions hasCreate={create} />}
+      actions={<Actions />}
       filters={buildAdmin(["list-filters", name], filters)}
-      bulkActionButtons={<Actions actions={actions} remove={remove} />}
+      bulkActionButtons={<BulkActions />}
       pagination={
         <Pagination rowsPerPageOptions={sortBy(uniq([10, 25, 50, 100, limit, limitMax]))} />
       }
     >
-      <Datagrid rowClick={show ? "show" : edit ? "edit" : false}>
+      <DatagridConfigurable rowClick={show ? "show" : edit ? "edit" : false}>
         {buildAdmin(["list-fields", name], fields)}
         {edit && <EditButton />}
-      </Datagrid>
+      </DatagridConfigurable>
     </List>
   )
 }
@@ -37,13 +48,25 @@ setupAdmin(["list-fields"], buildRA)
 
 setupAdmin(["list-filters"], buildRA)
 
-function MuffinResourceListActions({
-  actions,
-  remove,
-}: {
-  actions: AdminAction[]
-  remove?: boolean
-}) {
+function MuffinListActions() {
+  const {
+    list: { create },
+  } = useMuffinResourceOpts()
+  return (
+    <TopToolbar>
+      <SelectColumnsButton />
+      <FilterButton />
+      {create && <CreateButton />}
+      <ExportButton />
+    </TopToolbar>
+  )
+}
+setupAdmin(["list-actions"], MuffinListActions)
+
+function MuffinListBulkActions() {
+  const {
+    list: { actions, remove },
+  } = useMuffinResourceOpts()
   return (
     <>
       {actions.map((props) => (
@@ -54,4 +77,4 @@ function MuffinResourceListActions({
   )
 }
 
-setupAdmin(["list-actions"], MuffinResourceListActions)
+setupAdmin(["list-bulk-actions"], MuffinListBulkActions)