muffin-admin 1.43.0 → 1.44.1

package/dist/cjs/index.js

@@ -5,8 +5,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  initAdmin: true
+  initAdmin: true,
+  buildRAComponent: true
 };
+Object.defineProperty(exports, "buildRAComponent", {
+  enumerable: true,
+  get: function get() {
+    return _ui.buildRAComponent;
+  }
+});
 exports.initAdmin = initAdmin;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
@@ -24,6 +31,7 @@ Object.keys(_utils).forEach(function (key) {
     }
   });
 });
+var _ui = require("./ui");
 function initAdmin() {
   return _initAdmin.apply(this, arguments);
 }

package/dist/cjs/ui.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
+exports.buildRAComponent = buildRAComponent;
+exports["default"] = initRAItems;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactAdmin = require("react-admin");
 var _AvatarField = _interopRequireDefault(require("./fields/AvatarField"));
@@ -14,9 +15,7 @@ var _FKField = _interopRequireDefault(require("./fields/FKField"));
 var _FKInput = _interopRequireDefault(require("./inputs/FKInput"));
 var _JsonField = _interopRequireDefault(require("./fields/JsonField"));
 var _JsonInput = _interopRequireDefault(require("./inputs/JsonInput"));
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var ui = {
+var UI = {
   // Fields
   BooleanField: _reactAdmin.BooleanField,
   ChipField: _reactAdmin.ChipField,
@@ -57,21 +56,21 @@ var ui = {
   JsonInput: _JsonInput["default"],
   FKInput: _FKInput["default"]
 };
-var initRAItems = function initRAItems(itemsProps) {
-  return itemsProps.map(function (item) {
-    var _props$fullWidth;
-    var Item = ui[item[0]],
-      props = _objectSpread({}, item[1]);
-    if (props.required) {
-      props.validate = (0, _reactAdmin.required)();
-      delete props.required;
-    }
-    props.fullWidth = (_props$fullWidth = props.fullWidth) !== null && _props$fullWidth !== void 0 ? _props$fullWidth : true;
-    if (props.children) props.children = initRAItems(props.children)[0];
-    return /*#__PURE__*/_react["default"].createElement(Item, (0, _extends2["default"])({
-      key: props.source
-    }, props));
+function buildRAComponent(name, props) {
+  var _props$fullWidth;
+  var Item = UI[name];
+  if (props.required) {
+    props.validate = (0, _reactAdmin.required)();
+    delete props.required;
+  }
+  props.fullWidth = (_props$fullWidth = props.fullWidth) !== null && _props$fullWidth !== void 0 ? _props$fullWidth : true;
+  if (props.children) props.children = initRAItems(props.children)[0];
+  return /*#__PURE__*/_react["default"].createElement(Item, (0, _extends2["default"])({
+    key: props.source
+  }, props));
+}
+function initRAItems(items) {
+  return items.map(function (item) {
+    return buildRAComponent.apply(void 0, (0, _toConsumableArray2["default"])(item));
   });
-};
-var _default = initRAItems;
-exports["default"] = _default;
+}

package/dist/cjs/views/edit.js

@@ -2,16 +2,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _reactAdmin = require("react-admin");
 var _ui = _interopRequireDefault(require("../ui"));
 var _utils = require("../utils");
 var _ActionButton = require("../buttons/ActionButton");
-var _excluded = ["basePath", "resource"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Initialize an edit component
 (0, _utils.setupAdmin)("edit", (0, _utils.checkParams)(function (props, name) {
   var edit = props.edit,
@@ -19,18 +14,11 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
   var actions = edit.actions,
     inputs = edit.inputs;
   function MAEdit(props) {
-    var Actions = function Actions(_ref) {
-      var basePath = _ref.basePath,
-        resource = _ref.resource,
-        baseProps = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+    var Actions = function Actions() {
       return /*#__PURE__*/_react["default"].createElement(_reactAdmin.TopToolbar, null, actions.map(function (props, idx) {
-        var aProps = _objectSpread(_objectSpread({
-          resource: resource,
-          basePath: basePath
-        }, baseProps), props);
         return /*#__PURE__*/_react["default"].createElement(_ActionButton.ActionButton, (0, _extends2["default"])({
           key: idx
-        }, aProps));
+        }, props));
       }), /*#__PURE__*/_react["default"].createElement(_reactAdmin.ListButton, null), /*#__PURE__*/_react["default"].createElement(_reactAdmin.ShowButton, null));
     };
     return /*#__PURE__*/_react["default"].createElement(_reactAdmin.Edit, (0, _extends2["default"])({

package/dist/cjs/views/show.js

@@ -12,17 +12,26 @@ var _ActionButton = require("../buttons/ActionButton");
   var actions = _ref.actions,
     fields = _ref.fields;
   return function MAShow(props) {
-    var Actions = function Actions() {
-      return /*#__PURE__*/_react["default"].createElement(_reactAdmin.TopToolbar, null, actions.map(function (props, idx) {
-        return /*#__PURE__*/_react["default"].createElement(_ActionButton.ActionButton, (0, _extends2["default"])({
-          key: idx,
-          resource: resource
-        }, props));
-      }), /*#__PURE__*/_react["default"].createElement(_reactAdmin.ListButton, null), /*#__PURE__*/_react["default"].createElement(_reactAdmin.EditButton, null));
-    };
     return /*#__PURE__*/_react["default"].createElement(_reactAdmin.Show, (0, _extends2["default"])({
-      actions: /*#__PURE__*/_react["default"].createElement(Actions, null)
+      actions: (0, _utils.processAdmin)("show-actions", {
+        actions: actions,
+        resource: resource
+      }, resource)
     }, props), /*#__PURE__*/_react["default"].createElement(_reactAdmin.SimpleShowLayout, null, (0, _utils.processAdmin)("show-fields", fields, resource)));
   };
 }));
+
+/* Actions */
+(0, _utils.setupAdmin)("show-actions", function (_ref2) {
+  var actions = _ref2.actions,
+    resource = _ref2.resource;
+  return /*#__PURE__*/_react["default"].createElement(_reactAdmin.TopToolbar, null, actions.map(function (props, idx) {
+    return /*#__PURE__*/_react["default"].createElement(_ActionButton.ActionButton, (0, _extends2["default"])({
+      key: idx,
+      resource: resource
+    }, props));
+  }), /*#__PURE__*/_react["default"].createElement(_reactAdmin.ListButton, null), /*#__PURE__*/_react["default"].createElement(_reactAdmin.EditButton, null));
+});
+
+/* Fields */
 (0, _utils.setupAdmin)("show-fields", _ui["default"]);

package/dist/esm/index.js

@@ -4,6 +4,7 @@ import { createRoot } from "react-dom/client";
 import "./admin";
 import { processAdmin } from "./utils";
 export * from "./utils";
+export { buildRAComponent } from "./ui";
 export function initAdmin() {
   return _initAdmin.apply(this, arguments);
 }

package/dist/esm/ui.js

@@ -1,7 +1,5 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React from "react";
 import { required } from "react-admin";
 import { BooleanField, ChipField, DateField, EmailField, ImageField, FileField, NumberField, RichTextField, TextField, UrlField, SelectField, ArrayField, ReferenceField, ReferenceManyField, ReferenceArrayField } from "react-admin";
@@ -11,7 +9,7 @@ import FKField from "./fields/FKField";
 import FKInput from "./inputs/FKInput";
 import JsonField from "./fields/JsonField";
 import JsonInput from "./inputs/JsonInput";
-var ui = {
+var UI = {
   // Fields
   BooleanField: BooleanField,
   ChipField: ChipField,
@@ -52,20 +50,21 @@ var ui = {
   JsonInput: JsonInput,
   FKInput: FKInput
 };
-var initRAItems = function initRAItems(itemsProps) {
-  return itemsProps.map(function (item) {
-    var _props$fullWidth;
-    var Item = ui[item[0]],
-      props = _objectSpread({}, item[1]);
-    if (props.required) {
-      props.validate = required();
-      delete props.required;
-    }
-    props.fullWidth = (_props$fullWidth = props.fullWidth) !== null && _props$fullWidth !== void 0 ? _props$fullWidth : true;
-    if (props.children) props.children = initRAItems(props.children)[0];
-    return /*#__PURE__*/React.createElement(Item, _extends({
-      key: props.source
-    }, props));
+export function buildRAComponent(name, props) {
+  var _props$fullWidth;
+  var Item = UI[name];
+  if (props.required) {
+    props.validate = required();
+    delete props.required;
+  }
+  props.fullWidth = (_props$fullWidth = props.fullWidth) !== null && _props$fullWidth !== void 0 ? _props$fullWidth : true;
+  if (props.children) props.children = initRAItems(props.children)[0];
+  return /*#__PURE__*/React.createElement(Item, _extends({
+    key: props.source
+  }, props));
+}
+export default function initRAItems(items) {
+  return items.map(function (item) {
+    return buildRAComponent.apply(void 0, _toConsumableArray(item));
   });
-};
-export default initRAItems;
+}

package/dist/esm/views/edit.js

@@ -1,9 +1,4 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
-var _excluded = ["basePath", "resource"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 import React from "react";
 import { Edit, ListButton, ShowButton, SimpleForm, TopToolbar } from "react-admin";
 import initRAItems from "../ui";
@@ -17,18 +12,11 @@ setupAdmin("edit", checkParams(function (props, name) {
   var actions = edit.actions,
     inputs = edit.inputs;
   function MAEdit(props) {
-    var Actions = function Actions(_ref) {
-      var basePath = _ref.basePath,
-        resource = _ref.resource,
-        baseProps = _objectWithoutProperties(_ref, _excluded);
+    var Actions = function Actions() {
       return /*#__PURE__*/React.createElement(TopToolbar, null, actions.map(function (props, idx) {
-        var aProps = _objectSpread(_objectSpread({
-          resource: resource,
-          basePath: basePath
-        }, baseProps), props);
         return /*#__PURE__*/React.createElement(ActionButton, _extends({
           key: idx
-        }, aProps));
+        }, props));
       }), /*#__PURE__*/React.createElement(ListButton, null), /*#__PURE__*/React.createElement(ShowButton, null));
     };
     return /*#__PURE__*/React.createElement(Edit, _extends({

package/dist/esm/views/show.js

@@ -10,17 +10,26 @@ setupAdmin("show", checkParams(function (_ref, resource) {
   var actions = _ref.actions,
     fields = _ref.fields;
   return function MAShow(props) {
-    var Actions = function Actions() {
-      return /*#__PURE__*/React.createElement(TopToolbar, null, actions.map(function (props, idx) {
-        return /*#__PURE__*/React.createElement(ActionButton, _extends({
-          key: idx,
-          resource: resource
-        }, props));
-      }), /*#__PURE__*/React.createElement(ListButton, null), /*#__PURE__*/React.createElement(EditButton, null));
-    };
     return /*#__PURE__*/React.createElement(Show, _extends({
-      actions: /*#__PURE__*/React.createElement(Actions, null)
+      actions: processAdmin("show-actions", {
+        actions: actions,
+        resource: resource
+      }, resource)
     }, props), /*#__PURE__*/React.createElement(SimpleShowLayout, null, processAdmin("show-fields", fields, resource)));
   };
 }));
+
+/* Actions */
+setupAdmin("show-actions", function (_ref2) {
+  var actions = _ref2.actions,
+    resource = _ref2.resource;
+  return /*#__PURE__*/React.createElement(TopToolbar, null, actions.map(function (props, idx) {
+    return /*#__PURE__*/React.createElement(ActionButton, _extends({
+      key: idx,
+      resource: resource
+    }, props));
+  }), /*#__PURE__*/React.createElement(ListButton, null), /*#__PURE__*/React.createElement(EditButton, null));
+});
+
+/* Fields */
 setupAdmin("show-fields", initRAItems);

package/package.json

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

package/src/index.js

@@ -4,6 +4,7 @@ import "./admin"
 import { processAdmin } from "./utils"
 
 export * from "./utils"
+export { buildRAComponent } from "./ui"
 
 export async function initAdmin(prefix = "") {
   const response = await fetch(`${prefix}/ra.json`)

package/src/ui.jsx

@@ -44,7 +44,7 @@ import FKInput from "./inputs/FKInput"
 import JsonField from "./fields/JsonField"
 import JsonInput from "./inputs/JsonInput"
 
-const ui = {
+const UI = {
   // Fields
   BooleanField,
   ChipField,
@@ -87,21 +87,21 @@ const ui = {
   FKInput,
 }
 
-const initRAItems = (itemsProps) =>
-  itemsProps.map((item) => {
-    const Item = ui[item[0]],
-      props = { ...item[1] }
+export function buildRAComponent(name, props) {
+  const Item = UI[name]
 
-    if (props.required) {
-      props.validate = required()
-      delete props.required
-    }
+  if (props.required) {
+    props.validate = required()
+    delete props.required
+  }
 
-    props.fullWidth = props.fullWidth ?? true
+  props.fullWidth = props.fullWidth ?? true
 
-    if (props.children) props.children = initRAItems(props.children)[0]
+  if (props.children) props.children = initRAItems(props.children)[0]
 
-    return <Item key={props.source} {...props} />
-  })
+  return <Item key={props.source} {...props} />
+}
 
-export default initRAItems
+export default function initRAItems(items) {
+  return items.map((item) => buildRAComponent(...item))
+}

package/src/views/edit.jsx

@@ -20,11 +20,10 @@ setupAdmin(
     let { actions, inputs } = edit
 
     function MAEdit(props) {
-      const Actions = ({ basePath, resource, ...baseProps }) => (
+      const Actions = () => (
         <TopToolbar>
           {actions.map((props, idx) => {
-            let aProps = { resource, basePath, ...baseProps, ...props }
-            return <ActionButton key={idx} {...aProps} />
+            return <ActionButton key={idx} {...props} />
           })}
           <ListButton />
           <ShowButton />

package/src/views/show.jsx

@@ -18,18 +18,15 @@ setupAdmin(
   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}>
+          <Show
+            actions={processAdmin(
+              "show-actions",
+              { actions, resource },
+              resource
+            )}
+            {...props}
+          >
             <SimpleShowLayout>
               {processAdmin("show-fields", fields, resource)}
             </SimpleShowLayout>
@@ -39,4 +36,16 @@ setupAdmin(
   )
 )
 
+/* Actions */
+setupAdmin("show-actions", ({ actions, resource }) => (
+  <TopToolbar>
+    {actions.map((props, idx) => (
+      <ActionButton key={idx} resource={resource} {...props} />
+    ))}
+    <ListButton />
+    <EditButton />
+  </TopToolbar>
+))
+
+/* Fields */
 setupAdmin("show-fields", initRAItems)