@terreno/admin-frontend 0.11.6 → 0.11.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/AdminFieldRenderer.d.ts +9 -1
- package/dist/AdminFieldRenderer.js +10 -6
- package/dist/AdminFieldRenderer.js.map +1 -1
- package/dist/AdminModelForm.d.ts +7 -0
- package/dist/AdminModelForm.js +2 -2
- package/dist/AdminModelForm.js.map +1 -1
- package/dist/AdminModelTable.d.ts +7 -0
- package/dist/AdminModelTable.js +4 -2
- package/dist/AdminModelTable.js.map +1 -1
- package/dist/AdminNestedArrayField.d.ts +3 -1
- package/dist/AdminNestedArrayField.js +3 -2
- package/dist/AdminNestedArrayField.js.map +1 -1
- package/dist/AdminPrimitiveArrayField.d.ts +7 -0
- package/dist/AdminPrimitiveArrayField.js +10 -3
- package/dist/AdminPrimitiveArrayField.js.map +1 -1
- package/dist/AdminRefField.d.ts +7 -14
- package/dist/AdminRefField.js.map +1 -1
- package/dist/AdminScriptList.js +1 -1
- package/dist/AdminScriptList.js.map +1 -1
- package/dist/AdminScriptRunModal.d.ts +3 -0
- package/dist/AdminScriptRunModal.js +42 -34
- package/dist/AdminScriptRunModal.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +26 -0
- package/dist/types.js.map +1 -1
- package/package.json +2 -2
- package/src/AdminFieldRenderer.test.tsx +50 -0
- package/src/AdminFieldRenderer.tsx +30 -3
- package/src/AdminModelForm.tsx +9 -1
- package/src/AdminModelTable.test.tsx +65 -0
- package/src/AdminModelTable.tsx +10 -1
- package/src/AdminNestedArrayField.tsx +6 -1
- package/src/AdminPrimitiveArrayField.tsx +36 -12
- package/src/AdminRefField.tsx +7 -13
- package/src/AdminScriptList.tsx +1 -0
- package/src/AdminScriptRunModal.test.tsx +129 -0
- package/src/AdminScriptRunModal.tsx +91 -33
- package/src/index.tsx +3 -1
- package/src/types.ts +28 -0
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { Box, Button, Heading, Icon, Modal, Spinner, Text } from "@terreno/ui";
|
|
2
|
+
import { Badge, Box, Button, Heading, Icon, Modal, Spinner, Text } from "@terreno/ui";
|
|
3
3
|
import { useCallback, useEffect, useRef, useState } from "react";
|
|
4
4
|
import { useAdminScripts } from "./useAdminScripts";
|
|
5
5
|
const POLL_INTERVAL_MS = 2000;
|
|
6
6
|
const isTerminalStatus = (status) => status === "completed" || status === "failed" || status === "cancelled";
|
|
7
|
-
export const AdminScriptRunModal = ({ baseUrl, api, scriptName, visible, onDismiss, }) => {
|
|
7
|
+
export const AdminScriptRunModal = ({ baseUrl, api, scriptName, scriptDescription, visible, onDismiss, dryRunOnly = false, }) => {
|
|
8
8
|
const [taskId, setTaskId] = useState(null);
|
|
9
|
-
const [phase, setPhase] = useState("
|
|
9
|
+
const [phase, setPhase] = useState("confirm");
|
|
10
|
+
const [isDryRun, setIsDryRun] = useState(false);
|
|
10
11
|
const [startError, setStartError] = useState(null);
|
|
11
|
-
const
|
|
12
|
+
const startingRef = useRef(false);
|
|
12
13
|
const { useRunScriptMutation, useGetScriptTaskQuery, useCancelScriptTaskMutation } = useAdminScripts(api, baseUrl);
|
|
13
14
|
const [runScript] = useRunScriptMutation();
|
|
14
15
|
const [cancelTask, { isLoading: isCancelling }] = useCancelScriptTaskMutation();
|
|
@@ -18,34 +19,14 @@ export const AdminScriptRunModal = ({ baseUrl, api, scriptName, visible, onDismi
|
|
|
18
19
|
skip: !taskId,
|
|
19
20
|
});
|
|
20
21
|
const task = taskData === null || taskData === void 0 ? void 0 : taskData.task;
|
|
21
|
-
//
|
|
22
|
-
useEffect(() => {
|
|
23
|
-
if (!visible || !scriptName || hasStartedRef.current) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
hasStartedRef.current = true;
|
|
27
|
-
setTaskId(null);
|
|
28
|
-
setPhase("running");
|
|
29
|
-
setStartError(null);
|
|
30
|
-
void (async () => {
|
|
31
|
-
var _a, _b;
|
|
32
|
-
try {
|
|
33
|
-
const result = await runScript({ name: scriptName, wetRun: true }).unwrap();
|
|
34
|
-
setTaskId(result.taskId);
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
const errData = err === null || err === void 0 ? void 0 : err.data;
|
|
38
|
-
const message = (_b = (_a = errData === null || errData === void 0 ? void 0 : errData.detail) !== null && _a !== void 0 ? _a : errData === null || errData === void 0 ? void 0 : errData.title) !== null && _b !== void 0 ? _b : "Failed to start script";
|
|
39
|
-
setStartError(message);
|
|
40
|
-
setPhase("done");
|
|
41
|
-
hasStartedRef.current = false;
|
|
42
|
-
}
|
|
43
|
-
})();
|
|
44
|
-
}, [visible, scriptName, runScript]);
|
|
45
|
-
// Reset when modal closes
|
|
22
|
+
// Reset modal state whenever it becomes hidden
|
|
46
23
|
useEffect(() => {
|
|
47
24
|
if (!visible) {
|
|
48
|
-
|
|
25
|
+
setTaskId(null);
|
|
26
|
+
setPhase("confirm");
|
|
27
|
+
setIsDryRun(false);
|
|
28
|
+
setStartError(null);
|
|
29
|
+
startingRef.current = false;
|
|
49
30
|
}
|
|
50
31
|
}, [visible]);
|
|
51
32
|
// Transition to done when task reaches terminal status
|
|
@@ -54,7 +35,31 @@ export const AdminScriptRunModal = ({ baseUrl, api, scriptName, visible, onDismi
|
|
|
54
35
|
setPhase("done");
|
|
55
36
|
}
|
|
56
37
|
}, [task === null || task === void 0 ? void 0 : task.status]);
|
|
57
|
-
const
|
|
38
|
+
const startRun = useCallback(async (wetRun) => {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
if (!scriptName || startingRef.current) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
startingRef.current = true;
|
|
44
|
+
setIsDryRun(!wetRun);
|
|
45
|
+
setTaskId(null);
|
|
46
|
+
setStartError(null);
|
|
47
|
+
setPhase("running");
|
|
48
|
+
try {
|
|
49
|
+
const result = await runScript({ name: scriptName, wetRun }).unwrap();
|
|
50
|
+
setTaskId(result.taskId);
|
|
51
|
+
}
|
|
52
|
+
catch (err) {
|
|
53
|
+
const errData = err === null || err === void 0 ? void 0 : err.data;
|
|
54
|
+
const message = (_b = (_a = errData === null || errData === void 0 ? void 0 : errData.detail) !== null && _a !== void 0 ? _a : errData === null || errData === void 0 ? void 0 : errData.title) !== null && _b !== void 0 ? _b : "Failed to start script";
|
|
55
|
+
setStartError(message);
|
|
56
|
+
setPhase("done");
|
|
57
|
+
}
|
|
58
|
+
finally {
|
|
59
|
+
startingRef.current = false;
|
|
60
|
+
}
|
|
61
|
+
}, [scriptName, runScript]);
|
|
62
|
+
const handleCancelTask = useCallback(async () => {
|
|
58
63
|
if (!taskId) {
|
|
59
64
|
return;
|
|
60
65
|
}
|
|
@@ -65,9 +70,12 @@ export const AdminScriptRunModal = ({ baseUrl, api, scriptName, visible, onDismi
|
|
|
65
70
|
// Cancellation failed, task may already be done
|
|
66
71
|
}
|
|
67
72
|
}, [taskId, cancelTask]);
|
|
73
|
+
const renderConfirm = () => (_jsxs(Box, { gap: 4, paddingY: 4, children: [_jsx(Heading, { align: "center", size: "md", children: scriptName }), scriptDescription && (_jsx(Text, { align: "center", color: "secondaryDark", children: scriptDescription })), _jsx(Text, { align: "center", size: "sm", children: dryRunOnly
|
|
74
|
+
? "Dry runs simulate the script without persisting any changes."
|
|
75
|
+
: "Run a dry run first to preview changes, or run the script for real." }), _jsxs(Box, { direction: "row", gap: 2, justifyContent: "center", wrap: true, children: [_jsx(Button, { onClick: () => startRun(false), testID: "admin-script-dry-run-button", text: "Dry Run", variant: dryRunOnly ? "primary" : "secondary" }), !dryRunOnly && (_jsx(Button, { confirmationText: `Run "${scriptName}" for real? This will persist changes.`, onClick: () => startRun(true), testID: "admin-script-wet-run-button", text: "Run", variant: "primary", withConfirmation: true })), _jsx(Button, { onClick: onDismiss, testID: "admin-script-confirm-cancel-button", text: "Cancel", variant: "muted" })] })] }));
|
|
68
76
|
const renderRunning = () => {
|
|
69
77
|
var _a, _b, _c;
|
|
70
|
-
return (_jsxs(Box, { alignItems: "center", gap: 4, paddingY: 4, children: [_jsx(Heading, { align: "center", size: "md", children: scriptName }), _jsx(Spinner, { size: "md" }), ((_a = task === null || task === void 0 ? void 0 : task.progress) === null || _a === void 0 ? void 0 : _a.message) && _jsx(Text, { align: "center", children: task.progress.message }), ((_b = task === null || task === void 0 ? void 0 : task.progress) === null || _b === void 0 ? void 0 : _b.stage) && (_jsx(Text, { align: "center", color: "secondaryDark", size: "sm", children: task.progress.stage })), ((_c = task === null || task === void 0 ? void 0 : task.progress) === null || _c === void 0 ? void 0 : _c.percentage) !== undefined && task.progress.percentage > 0 && (_jsxs(Text, { align: "center", color: "secondaryDark", size: "sm", children: [task.progress.percentage, "%"] })), _jsx(Button, { disabled: isCancelling, loading: isCancelling, onClick:
|
|
78
|
+
return (_jsxs(Box, { alignItems: "center", gap: 4, paddingY: 4, children: [_jsx(Heading, { align: "center", size: "md", children: scriptName }), _jsx(Badge, { status: isDryRun ? "info" : "warning", value: isDryRun ? "Dry Run" : "Live Run" }), _jsx(Spinner, { size: "md" }), ((_a = task === null || task === void 0 ? void 0 : task.progress) === null || _a === void 0 ? void 0 : _a.message) && _jsx(Text, { align: "center", children: task.progress.message }), ((_b = task === null || task === void 0 ? void 0 : task.progress) === null || _b === void 0 ? void 0 : _b.stage) && (_jsx(Text, { align: "center", color: "secondaryDark", size: "sm", children: task.progress.stage })), ((_c = task === null || task === void 0 ? void 0 : task.progress) === null || _c === void 0 ? void 0 : _c.percentage) !== undefined && task.progress.percentage > 0 && (_jsxs(Text, { align: "center", color: "secondaryDark", size: "sm", children: [task.progress.percentage, "%"] })), _jsx(Button, { disabled: isCancelling || !taskId, loading: isCancelling, onClick: handleCancelTask, testID: "admin-script-cancel-button", text: "Cancel", variant: "destructive" })] }));
|
|
71
79
|
};
|
|
72
80
|
const renderDone = () => {
|
|
73
81
|
var _a, _b, _c;
|
|
@@ -79,9 +87,9 @@ export const AdminScriptRunModal = ({ baseUrl, api, scriptName, visible, onDismi
|
|
|
79
87
|
: "circle-xmark";
|
|
80
88
|
const iconColor = status === "completed" ? "success" : status === "cancelled" ? "warning" : "error";
|
|
81
89
|
const statusLabel = status === "completed" ? "Completed" : status === "cancelled" ? "Cancelled" : "Failed";
|
|
82
|
-
return (_jsxs(Box, { gap: 4, paddingY: 4, children: [_jsx(Heading, { align: "center", size: "md", children: scriptName }), _jsxs(Box, { alignItems: "center", gap: 2, children: [_jsx(Icon, { color: iconColor, iconName: iconName, size: "md" }), _jsx(Text, { align: "center", bold: true, children: statusLabel })] }), ((_b = task === null || task === void 0 ? void 0 : task.error) !== null && _b !== void 0 ? _b : startError) && (_jsx(Box, { color: "error", padding: 3, rounding: "md", children: _jsx(Text, { color: "inverted", size: "sm", children: (_c = task === null || task === void 0 ? void 0 : task.error) !== null && _c !== void 0 ? _c : startError }) })), (task === null || task === void 0 ? void 0 : task.result) && task.result.length > 0 && (_jsxs(Box, { gap: 1, maxHeight: 300, overflow: "scrollY", padding: 2, children: [_jsxs(Text, { bold: true, size: "sm", children: ["Results (", task.result.length, "):"] }), task.result.map((line, i) => (_jsx(Text, { color: "secondaryDark", size: "sm", children: line }, `${i}-${line.slice(0, 20)}`)))] }))] }));
|
|
90
|
+
return (_jsxs(Box, { gap: 4, paddingY: 4, children: [_jsx(Heading, { align: "center", size: "md", children: scriptName }), _jsxs(Box, { alignItems: "center", gap: 2, children: [_jsx(Badge, { status: isDryRun ? "info" : "warning", value: isDryRun ? "Dry Run" : "Live Run" }), _jsx(Icon, { color: iconColor, iconName: iconName, size: "md" }), _jsx(Text, { align: "center", bold: true, children: statusLabel })] }), ((_b = task === null || task === void 0 ? void 0 : task.error) !== null && _b !== void 0 ? _b : startError) && (_jsx(Box, { color: "error", padding: 3, rounding: "md", children: _jsx(Text, { color: "inverted", size: "sm", children: (_c = task === null || task === void 0 ? void 0 : task.error) !== null && _c !== void 0 ? _c : startError }) })), (task === null || task === void 0 ? void 0 : task.result) && task.result.length > 0 && (_jsxs(Box, { gap: 1, maxHeight: 300, overflow: "scrollY", padding: 2, children: [_jsxs(Text, { bold: true, size: "sm", children: ["Results (", task.result.length, "):"] }), task.result.map((line, i) => (_jsx(Text, { color: "secondaryDark", size: "sm", children: line }, `${i}-${line.slice(0, 20)}`)))] }))] }));
|
|
83
91
|
};
|
|
84
92
|
const isComplete = phase === "done";
|
|
85
|
-
return (_jsx(Modal, { onDismiss: onDismiss, persistOnBackgroundClick: !isComplete, primaryButtonOnClick: onDismiss, primaryButtonText: isComplete ? "Close" : undefined, visible: visible, children: _jsxs(Box, { minHeight: 200, padding: 2, children: [phase === "running" && renderRunning(), phase === "done" && renderDone()] }) }));
|
|
93
|
+
return (_jsx(Modal, { onDismiss: onDismiss, persistOnBackgroundClick: !isComplete, primaryButtonOnClick: isComplete ? onDismiss : undefined, primaryButtonText: isComplete ? "Close" : undefined, visible: visible, children: _jsxs(Box, { minHeight: 200, padding: 2, children: [phase === "confirm" && renderConfirm(), phase === "running" && renderRunning(), phase === "done" && renderDone()] }) }));
|
|
86
94
|
};
|
|
87
95
|
//# sourceMappingURL=AdminScriptRunModal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AdminScriptRunModal.js","sourceRoot":"","sources":["../src/AdminScriptRunModal.tsx"],"names":[],"mappings":";AACA,OAAO,EAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"AdminScriptRunModal.js","sourceRoot":"","sources":["../src/AdminScriptRunModal.tsx"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export { AdminModelTable } from "./AdminModelTable";
|
|
|
5
5
|
export { AdminNestedArrayField } from "./AdminNestedArrayField";
|
|
6
6
|
export { AdminObjectPicker } from "./AdminObjectPicker";
|
|
7
7
|
export { AdminPrimitiveArrayField } from "./AdminPrimitiveArrayField";
|
|
8
|
-
export { AdminRefField } from "./AdminRefField";
|
|
8
|
+
export { AdminRefField, type AdminRefFieldProps } from "./AdminRefField";
|
|
9
9
|
export { AdminScriptList } from "./AdminScriptList";
|
|
10
10
|
export { AdminScriptRunModal } from "./AdminScriptRunModal";
|
|
11
11
|
export { AdminVersionConfig } from "./AdminVersionConfig";
|
|
@@ -16,7 +16,7 @@ export { ConsentFormList } from "./ConsentFormList";
|
|
|
16
16
|
export { ConsentResponseViewer } from "./ConsentResponseViewer";
|
|
17
17
|
export { DocumentStorageBrowser } from "./DocumentStorageBrowser";
|
|
18
18
|
export { LocaleContentEditor } from "./LocaleContentEditor";
|
|
19
|
-
export type { AdminConfigResponse, AdminCustomScreen, AdminFieldConfig, AdminModelConfig, AdminScreenProps, AdminScriptConfig, BackgroundTask, DocumentFile, DocumentListResponse, DocumentStorageBrowserProps, } from "./types";
|
|
19
|
+
export type { AdminConfigResponse, AdminCustomScreen, AdminFieldConfig, AdminModelConfig, AdminScreenProps, AdminScriptConfig, BackgroundTask, DocumentFile, DocumentListResponse, DocumentStorageBrowserProps, RefFieldRendererProps, RefRendererMap, } from "./types";
|
|
20
20
|
export { SYSTEM_FIELDS } from "./types";
|
|
21
21
|
export { useAdminApi } from "./useAdminApi";
|
|
22
22
|
export { useAdminConfig } from "./useAdminConfig";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,wBAAwB,EAAC,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAC,aAAa,EAA0B,MAAM,iBAAiB,CAAC;AACvE,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,sBAAsB,EAAC,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAe1D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AACtC,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Api } from "@reduxjs/toolkit/query/react";
|
|
2
|
+
import type React from "react";
|
|
2
3
|
export interface AdminFieldConfig {
|
|
3
4
|
type: string;
|
|
4
5
|
required: boolean;
|
|
@@ -25,6 +26,8 @@ export interface AdminModelConfig {
|
|
|
25
26
|
defaultSort: string;
|
|
26
27
|
fields: Record<string, AdminFieldConfig>;
|
|
27
28
|
fieldOrder?: string[];
|
|
29
|
+
/** Optional per-column pixel widths used by AdminModelTable when rendering listFields. */
|
|
30
|
+
listColumnWidths?: Record<string, number>;
|
|
28
31
|
}
|
|
29
32
|
export interface AdminCustomScreen {
|
|
30
33
|
description?: string;
|
|
@@ -68,6 +71,29 @@ export interface AdminScreenProps {
|
|
|
68
71
|
baseUrl: string;
|
|
69
72
|
api: Api<any, any, any, any>;
|
|
70
73
|
}
|
|
74
|
+
/**
|
|
75
|
+
* Props passed to a custom ref-field renderer. Matches AdminRefField's interface so a
|
|
76
|
+
* custom renderer is a drop-in replacement.
|
|
77
|
+
*/
|
|
78
|
+
export interface RefFieldRendererProps {
|
|
79
|
+
api: Api<any, any, any, any>;
|
|
80
|
+
baseUrl: string;
|
|
81
|
+
routePath: string;
|
|
82
|
+
refModelName: string;
|
|
83
|
+
title: string;
|
|
84
|
+
value: string;
|
|
85
|
+
onChange: (value: string) => void;
|
|
86
|
+
errorText?: string;
|
|
87
|
+
helperText?: string;
|
|
88
|
+
}
|
|
89
|
+
/**
|
|
90
|
+
* Map from referenced model name (e.g. "User") to a custom component used to render
|
|
91
|
+
* fields that reference that model. When a key matches `fieldConfig.ref` (single ref)
|
|
92
|
+
* or `fieldConfig.itemRef` (primitive array of refs), the custom component renders in
|
|
93
|
+
* place of the built-in {@link AdminRefField}. Falls back to AdminRefField when no
|
|
94
|
+
* key matches.
|
|
95
|
+
*/
|
|
96
|
+
export type RefRendererMap = Record<string, React.ComponentType<RefFieldRendererProps>>;
|
|
71
97
|
export declare const SYSTEM_FIELDS: Set<string>;
|
|
72
98
|
export interface DocumentFile {
|
|
73
99
|
name: string;
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AA4GA,gDAAgD;AAChD,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
|
-
"@terreno/ui": "0.11.
|
|
3
|
+
"@terreno/ui": "0.11.8",
|
|
4
4
|
"expo-router": "~6.0.19",
|
|
5
5
|
"jspdf": "^4.2.0",
|
|
6
6
|
"lodash": "^4.17.23",
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"test:coverage": "bun run ../scripts/check-coverage.ts"
|
|
52
52
|
},
|
|
53
53
|
"types": "dist/index.d.ts",
|
|
54
|
-
"version": "0.11.
|
|
54
|
+
"version": "0.11.8"
|
|
55
55
|
}
|
|
@@ -372,6 +372,56 @@ describe("AdminFieldRenderer (main)", () => {
|
|
|
372
372
|
expect(toJSON()).toBeDefined();
|
|
373
373
|
});
|
|
374
374
|
|
|
375
|
+
it("uses custom refRenderer for single ref fields when matching ref model name", () => {
|
|
376
|
+
const CustomRenderer = mock((_props: any) => <></>) as any;
|
|
377
|
+
renderWithTheme(
|
|
378
|
+
<AdminFieldRenderer
|
|
379
|
+
{...base}
|
|
380
|
+
fieldConfig={{ref: "User", required: false, type: "objectid"}}
|
|
381
|
+
fieldKey="ownerId"
|
|
382
|
+
modelConfigs={[{name: "User", routePath: "/admin/users"}]}
|
|
383
|
+
refRenderers={{User: CustomRenderer}}
|
|
384
|
+
value="abc123"
|
|
385
|
+
/>
|
|
386
|
+
);
|
|
387
|
+
expect(CustomRenderer).toHaveBeenCalled();
|
|
388
|
+
const props = (CustomRenderer as any).mock.calls[0][0];
|
|
389
|
+
expect(props.refModelName).toBe("User");
|
|
390
|
+
expect(props.routePath).toBe("/admin/users");
|
|
391
|
+
expect(props.value).toBe("abc123");
|
|
392
|
+
});
|
|
393
|
+
|
|
394
|
+
it("does not invoke a refRenderer whose key does not match the field's ref model", () => {
|
|
395
|
+
const CustomRenderer = mock((_props: any) => <></>) as any;
|
|
396
|
+
// No modelConfigs entry for "Post" so AdminRefField path is also bypassed; this
|
|
397
|
+
// verifies the dispatch logic only fires the renderer when the key matches.
|
|
398
|
+
renderWithTheme(
|
|
399
|
+
<AdminFieldRenderer
|
|
400
|
+
{...base}
|
|
401
|
+
fieldConfig={{ref: "Post", required: false, type: "objectid"}}
|
|
402
|
+
fieldKey="postId"
|
|
403
|
+
refRenderers={{User: CustomRenderer}}
|
|
404
|
+
value=""
|
|
405
|
+
/>
|
|
406
|
+
);
|
|
407
|
+
expect(CustomRenderer).not.toHaveBeenCalled();
|
|
408
|
+
});
|
|
409
|
+
|
|
410
|
+
it("uses custom refRenderer when modelConfigs is missing (empty routePath)", () => {
|
|
411
|
+
const CustomRenderer = mock((_props: any) => <></>) as any;
|
|
412
|
+
renderWithTheme(
|
|
413
|
+
<AdminFieldRenderer
|
|
414
|
+
{...base}
|
|
415
|
+
fieldConfig={{ref: "User", required: false, type: "objectid"}}
|
|
416
|
+
fieldKey="ownerId"
|
|
417
|
+
refRenderers={{User: CustomRenderer}}
|
|
418
|
+
value="x"
|
|
419
|
+
/>
|
|
420
|
+
);
|
|
421
|
+
expect(CustomRenderer).toHaveBeenCalled();
|
|
422
|
+
expect((CustomRenderer as any).mock.calls[0][0].routePath).toBe("");
|
|
423
|
+
});
|
|
424
|
+
|
|
375
425
|
it("triggers onChange handlers for number, enum, array, object", () => {
|
|
376
426
|
const numberChange = mock((_: any) => {});
|
|
377
427
|
const {UNSAFE_root: numberRoot} = renderWithTheme(
|
|
@@ -12,7 +12,7 @@ import {AdminPrimitiveArrayField} from "./AdminPrimitiveArrayField";
|
|
|
12
12
|
import {AdminRefField} from "./AdminRefField";
|
|
13
13
|
import {CheckboxListEditor} from "./CheckboxListEditor";
|
|
14
14
|
import {LocaleContentEditor} from "./LocaleContentEditor";
|
|
15
|
-
import type {AdminFieldConfig, AdminScreenProps} from "./types";
|
|
15
|
+
import type {AdminFieldConfig, AdminScreenProps, RefRendererMap} from "./types";
|
|
16
16
|
|
|
17
17
|
// Attempts to parse a string as JSON, returning the parsed value or the raw string
|
|
18
18
|
const parseJsonValue = (text: string): any => {
|
|
@@ -47,6 +47,14 @@ interface AdminFieldRendererProps extends AdminScreenProps {
|
|
|
47
47
|
modelConfigs?: Array<{name: string; routePath: string}>;
|
|
48
48
|
/** Parent document form state, used to derive dynamic options for sub-fields */
|
|
49
49
|
parentFormState?: Record<string, any>;
|
|
50
|
+
/**
|
|
51
|
+
* Optional map of custom ref-field renderers keyed by referenced model name.
|
|
52
|
+
* When `fieldConfig.ref` (single ref) or `fieldConfig.itemRef` (primitive array
|
|
53
|
+
* of refs) matches a key, the custom component renders in place of the built-in
|
|
54
|
+
* {@link AdminRefField}. Forwarded to {@link AdminNestedArrayField} and
|
|
55
|
+
* {@link AdminPrimitiveArrayField} so nested fields participate in the override.
|
|
56
|
+
*/
|
|
57
|
+
refRenderers?: RefRendererMap;
|
|
50
58
|
}
|
|
51
59
|
|
|
52
60
|
/**
|
|
@@ -95,6 +103,7 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
95
103
|
api,
|
|
96
104
|
modelConfigs,
|
|
97
105
|
parentFormState,
|
|
106
|
+
refRenderers,
|
|
98
107
|
}) => {
|
|
99
108
|
const label = startCase(fieldKey);
|
|
100
109
|
const helperText = fieldConfig.description;
|
|
@@ -125,8 +134,24 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
125
134
|
}
|
|
126
135
|
|
|
127
136
|
// ObjectId with ref -> reference field (skip arrays — those go to AdminPrimitiveArrayField)
|
|
128
|
-
if (fieldConfig.ref &&
|
|
129
|
-
const
|
|
137
|
+
if (fieldConfig.ref && fieldConfig.type !== "array") {
|
|
138
|
+
const CustomRenderer = refRenderers?.[fieldConfig.ref];
|
|
139
|
+
const refModel = modelConfigs?.find((m) => m.name === fieldConfig.ref);
|
|
140
|
+
if (CustomRenderer) {
|
|
141
|
+
return (
|
|
142
|
+
<CustomRenderer
|
|
143
|
+
api={api}
|
|
144
|
+
baseUrl={baseUrl}
|
|
145
|
+
errorText={errorText}
|
|
146
|
+
helperText={helperText}
|
|
147
|
+
onChange={onChange}
|
|
148
|
+
refModelName={fieldConfig.ref}
|
|
149
|
+
routePath={refModel?.routePath ?? ""}
|
|
150
|
+
title={label}
|
|
151
|
+
value={value ?? ""}
|
|
152
|
+
/>
|
|
153
|
+
);
|
|
154
|
+
}
|
|
130
155
|
if (refModel) {
|
|
131
156
|
return (
|
|
132
157
|
<AdminRefField
|
|
@@ -281,6 +306,7 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
281
306
|
itemType={fieldConfig.itemType}
|
|
282
307
|
modelConfigs={modelConfigs}
|
|
283
308
|
onChange={onChange}
|
|
309
|
+
refRenderers={refRenderers}
|
|
284
310
|
title={label}
|
|
285
311
|
value={value ?? []}
|
|
286
312
|
/>
|
|
@@ -299,6 +325,7 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
299
325
|
modelConfigs={modelConfigs}
|
|
300
326
|
onChange={onChange}
|
|
301
327
|
parentFormState={parentFormState}
|
|
328
|
+
refRenderers={refRenderers}
|
|
302
329
|
title={label}
|
|
303
330
|
value={value ?? []}
|
|
304
331
|
/>
|
package/src/AdminModelForm.tsx
CHANGED
|
@@ -3,7 +3,7 @@ import {Box, Button, Page, Spinner, Text, useToast} from "@terreno/ui";
|
|
|
3
3
|
import {router, useNavigation} from "expo-router";
|
|
4
4
|
import React, {useCallback, useEffect, useMemo, useState} from "react";
|
|
5
5
|
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
6
|
-
import type {AdminFieldConfig, AdminModelConfig} from "./types";
|
|
6
|
+
import type {AdminFieldConfig, AdminModelConfig, RefRendererMap} from "./types";
|
|
7
7
|
import {SYSTEM_FIELDS} from "./types";
|
|
8
8
|
import {useAdminApi} from "./useAdminApi";
|
|
9
9
|
import {useAdminConfig} from "./useAdminConfig";
|
|
@@ -25,6 +25,12 @@ interface AdminModelFormProps {
|
|
|
25
25
|
result: any;
|
|
26
26
|
itemId?: string;
|
|
27
27
|
}) => Promise<void> | void;
|
|
28
|
+
/**
|
|
29
|
+
* Optional map of custom ref-field renderers keyed by referenced model name. Forwarded
|
|
30
|
+
* to every nested {@link AdminFieldRenderer} so refs in this form (including refs
|
|
31
|
+
* inside nested/primitive arrays) can be rendered with a consumer-provided component.
|
|
32
|
+
*/
|
|
33
|
+
refRenderers?: RefRendererMap;
|
|
28
34
|
}
|
|
29
35
|
|
|
30
36
|
const getEditableFields = (
|
|
@@ -158,6 +164,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
158
164
|
footerContent,
|
|
159
165
|
transformPayload,
|
|
160
166
|
onSaveSuccess,
|
|
167
|
+
refRenderers,
|
|
161
168
|
}) => {
|
|
162
169
|
const {config, isLoading: isConfigLoading} = useAdminConfig(api, baseUrl);
|
|
163
170
|
const [formState, setFormState] = useState<Record<string, any>>({});
|
|
@@ -354,6 +361,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
354
361
|
modelConfigs={modelConfigs}
|
|
355
362
|
onChange={(value: any) => handleFieldChange(fieldKey, value)}
|
|
356
363
|
parentFormState={formState}
|
|
364
|
+
refRenderers={refRenderers}
|
|
357
365
|
value={formState[fieldKey]}
|
|
358
366
|
/>
|
|
359
367
|
))}
|
|
@@ -238,6 +238,71 @@ describe("AdminModelTable", () => {
|
|
|
238
238
|
expect(deleteFn).toHaveBeenCalled();
|
|
239
239
|
});
|
|
240
240
|
|
|
241
|
+
it("applies columnWidths prop overrides to DataTable columns", () => {
|
|
242
|
+
configState.config = fullConfig;
|
|
243
|
+
listState.data = {data: [{_id: "u1", email: "a@b.com"}], total: 1};
|
|
244
|
+
const {UNSAFE_root} = renderWithTheme(
|
|
245
|
+
<AdminModelTable
|
|
246
|
+
api={{} as any}
|
|
247
|
+
baseUrl="/admin"
|
|
248
|
+
columnWidths={{email: 999}}
|
|
249
|
+
modelName="User"
|
|
250
|
+
/>
|
|
251
|
+
);
|
|
252
|
+
const tables = UNSAFE_root.findAll((n: any) => Array.isArray(n.props?.columns));
|
|
253
|
+
expect(tables.length).toBeGreaterThan(0);
|
|
254
|
+
const cols = (tables[0] as any).props.columns;
|
|
255
|
+
const emailCol = cols.find((c: any) => c.title === "Email");
|
|
256
|
+
expect(emailCol?.width).toBe(999);
|
|
257
|
+
});
|
|
258
|
+
|
|
259
|
+
it("falls back to listColumnWidths from backend config when columnWidths prop is absent", () => {
|
|
260
|
+
configState.config = {
|
|
261
|
+
customScreens: [],
|
|
262
|
+
models: [
|
|
263
|
+
{
|
|
264
|
+
...fullConfig.models[0],
|
|
265
|
+
listColumnWidths: {email: 555},
|
|
266
|
+
},
|
|
267
|
+
],
|
|
268
|
+
scripts: [],
|
|
269
|
+
};
|
|
270
|
+
listState.data = {data: [{_id: "u1", email: "a@b.com"}], total: 1};
|
|
271
|
+
const {UNSAFE_root} = renderWithTheme(
|
|
272
|
+
<AdminModelTable api={{} as any} baseUrl="/admin" modelName="User" />
|
|
273
|
+
);
|
|
274
|
+
const tables = UNSAFE_root.findAll((n: any) => Array.isArray(n.props?.columns));
|
|
275
|
+
const cols = (tables[0] as any).props.columns;
|
|
276
|
+
const emailCol = cols.find((c: any) => c.title === "Email");
|
|
277
|
+
expect(emailCol?.width).toBe(555);
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
it("prefers columnWidths prop over backend listColumnWidths", () => {
|
|
281
|
+
configState.config = {
|
|
282
|
+
customScreens: [],
|
|
283
|
+
models: [
|
|
284
|
+
{
|
|
285
|
+
...fullConfig.models[0],
|
|
286
|
+
listColumnWidths: {email: 100},
|
|
287
|
+
},
|
|
288
|
+
],
|
|
289
|
+
scripts: [],
|
|
290
|
+
};
|
|
291
|
+
listState.data = {data: [{_id: "u1", email: "a@b.com"}], total: 1};
|
|
292
|
+
const {UNSAFE_root} = renderWithTheme(
|
|
293
|
+
<AdminModelTable
|
|
294
|
+
api={{} as any}
|
|
295
|
+
baseUrl="/admin"
|
|
296
|
+
columnWidths={{email: 200}}
|
|
297
|
+
modelName="User"
|
|
298
|
+
/>
|
|
299
|
+
);
|
|
300
|
+
const tables = UNSAFE_root.findAll((n: any) => Array.isArray(n.props?.columns));
|
|
301
|
+
const cols = (tables[0] as any).props.columns;
|
|
302
|
+
const emailCol = cols.find((c: any) => c.title === "Email");
|
|
303
|
+
expect(emailCol?.width).toBe(200);
|
|
304
|
+
});
|
|
305
|
+
|
|
241
306
|
it("builds a descending sort string and falls back when column is out of range", async () => {
|
|
242
307
|
configState.config = fullConfig;
|
|
243
308
|
// Render data so DataTable mounts; then capture the setSortColumn via a dummy
|
package/src/AdminModelTable.tsx
CHANGED
|
@@ -26,6 +26,13 @@ interface AdminModelTableProps {
|
|
|
26
26
|
api: Api<any, any, any, any>;
|
|
27
27
|
modelName: string;
|
|
28
28
|
columns?: string[];
|
|
29
|
+
/**
|
|
30
|
+
* Optional pixel widths for individual list columns, keyed by field name. Falls
|
|
31
|
+
* back to {@link AdminModelConfig.listColumnWidths} from the backend, then to the
|
|
32
|
+
* built-in column-type defaults. Useful when the default heuristics pick the wrong
|
|
33
|
+
* width for a given model.
|
|
34
|
+
*/
|
|
35
|
+
columnWidths?: Record<string, number>;
|
|
29
36
|
}
|
|
30
37
|
|
|
31
38
|
const ACTIONS_COLUMN_TYPE = "adminActions";
|
|
@@ -192,6 +199,7 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
192
199
|
api,
|
|
193
200
|
modelName,
|
|
194
201
|
columns: columnsProp,
|
|
202
|
+
columnWidths,
|
|
195
203
|
}) => {
|
|
196
204
|
const {config, isLoading: isConfigLoading} = useAdminConfig(api, baseUrl);
|
|
197
205
|
const [page, setPage] = useState(1);
|
|
@@ -274,11 +282,12 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
274
282
|
const fieldConfig = modelConfig.fields[fieldKey];
|
|
275
283
|
const isFirst = index === 0;
|
|
276
284
|
const columnType = getColumnType(fieldKey, fieldConfig);
|
|
285
|
+
const widthOverride = columnWidths?.[fieldKey] ?? modelConfig.listColumnWidths?.[fieldKey];
|
|
277
286
|
return {
|
|
278
287
|
columnType: isFirst ? LINK_COLUMN_TYPE : columnType,
|
|
279
288
|
sortable: true,
|
|
280
289
|
title: startCase(fieldKey),
|
|
281
|
-
width: getColumnWidth(fieldKey, columnType),
|
|
290
|
+
width: widthOverride ?? getColumnWidth(fieldKey, columnType),
|
|
282
291
|
};
|
|
283
292
|
});
|
|
284
293
|
|
|
@@ -2,7 +2,7 @@ import type {Api} from "@reduxjs/toolkit/query/react";
|
|
|
2
2
|
import {Box, Button, Card, DraggableList, Heading, IconButton, Text} from "@terreno/ui";
|
|
3
3
|
import React, {useCallback, useMemo, useRef} from "react";
|
|
4
4
|
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
5
|
-
import type {AdminFieldConfig} from "./types";
|
|
5
|
+
import type {AdminFieldConfig, RefRendererMap} from "./types";
|
|
6
6
|
|
|
7
7
|
const FIELD_HEIGHT_ESTIMATE = 76;
|
|
8
8
|
const CARD_HEADER_HEIGHT = 44;
|
|
@@ -21,6 +21,8 @@ interface AdminNestedArrayFieldProps {
|
|
|
21
21
|
modelConfigs?: Array<{name: string; routePath: string}>;
|
|
22
22
|
/** Parent document form state, used to derive dynamic options for sub-fields */
|
|
23
23
|
parentFormState?: Record<string, any>;
|
|
24
|
+
/** Forwarded to nested {@link AdminFieldRenderer} so refs in sub-documents can use custom renderers. */
|
|
25
|
+
refRenderers?: RefRendererMap;
|
|
24
26
|
}
|
|
25
27
|
|
|
26
28
|
const buildDefaultItem = (items: Record<string, AdminFieldConfig>): Record<string, any> => {
|
|
@@ -57,6 +59,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
57
59
|
baseUrl,
|
|
58
60
|
modelConfigs,
|
|
59
61
|
parentFormState,
|
|
62
|
+
refRenderers,
|
|
60
63
|
}) => {
|
|
61
64
|
const arrayValue = useMemo((): Record<string, any>[] => {
|
|
62
65
|
return Array.isArray(value) ? value : [];
|
|
@@ -170,6 +173,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
170
173
|
modelConfigs={modelConfigs}
|
|
171
174
|
onChange={(val: any) => handleSubFieldChange(index, fieldKey, val)}
|
|
172
175
|
parentFormState={parentFormState}
|
|
176
|
+
refRenderers={refRenderers}
|
|
173
177
|
value={itemData[fieldKey]}
|
|
174
178
|
/>
|
|
175
179
|
))}
|
|
@@ -185,6 +189,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
185
189
|
baseUrl,
|
|
186
190
|
modelConfigs,
|
|
187
191
|
parentFormState,
|
|
192
|
+
refRenderers,
|
|
188
193
|
handleRemoveItem,
|
|
189
194
|
handleSubFieldChange,
|
|
190
195
|
]
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
import startCase from "lodash/startCase";
|
|
13
13
|
import React, {useCallback} from "react";
|
|
14
14
|
import {AdminRefField} from "./AdminRefField";
|
|
15
|
+
import type {RefRendererMap} from "./types";
|
|
15
16
|
|
|
16
17
|
interface AdminPrimitiveArrayFieldProps {
|
|
17
18
|
title: string;
|
|
@@ -25,6 +26,12 @@ interface AdminPrimitiveArrayFieldProps {
|
|
|
25
26
|
api: Api<any, any, any, any>;
|
|
26
27
|
baseUrl: string;
|
|
27
28
|
modelConfigs?: Array<{name: string; routePath: string}>;
|
|
29
|
+
/**
|
|
30
|
+
* Optional map of custom ref-field renderers keyed by referenced model name. When
|
|
31
|
+
* `itemRef` matches a key, the custom component renders in place of the built-in
|
|
32
|
+
* {@link AdminRefField} for each ref item.
|
|
33
|
+
*/
|
|
34
|
+
refRenderers?: RefRendererMap;
|
|
28
35
|
}
|
|
29
36
|
|
|
30
37
|
type PrimitiveItem = string | number | boolean;
|
|
@@ -56,6 +63,7 @@ export const AdminPrimitiveArrayField: React.FC<AdminPrimitiveArrayFieldProps> =
|
|
|
56
63
|
api,
|
|
57
64
|
baseUrl,
|
|
58
65
|
modelConfigs,
|
|
66
|
+
refRenderers,
|
|
59
67
|
}) => {
|
|
60
68
|
const arrayValue = Array.isArray(value) ? value : [];
|
|
61
69
|
|
|
@@ -102,18 +110,34 @@ export const AdminPrimitiveArrayField: React.FC<AdminPrimitiveArrayFieldProps> =
|
|
|
102
110
|
/>
|
|
103
111
|
);
|
|
104
112
|
}
|
|
105
|
-
if (itemType === "objectid" &&
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
if (itemType === "objectid" && itemRef) {
|
|
114
|
+
const CustomRenderer = refRenderers?.[itemRef];
|
|
115
|
+
if (CustomRenderer) {
|
|
116
|
+
return (
|
|
117
|
+
<CustomRenderer
|
|
118
|
+
api={api}
|
|
119
|
+
baseUrl={baseUrl}
|
|
120
|
+
onChange={(val: string) => handleUpdate(index, val)}
|
|
121
|
+
refModelName={itemRef}
|
|
122
|
+
routePath={refModel?.routePath ?? ""}
|
|
123
|
+
title=""
|
|
124
|
+
value={item != null ? String(item) : ""}
|
|
125
|
+
/>
|
|
126
|
+
);
|
|
127
|
+
}
|
|
128
|
+
if (refModel) {
|
|
129
|
+
return (
|
|
130
|
+
<AdminRefField
|
|
131
|
+
api={api}
|
|
132
|
+
baseUrl={baseUrl}
|
|
133
|
+
onChange={(val: string) => handleUpdate(index, val)}
|
|
134
|
+
refModelName={refModel.name}
|
|
135
|
+
routePath={refModel.routePath}
|
|
136
|
+
title=""
|
|
137
|
+
value={item != null ? String(item) : ""}
|
|
138
|
+
/>
|
|
139
|
+
);
|
|
140
|
+
}
|
|
117
141
|
}
|
|
118
142
|
if (itemType === "number") {
|
|
119
143
|
return (
|