muffin-admin 3.1.0 → 3.1.2

package/dist/MuffinResourceList.js

@@ -20,7 +20,7 @@ setupAdmin(["list-filters"], buildRA);
 function MuffinListDatagrid() {
     const { name, list } = useMuffinResourceOpts();
     const { fields, edit, show } = list;
-    return (_jsxs(DatagridConfigurable, { rowClick: show ? "show" : edit ? "edit" : false, children: [buildAdmin(["list-fields", name], fields), buildAdmin(["list-grid-buttons"], name)] }));
+    return (_jsxs(DatagridConfigurable, { rowClick: show ? "show" : edit ? "edit" : false, children: [buildAdmin(["list-fields", name], fields), buildAdmin(["list-grid-buttons", name])] }));
 }
 setupAdmin(["list-grid"], MuffinListDatagrid);
 function MuffinListGridButtons() {

package/dist/buttons/ActionButton.d.ts

@@ -1,3 +1,3 @@
 import { AdminAction } from "../types";
-export declare function BulkActionButton({ label, icon, title, action, id }: AdminAction): import("react/jsx-runtime").JSX.Element;
 export declare function ActionButton({ icon, label, title, action, id }: AdminAction): import("react/jsx-runtime").JSX.Element;
+export declare function BulkActionButton({ label, icon, title, action, id }: AdminAction): import("react/jsx-runtime").JSX.Element;

package/dist/buttons/ActionButton.js

@@ -3,48 +3,47 @@ import { Button, useListContext, useNotify, useRecordContext, useRefresh, useRes
 import { useState } from "react";
 import { useAction } from "../hooks/useAction";
 import { buildIcon, findBuilder } from "../utils";
-export function BulkActionButton({ label, icon, title, action, id }) {
-    const resource = useResourceContext();
-    const { selectedIds } = useListContext();
+export function ActionButton({ icon, label, title, action, id }) {
     const [payloadActive, setPayloadActive] = useState(false);
-    const PayloadBuilder = findBuilder(["action", "payload", id]);
-    const refresh = useRefresh(), unselectAll = useUnselectAll(resource), notify = useNotify();
-    const { mutate, isLoading } = useAction(action);
-    const process = (payload) => mutate({ ids: selectedIds, payload }, {
+    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 {
-                unselectAll();
+            else
                 refresh();
-            }
         },
         onError: (err) => {
             notify(typeof err === "string" ? err : err.message, { type: "error" });
         },
     });
-    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : process()), disabled: isLoading, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => process(payload), onClose: () => setPayloadActive(false) }))] }));
+    const PayloadBuilder = findBuilder(["action", "payload", id]);
+    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : mutate({ record })), disabled: isLoading, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => mutate({ record, payload }), onClose: () => setPayloadActive(false) }))] }));
 }
-export function ActionButton({ icon, label, title, action, id }) {
+export function BulkActionButton({ label, icon, title, action, id }) {
+    const resource = useResourceContext();
+    const { selectedIds } = useListContext();
     const [payloadActive, setPayloadActive] = useState(false);
-    const record = useRecordContext();
-    const { mutate, isLoading } = useAction(action);
-    const PayloadBuilder = findBuilder(["action", "payload", id]);
-    const refresh = useRefresh(), notify = useNotify();
-    const process = (payload) => mutate({ record, payload }, {
+    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
+            else {
+                unselectAll();
                 refresh();
+            }
         },
         onError: (err) => {
             notify(typeof err === "string" ? err : err.message, { type: "error" });
         },
     });
-    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : process()), disabled: isLoading, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => process(payload), onClose: () => setPayloadActive(false) }))] }));
+    const PayloadBuilder = findBuilder(["action", "payload", id]);
+    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : mutate({ ids: selectedIds })), disabled: isLoading, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => mutate({ ids: selectedIds, payload }), onClose: () => setPayloadActive(false) }))] }));
 }

package/dist/dataprovider.d.ts

@@ -61,8 +61,8 @@ export declare function MuffinDataprovider(apiUrl: string): {
         data: any;
     }>;
 };
-export type TActionProps = {
+export type TActionProps<T = any> = {
     payload?: any;
     ids?: string[];
-    record: any;
+    record?: T;
 };

package/dist/hooks/useAction.d.ts

@@ -1,5 +1,7 @@
-export declare function useAction(action: any): import("react-query").UseMutationResult<{
+import { UseMutationOptions } from "react-query";
+import { TActionProps } from "../dataprovider";
+export declare function useAction(action: string, options?: UseMutationOptions<{
     data: any;
-}, string | {
-    message: string;
-}, any, unknown>;
+}, any, TActionProps>): import("react-query").UseMutationResult<{
+    data: any;
+}, any, TActionProps, unknown>;

package/dist/hooks/useAction.js

@@ -1,7 +1,7 @@
 import { useDataProvider, useResourceContext } from "react-admin";
 import { useMutation } from "react-query";
-export function useAction(action) {
-    const dataProvider = useDataProvider();
+export function useAction(action, options) {
     const resource = useResourceContext();
-    return useMutation((params) => dataProvider.runAction(resource, action, params));
+    const dataProvider = useDataProvider();
+    return useMutation((params) => dataProvider.runAction(resource, action, params), options);
 }