muffin-admin 11.8.0 → 13.0.0

package/src/common/AdminModal.tsx

@@ -1,11 +1,13 @@
-import { Dialog, DialogActions, DialogContent, DialogProps, DialogTitle } from "@mui/material"
-import { PropsWithChildren } from "react"
+import { Dialog, DialogActions, DialogContent, type DialogProps, DialogTitle } from "@mui/material"
+import type { SxProps, Theme } from "@mui/material/styles"
+import type { PropsWithChildren } from "react"
 
-interface IProps {
+interface IProps extends Omit<DialogProps, "title" | "open" | "onClose"> {
   open: boolean
   onClose: () => void
   title?: React.ReactNode
   actions?: React.ReactNode
+  contentSx?: SxProps<Theme>
 }
 
 export function AdminModal({
@@ -14,12 +16,13 @@ export function AdminModal({
   children,
   title,
   actions,
+  contentSx,
   ...props
-}: PropsWithChildren<IProps & DialogProps>) {
+}: PropsWithChildren<IProps>) {
   return (
     <Dialog open={open} onClose={onClose} fullWidth maxWidth="md" {...props}>
       {title && <DialogTitle>{title}</DialogTitle>}
-      <DialogContent>{children}</DialogContent>
+      <DialogContent sx={contentSx}>{children}</DialogContent>
       {actions && <DialogActions>{actions}</DialogActions>}
     </Dialog>
   )

package/src/common/ConfirmationProvider.tsx

@@ -1,5 +1,5 @@
 import { Button, Typography } from "@mui/material"
-import { createContext, PropsWithChildren, useContext, useState } from "react"
+import { createContext, type PropsWithChildren, useContext, useState } from "react"
 import { useTranslate } from "react-admin"
 import { AdminModal } from "./AdminModal"
 

package/src/common/PayloadButtons.tsx

@@ -11,7 +11,7 @@ export function PayloadButtons({
   isValid: boolean
 }) {
   return (
-    <Stack direction="row" alignItems="center" justifyContent="flex-end" spacing={1}>
+    <Stack direction="row" spacing={1} sx={{ alignItems: "center", justifyContent: "flex-end" }}>
       <Button
         label="ra.action.confirm"
         variant="contained"

package/src/context.ts

@@ -1,4 +1,4 @@
 import { createContext } from "react"
-import { AdminOpts } from "./types"
+import type { AdminOpts } from "./types"
 
 export const MuffinAdminContext = createContext<AdminOpts>(null)

package/src/dataprovider.ts

@@ -1,5 +1,5 @@
-import { TID } from "./types"
-import { APIParams, makeRequest, prepareFilters, setupAdmin } from "./utils"
+import type { TID } from "./types"
+import { type APIParams, makeRequest, prepareFilters, setupAdmin } from "./utils"
 
 type TQueryMeta = {
   key?: string

package/src/fields/AvatarField.tsx

@@ -5,28 +5,26 @@ import { useRecordContext } from "ra-core"
 
 export function AvatarField({ source, alt, style, nameProp, ...props }) {
   const record = useRecordContext(props)
-  let value = get(record, source),
+  const value = get(record, source),
     name = record[nameProp]
 
   // Check value is a valid URL
   if (value) {
     try {
-      new URL(value);
+      new URL(value)
     } catch {
       // Not a valid URL, return loader
-      return (
-        <CircularProgress size={24} />
-      )
+      return <CircularProgress size={24} />
     }
   }
 
   const letters = name
     ? name
-      .trim(" ")
-      .split(/\s+/)
-      .slice(0, 2)
-      .map((n: string) => n[0]?.toUpperCase())
-      .join("")
+        .trim(" ")
+        .split(/\s+/)
+        .slice(0, 2)
+        .map((n: string) => n[0]?.toUpperCase())
+        .join("")
     : ""
 
   return (

package/src/fields/FKField.tsx

@@ -1,11 +1,23 @@
-import { ReferenceField, TextField, useFieldValue, UseFieldValueOptions } from "react-admin"
+import { ReferenceField, TextField, type UseFieldValueOptions, useFieldValue } from "react-admin"
+import { useLocation } from "react-router-dom"
 
 export function FKField({ reference, refSource, refKey, link, source, ...props }) {
+  const location = useLocation()
   refKey = refKey || "id"
+  const returnTo = `${location.pathname}${location.search}`
+
+  const resolveLink =
+    link ||
+    ((record) => {
+      const id = record?.[refKey]
+      if (id === undefined || id === null) return false
+      return `/${reference}/${id}/show?returnTo=${encodeURIComponent(returnTo)}`
+    })
+
   return (
     <ReferenceField
       source={source}
-      link={link || "show"}
+      link={resolveLink}
       reference={reference}
       queryOptions={{ meta: { key: refKey } }}
       {...props}

package/src/filters/Filter.tsx

@@ -4,7 +4,7 @@ import Menu from "@mui/material/Menu"
 import MenuItem from "@mui/material/MenuItem"
 import TextField from "@mui/material/TextField"
 import { useState } from "react"
-import { FieldTitle, InputProps, useInput } from "react-admin"
+import { FieldTitle, type InputProps, useInput } from "react-admin"
 
 const OPERATORS = {
   $eq: "=",
@@ -22,7 +22,7 @@ export function Filter({ type = "text", ...props }: InputProps) {
   })
   const [op, setOp] = useState((field.value && Object.keys(field.value)[0]) || "$eq")
 
-  const onChange = function(e: any) {
+  const onChange = (e: any) => {
     field.onChange({ [op]: e.target.value })
   }
 

package/src/filters/SearchFilter.tsx

@@ -4,7 +4,12 @@ import clsx from "clsx"
 import debounce from "lodash/debounce"
 import { useTranslate } from "ra-core"
 import { useState } from "react"
-import { ResettableTextField, SearchInputProps, useInput, useResourceContext } from "react-admin"
+import {
+  ResettableTextField,
+  type SearchInputProps,
+  useInput,
+  useResourceContext,
+} from "react-admin"
 
 export function SearchFilter({ source, className, ...props }: SearchInputProps) {
   const translate = useTranslate()
@@ -29,12 +34,14 @@ export function SearchFilter({ source, className, ...props }: SearchInputProps)
       }}
       {...props}
       className={clsx("ra-input", `ra-input-${source}`, className)}
-      InputProps={{
-        endAdornment: (
-          <InputAdornment position="end">
-            <SearchIcon color="disabled" />
-          </InputAdornment>
-        ),
+      slotProps={{
+        input: {
+          endAdornment: (
+            <InputAdornment position="end">
+              <SearchIcon color="disabled" />
+            </InputAdornment>
+          ),
+        },
       }}
     />
   )

package/src/globals.d.ts

@@ -0,0 +1 @@
+declare module "*.css"

package/src/hooks/useAction.ts

@@ -1,4 +1,4 @@
-import { UseMutationOptions, useMutation } from "@tanstack/react-query"
+import { type UseMutationOptions, useMutation } from "@tanstack/react-query"
 import {
   useDataProvider,
   useNotify,
@@ -6,7 +6,7 @@ import {
   useResourceContext,
   useUnselectAll,
 } from "react-admin"
-import { MuffinDataprovider, TActionProps } from "../dataprovider"
+import type { MuffinDataprovider, TActionProps } from "../dataprovider"
 
 export function useAction(
   action: string,
@@ -21,8 +21,8 @@ export function useAction(
   return useMutation({
     mutationFn: (params: TActionProps) => dataProvider.runAction(resource, action, params),
     onSuccess: ({ data }) => {
-      if (data && data.message) notify(data.message, { type: "success" })
-      if (data && data.redirectTo) window.location = data.redirectTo
+      if (data?.message) notify(data.message, { type: "success" })
+      if (data?.redirectTo) window.location = data.redirectTo
       else {
         unselectAll()
         refresh()

package/src/i18n/en.ts

@@ -1,4 +1,4 @@
-import { TranslationMessages } from "ra-core"
+import type { TranslationMessages } from "ra-core"
 import raEnglishMessages from "ra-language-english"
 
 const muffinEnglishMessages: TranslationMessages = {

package/src/i18n/ru.ts

@@ -1,4 +1,4 @@
-import { TranslationMessages } from "ra-core"
+import type { TranslationMessages } from "ra-core"
 import raRussianMessages from "ra-language-russian"
 
 const muffinRussianMessages = {

package/src/index.tsx

@@ -1,18 +1,7 @@
 import { createRoot } from "react-dom/client"
-import { MuffinAdmin } from "./MuffinAdmin"
 import { MuffinAdminContext } from "./context"
+import { MuffinAdmin } from "./MuffinAdmin"
 
-export * from "./utils"
-
-export * from "./MuffinAdmin"
-export * from "./MuffinDashboard"
-export * from "./MuffinMenu"
-export * from "./MuffinRecordList"
-export * from "./MuffinResource"
-export * from "./MuffinResourceCreate"
-export * from "./MuffinResourceEdit"
-export * from "./MuffinResourceList"
-export * from "./MuffinResourceShow"
 export * from "./actions"
 export * from "./authprovider"
 export * from "./buildRA"
@@ -22,7 +11,17 @@ export * from "./context"
 export * from "./dataprovider"
 export * from "./fields"
 export * from "./hooks"
+export * from "./MuffinAdmin"
+export * from "./MuffinDashboard"
+export * from "./MuffinMenu"
+export * from "./MuffinRecordList"
+export * from "./MuffinResource"
+export * from "./MuffinResourceCreate"
+export * from "./MuffinResourceEdit"
+export * from "./MuffinResourceList"
+export * from "./MuffinResourceShow"
 export * from "./types"
+export * from "./utils"
 
 export async function initAdmin(prefix = "", containerId: string = "root") {
   const response = await fetch(`${prefix}/ra.json`)
@@ -37,4 +36,4 @@ export async function initAdmin(prefix = "", containerId: string = "root") {
   )
 }
 
-export const VERSION = "11.8.0"
+export { VERSION } from "./version"

package/src/inputs/DateRangeInput.tsx

@@ -1,6 +1,6 @@
 import TextField from "@mui/material/TextField"
 import { enGB, ru } from "date-fns/locale"
-import { FieldTitle, InputProps, useLocale } from "react-admin"
+import { FieldTitle, type InputProps, useLocale } from "react-admin"
 import DatePicker, { registerLocale } from "react-datepicker"
 import "react-datepicker/dist/react-datepicker.css"
 

package/src/inputs/JsonInput.tsx

@@ -8,7 +8,7 @@ const parseFunction = (json) => {
   try {
     retval = JSON.parse(json)
   } finally {
-    // eslint-disable-next-line no-unsafe-finally
+    // biome-ignore lint/correctness/noUnsafeFinally: intentional - return parsed value or original on error
     return retval
   }
 }

package/src/utils.tsx

@@ -1,7 +1,7 @@
 import * as icons from "@mui/icons-material"
 import { stringify } from "query-string"
 import { fetchUtils } from "ra-core"
-import { TAdminPath } from "./types"
+import type { TAdminPath } from "./types"
 
 const builders = new Map<string, (props: any) => any>()
 
@@ -58,6 +58,7 @@ export function makeRequest(url: string, params: APIParams = {}) {
 }
 
 export function findIcon(icon?: string) {
+  // biome-ignore lint/performance/noDynamicNamespaceImportAccess: icons are looked up by name from admin config
   return icon ? icons[icon] : undefined
 }
 

package/src/version.ts

@@ -0,0 +1 @@
+export const VERSION = "13.0.0"

package/src/web.ts

@@ -1,4 +1,3 @@
 import { initAdmin } from "."
 
-// @ts-ignore
 globalThis.initAdmin = initAdmin