muffin-admin 2.6.1 → 2.6.2

package/dist/types.d.ts

@@ -3,10 +3,11 @@ export type TProps = {
 };
 export type AdminAction = {
     view: string;
+    id: string;
+    label: string;
+    title: string;
     icon: string;
     action: string;
-    title: string;
-    label: string;
 };
 export type AdminField = [string, {
     source: string;

package/package.json

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

package/src/MuffinResourceList.tsx

@@ -40,8 +40,8 @@ setupAdmin(
   ["list-actions"],
   ({ actions, remove }: { actions: AdminAction[]; remove?: boolean }) => (
     <>
-      {actions.map((props, idx) => (
-        <BulkActionButton key={idx} {...props} />
+      {actions.map((props) => (
+        <BulkActionButton key={props.id} {...props} />
       ))}
       {remove && <BulkDeleteButton />}
     </>

package/src/MuffinResourceShow.tsx

@@ -23,14 +23,18 @@ export function MuffinResourceShow(props: AdminShowProps) {
   )
 }
 
-setupAdmin(["show"], (props) => <MuffinResourceShow {...props} />)
-setupAdmin(["show-fields"], ({ fields }) => buildRA(fields))
 setupAdmin(["record-actions"], ({ actions }: { actions: AdminAction[] }) =>
-  actions.map((props, idx) => <ActionButton key={idx} {...props} />)
+  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) => <MuffinResourceShow {...props} />)
+
+setupAdmin(["show-fields"], ({ fields }) => buildRA(fields))
+
 setupAdmin(["show-actions"], ({ actions, links, edit }: AdminShowProps) => {
   const resourceName = useResourceContext()
   const Actions = findBuilder(["record-actions", resourceName])

package/src/buttons/ActionButton.tsx

@@ -13,12 +13,12 @@ import { useAction } from "../hooks/useAction"
 import { AdminAction } from "../types"
 import { buildIcon, findBuilder } from "../utils"
 
-export function BulkActionButton({ label, icon, title, action }: AdminAction) {
+export function BulkActionButton({ label, icon, title, action, id }: AdminAction) {
   const resource = useResourceContext()
   const { selectedIds } = useListContext()
   const [payloadActive, setPayloadActive] = useState(false)
 
-  const PayloadBuilder = findBuilder(["action", "payload", label])
+  const PayloadBuilder = findBuilder(["action", "payload", id])
 
   const refresh = useRefresh(),
     unselectAll = useUnselectAll(resource),
@@ -65,13 +65,13 @@ export function BulkActionButton({ label, icon, title, action }: AdminAction) {
   )
 }
 
-export function ActionButton({ icon, label, title, action }: AdminAction) {
+export function ActionButton({ icon, label, title, action, id }: AdminAction) {
   const [payloadActive, setPayloadActive] = useState(false)
 
   const record = useRecordContext()
   const { mutate, isLoading } = useAction(action)
 
-  const PayloadBuilder = findBuilder(["action", "payload", label])
+  const PayloadBuilder = findBuilder(["action", "payload", id])
 
   const refresh = useRefresh(),
     notify = useNotify()

package/src/types.ts

@@ -4,10 +4,11 @@ export type TProps = {
 
 export type AdminAction = {
   view: string
+  id: string
+  label: string
+  title: string
   icon: string
   action: string
-  title: string
-  label: string
 }
 
 export type AdminField = [string, { source: string }]
@@ -32,12 +33,12 @@ export type AdminResourceProps = {
   label: string
   create: AdminInput[] | false
   edit:
-    | {
-        actions: AdminAction[]
-        inputs: AdminInput[]
-        remove?: boolean
-      }
-    | false
+  | {
+    actions: AdminAction[]
+    inputs: AdminInput[]
+    remove?: boolean
+  }
+  | false
   list: {
     limit: number
     limitMax: number