muffin-admin 2.9.1 → 3.0.0

package/package.json

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

package/src/MuffinResourceCreate.tsx

@@ -7,21 +7,20 @@ export function MuffinResourceCreate() {
   const { name, create } = useMuffinResourceOpts()
   if (!create) return null
 
-  const Actions = findBuilder(["create-actions", name])
+  const Toolbar = findBuilder(["create-toolbar", name])
 
   return (
-    <Create actions={<Actions />}>
+    <Create actions={<Toolbar />}>
       <SimpleForm>{buildAdmin(["create-inputs", name], create)}</SimpleForm>
     </Create>
   )
 }
 
 setupAdmin(["create"], MuffinResourceCreate)
+setupAdmin(["create-inputs"], buildRA)
 
-setupAdmin(["create-actions"], () => (
+setupAdmin(["create-toolbar"], () => (
   <TopToolbar>
     <ListButton />
   </TopToolbar>
 ))
-
-setupAdmin(["create-inputs"], buildRA)

package/src/MuffinResourceEdit.tsx

@@ -5,7 +5,6 @@ import {
   SaveButton,
   ShowButton,
   SimpleForm,
-  Toolbar,
   TopToolbar,
 } from "react-admin"
 import { buildRA } from "./buildRA"
@@ -13,7 +12,7 @@ import { ActionButton } from "./buttons"
 import { useMuffinAdminOpts, useMuffinResourceOpts } from "./hooks"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
-export function MuffinResourceEdit() {
+export function MuffinEdit() {
   const {
     adminProps: { mutationMode = "optimistic" },
   } = useMuffinAdminOpts()
@@ -21,10 +20,10 @@ export function MuffinResourceEdit() {
   if (!edit) return null
 
   const { inputs, remove } = edit
-  const Actions = findBuilder(["edit-actions", name]) as unknown as any
+  const Toolbar = findBuilder(["edit-toolbar", name])
 
   return (
-    <Edit actions={<Actions />} mutationMode={mutationMode}>
+    <Edit actions={<Toolbar />} mutationMode={mutationMode}>
       <SimpleForm
         toolbar={
           <Toolbar>
@@ -45,23 +44,34 @@ export function MuffinResourceEdit() {
   )
 }
 
-setupAdmin(["edit"], MuffinResourceEdit)
+setupAdmin(["edit"], MuffinEdit)
+setupAdmin(["edit-inputs"], buildRA)
+
+export function MuffinEditToolbar() {
+  const { name } = useMuffinResourceOpts()
+  const Actions = findBuilder(["edit-actions", name])
+  return (
+    <TopToolbar>
+      <Actions />
+      <ListButton />
+      <ShowButton />
+    </TopToolbar>
+  )
+}
+
+setupAdmin(["edit-toolbar"], MuffinEditToolbar)
 
-function MuffinResourceEditActions() {
+export function MuffinEditActions() {
   const { edit } = useMuffinResourceOpts()
   if (!edit) return null
   const { actions = [] } = edit
   return (
-    <TopToolbar>
+    <>
       {actions.map((props, idx) => (
         <ActionButton key={idx} {...props} />
       ))}
-      <ListButton />
-      <ShowButton />
-    </TopToolbar>
+    </>
   )
 }
 
-setupAdmin(["edit-actions"], MuffinResourceEditActions)
-
-setupAdmin(["edit-inputs"], buildRA)
+setupAdmin(["edit-actions"], MuffinEditActions)

package/src/MuffinResourceList.tsx

@@ -17,18 +17,18 @@ import { BulkActionButton } from "./buttons"
 import { useMuffinResourceOpts } from "./hooks"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
-export function MuffinResourceList() {
+export function MuffinList() {
   const { name, list } = useMuffinResourceOpts()
   const { fields, edit, show, limit, limitMax, filters, sort } = list
 
-  const Actions = findBuilder(["list-actions", name])
+  const Toolbar = findBuilder(["list-toolbar", name])
   const BulkActions = findBuilder(["list-bulk-actions", name])
 
   return (
     <List
       sort={sort}
       perPage={limit}
-      actions={<Actions />}
+      actions={<Toolbar />}
       filters={buildAdmin(["list-filters", name], filters)}
       bulkActionButtons={<BulkActions />}
       pagination={
@@ -43,12 +43,11 @@ export function MuffinResourceList() {
   )
 }
 
-setupAdmin(["list"], MuffinResourceList)
+setupAdmin(["list"], MuffinList)
 setupAdmin(["list-fields"], buildRA)
-
 setupAdmin(["list-filters"], buildRA)
 
-function MuffinListActions() {
+function MuffinListToolbar() {
   const {
     list: { create },
   } = useMuffinResourceOpts()
@@ -61,7 +60,7 @@ function MuffinListActions() {
     </TopToolbar>
   )
 }
-setupAdmin(["list-actions"], MuffinListActions)
+setupAdmin(["list-toolbar"], MuffinListToolbar)
 
 function MuffinListBulkActions() {
   const {

package/src/MuffinResourceShow.tsx

@@ -1,53 +1,61 @@
-import {
-  EditButton,
-  ListButton,
-  Show,
-  SimpleShowLayout,
-  TopToolbar,
-  useResourceContext,
-} from "react-admin"
+import { EditButton, ListButton, Show, SimpleShowLayout, TopToolbar } from "react-admin"
 import { LinkAction } from "./actions"
 import { buildRA } from "./buildRA"
 import { ActionButton } from "./buttons"
 import { useMuffinResourceOpts } from "./hooks"
-import { AdminAction, AdminShowProps } from "./types"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
 
-export function MuffinResourceShow() {
+export function MuffinShow() {
   const { show, name } = useMuffinResourceOpts()
-  const ShowActions = findBuilder(["show-actions", name])
+  const Toolbar = findBuilder(["show-toolbar", name])
 
   return (
-    <Show actions={<ShowActions {...show} />}>
+    <Show actions={<Toolbar />}>
       <SimpleShowLayout>{buildAdmin(["show-fields", name], show)}</SimpleShowLayout>
     </Show>
   )
 }
 
-setupAdmin(["record-actions"], ({ actions }: { actions: AdminAction[] }) =>
-  actions.map((props) => <ActionButton key={props.id} {...props} />)
-)
-
-setupAdmin(["record-links"], ({ links }: { links: AdminShowProps["links"] }) =>
-  links.map(([key, props]) => <LinkAction key={key} resource={key} {...props} />)
-)
+setupAdmin(["show"], (props) => <MuffinShow {...props} />)
+setupAdmin(["show-fields"], ({ fields }) => buildRA(fields))
 
-setupAdmin(["show"], (props) => <MuffinResourceShow {...props} />)
+export function MuffinShowToolbar() {
+  const { show, name } = useMuffinResourceOpts()
+  const { edit } = show
 
-setupAdmin(["show-fields"], ({ fields }) => buildRA(fields))
+  const Links = findBuilder(["show-links", name])
+  const Actions = findBuilder(["show-actions", name])
 
-setupAdmin(["show-actions"], ({ actions, links, edit }: AdminShowProps) => {
-  const resourceName = useResourceContext()
-  const Actions = findBuilder(["record-actions", resourceName])
-  const Links = findBuilder(["record-links", resourceName])
   return (
     <TopToolbar>
-      <div style={{ marginRight: "auto" }}>
-        <Links links={links} />
-      </div>
-      <Actions actions={actions} />
+      <Links />
+      <Actions />
       <ListButton />
       {edit && <EditButton />}
     </TopToolbar>
   )
-})
+}
+
+setupAdmin(["show-toolbar"], MuffinShowToolbar)
+
+export function MuffinShowActions() {
+  const { show } = useMuffinResourceOpts()
+  const { actions } = show
+  return actions.map((props) => <ActionButton key={props.id} {...props} />)
+}
+
+setupAdmin(["show-actions"], MuffinShowActions)
+
+export function MuffinShowLinks() {
+  const { show } = useMuffinResourceOpts()
+  const { links } = show
+  return (
+    <div style={{ marginRight: "auto" }}>
+      {links.map(([key, props]) => (
+        <LinkAction key={key} resource={key} {...props} />
+      ))}
+    </div>
+  )
+}
+
+setupAdmin(["show-links"], MuffinShowLinks)