muffin-admin 6.1.3 → 7.0.0

package/dist/MuffinResource.js

@@ -19,6 +19,10 @@ export function MuffinResource(_a) {
     const opts = adminOpts === null || adminOpts === void 0 ? void 0 : adminOpts.resources.find((r) => r.name == name);
     if (!opts)
         return null;
-    return (_jsx(Resource, Object.assign({ name: name, icon: findIcon(opts.icon), create: findBuilder(["create", name]), edit: findBuilder(["edit", name]), list: findBuilder(["list", name]), show: findBuilder(["show", name]) }, props), name));
+    const Create = findBuilder(["create", name]);
+    const Edit = findBuilder(["edit", name]);
+    const List = findBuilder(["list", name]);
+    const Show = findBuilder(["show", name]);
+    return (_jsx(Resource, Object.assign({ name: name, icon: findIcon(opts.icon), create: Create, edit: Edit, list: List, show: Show }, props), name));
 }
 setupAdmin(["resource"], MuffinResource);

package/dist/MuffinResourceEdit.d.ts

@@ -1,4 +1,6 @@
 import { PropsWithChildren } from "react";
 export declare function MuffinEdit({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function MuffinEditFormToolbar(): import("react/jsx-runtime").JSX.Element;
+export declare function MuffinEditInputs(): import("react/jsx-runtime").JSX.Element;
 export declare function MuffinEditToolbar({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;
 export declare function MuffinEditActions({ children }: PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/MuffinResourceEdit.js

@@ -3,20 +3,34 @@ import { DeleteButton, Edit, ListButton, SaveButton, ShowButton, SimpleForm, Too
 import { buildRA } from "./buildRA";
 import { ActionButton } from "./buttons";
 import { useMuffinAdminOpts, useMuffinResourceOpts } from "./hooks";
-import { buildAdmin, findBuilder, setupAdmin } from "./utils";
+import { findBuilder, setupAdmin } from "./utils";
 export function MuffinEdit({ children }) {
     const { adminProps: { mutationMode = "optimistic" }, } = useMuffinAdminOpts();
     const { edit, name } = useMuffinResourceOpts();
     if (!edit)
         return null;
-    const { inputs, remove } = edit;
-    const ActionsToolbar = findBuilder(["edit-toolbar", name]);
-    return (_jsxs(Edit, { actions: _jsx(ActionsToolbar, {}), mutationMode: mutationMode, children: [children, _jsx(SimpleForm, { toolbar: _jsxs(Toolbar, { children: [_jsx(SaveButton, {}), remove && (_jsx(DeleteButton, { sx: {
-                                marginLeft: "auto",
-                            } }))] }), children: buildAdmin(["edit-inputs", name], inputs) })] }));
+    const Actions = findBuilder(["edit-toolbar", name]);
+    const Inputs = findBuilder(["edit-inputs", name]);
+    const FormToolbar = findBuilder(["edit-form-toolbar", name]);
+    return (_jsxs(Edit, { actions: _jsx(Actions, {}), mutationMode: mutationMode, children: [children, _jsx(SimpleForm, { toolbar: _jsx(FormToolbar, {}), children: _jsx(Inputs, {}) })] }));
 }
 setupAdmin(["edit"], MuffinEdit);
-setupAdmin(["edit-inputs"], buildRA);
+export function MuffinEditFormToolbar() {
+    const { edit } = useMuffinResourceOpts();
+    if (!edit)
+        return null;
+    const { remove } = edit;
+    return (_jsxs(Toolbar, { children: [_jsx(SaveButton, {}), remove && _jsx(DeleteButton, { sx: { marginLeft: "auto" } })] }));
+}
+setupAdmin(["edit-form-toolbar"], MuffinEditFormToolbar);
+export function MuffinEditInputs() {
+    const { edit } = useMuffinResourceOpts();
+    if (!edit)
+        return null;
+    const { inputs } = edit;
+    return _jsx(_Fragment, { children: buildRA(inputs) });
+}
+setupAdmin(["edit-inputs"], MuffinEditInputs);
 export function MuffinEditToolbar({ children }) {
     const resource = useResourceContext();
     const Actions = findBuilder(["edit-actions", resource]);

package/dist/MuffinResourceList.js

@@ -2,21 +2,28 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import sortBy from "lodash/sortBy";
 import uniq from "lodash/uniq";
 import { BulkDeleteButton, BulkExportButton, CreateButton, DatagridConfigurable, EditButton, ExportButton, FilterButton, InfiniteList, List, Pagination, SelectColumnsButton, TopToolbar, } from "react-admin";
-import { buildRA } from "./buildRA";
+import { buildRA, buildRAComponent } from "./buildRA";
 import { BulkActionButton, ListActionButton } from "./buttons";
 import { HelpLink } from "./common/HelpLink";
 import { useMuffinResourceOpts } from "./hooks";
 import { buildAdmin, findBuilder, setupAdmin } from "./utils";
 export function MuffinList({ children }) {
     const { name, list } = useMuffinResourceOpts();
-    const { limit, limitMax, limitTotal, filters, sort } = list;
+    const { limit, limitMax, limitTotal, sort, filters } = list;
     const DataGrid = findBuilder(["list-grid", name]);
     const Toolbar = findBuilder(["list-toolbar", name]);
-    return limitTotal ? (_jsxs(List, { sort: sort, perPage: limit, actions: _jsx(Toolbar, {}), filters: buildAdmin(["list-filters", name], filters), pagination: _jsx(Pagination, { rowsPerPageOptions: sortBy(uniq([10, 25, 50, 100, limit, limitMax])) }), children: [children, _jsx(DataGrid, {})] })) : (_jsxs(InfiniteList, { sort: sort, perPage: limit, actions: _jsx(Toolbar, {}), filters: buildAdmin(["list-filters", name], filters), children: [children, _jsx(DataGrid, {})] }));
+    const raFilters = buildAdmin(["list-filters", name], filters);
+    return limitTotal ? (_jsxs(List, { sort: sort, perPage: limit, filters: raFilters, actions: _jsx(Toolbar, {}), pagination: _jsx(Pagination, { rowsPerPageOptions: sortBy(uniq([10, 25, 50, 100, limit, limitMax])) }), children: [children, _jsx(DataGrid, {})] })) : (_jsxs(InfiniteList, { sort: sort, perPage: limit, actions: _jsx(Toolbar, {}), filters: raFilters, children: [children, _jsx(DataGrid, {})] }));
 }
 setupAdmin(["list"], MuffinList);
 setupAdmin(["list-fields"], buildRA);
-setupAdmin(["list-filters"], buildRA);
+function muffinListFilters(filters) {
+    return filters.map((props) => {
+        const [rtype, opts] = props;
+        return buildRAComponent(rtype, Object.assign(Object.assign({}, opts), { variant: "outlined" }));
+    });
+}
+setupAdmin(["list-filters"], muffinListFilters);
 function MuffinListDatagrid() {
     const { name, list } = useMuffinResourceOpts();
     const { fields, edit, show } = list;
@@ -47,6 +54,3 @@ function MuffinListActions() {
     return (_jsxs(_Fragment, { children: [actions.map((props) => (_jsx(BulkActionButton, Object.assign({}, props), props.id))), _jsx(BulkExportButton, {}), remove && _jsx(BulkDeleteButton, {})] }));
 }
 setupAdmin(["list-actions"], MuffinListActions);
-function MuffinPagination() {
-    return null;
-}

package/dist/MuffinResourceShow.js

@@ -7,10 +7,10 @@ import { useMuffinResourceOpts } from "./hooks";
 import { buildAdmin, findBuilder, setupAdmin } from "./utils";
 export function MuffinShow({ children }) {
     const { show, name } = useMuffinResourceOpts();
-    const ActionsToolbar = findBuilder(["show-toolbar", name]);
-    return (_jsxs(Show, { actions: _jsx(ActionsToolbar, {}), children: [children, _jsx(SimpleShowLayout, { children: buildAdmin(["show-fields", name], show) })] }));
+    const ShowToolbar = findBuilder(["show-toolbar", name]);
+    return (_jsxs(Show, { actions: _jsx(ShowToolbar, {}), children: [children, _jsx(SimpleShowLayout, { children: buildAdmin(["show-fields", name], show) })] }));
 }
-setupAdmin(["show"], (props) => _jsx(MuffinShow, Object.assign({}, props)));
+setupAdmin(["show"], MuffinShow);
 setupAdmin(["show-fields"], ({ fields }) => buildRA(fields));
 export function MuffinShowToolbar({ children }) {
     const { show, name } = useMuffinResourceOpts();

package/dist/buildRA.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { ArrayField, ArrayInput, AutocompleteArrayInput, AutocompleteInput, BooleanField, BooleanInput, CheckboxGroupInput, ChipField, DateField, DateInput, DateTimeInput, EmailField, FileField, FileInput, ImageField, ImageInput, NullableBooleanInput, NumberField, NumberInput, PasswordInput, RadioButtonGroupInput, ReferenceArrayField, ReferenceArrayInput, ReferenceField, ReferenceInput, ReferenceManyField, RichTextField, SelectField, SelectInput, TextField, TextInput, UrlField, required, } from "react-admin";
+import { ArrayField, ArrayInput, AutocompleteArrayInput, AutocompleteInput, BooleanField, BooleanInput, CheckboxGroupInput, ChipField, DateField, DateInput, DateTimeInput, EmailField, FileField, FileInput, ImageField, ImageInput, NullableBooleanInput, NumberField, NumberInput, PasswordInput, RadioButtonGroupInput, ReferenceArrayField, ReferenceArrayInput, ReferenceField, ReferenceInput, ReferenceManyField, required, RichTextField, SelectArrayInput, SelectField, SelectInput, TextField, TextInput, UrlField, } from "react-admin";
 import { AvatarField, EditableBooleanField, FKField, JsonField } from "./fields";
-import { FKInput, JsonInput } from "./inputs";
+import { FilterInput, FKInput, JsonInput } from "./inputs";
 const UI = {
     // Fields
     BooleanField,
@@ -24,25 +24,27 @@ const UI = {
     FKField,
     JsonField,
     // Inputs
+    ArrayInput,
+    AutocompleteArrayInput,
+    AutocompleteInput,
     BooleanInput,
-    NullableBooleanInput,
+    CheckboxGroupInput,
     DateInput,
+    FilterInput,
     DateTimeInput,
-    ImageInput,
+    FKInput,
     FileInput,
+    ImageInput,
+    JsonInput,
+    NullableBooleanInput,
     NumberInput,
     PasswordInput,
-    TextInput,
-    AutocompleteInput,
     RadioButtonGroupInput,
-    SelectInput,
-    ArrayInput,
-    AutocompleteArrayInput,
-    CheckboxGroupInput,
     ReferenceArrayInput,
     ReferenceInput,
-    JsonInput,
-    FKInput,
+    SelectInput,
+    TextInput,
+    SelectArrayInput,
 };
 export function buildRAComponent(name, props) {
     const Item = UI[name];

package/dist/dataprovider.d.ts

@@ -85,7 +85,7 @@ export declare function MuffinDataprovider(apiUrl: string): {
         total?: undefined;
         pageInfo?: undefined;
     }>;
-    runAction: (resource: string, action: string, props: TActionProps) => Promise<{
+    runAction: (_: string, action: string, props: TActionProps) => Promise<{
         data: any;
     }>;
 };

package/dist/dataprovider.js

@@ -33,8 +33,12 @@ export function MuffinDataprovider(apiUrl) {
         getList: (resource, params) => __awaiter(this, void 0, void 0, function* () {
             const { filter, pagination, sort } = params;
             const query = {};
-            if (filter)
-                query.where = JSON.stringify(filter);
+            if (filter) {
+                query.where = JSON.stringify(Object.entries(filter).reduce((acc, [key, value]) => {
+                    acc[key] = Array.isArray(value) ? { $in: value } : value;
+                    return acc;
+                }, {}));
+            }
             if (pagination) {
                 const { page, perPage: limit } = pagination;
                 query.limit = limit;
@@ -97,7 +101,7 @@ export function MuffinDataprovider(apiUrl) {
             filter[target] = id;
             return yield methods.getList(resource, Object.assign({ filter }, opts));
         }),
-        runAction: (resource, action, props) => __awaiter(this, void 0, void 0, function* () {
+        runAction: (_, action, props) => __awaiter(this, void 0, void 0, function* () {
             const { payload, ids, record } = props;
             action = action.replace(/^\/+/, "");
             if (record) {

package/dist/inputs/FilterInput.d.ts

@@ -0,0 +1 @@
+export declare function FilterInput({ type, ...props }: any): import("react/jsx-runtime").JSX.Element;

package/dist/inputs/FilterInput.js

@@ -0,0 +1,42 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import Button from "@mui/material/Button";
+import FormGroup from "@mui/material/FormGroup";
+import Menu from "@mui/material/Menu";
+import MenuItem from "@mui/material/MenuItem";
+import TextField from "@mui/material/TextField";
+import { useState } from "react";
+import { useInput } from "react-admin";
+const OPERATORS = {
+    $eq: "=",
+    $ne: "≠",
+    $gt: ">",
+    $ge: "≥",
+    $lt: "<",
+    $le: "≤",
+};
+export function FilterInput(_a) {
+    var { type = "text" } = _a, props = __rest(_a, ["type"]);
+    const { field } = useInput(Object.assign({ format: (value) => (value ? value[Object.keys(value)[0]] : "") }, props));
+    const [op, setOp] = useState((field.value && Object.keys(field.value)[0]) || "$eq");
+    const onChange = function (e) {
+        field.onChange({ [op]: e.target.value });
+    };
+    const [menuEl, setMenuEl] = useState(null);
+    const open = Boolean(menuEl);
+    return (_jsxs(_Fragment, { children: [_jsxs(FormGroup, { row: true, sx: { flexWrap: "nowrap" }, children: [_jsx(Button, { size: "small", disableElevation: true, sx: { minWidth: 30 }, onClick: (e) => setMenuEl(e.currentTarget), children: _jsx("span", { style: { fontSize: "1.5em" }, children: OPERATORS[op] }) }), _jsx(TextField, Object.assign({}, field, { onChange: onChange, value: field.value, variant: "outlined", type: type }))] }), _jsx(Menu, { open: open, onClose: () => setMenuEl(null), anchorEl: menuEl, children: Object.entries(OPERATORS).map(([key, value]) => (_jsx(MenuItem, { selected: op === value, onClick: () => {
+                        setOp(key);
+                        setMenuEl(null);
+                        field.onChange({ [key]: field.value });
+                    }, children: value }, key))) })] }));
+}

package/dist/inputs/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./FilterInput";
 export * from "./FKInput";
 export * from "./JsonInput";

package/dist/inputs/index.js

@@ -1,2 +1,3 @@
+export * from "./FilterInput";
 export * from "./FKInput";
 export * from "./JsonInput";