muffin-admin 11.7.2 → 12.0.0

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 { 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.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, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, FilterButton, InfiniteList, List, Pagination, SelectColumnsButton, TopToolbar, } from "react-admin";
+import { BulkDeleteButton, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, 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,10 +33,16 @@ 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() {

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 MuffinShowToolbar(): 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;

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 { 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/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 { SxProps, Theme } from "@mui/material/styles";
+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-runtime").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/fields/FKField.js

@@ -11,10 +11,20 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { ReferenceField, TextField, useFieldValue } from "react-admin";
+import { useLocation } from "react-router-dom";
 export function FKField(_a) {
     var { reference, refSource, refKey, link, source } = _a, props = __rest(_a, ["reference", "refSource", "refKey", "link", "source"]);
+    const location = useLocation();
     refKey = refKey || "id";
-    return (_jsxs(ReferenceField, Object.assign({ source: source, link: link || "show", reference: reference, queryOptions: { meta: { key: refKey } } }, props, { children: [_jsx(TextField, { source: refSource }), refSource !== refKey && _jsx(FKFieldValue, { source: refKey })] })));
+    const returnTo = `${location.pathname}${location.search}`;
+    const resolveLink = link ||
+        ((record) => {
+            const id = record === null || record === void 0 ? void 0 : record[refKey];
+            if (id === undefined || id === null)
+                return false;
+            return `/${reference}/${id}/show?returnTo=${encodeURIComponent(returnTo)}`;
+        });
+    return (_jsxs(ReferenceField, Object.assign({ source: source, link: resolveLink, reference: reference, queryOptions: { meta: { key: refKey } } }, props, { children: [_jsx(TextField, { source: refSource }), refSource !== refKey && _jsx(FKFieldValue, { source: refKey })] })));
 }
 function FKFieldValue(props) {
     const value = useFieldValue(props);

package/dist/index.d.ts

@@ -19,4 +19,4 @@ export * from "./fields";
 export * from "./hooks";
 export * from "./types";
 export declare function initAdmin(prefix?: string, containerId?: string): Promise<void>;
-export declare const VERSION = "11.7.2";
+export declare const VERSION = "12.0.0";

package/dist/index.js

@@ -42,4 +42,4 @@ export function initAdmin() {
         root.render(_jsx(MuffinAdminContext.Provider, { value: adminOpts, children: _jsx(MuffinAdmin, {}) }));
     });
 }
-export const VERSION = "11.7.2";
+export const VERSION = "12.0.0";