muffin-admin 1.29.0 → 1.30.0

package/utils.js

@@ -1,35 +1,39 @@
-import React from "react";
+/* eslint-disable no-console */
 
-import { fetchUtils } from 'ra-core';
-import { stringify } from 'query-string';
-import { required } from 'react-admin';
+import { isValidElement } from 'react'
 
+import { fetchUtils } from 'ra-core'
+import { stringify } from 'query-string'
 
-const admin = globalThis.admin = globalThis.admin || {};
+const parts = {}
+
+export const setupAdmin = (part, gen) => (parts[part] = gen)
 
-export const setupAdmin = globalThis.setupAdmin = (type, fn) => admin[type] = fn
 export const checkParams = (fn) => (props, res) => {
-  if (!props || React.isValidElement(props)) return props;
-  return fn(props, res);
+  if (!props || isValidElement(props)) return props
+  return fn(props, res)
 }
-export const processAdmin = (type, props, res) => {
-  let callbacks = [], result = props;
 
-  if (process.env.NODE_ENV == 'development') console.log(`${type}${ res ? '-' + res : ''}`, props);
+export const processAdmin = (type, props, res) => {
+  if (process.env.NODE_ENV == 'development')
+    console.log(`${type}${res ? '-' + res : ''}`, props)
 
-  if (admin[`${type}-${res}`]) return admin[`${type}-${res}`](props, res);
-  if (admin[type]) return admin[type](props, res);
+  if (parts[`${type}-${res}`]) return parts[`${type}-${res}`](props, res)
+  if (parts[type]) return parts[type](props, res)
 }
 
-export const requestHeaders = {};
+export const requestHeaders = {}
 
 export const makeRequest = (url, params) => {
-  let {data, query, ...opts} = params || {};
+  let { data, query, ...opts } = params || {}
 
-  if (data) opts.body = JSON.stringify(data);
-  if (query) url = `${url}?${stringify(query)}`;
+  if (data) opts.body = JSON.stringify(data)
+  if (query) url = `${url}?${stringify(query)}`
 
-  opts = {...opts, headers: new Headers({...requestHeaders, ...opts.headers})}
+  opts = {
+    ...opts,
+    headers: new Headers({ ...requestHeaders, ...opts.headers }),
+  }
 
-  return fetchUtils.fetchJson(url, opts);
+  return fetchUtils.fetchJson(url, opts)
 }

package/views/create.jsx

@@ -1,26 +1,30 @@
-import React from "react";
+import React from 'react'
 
-import { Create, SimpleForm, TopToolbar, ListButton } from "react-admin";
+import { Create, SimpleForm, TopToolbar, ListButton } from 'react-admin'
 
 import initRAItems from '../ui.jsx'
 import { checkParams, processAdmin, setupAdmin } from '../utils'
 
-
 // Initialize a create component
-setupAdmin('create', checkParams((inputs, res) => props => {
-
-  const Actions = ({basePath}) => (
-      <TopToolbar>
-        <ListButton basePath={ basePath } />
-      </TopToolbar>
-  )
+setupAdmin(
+  'create',
+  checkParams(
+    (inputs, res) =>
+      function MACreate(props) {
+        const Actions = (
+          <TopToolbar>
+            <ListButton />
+          </TopToolbar>
+        )
 
-  return (
-    <Create actions={ <Actions /> } {...props}>
-      <SimpleForm children={ processAdmin('create-inputs', inputs, res) } />
-    </Create>
+        return (
+          <Create actions={Actions} {...props}>
+            <SimpleForm>
+              {processAdmin('create-inputs', inputs, res)}
+            </SimpleForm>
+          </Create>
+        )
+      }
   )
-}
-));
-setupAdmin('create-inputs', initRAItems);
-
+)
+setupAdmin('create-inputs', initRAItems)

package/views/edit.jsx

@@ -1,34 +1,42 @@
-import React from "react";
+import React from 'react'
 
-import { Edit, ListButton, ShowButton, SimpleForm, TopToolbar } from "react-admin";
+import {
+  Edit,
+  ListButton,
+  ShowButton,
+  SimpleForm,
+  TopToolbar,
+} from 'react-admin'
 
 import initRAItems from '../ui.jsx'
 import { checkParams, processAdmin, setupAdmin } from '../utils'
 
 import { ActionButton } from '../buttons/ActionButton.jsx'
 
-
 // Initialize an edit component
-setupAdmin('edit', checkParams(({actions, inputs}, res) => props => {
-
-    const Actions = ({basePath, data, resource, ...baseProps}) => (
-      <TopToolbar>
-        {
-          actions.map((props, idx) => {
-            let aProps = {resource, basePath, ...baseProps, ...props};
-            return <ActionButton key={ idx } {...aProps} />
-          })
-        }
-        <ListButton basePath={ basePath } />
-        <ShowButton basePath={basePath} record={data} />
-      </TopToolbar>
-    )
-
-    return (
-      <Edit actions={ <Actions /> } { ...props }>
-        <SimpleForm children={ processAdmin('edit-inputs', inputs, res) } />
-      </Edit>
-    )
-}));
-
-setupAdmin('edit-inputs', initRAItems);
+setupAdmin(
+  'edit',
+  checkParams(
+    ({ actions, inputs }, res) =>
+      function MAEdit(props) {
+        const Actions = ({ basePath, resource, ...baseProps }) => (
+          <TopToolbar>
+            {actions.map((props, idx) => {
+              let aProps = { resource, basePath, ...baseProps, ...props }
+              return <ActionButton key={idx} {...aProps} />
+            })}
+            <ListButton />
+            <ShowButton />
+          </TopToolbar>
+        )
+
+        return (
+          <Edit actions={<Actions />} {...props}>
+            <SimpleForm>{processAdmin('edit-inputs', inputs, res)}</SimpleForm>
+          </Edit>
+        )
+      }
+  )
+)
+
+setupAdmin('edit-inputs', initRAItems)

package/views/list.jsx

@@ -1,56 +1,86 @@
-import React from "react";
+import React from 'react'
 
-import { 
+import {
   BulkDeleteButton,
   Datagrid,
   EditButton,
   Filter,
   List,
   Pagination,
-  Show,
-} from "react-admin";
-import uniq from "lodash/uniq";
-import sortBy from "lodash/sortBy";
+} from 'react-admin'
+import uniq from 'lodash/uniq'
+import sortBy from 'lodash/sortBy'
 
 import initRAItems from '../ui.jsx'
 import { checkParams, processAdmin, setupAdmin } from '../utils'
 import { BulkActionButton } from '../buttons/ActionButton.jsx'
 
-
-const defaultPagination = <Pagination rowsPerPageOptions={[10, 25, 50, 100]} />;
+const defaultPagination = <Pagination rowsPerPageOptions={[10, 25, 50, 100]} />
 
 // Initiliaze a list component
-setupAdmin('list', checkParams((props, res) => {
-    let {children, filters, edit, pagination, show, limit, limitMax, actions, ...listProps } = props;
+setupAdmin(
+  'list',
+  checkParams((props, res) => {
+    let {
+      children,
+      filters,
+      edit,
+      pagination,
+      show,
+      limit,
+      limitMax,
+      actions,
+      ...listProps
+    } = props
 
-    children = processAdmin('list-fields', children, res);
-    if (edit) children.push(<EditButton key="edit-button" />);
+    children = processAdmin('list-fields', children, res)
+    if (edit) children.push(<EditButton key='edit-button' />)
 
-    pagination = pagination || <Pagination rowsPerPageOptions={sortBy(uniq([10, 25, 50, 100, limit, limitMax]))} />
+    pagination = pagination || (
+      <Pagination
+        rowsPerPageOptions={sortBy(uniq([10, 25, 50, 100, limit, limitMax]))}
+      />
+    )
 
-    return props => {
-      let Filters = (props) => <Filter { ...props } children={ processAdmin('list-filters', filters, res) } />
-      let Actions = processAdmin('list-bulkActions', actions);
+    return function MAList(props) {
+      let Filters = (props) => (
+        <Filter {...props}>{processAdmin('list-filters', filters, res)}</Filter>
+      )
+      let Actions = processAdmin('list-bulkActions', actions)
 
-      props = { ...props, ...listProps };
+      props = { ...props, ...listProps }
       return (
-        <List filters={ <Filters /> } bulkActionButtons={ <Actions /> } perPage={ limit } pagination={ pagination || defaultPagination } { ...props }>
-        <Datagrid rowClick={ show ? "show" : null } children={ children } />
+        <List
+          filters={<Filters />}
+          bulkActionButtons={<Actions />}
+          perPage={limit}
+          pagination={pagination || defaultPagination}
+          {...props}
+        >
+          <Datagrid rowClick={show ? 'show' : null}>{children}</Datagrid>
         </List>
       )
-    };
-}));
+    }
+  })
+)
 
-setupAdmin('list-bulkActions', actions => props => {
-  let buttons = actions.map((action, idx) => {
-        let aProps = { ...action, ...props };
+setupAdmin(
+  'list-bulkActions',
+  (actions) =>
+    function MABulkActions(props) {
+      let buttons = actions.map((action, idx) => {
+        let aProps = { ...action, ...props }
         return <BulkActionButton key={idx} {...aProps} />
-  })
+      })
+
+      return (
+        <>
+          {buttons}
+          <BulkDeleteButton {...props} />
+        </>
+      )
+    }
+)
 
-  return <>
-    { buttons }
-    <BulkDeleteButton {...props} />
-  </>
-});
-setupAdmin('list-filters', initRAItems);
-setupAdmin('list-fields', initRAItems);
+setupAdmin('list-filters', initRAItems)
+setupAdmin('list-fields', initRAItems)

package/views/show.jsx

@@ -1,34 +1,43 @@
-import React from "react";
+import React from 'react'
 
-import { ListButton, EditButton, Show, SimpleShowLayout, TopToolbar } from "react-admin";
+import {
+  ListButton,
+  EditButton,
+  Show,
+  SimpleShowLayout,
+  TopToolbar,
+} from 'react-admin'
 
 import initRAItems from '../ui.jsx'
 import { checkParams, processAdmin, setupAdmin } from '../utils'
 
 import { ActionButton } from '../buttons/ActionButton.jsx'
 
-
 // Initiliaze a show component
-setupAdmin('show', checkParams(({actions, fields}, res) => props => {
-
-    const Actions = ({basePath, data, resource, ...baseProps}) => (
-      <TopToolbar>
-        {
-          actions.map((props, idx) => {
-            let aProps = {resource, basePath, record: data, ...baseProps, ...props};
-            return <ActionButton key={ idx } {...aProps} />
-          })
-        }
-        <ListButton basePath={ basePath } />
-        <EditButton basePath={basePath} record={data} />
-      </TopToolbar>
-    )
-
-    return (
-      <Show actions={ <Actions /> } {...props}>
-        <SimpleShowLayout children={ processAdmin('show-fields', fields, res) } />
-      </Show>
-    )
-}));
-
-setupAdmin('show-fields', initRAItems);
+setupAdmin(
+  'show',
+  checkParams(
+    ({ actions, fields }, resource) =>
+      function MAShow(props) {
+        const Actions = () => (
+          <TopToolbar>
+            {actions.map((props, idx) => {
+              return <ActionButton key={idx} resource={resource} {...props} />
+            })}
+            <ListButton />
+            <EditButton />
+          </TopToolbar>
+        )
+
+        return (
+          <Show actions={<Actions />} {...props}>
+            <SimpleShowLayout>
+              {processAdmin('show-fields', fields, resource)}
+            </SimpleShowLayout>
+          </Show>
+        )
+      }
+  )
+)
+
+setupAdmin('show-fields', initRAItems)

package/webpack.config.js

@@ -33,6 +33,7 @@ module.exports = {
 
   devServer: {
     hot: true,
+    open: true,
     proxy: [
       {
         context: ['!*.js'],