muffin-admin 9.4.0 → 9.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "9.4.0",
+  "version": "9.4.2",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/MuffinAdmin.tsx

@@ -13,8 +13,10 @@ import {
   LayoutProps,
   localStorageStore,
   Login,
+  LoginProps,
 } from "react-admin"
 
+import { useEffect } from "react"
 import { ConfirmationProvider } from "./common"
 import { useMuffinAdminOpts } from "./hooks"
 import { buildProvider, muffinTranslations } from "./i18n"
@@ -28,11 +30,11 @@ export function MuffinAdmin(props: AdminProps) {
   const muffinI18nProvider = buildProvider(
     backendLocales
       ? Object.fromEntries(
-        Object.entries(muffinTranslations).map(([locale, messages]) => [
-          locale,
-          deepMerge({}, messages, backendLocales[locale], buildAdmin(["locale", locale]) || {}),
-        ])
-      )
+          Object.entries(muffinTranslations).map(([locale, messages]) => [
+            locale,
+            deepMerge({}, messages, backendLocales[locale], buildAdmin(["locale", locale]) || {}),
+          ])
+        )
       : muffinTranslations
   )
 
@@ -132,5 +134,20 @@ export function MuffinAppBar(props: AppBarProps) {
 
 setupAdmin(["appbar"], MuffinAppBar)
 
+export function MuffinLogin(props: LoginProps) {
+  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 <Login {...props} />
+}
+
 // Initialize login page
-setupAdmin(["loginpage"], Login)
+setupAdmin(["loginpage"], MuffinLogin)

package/src/MuffinMenu.tsx

@@ -7,6 +7,7 @@ import ListItemText from "@mui/material/ListItemText"
 
 import { Menu, MenuProps, useTranslate } from "react-admin"
 
+import find from "lodash/find"
 import groupBy from "lodash/groupBy"
 import { useContext, useState } from "react"
 import { MuffinAdminContext } from "./context"
@@ -25,12 +26,12 @@ export function MuffinMenu(props: MenuProps) {
   return (
     <Menu {...props}>
       <Menu.DashboardItem />
-      {resources.map(({ name, group, icon }) => {
+      {resources.map(({ name, group }) => {
         if (!group) return <Menu.ResourceItem name={name} key={name} />
         if (groupRendered.includes(group)) return null
         groupRendered.push(group)
         const groupResources = groups[group]
-        return <MenuGroup name={group} icon={icon} resources={groupResources} key={group} />
+        return <MenuGroup name={group} resources={groupResources} key={group} />
       })}
     </Menu>
   )
@@ -38,25 +39,20 @@ export function MuffinMenu(props: MenuProps) {
 
 setupAdmin(["menu"], MuffinMenu)
 
-function MenuGroup({
-  name,
-  icon,
-  resources,
-}: {
-  name: string
-  icon: string
-  resources: AdminResourceProps[]
-}) {
-  const Icon = findIcon(icon)
+function MenuGroup({ name, resources }: { name: string; resources: AdminResourceProps[] }) {
+  const iconRes = find(resources, "icon")
+  const Icon = iconRes ? findIcon(iconRes.icon) : null
   const translate = useTranslate()
   const [groupOpen, setGroupOpen] = useState(false)
 
   return (
     <div>
       <ListItemButton onClick={() => setGroupOpen(!groupOpen)}>
-        <ListItemIcon sx={{ minWidth: 40 }}>
-          <Icon />
-        </ListItemIcon>
+        {Icon && (
+          <ListItemIcon sx={{ minWidth: 40 }}>
+            <Icon />
+          </ListItemIcon>
+        )}
         <ListItemText primary={translate(`groups.${name}`)} />
         {groupOpen ? <ExpandLess /> : <ExpandMore />}
       </ListItemButton>

package/src/index.tsx

@@ -37,4 +37,4 @@ export async function initAdmin(prefix = "", containerId: string = "root") {
   )
 }
 
-export const VERSION = "9.4.0"
+export const VERSION = "9.4.2"