muffin-admin 3.17.0 → 3.18.0

package/package.json

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

package/src/MuffinResourceList.tsx

@@ -14,7 +14,7 @@ import {
   TopToolbar,
 } from "react-admin"
 import { buildRA } from "./buildRA"
-import { ActionButton, BulkActionButton } from "./buttons"
+import { BulkActionButton, ListActionButton } from "./buttons"
 import { HelpLink } from "./common/HelpLink"
 import { useMuffinResourceOpts } from "./hooks"
 import { buildAdmin, findBuilder, setupAdmin } from "./utils"
@@ -85,7 +85,9 @@ function MuffinListToolbar() {
       <SelectColumnsButton />
       <FilterButton />
       {create && <CreateButton />}
-      {actions.length ? actions.map((props) => <ActionButton key={props.id} {...props} />) : null}
+      {actions.length
+        ? actions.map((props) => <ListActionButton key={props.id} {...props} />)
+        : null}
       {!hasExport && <ExportButton />}
     </TopToolbar>
   )

package/src/buttons/ActionButton.tsx

@@ -29,30 +29,38 @@ export function ActionButton({ paths, confirm, file, ...props }: AdminAction) {
   const translate = useTranslate()
   const record = useRecordContext()
   const confirmation = useConfirmation()
+
   const path = paths.find((p) => p.includes("{id}")) || paths[paths.length - 1]
   const { mutate, isPending } = useAction(path)
-  const { apiUrl } = useMuffinAdminOpts()
 
-  if (file) {
-    let url = `${apiUrl}${path}`
-    if (record) url.replace("{id}", record.id as string)
+  if (file) return <FileButton path={path} record={record} {...props} />
 
-    const authorization = requestHeaders["Authorization"]
-    if (authorization) url += `?t=${authorization}`
+  const confirmMessage =
+    typeof confirm === "string" ? translate(confirm) : "Do you confirm this action?"
 
-    return (
-      <Button href={url} label={props.label} component={Link} target="_blank">
-        {buildIcon(props.icon)}
-      </Button>
-    )
+  const onHandle = async (payload?) => {
+    const process = confirm ? await confirmation.confirm({ message: confirmMessage }) : true
+    if (process) await mutate({ record, payload })
   }
 
+  return <ActionButtonBase {...props} isPending={isPending} onHandle={onHandle} />
+}
+
+export function ListActionButton({ paths, confirm, file, ...props }: AdminAction) {
+  const translate = useTranslate()
+  const confirmation = useConfirmation()
+  const path = paths.find((p) => !p.includes("{id}")) || paths[paths.length - 1]
+  const { mutate, isPending } = useAction(path)
+
+  const { filterValues } = useListContext()
+  if (file) return <FileButton path={path} filterValues={filterValues} {...props} />
+
   const confirmMessage =
     typeof confirm === "string" ? translate(confirm) : "Do you confirm this action?"
 
   const onHandle = async (payload?) => {
     const process = confirm ? await confirmation.confirm({ message: confirmMessage }) : true
-    if (process) await mutate({ record, payload })
+    if (process) await mutate({ payload })
   }
 
   return <ActionButtonBase {...props} isPending={isPending} onHandle={onHandle} />
@@ -173,3 +181,29 @@ export function CommonPayload({
     </FormProvider>
   )
 }
+
+function FileButton({
+  path,
+  record,
+  label,
+  icon,
+  filterValues,
+}: {
+  path: string
+  label: string
+  icon: string
+  record?: any
+  filterValues?: any
+}) {
+  const { apiUrl } = useMuffinAdminOpts()
+  let url = `${apiUrl}${path}`
+  if (record) url = url.replace("{id}", record.id as string)
+  const authorization = requestHeaders["Authorization"]
+  if (authorization) url += `?t=${authorization}`
+  if (Object.keys(filterValues).length) url += `&where=${JSON.stringify(filterValues)}`
+  return (
+    <Button href={url} label={label} component={Link} target="_blank">
+      {buildIcon(icon)}
+    </Button>
+  )
+}