muffin-admin 3.2.2 → 3.3.12

package/dist/MuffinResourceList.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import sortBy from "lodash/sortBy";
 import uniq from "lodash/uniq";
-import { BulkDeleteButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, FilterButton, List, Pagination, SelectColumnsButton, TopToolbar, } from "react-admin";
+import { BulkDeleteButton, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, FilterButton, List, Pagination, SelectColumnsButton, TopToolbar, } from "react-admin";
 import { buildRA } from "./buildRA";
 import { BulkActionButton } from "./buttons";
 import { useMuffinResourceOpts } from "./hooks";
@@ -11,8 +11,7 @@ export function MuffinList() {
     const { limit, limitMax, filters, sort } = list;
     const DataGrid = findBuilder(["list-grid", name]);
     const Toolbar = findBuilder(["list-toolbar", name]);
-    const BulkActions = findBuilder(["list-bulk-actions", name]);
-    return (_jsx(List, { sort: sort, perPage: limit, actions: _jsx(Toolbar, {}), filters: buildAdmin(["list-filters", name], filters), bulkActionButtons: _jsx(BulkActions, {}), pagination: _jsx(Pagination, { rowsPerPageOptions: sortBy(uniq([10, 25, 50, 100, limit, limitMax])) }), children: _jsx(DataGrid, {}) }));
+    return (_jsx(List, { sort: sort, perPage: limit, actions: _jsx(Toolbar, {}), filters: buildAdmin(["list-filters", name], filters), pagination: _jsx(Pagination, { rowsPerPageOptions: sortBy(uniq([10, 25, 50, 100, limit, limitMax])) }), children: _jsx(DataGrid, {}) }));
 }
 setupAdmin(["list"], MuffinList);
 setupAdmin(["list-fields"], buildRA);
@@ -20,7 +19,8 @@ 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])] }));
+    const BulkActions = findBuilder(["list-bulk-actions", name]);
+    return (_jsxs(DatagridConfigurable, { rowClick: show ? "show" : edit ? "edit" : false, bulkActionButtons: _jsx(BulkActions, {}), children: [buildAdmin(["list-fields", name], fields), buildAdmin(["list-grid-buttons", name])] }));
 }
 setupAdmin(["list-grid"], MuffinListDatagrid);
 function MuffinListGridButtons() {
@@ -38,6 +38,6 @@ function MuffinListToolbar() {
 setupAdmin(["list-toolbar"], MuffinListToolbar);
 function MuffinListBulkActions() {
     const { list: { actions, remove }, } = useMuffinResourceOpts();
-    return (_jsxs(_Fragment, { children: [actions.map((props) => (_jsx(BulkActionButton, Object.assign({}, props), props.id))), remove && _jsx(BulkDeleteButton, {})] }));
+    return (_jsxs(_Fragment, { children: [actions.map((props) => (_jsx(BulkActionButton, Object.assign({}, props), props.id))), _jsx(BulkExportButton, {}), remove && _jsx(BulkDeleteButton, {})] }));
 }
 setupAdmin(["list-bulk-actions"], MuffinListBulkActions);

package/dist/buttons/ActionButton.js

@@ -7,15 +7,15 @@ export function ActionButton({ icon, label, title, action, id }) {
     const [payloadActive, setPayloadActive] = useState(false);
     const record = useRecordContext();
     const resource = useResourceContext();
-    const { mutate, isLoading } = useAction(action, {});
+    const { mutate, isPending } = useAction(action, {});
     const PayloadBuilder = findBuilder(["action", "payload", id, resource]);
-    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) }))] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : mutate({ record })), disabled: isPending, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => mutate({ record, payload }), onClose: () => setPayloadActive(false) }))] }));
 }
 export function BulkActionButton({ label, icon, title, action, id }) {
     const { selectedIds } = useListContext();
-    const { mutate, isLoading } = useAction(action);
+    const { mutate, isPending } = useAction(action);
     const resource = useResourceContext();
     const [payloadActive, setPayloadActive] = useState(false);
     const PayloadBuilder = findBuilder(["action", "payload", id, resource]);
-    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) }))] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Button, { label: label, title: title, onClick: () => (PayloadBuilder ? setPayloadActive(true) : mutate({ ids: selectedIds })), disabled: isPending, children: buildIcon(icon) }), PayloadBuilder && (_jsx(PayloadBuilder, { active: payloadActive, onHandle: (payload) => mutate({ ids: selectedIds, payload }), onClose: () => setPayloadActive(false) }))] }));
 }

package/dist/context.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import { AdminOpts } from "./types";
 export declare const MuffinAdminContext: import("react").Context<AdminOpts>;

package/dist/dataprovider.js

@@ -50,27 +50,27 @@ export function MuffinDataprovider(apiUrl) {
         getOne: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { id }) {
             return yield request(`${resource}/${id}`);
         }),
-        create: (resource_2, _b) => __awaiter(this, [resource_2, _b], void 0, function* (resource, { data }) {
+        create: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { data }) {
             return yield request(resource, {
                 data,
                 method: "POST",
             });
         }),
-        update: (resource_3, _c) => __awaiter(this, [resource_3, _c], void 0, function* (resource, { id, data }) {
+        update: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { id, data }) {
             return yield makeRequest(`${apiUrl}/${resource}/${id}`, {
                 data,
                 method: "PUT",
             }).then(({ json }) => ({ data: json }));
         }),
-        updateMany: (resource_4, _d) => __awaiter(this, [resource_4, _d], void 0, function* (resource, { ids, data }) {
+        updateMany: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { ids, data }) {
             yield Promise.all(ids.map((id) => methods.update(resource, { id, data })));
             return { data: ids };
         }),
-        delete: (resource_5, _e) => __awaiter(this, [resource_5, _e], void 0, function* (resource, { id }) {
+        delete: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { id }) {
             yield request(`${resource}/${id}`, { method: "DELETE" });
             return { data: { id } };
         }),
-        deleteMany: (resource_6, _f) => __awaiter(this, [resource_6, _f], void 0, function* (resource, { ids }) {
+        deleteMany: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { ids }) {
             yield request(resource, {
                 data: ids,
                 method: "DELETE",
@@ -82,8 +82,8 @@ export function MuffinDataprovider(apiUrl) {
             const key = (meta === null || meta === void 0 ? void 0 : meta.key) || "id";
             return methods.getList(resource, { filter: { [key]: { $in: ids } } });
         },
-        getManyReference: (resource, _g) => __awaiter(this, void 0, void 0, function* () {
-            var { target, id, filter } = _g, opts = __rest(_g, ["target", "id", "filter"]);
+        getManyReference: (resource, _a) => __awaiter(this, void 0, void 0, function* () {
+            var { target, id, filter } = _a, opts = __rest(_a, ["target", "id", "filter"]);
             filter = filter || {};
             filter[target] = id;
             return yield methods.getList(resource, Object.assign({ filter }, opts));

package/dist/hooks/useAction.d.ts

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

package/dist/hooks/useAction.js

@@ -1,12 +1,12 @@
+import { useMutation } from "@tanstack/react-query";
 import { useDataProvider, useNotify, useRefresh, useResourceContext, useUnselectAll, } from "react-admin";
-import { useMutation } from "react-query";
 export function useAction(action, options) {
     const notify = useNotify();
     const refresh = useRefresh();
     const resource = useResourceContext();
     const unselectAll = useUnselectAll(resource);
     const dataProvider = useDataProvider();
-    return useMutation((params) => dataProvider.runAction(resource, action, params), Object.assign({ onSuccess: ({ data }) => {
+    return useMutation(Object.assign({ mutationFn: (params) => dataProvider.runAction(resource, action, params), onSuccess: ({ data }) => {
             if (data && data.message)
                 notify(data.message, { type: "success" });
             if (data && data.redirectTo)