muffin-admin 9.5.1 → 9.5.3

package/dist/types.d.ts

@@ -29,6 +29,7 @@ export type AdminShowLink = {
     title?: string;
     icon?: string;
     field?: string;
+    filter?: string;
 };
 export type AdminShowProps = {
     fields: AdminField[];

package/package.json

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

package/src/MuffinMenu.tsx

@@ -6,7 +6,7 @@ import ListItemIcon from "@mui/material/ListItemIcon"
 import ListItemText from "@mui/material/ListItemText"
 import { matchPath, useLocation } from "react-router-dom"
 
-import { Menu, MenuProps, useBasename, useTranslate } from "react-admin"
+import { Menu, MenuProps, useBasename, useTheme, useTranslate } from "react-admin"
 
 import find from "lodash/find"
 import groupBy from "lodash/groupBy"
@@ -50,12 +50,25 @@ function MenuGroup({ name, resources }: { name: string; resources: AdminResource
     (resource) => !!matchPath({ path: `${basename}/${resource.name}/*` }, pathname)
   )
   const [groupOpen, setGroupOpen] = useState(match)
+  const theme = useTheme()[0]
+  const colors =
+    theme == "dark"
+      ? {
+          text: "rgba(255, 255, 255, 0.87)",
+          textSecondary: "rgba(255, 255, 255, 0.6)",
+        }
+      : {
+          text: "rgba(0, 0, 0, 0.87)",
+          textSecondary: "rgba(0, 0, 0, 0.6)",
+        }
 
   return (
     <div>
       <ListItemButton
         onClick={() => setGroupOpen(!groupOpen)}
-        sx={{ color: match ? "rgba(0, 0, 0, 0.87)" : "rgba(0, 0, 0, 0.6)" }}
+        sx={{
+          color: match ? colors.text : colors.textSecondary,
+        }}
       >
         {Icon && (
           <ListItemIcon sx={{ minWidth: 40 }}>

package/src/actions/LinkAction.tsx

@@ -3,10 +3,17 @@ import LinkButton from "../buttons/LinkButton"
 import { useMuffinAdminOpts } from "../hooks"
 import { AdminShowLink } from "../types"
 
-export function LinkAction({ field, icon, label, ...props }: AdminShowLink & { resource: string }) {
-  const { resources } = useMuffinAdminOpts()
+export function LinkAction({
+  field,
+  filter,
+  icon,
+  label,
+  ...props
+}: AdminShowLink & { resource: string }) {
   const record = useRecordContext()
+  const { resources } = useMuffinAdminOpts()
   const currentResource = useResourceContext()
+
   if (!record) return null
 
   const resource = resources.find((r) => r.name === props.resource)
@@ -16,7 +23,7 @@ export function LinkAction({ field, icon, label, ...props }: AdminShowLink & { r
       {...props}
       icon={icon || resource?.icon}
       label={label || `resources.${props.resource}.name`}
-      filters={{ [currentResource]: encodeURIComponent(record[field || "id"]) }}
+      filters={{ [filter || currentResource]: encodeURIComponent(record[field || "id"]) }}
     />
   )
 }

package/src/index.tsx

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

package/src/types.ts

@@ -56,13 +56,14 @@ export type AdminAction = {
 }
 
 export type AdminField = [string, { source: string }]
-export type AdminInput = [string, { required: boolean; source: string;[key: string]: any }]
+export type AdminInput = [string, { required: boolean; source: string; [key: string]: any }]
 
 export type AdminShowLink = {
   label: string
   title?: string
   icon?: string
   field?: string
+  filter?: string
 }
 export type AdminShowProps = {
   fields: AdminField[]
@@ -88,11 +89,11 @@ export type AdminResourceProps = {
   actions: AdminAction[]
   create: AdminInput[] | false
   edit:
-  | {
-    inputs: AdminInput[]
-    remove?: boolean
-  }
-  | false
+    | {
+        inputs: AdminInput[]
+        remove?: boolean
+      }
+    | false
   list: {
     limit: number
     limitMax: number