muffin-admin 3.1.2 → 3.2.0

package/package.json

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

package/src/buttons/ActionButton.tsx

@@ -1,12 +1,4 @@
-import {
-  Button,
-  useListContext,
-  useNotify,
-  useRecordContext,
-  useRefresh,
-  useResourceContext,
-  useUnselectAll,
-} from "react-admin"
+import { Button, useListContext, useRecordContext } from "react-admin"
 
 import { useState } from "react"
 import { useAction } from "../hooks/useAction"
@@ -16,18 +8,7 @@ import { buildIcon, findBuilder } from "../utils"
 export function ActionButton({ icon, label, title, action, id }: AdminAction) {
   const [payloadActive, setPayloadActive] = useState(false)
   const record = useRecordContext()
-  const notify = useNotify()
-  const refresh = useRefresh()
-  const { mutate, isLoading } = useAction(action, {
-    onSuccess: ({ data }) => {
-      if (data && data.message) notify(data.message, { type: "success" })
-      if (data && data.redirectTo) window.location = data.redirectTo
-      else refresh()
-    },
-    onError: (err) => {
-      notify(typeof err === "string" ? err : err.message, { type: "error" })
-    },
-  })
+  const { mutate, isLoading } = useAction(action, {})
 
   const PayloadBuilder = findBuilder(["action", "payload", id])
 
@@ -53,28 +34,10 @@ export function ActionButton({ icon, label, title, action, id }: AdminAction) {
 }
 
 export function BulkActionButton({ label, icon, title, action, id }: AdminAction) {
-  const resource = useResourceContext()
   const { selectedIds } = useListContext()
+  const { mutate, isLoading } = useAction(action)
   const [payloadActive, setPayloadActive] = useState(false)
 
-  const refresh = useRefresh(),
-    unselectAll = useUnselectAll(resource),
-    notify = useNotify()
-
-  const { mutate, isLoading } = useAction(action, {
-    onSuccess: ({ data }) => {
-      if (data && data.message) notify(data.message, { type: "success" })
-      if (data && data.redirectTo) window.location = data.redirectTo
-      else {
-        unselectAll()
-        refresh()
-      }
-    },
-    onError: (err) => {
-      notify(typeof err === "string" ? err : err.message, { type: "error" })
-    },
-  })
-
   const PayloadBuilder = findBuilder(["action", "payload", id])
 
   return (

package/src/hooks/useAction.ts

@@ -1,4 +1,10 @@
-import { useDataProvider, useResourceContext } from "react-admin"
+import {
+  useDataProvider,
+  useNotify,
+  useRefresh,
+  useResourceContext,
+  useUnselectAll,
+} from "react-admin"
 import { UseMutationOptions, useMutation } from "react-query"
 import { MuffinDataprovider, TActionProps } from "../dataprovider"
 
@@ -6,10 +12,23 @@ export function useAction(
   action: string,
   options?: UseMutationOptions<{ data: any }, any, TActionProps>
 ) {
+  const notify = useNotify()
+  const refresh = useRefresh()
   const resource = useResourceContext()
+  const unselectAll = useUnselectAll(resource)
   const dataProvider = useDataProvider() as ReturnType<typeof MuffinDataprovider>
-  return useMutation(
-    (params: TActionProps) => dataProvider.runAction(resource, action, params),
-    options
-  )
+  return useMutation((params: TActionProps) => dataProvider.runAction(resource, action, params), {
+    onSuccess: ({ data }) => {
+      if (data && data.message) notify(data.message, { type: "success" })
+      if (data && data.redirectTo) window.location = data.redirectTo
+      else {
+        unselectAll()
+        refresh()
+      }
+    },
+    onError: (err) => {
+      notify(typeof err === "string" ? err : err.message, { type: "error" })
+    },
+    ...options,
+  })
 }