muffin-admin 11.8.0 → 13.0.0

package/dist/MuffinAdmin.d.ts

@@ -1,5 +1,5 @@
-import { AdminProps, AppBarProps, LayoutProps, LoginProps } from "react-admin";
-export declare function MuffinAdmin({ lightTheme, darkTheme, ...props }: AdminProps): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinAdminLayout(props: LayoutProps): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinAppBar(props: AppBarProps): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinLogin(props: LoginProps): import("react/jsx-runtime").JSX.Element;
+import { type AdminProps, type AppBarProps, type LayoutProps, type LoginProps } from "react-admin";
+export declare function MuffinAdmin({ lightTheme, darkTheme, ...props }: AdminProps): import("react").JSX.Element;
+export declare function MuffinAdminLayout(props: LayoutProps): import("react").JSX.Element;
+export declare function MuffinAppBar(props: AppBarProps): import("react").JSX.Element;
+export declare function MuffinLogin(props: LoginProps): import("react").JSX.Element;

package/dist/MuffinAdmin.js

@@ -14,8 +14,8 @@ import IconButton from "@mui/material/IconButton";
 import SvgIcon from "@mui/material/SvgIcon";
 import Tooltip from "@mui/material/Tooltip";
 import Typography from "@mui/material/Typography";
-import { AdminContext, AdminUI, AppBar, Layout, localStorageStore, Login, } from "react-admin";
 import { useEffect } from "react";
+import { AdminContext, AdminUI, AppBar, Layout, Login, localStorageStore, } from "react-admin";
 import { ConfirmationProvider } from "./common";
 import { useMuffinAdminOpts } from "./hooks";
 import { buildProvider, muffinTranslations } from "./i18n";

package/dist/MuffinDashboard.d.ts

@@ -1 +1 @@
-export declare function MuffinDashboard(): import("react/jsx-runtime").JSX.Element;
+export declare function MuffinDashboard(): import("react").JSX.Element;

package/dist/MuffinDashboard.js

@@ -9,14 +9,14 @@ import TableCell from "@mui/material/TableCell";
 import TableRow from "@mui/material/TableRow";
 import Typography from "@mui/material/Typography";
 import { useTranslate } from "react-admin";
-import { VERSION } from ".";
 import { HelpLink } from "./common/HelpLink";
 import { useMuffinAdminOpts } from "./hooks";
 import { buildAdmin, setupAdmin } from "./utils";
+import { VERSION } from "./version";
 export function MuffinDashboard() {
     const { dashboard, help } = useMuffinAdminOpts();
     const translate = useTranslate();
-    return (_jsxs(Stack, { gap: 2, pt: 1, children: [_jsxs(Stack, { direction: "row", flexWrap: "wrap", gap: 1, children: [help && _jsx(HelpLink, { href: help, label: translate("muffin.how_to_use_admin") }), buildAdmin(["dashboard-actions"])] }), _jsxs(Grid, { container: true, spacing: 1, children: [buildAdmin(["dashboard-content"]), _jsx(AdminCards, { src: dashboard })] }), VERSION && (_jsxs(Typography, { variant: "body2", color: "textSecondary", align: "center", my: 1, children: ["Muffin Admin v.", VERSION] }))] }));
+    return (_jsxs(Stack, { sx: { gap: 2, pt: 1 }, children: [_jsxs(Stack, { direction: "row", sx: { flexWrap: "wrap", gap: 1 }, children: [help && _jsx(HelpLink, { href: help, label: translate("muffin.how_to_use_admin") }), buildAdmin(["dashboard-actions"])] }), _jsxs(Grid, { container: true, spacing: 1, children: [buildAdmin(["dashboard-content"]), _jsx(AdminCards, { src: dashboard })] }), VERSION && (_jsxs(Typography, { variant: "body2", color: "textSecondary", align: "center", sx: { my: 1 }, children: ["Muffin Admin v.", VERSION] }))] }));
 }
 setupAdmin(["dashboard"], MuffinDashboard);
 setupAdmin(["dashboard-actions"], () => null);
@@ -27,6 +27,6 @@ function AdminCards({ src }) {
     return _jsx(DashboardCard, Object.assign({}, src));
 }
 function DashboardCard({ title, value }) {
-    return (_jsx(Card, { children: _jsxs(CardContent, { children: [_jsx(Typography, { variant: "h5", component: "h2", m: 2, style: { textAlign: "center" }, children: title }), (Array.isArray(value) && _jsx(AdminTableView, { src: value })) || (_jsx("pre", { children: JSON.stringify(value, null, 2) }))] }) }));
+    return (_jsx(Card, { children: _jsxs(CardContent, { children: [_jsx(Typography, { variant: "h5", component: "h2", sx: { m: 2, textAlign: "center" }, children: title }), (Array.isArray(value) && _jsx(AdminTableView, { src: value })) || (_jsx("pre", { children: JSON.stringify(value, null, 2) }))] }) }));
 }
 const AdminTableView = ({ src }) => (_jsx(Table, { width: "100%", sx: { tableLayout: "fixed" }, children: _jsx(TableBody, { children: src.map((row, idx) => (_jsx(TableRow, { hover: true, children: row.map((cell, idx) => (_jsx(TableCell, { children: cell }, idx))) }, idx))) }) }));

package/dist/MuffinMenu.d.ts

@@ -1,2 +1,2 @@
-import { MenuProps } from "react-admin";
-export declare function MuffinMenu(props: MenuProps): import("react/jsx-runtime").JSX.Element;
+import { type MenuProps } from "react-admin";
+export declare function MuffinMenu(props: MenuProps): import("react").JSX.Element;

package/dist/MuffinMenu.js

@@ -5,11 +5,11 @@ import Collapse from "@mui/material/Collapse";
 import ListItemButton from "@mui/material/ListItemButton";
 import ListItemIcon from "@mui/material/ListItemIcon";
 import ListItemText from "@mui/material/ListItemText";
-import { matchPath, useLocation } from "react-router-dom";
-import { Menu, useBasename, useTheme, useTranslate } from "react-admin";
 import find from "lodash/find";
 import groupBy from "lodash/groupBy";
 import { useContext, useState } from "react";
+import { Menu, useBasename, useTheme, useTranslate } from "react-admin";
+import { matchPath, useLocation } from "react-router-dom";
 import { MuffinAdminContext } from "./context";
 import { findIcon, setupAdmin } from "./utils";
 export function MuffinMenu(props) {

package/dist/MuffinRecordList.d.ts

@@ -1,8 +1,8 @@
-import { SortPayload } from "react-admin";
+import { type SortPayload } from "react-admin";
 type TProps = {
     resource: string;
     filter: (record: any) => Record<string, any>;
     sort?: SortPayload;
 };
-export declare function MuffinRecordList({ resource, filter, sort }: TProps): import("react/jsx-runtime").JSX.Element;
+export declare function MuffinRecordList({ resource, filter, sort }: TProps): import("react").JSX.Element;
 export {};

package/dist/MuffinRecordList.js

@@ -9,5 +9,5 @@ export function MuffinRecordList({ resource, filter, sort }) {
     const translate = useTranslate();
     const { list: { fields }, } = useMuffinResourceOpts(resource);
     const { data, isPending } = useGetList(resource, { sort, filter: filter(record) });
-    return (_jsxs(Box, { p: 2, children: [_jsx(Typography, { variant: "h6", children: translate(`resources.${resource}.name`, { smart_count: 2 }) }), _jsx(Datagrid, { resource: resource, bulkActionButtons: false, isPending: isPending, data: data, children: buildAdmin(["list-fields", resource], fields) })] }));
+    return (_jsxs(Box, { sx: { p: 2 }, children: [_jsx(Typography, { variant: "h6", children: translate(`resources.${resource}.name`, { smart_count: 2 }) }), _jsx(Datagrid, { resource: resource, bulkActionButtons: false, isPending: isPending, data: data, children: buildAdmin(["list-fields", resource], fields) })] }));
 }

package/dist/MuffinResource.d.ts

@@ -1,2 +1,2 @@
-import { ResourceProps } from "react-admin";
-export declare function MuffinResource({ name, ...props }: ResourceProps): import("react/jsx-runtime").JSX.Element;
+import { type ResourceProps } from "react-admin";
+export declare function MuffinResource({ name, ...props }: ResourceProps): import("react").JSX.Element;

package/dist/MuffinResourceCreate.d.ts

@@ -1,3 +1,3 @@
-import { PropsWithChildren } from "react";
-export declare function MuffinResourceCreate({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinCreateToolbar({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+import type { PropsWithChildren } from "react";
+export declare function MuffinResourceCreate({ children }: PropsWithChildren): import("react").JSX.Element;
+export declare function MuffinCreateToolbar({ children }: PropsWithChildren): import("react").JSX.Element;

package/dist/MuffinResourceEdit.d.ts

@@ -1,6 +1,6 @@
-import { PropsWithChildren } from "react";
-export declare function MuffinEdit({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinEditFormToolbar(): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinEditInputs(): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinEditToolbar({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinEditActions({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+import type { PropsWithChildren } from "react";
+export declare function MuffinEdit({ children }: PropsWithChildren): import("react").JSX.Element;
+export declare function MuffinEditFormToolbar(): import("react").JSX.Element;
+export declare function MuffinEditInputs(): import("react").JSX.Element;
+export declare function MuffinEditToolbar({ children }: PropsWithChildren): import("react").JSX.Element;
+export declare function MuffinEditActions({ children }: PropsWithChildren): import("react").JSX.Element;

package/dist/MuffinResourceEdit.js

@@ -1,18 +1,48 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { DeleteButton, Edit, ListButton, SaveButton, ShowButton, SimpleForm, Toolbar, TopToolbar, useResourceContext, } from "react-admin";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Typography } from "@mui/material";
+import { DeleteButton, Edit, ListButton, SaveButton, ShowButton, SimpleForm, Toolbar, TopToolbar, useRecordContext, useResourceContext, useTranslate, } from "react-admin";
+import { useLocation, useNavigate } from "react-router-dom";
 import { buildRA } from "./buildRA";
 import { ActionButton } from "./buttons";
+import { AdminModal } from "./common";
 import { useMuffinAdminOpts, useMuffinResourceOpts } from "./hooks";
 import { findBuilder, setupAdmin } from "./utils";
 export function MuffinEdit({ children }) {
     const { adminProps: { mutationMode = "optimistic" }, } = useMuffinAdminOpts();
     const { edit, name, key } = useMuffinResourceOpts();
+    const location = useLocation();
+    const navigate = useNavigate();
+    const returnTo = new URLSearchParams(location.search).get("returnTo");
     if (!edit)
         return null;
+    const handleClose = () => {
+        if (returnTo) {
+            navigate(returnTo);
+            return;
+        }
+        if (window.history.length > 1) {
+            navigate(-1);
+            return;
+        }
+        navigate(`/${name}`);
+    };
     const Actions = findBuilder(["edit-toolbar", name]);
     const Inputs = findBuilder(["edit-inputs", name]);
     const FormToolbar = findBuilder(["edit-form-toolbar", name]);
-    return (_jsxs(Edit, { actions: _jsx(Actions, {}), mutationMode: mutationMode, queryOptions: { meta: { key } }, children: [children, _jsx(SimpleForm, { toolbar: _jsx(FormToolbar, {}), children: _jsx(Inputs, {}) })] }));
+    return (_jsx(Edit, { actions: false, title: false, component: "div", mutationMode: mutationMode, queryOptions: { meta: { key } }, sx: {
+            "& .RaEdit-main": {
+                padding: 0,
+            },
+        }, children: _jsxs(AdminModal, { open: true, onClose: handleClose, title: _jsx(Actions, {}), maxWidth: "xl", contentSx: {
+                paddingTop: "8px !important",
+                paddingBottom: "12px !important",
+                paddingLeft: "16px !important",
+                paddingRight: "16px !important",
+            }, sx: {
+                "& .MuiDialog-paper": {
+                    width: "min(1400px, 96vw)",
+                },
+            }, children: [children, _jsx(SimpleForm, { toolbar: _jsx(FormToolbar, {}), children: _jsx(Inputs, {}) })] }) }));
 }
 setupAdmin(["edit"], MuffinEdit);
 export function MuffinEditFormToolbar() {
@@ -33,8 +63,10 @@ export function MuffinEditInputs() {
 setupAdmin(["edit-inputs"], MuffinEditInputs);
 export function MuffinEditToolbar({ children }) {
     const resource = useResourceContext();
+    const record = useRecordContext();
+    const translate = useTranslate();
     const Actions = findBuilder(["edit-actions", resource]);
-    return (_jsxs(TopToolbar, { children: [_jsx(Actions, {}), children, _jsx(ListButton, {}), _jsx(ShowButton, {})] }));
+    return (_jsx(Box, { sx: { display: "flex", flexDirection: "column", width: "100%" }, children: _jsxs(TopToolbar, { sx: { pl: 0, pr: 0, width: "100%", justifyContent: "space-between" }, children: [_jsxs(Typography, { variant: "h6", sx: { mr: 2 }, children: [translate(`resources.${resource}.name`, { smart_count: 1, _: resource }), (record === null || record === void 0 ? void 0 : record.id) ? ` #${record.id}` : ""] }), _jsxs(Box, { sx: { display: "flex", alignItems: "center" }, children: [_jsx(Actions, {}), children, _jsx(ShowButton, {}), _jsx(ListButton, {})] })] }) }));
 }
 setupAdmin(["edit-toolbar"], MuffinEditToolbar);
 export function MuffinEditActions({ children }) {

package/dist/MuffinResourceList.d.ts

@@ -1,2 +1,2 @@
-import { PropsWithChildren } from "react";
-export declare function MuffinList({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+import type { PropsWithChildren } from "react";
+export declare function MuffinList({ children }: PropsWithChildren): import("react").JSX.Element;

package/dist/MuffinResourceList.js

@@ -1,7 +1,7 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import sortBy from "lodash/sortBy";
 import uniq from "lodash/uniq";
-import { BulkDeleteButton, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, FilterButton, InfiniteList, List, Pagination, SelectColumnsButton, TopToolbar, } from "react-admin";
+import { BulkDeleteButton, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, FilterButton, InfiniteList, List, Pagination, SelectColumnsButton, TopToolbar, useTranslate, } from "react-admin";
 import { buildRA, buildRAComponent } from "./buildRA";
 import { BulkActionButton, ListActionButton } from "./buttons";
 import { HelpLink } from "./common/HelpLink";
@@ -33,19 +33,24 @@ function MuffinListDatagrid() {
 setupAdmin(["list-grid"], MuffinListDatagrid);
 function MuffinListGridButtons() {
     const { list } = useMuffinResourceOpts();
+    const translate = useTranslate();
     const { edit } = list;
     if (!edit)
         return null;
-    return _jsx(EditButton, {});
+    return (_jsx(EditButton, { label: "", title: translate("ra.action.edit", { _: "Edit" }), sx: {
+            minWidth: "auto",
+            width: "100%",
+            justifyContent: "flex-end",
+            "& .MuiButton-startIcon": { margin: 0 },
+        } }));
 }
 setupAdmin(["list-grid-buttons"], MuffinListGridButtons);
 function MuffinListToolbar() {
     const { actions: baseActions = [], help, list: { create }, } = useMuffinResourceOpts();
     const actions = baseActions.filter((a) => { var _a; return (_a = a.view) === null || _a === void 0 ? void 0 : _a.includes("list"); });
-    const hasExport = actions.some((a) => a.id === "export");
     return (_jsxs(TopToolbar, { children: [help && _jsx(HelpLink, { href: help }), _jsx(SelectColumnsButton, {}), _jsx(FilterButton, {}), create && _jsx(CreateButton, {}), actions.length
                 ? actions.map((props) => _jsx(ListActionButton, Object.assign({}, props), props.id))
-                : null, !hasExport && _jsx(ExportButton, {})] }));
+                : null] }));
 }
 setupAdmin(["list-toolbar"], MuffinListToolbar);
 function MuffinListActions() {

package/dist/MuffinResourceShow.d.ts

@@ -1,5 +1,5 @@
-import { PropsWithChildren } from "react";
-export declare function MuffinShow({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinShowToolbar({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinShowActions({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
-export declare function MuffinShowLinks({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+import type { PropsWithChildren } from "react";
+export declare function MuffinShow({ children }: PropsWithChildren): import("react").JSX.Element;
+export declare function MuffinShowToolbar(): import("react").JSX.Element;
+export declare function MuffinShowActions({ children }: PropsWithChildren): import("react").JSX.Element;
+export declare function MuffinShowLinks({ children }: PropsWithChildren): import("react").JSX.Element;

package/dist/MuffinResourceShow.js

@@ -1,23 +1,60 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { EditButton, ListButton, Show, SimpleShowLayout, TopToolbar } from "react-admin";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Typography } from "@mui/material";
+import { EditButton, ListButton, Show, SimpleShowLayout, TopToolbar, useRecordContext, useTranslate, } from "react-admin";
+import { useLocation, useNavigate } from "react-router-dom";
 import { LinkAction } from "./actions";
 import { buildRA } from "./buildRA";
 import { ActionButton } from "./buttons";
+import { AdminModal } from "./common";
 import { useMuffinResourceOpts } from "./hooks";
 import { buildAdmin, findBuilder, setupAdmin } from "./utils";
 export function MuffinShow({ children }) {
     const { show, name, key } = useMuffinResourceOpts();
+    const location = useLocation();
+    const navigate = useNavigate();
     const ShowToolbar = findBuilder(["show-toolbar", name]);
-    return (_jsxs(Show, { actions: _jsx(ShowToolbar, {}), queryOptions: { meta: { key } }, children: [_jsx(SimpleShowLayout, { children: buildAdmin(["show-fields", name], show) }), children] }));
+    const returnTo = new URLSearchParams(location.search).get("returnTo");
+    const handleClose = () => {
+        if (returnTo) {
+            navigate(returnTo);
+            return;
+        }
+        if (window.history.length > 1) {
+            navigate(-1);
+            return;
+        }
+        navigate(`/${name}`);
+    };
+    return (_jsx(Show, { actions: false, title: false, component: "div", queryOptions: { meta: { key } }, sx: {
+            "& .RaShow-main": {
+                padding: 0,
+            },
+        }, children: _jsxs(AdminModal, { open: true, onClose: handleClose, title: _jsx(ShowToolbar, {}), maxWidth: "xl", hideBackdrop: true, disableScrollLock: true, contentSx: {
+                paddingTop: "8px !important",
+                paddingBottom: "12px !important",
+                paddingLeft: "16px !important",
+                paddingRight: "16px !important",
+            }, sx: {
+                "& .MuiDialog-paper": {
+                    width: "min(1400px, 96vw)",
+                },
+            }, children: [_jsx(SimpleShowLayout, { sx: {
+                        padding: 0,
+                        "& .RaSimpleShowLayout-stack": {
+                            rowGap: 1,
+                        },
+                    }, children: buildAdmin(["show-fields", name], show) }), children] }) }));
 }
 setupAdmin(["show"], MuffinShow);
 setupAdmin(["show-fields"], ({ fields }) => buildRA(fields));
-export function MuffinShowToolbar({ children }) {
+export function MuffinShowToolbar() {
     const { show, name } = useMuffinResourceOpts();
+    const record = useRecordContext();
+    const translate = useTranslate();
     const { edit } = show;
     const Links = findBuilder(["show-links", name]);
     const Actions = findBuilder(["show-actions", name]);
-    return (_jsxs(TopToolbar, { children: [_jsx(Links, {}), _jsx(Actions, {}), children, _jsx(ListButton, {}), edit && _jsx(EditButton, {})] }));
+    return (_jsxs(Box, { sx: { display: "flex", flexDirection: "column", width: "100%" }, children: [_jsxs(TopToolbar, { sx: { pl: 0, pr: 0, width: "100%", justifyContent: "space-between" }, children: [_jsxs(Typography, { variant: "h6", sx: { mr: 2 }, children: [translate(`resources.${name}.name`, { smart_count: 1, _: name }), (record === null || record === void 0 ? void 0 : record.id) ? ` #${record.id}` : ""] }), _jsxs(Box, { sx: { display: "flex", alignItems: "center" }, children: [_jsx(Actions, {}), edit && _jsx(EditButton, {}), _jsx(ListButton, {})] })] }), _jsx(Box, { sx: { mt: 0.5 }, children: _jsx(Links, {}) })] }));
 }
 setupAdmin(["show-toolbar"], MuffinShowToolbar);
 export function MuffinShowActions({ children }) {
@@ -29,6 +66,6 @@ setupAdmin(["show-actions"], MuffinShowActions);
 export function MuffinShowLinks({ children }) {
     const { show } = useMuffinResourceOpts();
     const { links } = show;
-    return (_jsxs("div", { style: { marginRight: "auto" }, children: [links.map(([key, props]) => (_jsx(LinkAction, Object.assign({ resource: key }, props), key))), children] }));
+    return (_jsxs(Box, { sx: { display: "flex", flexWrap: "wrap", gap: 1 }, children: [links.map(([key, props]) => (_jsx(LinkAction, Object.assign({ resource: key }, props), key))), children] }));
 }
 setupAdmin(["show-links"], MuffinShowLinks);

package/dist/actions/LinkAction.d.ts

@@ -1,4 +1,4 @@
-import { AdminShowLink } from "../types";
+import type { AdminShowLink } from "../types";
 export declare function LinkAction({ field, filter, icon, label, ...props }: AdminShowLink & {
     resource: string;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;

package/dist/authprovider.js

@@ -8,27 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Cookies from "js-cookie";
-import { findBuilder, makeRequest, requestHeaders, setupAdmin } from ".";
-setupAdmin(["auth-storage-get"], ({ storage, storageName }) => () => storage == "localstorage"
-    ? localStorage.getItem(storageName)
-    : Cookies.get(storageName));
-setupAdmin(["auth-storage-set"], ({ storage }) => (name, value, requestOnly) => {
+import { findBuilder, makeRequest, requestHeaders, setupAdmin } from "./utils";
+setupAdmin(["auth-storage-get"], ({ storage, storageName }) => () => storage == "localstorage" ? localStorage.getItem(storageName) : Cookies.get(storageName));
+setupAdmin(["auth-storage-set"], ({ storage }) => (name, value, _requestOnly) => {
     if (storage == "localstorage") {
         localStorage.setItem(name, value);
-        requestHeaders["Authorization"] = value;
+        requestHeaders.Authorization = value;
     }
     else
         Cookies.set(name, value);
 });
 export function MuffinAuthProvider(props) {
-    const { identityURL, authorizeURL, logoutURL, required, storageName, storage, } = props;
+    const { identityURL, authorizeURL, logoutURL, required, storageName, storage } = props;
     const authGet = findBuilder(["auth-storage-get"])(props);
     const authSet = findBuilder(["auth-storage-set"])(props);
     // Initialize request headers
     if (storage == "localstorage") {
         const token = authGet(storageName);
         if (token)
-            requestHeaders["Authorization"] = token;
+            requestHeaders.Authorization = token;
     }
     const getIdentity = () => __awaiter(this, void 0, void 0, function* () {
         if (identityURL) {
@@ -79,7 +77,7 @@ export function MuffinAuthProvider(props) {
             }),
             getIdentity,
             getPermissions: () => __awaiter(this, void 0, void 0, function* () {
-                const role = authGet(storageName + "_role");
+                const role = authGet(`${storageName}_role`);
                 return role || "";
             }),
         };

package/dist/buildRA.d.ts

@@ -1,3 +1,4 @@
-export declare function buildRAComponent(name: string, props: any): import("react/jsx-runtime").JSX.Element;
-export declare function buildRA(items: [string, Record<string, any>][]): import("react/jsx-runtime").JSX.Element[];
-export declare function registerUI(name: string, component: JSX.ElementType): void;
+import type { ElementType } from "react";
+export declare function buildRAComponent(name: string, props: any): import("react").JSX.Element;
+export declare function buildRA(items: [string, Record<string, any>][]): import("react").JSX.Element[];
+export declare function registerUI(name: string, component: ElementType): void;

package/dist/buildRA.js

@@ -1,5 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ArrayField, ArrayInput, AutocompleteArrayInput, AutocompleteInput, BooleanField, BooleanInput, CheckboxGroupInput, ChipField, DateField, DateInput, DateTimeInput, EmailField, FileField, FileInput, ImageField, ImageInput, NullableBooleanInput, NumberField, NumberInput, PasswordInput, RadioButtonGroupInput, ReferenceArrayField, ReferenceArrayInput, ReferenceField, ReferenceInput, ReferenceManyField, required, RichTextField, SearchInput, SelectArrayInput, SelectField, SelectInput, TextField, TextInput, UrlField, } from "react-admin";
+import { ArrayField, ArrayInput, AutocompleteArrayInput, AutocompleteInput, BooleanField, BooleanInput, CheckboxGroupInput, ChipField, DateField, DateInput, DateTimeInput, EmailField, FileField, FileInput, ImageField, ImageInput, NullableBooleanInput, NumberField, NumberInput, PasswordInput, RadioButtonGroupInput, ReferenceArrayField, ReferenceArrayInput, ReferenceField, ReferenceInput, ReferenceManyField, RichTextField, required, SearchInput, SelectArrayInput, SelectField, SelectInput, TextField, TextInput, UrlField, } from "react-admin";
 import { AvatarField, CopyField, EditableBooleanField, FKField, JsonField } from "./fields";
 import { DateRangeFilter, Filter, SearchFilter } from "./filters";
 import { FKInput, ImgInput, JsonInput, TimestampInput } from "./inputs";

package/dist/buttons/ActionButton.d.ts

@@ -1,10 +1,10 @@
-import { AdminAction, AdminPayloadProps } from "../types";
+import type { AdminAction, AdminPayloadProps } from "../types";
 export type ActionPayloadProps = {
     active: boolean;
     onClose: () => void;
     onHandle: (payload: any) => void;
 };
-export declare function ActionButton({ paths, confirm, file, ...props }: AdminAction): import("react/jsx-runtime").JSX.Element;
-export declare function ListActionButton({ paths, confirm, file, ...props }: AdminAction): import("react/jsx-runtime").JSX.Element;
-export declare function BulkActionButton({ paths, confirm, ...props }: AdminAction): import("react/jsx-runtime").JSX.Element;
-export declare function CommonPayload({ active, onClose, onHandle, schema, title, help, }: AdminPayloadProps): import("react/jsx-runtime").JSX.Element;
+export declare function ActionButton({ paths, confirm, file, ...props }: AdminAction): import("react").JSX.Element;
+export declare function ListActionButton({ paths, confirm, file, ...props }: AdminAction): import("react").JSX.Element;
+export declare function BulkActionButton({ paths, confirm, ...props }: AdminAction): import("react").JSX.Element;
+export declare function CommonPayload({ active, onClose, onHandle, schema, title, help, }: AdminPayloadProps): import("react").JSX.Element;

package/dist/buttons/ActionButton.js

@@ -18,11 +18,11 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { Button, FormGroupsProvider, useAugmentedForm, useListContext, useRecordContext, useResourceContext, useTranslate, } from "react-admin";
-import { FormProvider } from "react-hook-form";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Link, Stack } from "@mui/material";
 import { useState } from "react";
+import { Button, FormGroupsProvider, useAugmentedForm, useListContext, useRecordContext, useResourceContext, useTranslate, } from "react-admin";
+import { FormProvider } from "react-hook-form";
 import { buildRA } from "../buildRA";
 import { AdminModal, PayloadButtons, useConfirmation } from "../common";
 import { HelpLink } from "../common/HelpLink";
@@ -99,7 +99,7 @@ export function CommonPayload({ active, onClose, onHandle, schema, title, help,
         record: {},
     });
     return (_jsx(FormProvider, Object.assign({}, form, { children: _jsx(FormGroupsProvider, { children: _jsx(AdminModal, { maxWidth: "sm", open: active, onClose: onClose, title: help
-                    ? (_jsxs(Stack, { alignItems: "flex-start", children: [_jsx("span", { children: translate(title, { _: title }) }), _jsx(HelpLink, { href: help, style: { alignSelf: "flex-end" } })] }))
+                    ? (_jsxs(Stack, { sx: { alignItems: "flex-start" }, children: [_jsx("span", { children: translate(title, { _: title }) }), _jsx(HelpLink, { href: help, style: { alignSelf: "flex-end" } })] }))
                     : translate(title, { _: title }), actions: _jsx(PayloadButtons, { onClose: onClose, onSubmit: formHandleSubmit, isValid: form.formState.isValid }), children: inputs }) }) })));
 }
 function FileButton({ path, record, label, icon, filterValues, }) {
@@ -107,7 +107,7 @@ function FileButton({ path, record, label, icon, filterValues, }) {
     let url = `${apiUrl}${path}?f`;
     if (record)
         url = url.replace("{id}", record.id);
-    const authorization = requestHeaders["Authorization"];
+    const authorization = requestHeaders.Authorization;
     if (authorization)
         url += `&t=${authorization}`;
     if (Object.keys(filterValues).length)

package/dist/buttons/CopyButton.d.ts

@@ -1,3 +1,3 @@
 export declare function CopyButton({ value }: {
     value: any;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;

package/dist/buttons/LinkButton.d.ts

@@ -1,7 +1,7 @@
-import { AdminShowLink } from "../types";
+import type { AdminShowLink } from "../types";
 declare const LinkButton: ({ filters, icon, label, resource, id, title, }: AdminShowLink & {
     resource: string;
     filters?: any;
     id?: string;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => import("react").JSX.Element;
 export default LinkButton;

package/dist/buttons/LinkButton.js

@@ -1,11 +1,17 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Button } from "react-admin";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import { buildIcon } from "../utils";
 const LinkButton = ({ filters, icon, label, resource, id, title, }) => {
+    const location = useLocation();
+    const searchParams = new URLSearchParams();
+    searchParams.set("returnTo", `${location.pathname}${location.search}`);
+    if (filters) {
+        searchParams.set("filter", JSON.stringify(filters));
+    }
     const linkParams = {
         pathname: `/${resource}`,
-        search: filters ? `filter=${JSON.stringify(filters)}` : undefined,
+        search: `?${searchParams.toString()}`,
     };
     if (id)
         linkParams.pathname += `/${id}/show`;

package/dist/common/AdminModal.d.ts

@@ -1,10 +1,12 @@
-import { DialogProps } from "@mui/material";
-import { PropsWithChildren } from "react";
-interface IProps {
+import { type DialogProps } from "@mui/material";
+import type { SxProps, Theme } from "@mui/material/styles";
+import type { PropsWithChildren } from "react";
+interface IProps extends Omit<DialogProps, "title" | "open" | "onClose"> {
     open: boolean;
     onClose: () => void;
     title?: React.ReactNode;
     actions?: React.ReactNode;
+    contentSx?: SxProps<Theme>;
 }
-export declare function AdminModal({ open, onClose, children, title, actions, ...props }: PropsWithChildren<IProps & DialogProps>): import("react/jsx-runtime").JSX.Element;
+export declare function AdminModal({ open, onClose, children, title, actions, contentSx, ...props }: PropsWithChildren<IProps>): import("react").JSX.Element;
 export {};

package/dist/common/AdminModal.js

@@ -12,6 +12,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Dialog, DialogActions, DialogContent, DialogTitle } from "@mui/material";
 export function AdminModal(_a) {
-    var { open, onClose, children, title, actions } = _a, props = __rest(_a, ["open", "onClose", "children", "title", "actions"]);
-    return (_jsxs(Dialog, Object.assign({ open: open, onClose: onClose, fullWidth: true, maxWidth: "md" }, props, { children: [title && _jsx(DialogTitle, { children: title }), _jsx(DialogContent, { children: children }), actions && _jsx(DialogActions, { children: actions })] })));
+    var { open, onClose, children, title, actions, contentSx } = _a, props = __rest(_a, ["open", "onClose", "children", "title", "actions", "contentSx"]);
+    return (_jsxs(Dialog, Object.assign({ open: open, onClose: onClose, fullWidth: true, maxWidth: "md" }, props, { children: [title && _jsx(DialogTitle, { children: title }), _jsx(DialogContent, { sx: contentSx, children: children }), actions && _jsx(DialogActions, { children: actions })] })));
 }

package/dist/common/ConfirmationProvider.d.ts

@@ -1,4 +1,4 @@
-import { PropsWithChildren } from "react";
+import { type PropsWithChildren } from "react";
 type TConfirmProps = {
     title?: string;
     message: string;
@@ -8,6 +8,6 @@ type TConfirmContext = {
     confirm: (props: TConfirmProps) => Promise<boolean>;
 };
 export declare const ConfirmContext: import("react").Context<TConfirmContext>;
-export declare function ConfirmationProvider({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function ConfirmationProvider({ children }: PropsWithChildren): import("react").JSX.Element;
 export declare const useConfirmation: () => TConfirmContext;
 export {};

package/dist/common/ConfirmationProvider.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Button, Typography } from "@mui/material";
 import { createContext, useContext, useState } from "react";
 import { useTranslate } from "react-admin";

package/dist/common/HelpLink.d.ts

@@ -1,2 +1,2 @@
 import { Button } from "react-admin";
-export declare function HelpLink({ label, ...props }: Parameters<typeof Button>[0]): import("react/jsx-runtime").JSX.Element;
+export declare function HelpLink({ label, ...props }: Parameters<typeof Button>[0]): import("react").JSX.Element;

package/dist/common/PayloadButtons.d.ts

@@ -2,4 +2,4 @@ export declare function PayloadButtons({ onClose, onSubmit, isValid, }: {
     onClose: () => void;
     onSubmit?: (e: any) => void;
     isValid: boolean;
-}): import("react/jsx-runtime").JSX.Element;
+}): import("react").JSX.Element;

package/dist/common/PayloadButtons.js

@@ -2,5 +2,5 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Stack } from "@mui/material";
 import { Button } from "react-admin";
 export function PayloadButtons({ onClose, onSubmit, isValid = true, }) {
-    return (_jsxs(Stack, { direction: "row", alignItems: "center", justifyContent: "flex-end", spacing: 1, children: [_jsx(Button, { label: "ra.action.confirm", variant: "contained", disabled: !isValid, size: "medium", onClick: onSubmit }), _jsx(Button, { label: "ra.action.cancel", variant: "outlined", size: "medium", onClick: onClose })] }));
+    return (_jsxs(Stack, { direction: "row", spacing: 1, sx: { alignItems: "center", justifyContent: "flex-end" }, children: [_jsx(Button, { label: "ra.action.confirm", variant: "contained", disabled: !isValid, size: "medium", onClick: onSubmit }), _jsx(Button, { label: "ra.action.cancel", variant: "outlined", size: "medium", onClick: onClose })] }));
 }

package/dist/context.d.ts

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

package/dist/dataprovider.d.ts

@@ -1,5 +1,5 @@
-import { TID } from "./types";
-import { APIParams } from "./utils";
+import type { TID } from "./types";
+import { type APIParams } from "./utils";
 type TQueryMeta = {
     key?: string;
 };
@@ -16,9 +16,9 @@ export declare function MuffinDataprovider(apiUrl: string): {
             hasNextPage: boolean;
         };
     } | {
-        data: any;
         total?: undefined;
         pageInfo?: undefined;
+        data: any;
     }>;
     getOne: (resource: string, { id, meta }: {
         id: TID;
@@ -68,15 +68,15 @@ export declare function MuffinDataprovider(apiUrl: string): {
             hasNextPage: boolean;
         };
     } | {
-        data: any;
         total?: undefined;
         pageInfo?: undefined;
+        data: any;
     }>;
     getManyReference: (resource: string, { target, id, filter, ...opts }: {
         [x: string]: any;
-        target: any;
-        id: any;
         filter: any;
+        id: any;
+        target: any;
     }) => Promise<{
         data: any;
         total: number;
@@ -85,9 +85,9 @@ export declare function MuffinDataprovider(apiUrl: string): {
             hasNextPage: boolean;
         };
     } | {
-        data: any;
         total?: undefined;
         pageInfo?: undefined;
+        data: any;
     }>;
     runAction: (_: string, action: string, props: TActionProps) => Promise<{
         data: any;