muffin-admin 9.4.0 → 9.4.2

package/dist/MuffinAdmin.d.ts

@@ -1,4 +1,5 @@
-import { AdminProps, AppBarProps, LayoutProps } from "react-admin";
+import { AdminProps, AppBarProps, LayoutProps, LoginProps } from "react-admin";
 export declare function MuffinAdmin(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;

package/dist/MuffinAdmin.js

@@ -4,6 +4,7 @@ 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 { ConfirmationProvider } from "./common";
 import { useMuffinAdminOpts } from "./hooks";
 import { buildProvider, muffinTranslations } from "./i18n";
@@ -36,5 +37,17 @@ export function MuffinAppBar(props) {
                 } }), appBarLinks.map((info) => (_jsx(Tooltip, { title: info.title, children: _jsx(IconButton, { color: "inherit", href: info.url, children: _jsx(SvgIcon, { component: findIcon(info.icon) }) }) }, info.url)))] })));
 }
 setupAdmin(["appbar"], MuffinAppBar);
+export function MuffinLogin(props) {
+    const { auth: { loginURL }, } = useMuffinAdminOpts();
+    useEffect(() => {
+        if (loginURL) {
+            const { pathname, search } = window.location;
+            const url = new URL(loginURL);
+            url.searchParams.set("redirect", pathname + search);
+            window.location.replace(url.toString());
+        }
+    }, [loginURL]);
+    return _jsx(Login, Object.assign({}, props));
+}
 // Initialize login page
-setupAdmin(["loginpage"], Login);
+setupAdmin(["loginpage"], MuffinLogin);

package/dist/MuffinMenu.js

@@ -6,6 +6,7 @@ import ListItemButton from "@mui/material/ListItemButton";
 import ListItemIcon from "@mui/material/ListItemIcon";
 import ListItemText from "@mui/material/ListItemText";
 import { Menu, useTranslate } from "react-admin";
+import find from "lodash/find";
 import groupBy from "lodash/groupBy";
 import { useContext, useState } from "react";
 import { MuffinAdminContext } from "./context";
@@ -14,20 +15,21 @@ export function MuffinMenu(props) {
     const { resources } = useContext(MuffinAdminContext);
     const groups = groupBy(resources.filter((r) => r.group), "group");
     const groupRendered = [];
-    return (_jsxs(Menu, Object.assign({}, props, { children: [_jsx(Menu.DashboardItem, {}), resources.map(({ name, group, icon }) => {
+    return (_jsxs(Menu, Object.assign({}, props, { children: [_jsx(Menu.DashboardItem, {}), resources.map(({ name, group }) => {
                 if (!group)
                     return _jsx(Menu.ResourceItem, { name: name }, name);
                 if (groupRendered.includes(group))
                     return null;
                 groupRendered.push(group);
                 const groupResources = groups[group];
-                return _jsx(MenuGroup, { name: group, icon: icon, resources: groupResources }, group);
+                return _jsx(MenuGroup, { name: group, resources: groupResources }, group);
             })] })));
 }
 setupAdmin(["menu"], MuffinMenu);
-function MenuGroup({ name, icon, resources, }) {
-    const Icon = findIcon(icon);
+function MenuGroup({ name, resources }) {
+    const iconRes = find(resources, "icon");
+    const Icon = iconRes ? findIcon(iconRes.icon) : null;
     const translate = useTranslate();
     const [groupOpen, setGroupOpen] = useState(false);
-    return (_jsxs("div", { children: [_jsxs(ListItemButton, { onClick: () => setGroupOpen(!groupOpen), children: [_jsx(ListItemIcon, { sx: { minWidth: 40 }, children: _jsx(Icon, {}) }), _jsx(ListItemText, { primary: translate(`groups.${name}`) }), groupOpen ? _jsx(ExpandLess, {}) : _jsx(ExpandMore, {})] }), _jsx(Collapse, { in: groupOpen, timeout: "auto", unmountOnExit: true, children: resources.map(({ name }) => (_jsx(Menu.ResourceItem, { name: name }, name))) })] }));
+    return (_jsxs("div", { children: [_jsxs(ListItemButton, { onClick: () => setGroupOpen(!groupOpen), children: [Icon && (_jsx(ListItemIcon, { sx: { minWidth: 40 }, children: _jsx(Icon, {}) })), _jsx(ListItemText, { primary: translate(`groups.${name}`) }), groupOpen ? _jsx(ExpandLess, {}) : _jsx(ExpandMore, {})] }), _jsx(Collapse, { in: groupOpen, timeout: "auto", unmountOnExit: true, children: resources.map(({ name }) => (_jsx(Menu.ResourceItem, { name: name }, name))) })] }));
 }

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 = "9.4.0";
+export declare const VERSION = "9.4.2";

package/dist/index.js

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