muffin-admin 2.6.7 → 2.7.0

package/dist/types.d.ts

@@ -42,8 +42,8 @@ export type AdminResourceProps = {
         limit: number;
         limitMax: number;
         actions: AdminAction[];
-        fields: AdminField[];
         filters: AdminInput[];
+        fields: AdminField[];
         show: boolean;
         edit?: boolean;
         remove?: boolean;

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { AdminOpts } from "./types";
-export declare function setupAdmin<T>(adminType: string[], fc: (props: any) => T): void;
+export declare function setupAdmin<T>(adminType: string[], fc: (opts: any, props?: any) => T): void;
 export declare function buildAdmin(adminType: string[], props?: {}): any;
 export declare function findBuilder(adminType: string[]): (props: any) => any;
 export declare const AdminPropsContext: import("react").Context<AdminOpts>;

package/package.json

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

package/src/MuffinAdmin.tsx

@@ -2,17 +2,12 @@ import IconButton from "@mui/material/IconButton"
 import SvgIcon from "@mui/material/SvgIcon"
 import Tooltip from "@mui/material/Tooltip"
 import Typography from "@mui/material/Typography"
-import createTheme from "@mui/material/styles/createTheme"
-import { Admin, AppBar, DataProvider, Layout, Login } from "react-admin"
+import { Admin, AdminProps, AppBar, DataProvider, Layout, Login } from "react-admin"
 import { AdminOpts } from "./types"
 import { AdminPropsContext, buildAdmin, findBuilder, findIcon, setupAdmin } from "./utils"
 
-const darkTheme = createTheme({
-  palette: { mode: "dark" },
-})
-
-export function MuffinAdmin(props: AdminOpts) {
-  const { resources, auth, appBarLinks, adminProps, dashboard } = props
+export function MuffinAdmin(opts: AdminOpts, props: AdminProps) {
+  const { resources, auth, appBarLinks, adminProps, dashboard } = opts
   const children = resources.map((resource) =>
     buildAdmin(["resource", resource.name], {
       ...resource,
@@ -29,9 +24,9 @@ export function MuffinAdmin(props: AdminOpts) {
         id="react-admin-title"
         style={{
           flex: 1,
-          textOverflow: "ellipsis",
-          whiteSpace: "nowrap",
           overflow: "hidden",
+          whiteSpace: "nowrap",
+          textOverflow: "ellipsis",
         }}
       />
       {appBarLinks.map((info) => (
@@ -45,15 +40,16 @@ export function MuffinAdmin(props: AdminOpts) {
   )
 
   return (
-    <AdminPropsContext.Provider value={props}>
+    <AdminPropsContext.Provider value={opts}>
       <Admin
         authProvider={buildAdmin(["authprovider"], auth)}
-        dashboard={dashboard ? buildAdmin(["dashboard"], dashboard) : null}
-        dataProvider={buildAdmin(["dataprovider"], props) as unknown as DataProvider}
+        dataProvider={buildAdmin(["dataprovider"], opts) as unknown as DataProvider}
         layout={(props) => <Layout {...props} appBar={appBar} />}
         loginPage={findBuilder(["loginpage"])}
+        dashboard={dashboard ? buildAdmin(["dashboard"], dashboard) : null}
         requireAuth={auth.required}
         darkTheme={{ palette: { mode: "dark" } }}
+        {...props}
       >
         {children}
       </Admin>

package/src/fields/FKField.tsx

@@ -3,9 +3,9 @@ import { ReferenceField, TextField } from "react-admin"
 export function FKField({ reference, refSource, refKey, link, source, ...props }) {
   return (
     <ReferenceField
+      source={source}
       link={link || "show"}
       reference={reference}
-      source={source}
       queryOptions={{ meta: { key: refKey } }}
       {...props}
     >

package/src/fields/JsonField.tsx

@@ -14,9 +14,9 @@ export function JsonField({ label, source }) {
       <p></p>
       {label}
       <Button
-        variant="contained"
-        color="primary"
         size="small"
+        color="primary"
+        variant="contained"
         label={expand ? "colapse" : "expand"}
         onClick={(e) => {
           setExpand(!expand)

package/src/types.ts

@@ -43,11 +43,14 @@ export type AdminResourceProps = {
     limit: number
     limitMax: number
     actions: AdminAction[]
-    fields: AdminField[]
     filters: AdminInput[]
+    fields: AdminField[]
+    // Enable show button
     show: boolean
+    // Permissions
     edit?: boolean
     remove?: boolean
+    // Default sorting
     sort?: {
       field: string
       order: "ASC" | "DESC"

package/src/utils.tsx

@@ -6,7 +6,7 @@ import { AdminOpts } from "./types"
 
 const builders = new Map<string, (props) => any>()
 
-export function setupAdmin<T>(adminType: string[], fc: (props) => T) {
+export function setupAdmin<T>(adminType: string[], fc: (opts, props?) => T) {
   const key = adminType.join("/")
   builders.set(key, fc)
 }