muffin-admin 9.5.4 → 10.0.1

package/dist/MuffinDashboard.js

@@ -23,10 +23,10 @@ setupAdmin(["dashboard-actions"], () => null);
 setupAdmin(["dashboard-content"], () => null);
 function AdminCards({ src }) {
     if (Array.isArray(src))
-        return (_jsx(Grid, { container: true, item: true, spacing: 2, children: src.map((card, idx) => (_jsx(AdminCards, { src: card }, idx))) }));
+        return (_jsx(Grid, { container: true, spacing: 2, children: src.map((card, idx) => (_jsx(AdminCards, { src: card }, idx))) }));
     return _jsx(DashboardCard, Object.assign({}, src));
 }
 function DashboardCard({ title, value }) {
-    return (_jsx(Grid, { item: true, xs: true, children: _jsx(Card, { children: _jsxs(CardContent, { children: [_jsx(Typography, { variant: "h5", component: "h2", m: 2, style: { textAlign: "center" }, children: title }), (Array.isArray(value) && _jsx(AdminTableView, { src: value })) || (_jsx("pre", { children: JSON.stringify(value, null, 2) }))] }) }) }));
+    return (_jsx(Card, { children: _jsxs(CardContent, { children: [_jsx(Typography, { variant: "h5", component: "h2", m: 2, style: { textAlign: "center" }, children: title }), (Array.isArray(value) && _jsx(AdminTableView, { src: value })) || (_jsx("pre", { children: JSON.stringify(value, null, 2) }))] }) }));
 }
-const AdminTableView = ({ src }) => (_jsx(Table, { children: _jsx(TableBody, { children: src.map((row, idx) => (_jsx(TableRow, { hover: true, children: row.map((cell, idx) => (_jsx(TableCell, { children: cell }, idx))) }, idx))) }) }));
+const AdminTableView = ({ src }) => (_jsx(Table, { width: "100%", sx: { tableLayout: "fixed" }, children: _jsx(TableBody, { children: src.map((row, idx) => (_jsx(TableRow, { hover: true, children: row.map((cell, idx) => (_jsx(TableCell, { children: cell }, idx))) }, idx))) }) }));

package/dist/MuffinResourceEdit.js

@@ -6,13 +6,13 @@ import { useMuffinAdminOpts, useMuffinResourceOpts } from "./hooks";
 import { findBuilder, setupAdmin } from "./utils";
 export function MuffinEdit({ children }) {
     const { adminProps: { mutationMode = "optimistic" }, } = useMuffinAdminOpts();
-    const { edit, name } = useMuffinResourceOpts();
+    const { edit, name, pk } = useMuffinResourceOpts();
     if (!edit)
         return null;
     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, {}) })] }));
+    return (_jsxs(Edit, { actions: _jsx(Actions, {}), mutationMode: mutationMode, queryOptions: { meta: { key: pk } }, children: [children, _jsx(SimpleForm, { toolbar: _jsx(FormToolbar, {}), children: _jsx(Inputs, {}) })] }));
 }
 setupAdmin(["edit"], MuffinEdit);
 export function MuffinEditFormToolbar() {

package/dist/MuffinResourceList.js

@@ -8,12 +8,12 @@ import { HelpLink } from "./common/HelpLink";
 import { useMuffinResourceOpts } from "./hooks";
 import { buildAdmin, findBuilder, setupAdmin } from "./utils";
 export function MuffinList({ children }) {
-    const { name, list } = useMuffinResourceOpts();
+    const { name, list, pk } = useMuffinResourceOpts();
     const { limit, limitMax, limitTotal, sort, filters } = list;
     const DataGrid = findBuilder(["list-grid", name]);
     const Toolbar = findBuilder(["list-toolbar", name]);
     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, {})] }));
+    return limitTotal ? (_jsxs(List, { sort: sort, perPage: limit, filters: raFilters, actions: _jsx(Toolbar, {}), queryOptions: { meta: { key: pk } }, pagination: _jsx(Pagination, { rowsPerPageOptions: sortBy(uniq([10, 25, 50, 100, limit, limitMax])) }), children: [children, _jsx(DataGrid, {})] })) : (_jsxs(InfiniteList, { sort: sort, perPage: limit, filters: raFilters, actions: _jsx(Toolbar, {}), queryOptions: { meta: { key: pk } }, children: [children, _jsx(DataGrid, {})] }));
 }
 setupAdmin(["list"], MuffinList);
 setupAdmin(["list-fields"], buildRA);

package/dist/MuffinResourceShow.js

@@ -6,9 +6,9 @@ import { ActionButton } from "./buttons";
 import { useMuffinResourceOpts } from "./hooks";
 import { buildAdmin, findBuilder, setupAdmin } from "./utils";
 export function MuffinShow({ children }) {
-    const { show, name } = useMuffinResourceOpts();
+    const { show, name, pk } = useMuffinResourceOpts();
     const ShowToolbar = findBuilder(["show-toolbar", name]);
-    return (_jsxs(Show, { actions: _jsx(ShowToolbar, {}), children: [_jsx(SimpleShowLayout, { children: buildAdmin(["show-fields", name], show) }), children] }));
+    return (_jsxs(Show, { actions: _jsx(ShowToolbar, {}), queryOptions: { meta: { key: pk } }, children: [_jsx(SimpleShowLayout, { children: buildAdmin(["show-fields", name], show) }), children] }));
 }
 setupAdmin(["show"], MuffinShow);
 setupAdmin(["show-fields"], ({ fields }) => buildRA(fields));

package/dist/dataprovider.d.ts

@@ -1,11 +1,14 @@
 import { TID } from "./types";
 import { APIParams } from "./utils";
+type TQueryMeta = {
+    key?: string;
+};
 export declare function MuffinDataprovider(apiUrl: string): {
     request: (url: string, options?: APIParams) => Promise<{
         data: any;
         headers: Headers;
     }>;
-    getList: (resource: string, params: any) => Promise<{
+    getList: (resource: string, { meta, ...params }: any) => Promise<{
         data: any;
         total: number;
         pageInfo: {
@@ -17,8 +20,9 @@ export declare function MuffinDataprovider(apiUrl: string): {
         total?: undefined;
         pageInfo?: undefined;
     }>;
-    getOne: (resource: string, { id }: {
+    getOne: (resource: string, { id, meta }: {
         id: TID;
+        meta?: TQueryMeta;
     }) => Promise<{
         data: any;
         headers: Headers;
@@ -94,3 +98,4 @@ export type TActionProps<T = any> = {
     ids?: string[];
     record?: T;
 };
+export {};

package/dist/dataprovider.js

@@ -30,7 +30,9 @@ export function MuffinDataprovider(apiUrl) {
     }
     const methods = {
         request,
-        getList: (resource, params) => __awaiter(this, void 0, void 0, function* () {
+        getList: (resource, _a) => __awaiter(this, void 0, void 0, function* () {
+            var _b;
+            var { meta } = _a, params = __rest(_a, ["meta"]);
             const { filter, pagination, sort } = params;
             const query = {};
             if (filter)
@@ -45,6 +47,12 @@ export function MuffinDataprovider(apiUrl) {
                 query.sort = order == "ASC" ? field : `-${field}`;
             }
             const { headers, data } = yield request(resource, { query });
+            // React-admin requires item to have an `id` field
+            if (meta === null || meta === void 0 ? void 0 : meta.key) {
+                for (const item of data) {
+                    item.id = (_b = item.id) !== null && _b !== void 0 ? _b : item[meta.key];
+                }
+            }
             if (pagination)
                 return {
                     data,
@@ -56,8 +64,14 @@ export function MuffinDataprovider(apiUrl) {
                 };
             return { data };
         }),
-        getOne: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { id }) {
-            return yield request(`${resource}/${id}`);
+        getOne: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { id, meta }) {
+            var _b;
+            const response = yield request(`${resource}/${id}`);
+            const { data } = response;
+            if (meta === null || meta === void 0 ? void 0 : meta.key) {
+                data.id = (_b = data.id) !== null && _b !== void 0 ? _b : data[meta.key];
+            }
+            return response;
         }),
         create: (resource_1, _a) => __awaiter(this, [resource_1, _a], void 0, function* (resource, { data }) {
             return yield request(resource, {
@@ -89,7 +103,7 @@ export function MuffinDataprovider(apiUrl) {
         getMany: (resource, props) => {
             const { ids, meta } = props;
             const key = (meta === null || meta === void 0 ? void 0 : meta.key) || "id";
-            return methods.getList(resource, { filter: { [key]: { $in: ids } } });
+            return methods.getList(resource, { filter: { [key]: { $in: ids } }, meta });
         },
         getManyReference: (resource, _a) => __awaiter(this, void 0, void 0, function* () {
             var { target, id, filter } = _a, opts = __rest(_a, ["target", "id", "filter"]);
@@ -104,7 +118,7 @@ export function MuffinDataprovider(apiUrl) {
                 action = action.replace(/\{([^}]+)\}/, (_, field) => record[field]);
             }
             const { json } = yield makeRequest(`${apiUrl}/${action}`, {
-                query: { ids },
+                query: { pks: ids },
                 method: "POST",
                 data: payload,
             });

package/dist/fields/FKField.js

@@ -13,6 +13,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { ReferenceField, TextField } from "react-admin";
 export function FKField(_a) {
     var { reference, refSource, refKey, link, source } = _a, props = __rest(_a, ["reference", "refSource", "refKey", "link", "source"]);
-    return (_jsx(ReferenceField, Object.assign({ source: source, link: link || "show", reference: reference, queryOptions: { meta: { key: refKey } } }, props, { children: _jsxs(_Fragment, { children: [_jsx(TextField, { source: refSource }), " (#", _jsx(TextField, { source: refKey || "id" }), ")"] }) })));
+    refKey = refKey || "id";
+    return (_jsx(ReferenceField, Object.assign({ source: source, link: link || "show", reference: reference, queryOptions: { meta: { key: refKey } } }, props, { children: _jsxs(_Fragment, { children: [_jsx(TextField, { source: refSource }), refSource !== refKey && (_jsxs(_Fragment, { children: [" (#", _jsx(TextField, { source: refKey }), ")"] }))] }) })));
 }
 FKField.displayName = "FKField";

package/dist/index.d.ts

@@ -19,4 +19,4 @@ export * from "./fields";
 export * from "./hooks";
 export * from "./types";
 export declare function initAdmin(prefix?: string, containerId?: string): Promise<void>;
-export declare const VERSION = "9.5.4";
+export declare const VERSION = "10.0.1";

package/dist/index.js

@@ -42,4 +42,4 @@ export function initAdmin() {
         root.render(_jsx(MuffinAdminContext.Provider, { value: adminOpts, children: _jsx(MuffinAdmin, {}) }));
     });
 }
-export const VERSION = "9.5.4";
+export const VERSION = "10.0.1";

package/dist/inputs/FKInput.js

@@ -26,5 +26,7 @@ export function FKInput(_a) {
             return `#${pk}`;
         return (pk && `${record[refSource]} (#${pk})`) || "";
     };
-    return (_jsx(ReferenceInput, { reference: reference, source: source, children: _jsx(AutocompleteInput, Object.assign({ source: refKey, optionText: renderText, fullWidth: fullWidth, sx: { minWidth: 300 } }, props)) }));
+    return (_jsx(ReferenceInput, { reference: reference, source: source, queryOptions: {
+            meta: { key: refKey },
+        }, children: _jsx(AutocompleteInput, Object.assign({ source: refKey, optionText: renderText, fullWidth: fullWidth, sx: { minWidth: 300 } }, props)) }));
 }