@terreno/admin-frontend 57.0.0 → 57.2.0
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/AdminActionMenu.d.ts +15 -0
- package/dist/AdminActionMenu.js +56 -0
- package/dist/AdminActionMenu.js.map +1 -0
- package/dist/AdminFieldRenderer.js +2 -2
- package/dist/AdminFieldRenderer.js.map +1 -1
- package/dist/AdminFieldRendererCore.d.ts +2 -0
- package/dist/AdminFieldRendererCore.js +18 -47
- package/dist/AdminFieldRendererCore.js.map +1 -1
- package/dist/AdminFilterDrawer.d.ts +20 -0
- package/dist/AdminFilterDrawer.js +117 -0
- package/dist/AdminFilterDrawer.js.map +1 -0
- package/dist/AdminHome.d.ts +2 -4
- package/dist/AdminHome.js +15 -137
- package/dist/AdminHome.js.map +1 -1
- package/dist/AdminModelForm.js +29 -10
- package/dist/AdminModelForm.js.map +1 -1
- package/dist/AdminModelList.d.ts +2 -1
- package/dist/AdminModelList.js +5 -1
- package/dist/AdminModelList.js.map +1 -1
- package/dist/AdminModelTable.js +56 -98
- package/dist/AdminModelTable.js.map +1 -1
- package/dist/AdminObjectPicker.d.ts +3 -0
- package/dist/AdminObjectPicker.js +27 -7
- package/dist/AdminObjectPicker.js.map +1 -1
- package/dist/AdminPrimitiveArrayField.d.ts +2 -0
- package/dist/AdminPrimitiveArrayField.js +3 -3
- package/dist/AdminPrimitiveArrayField.js.map +1 -1
- package/dist/AdminProvider.d.ts +16 -0
- package/dist/AdminProvider.js +84 -0
- package/dist/AdminProvider.js.map +1 -0
- package/dist/AdminRefField.js +2 -2
- package/dist/AdminRefField.js.map +1 -1
- package/dist/AdminRolesField.d.ts +9 -0
- package/dist/AdminRolesField.js +45 -0
- package/dist/AdminRolesField.js.map +1 -0
- package/dist/AdminRolesList.d.ts +3 -0
- package/dist/AdminRolesList.js +187 -0
- package/dist/AdminRolesList.js.map +1 -0
- package/dist/AdminScreenRouter.d.ts +13 -0
- package/dist/AdminScreenRouter.js +52 -0
- package/dist/AdminScreenRouter.js.map +1 -0
- package/dist/AdminScriptList.js +12 -10
- package/dist/AdminScriptList.js.map +1 -1
- package/dist/AdminShell.d.ts +2 -0
- package/dist/AdminShell.js +68 -21
- package/dist/AdminShell.js.map +1 -1
- package/dist/Constants.d.ts +4 -0
- package/dist/Constants.js +5 -0
- package/dist/Constants.js.map +1 -0
- package/dist/adminModelListQueryParams.d.ts +4 -0
- package/dist/adminModelListQueryParams.js +38 -3
- package/dist/adminModelListQueryParams.js.map +1 -1
- package/dist/adminPageAccess.d.ts +5 -0
- package/dist/adminPageAccess.js +19 -0
- package/dist/adminPageAccess.js.map +1 -0
- package/dist/index.d.ts +20 -1
- package/dist/index.js +18 -0
- package/dist/index.js.map +1 -1
- package/dist/types.d.ts +74 -0
- package/dist/types.js.map +1 -1
- package/dist/useAdminRoles.d.ts +65 -0
- package/dist/useAdminRoles.js +84 -0
- package/dist/useAdminRoles.js.map +1 -0
- package/dist/useDocumentStorageApi.js +2 -2
- package/dist/useDocumentStorageApi.js.map +1 -1
- package/dist/widgets/AIRequestsScreenWidget.d.ts +4 -0
- package/dist/widgets/AIRequestsScreenWidget.js +54 -0
- package/dist/widgets/AIRequestsScreenWidget.js.map +1 -0
- package/dist/widgets/CustomScreensListWidget.d.ts +4 -0
- package/dist/widgets/CustomScreensListWidget.js +21 -0
- package/dist/widgets/CustomScreensListWidget.js.map +1 -0
- package/dist/widgets/DocumentsScreenWidget.d.ts +4 -0
- package/dist/widgets/DocumentsScreenWidget.js +9 -0
- package/dist/widgets/DocumentsScreenWidget.js.map +1 -0
- package/dist/widgets/FeatureFlagsOverridesWidget.d.ts +4 -0
- package/dist/widgets/FeatureFlagsOverridesWidget.js +18 -0
- package/dist/widgets/FeatureFlagsOverridesWidget.js.map +1 -0
- package/dist/widgets/MissingWidget.d.ts +7 -0
- package/dist/widgets/MissingWidget.js +6 -0
- package/dist/widgets/MissingWidget.js.map +1 -0
- package/dist/widgets/ModelsGridWidget.d.ts +3 -0
- package/dist/widgets/ModelsGridWidget.js +30 -0
- package/dist/widgets/ModelsGridWidget.js.map +1 -0
- package/dist/widgets/RecentActivityWidget.d.ts +3 -0
- package/dist/widgets/RecentActivityWidget.js +27 -0
- package/dist/widgets/RecentActivityWidget.js.map +1 -0
- package/dist/widgets/ScriptRunnerWidget.d.ts +3 -0
- package/dist/widgets/ScriptRunnerWidget.js +12 -0
- package/dist/widgets/ScriptRunnerWidget.js.map +1 -0
- package/dist/widgets/VersionConfigScreenWidget.d.ts +3 -0
- package/dist/widgets/VersionConfigScreenWidget.js +7 -0
- package/dist/widgets/VersionConfigScreenWidget.js.map +1 -0
- package/dist/widgets/VersionConfigWidget.d.ts +3 -0
- package/dist/widgets/VersionConfigWidget.js +7 -0
- package/dist/widgets/VersionConfigWidget.js.map +1 -0
- package/dist/widgets/builtInFieldWidgets.d.ts +7 -0
- package/dist/widgets/builtInFieldWidgets.js +61 -0
- package/dist/widgets/builtInFieldWidgets.js.map +1 -0
- package/dist/widgets/builtInWidgets.d.ts +6 -0
- package/dist/widgets/builtInWidgets.js +31 -0
- package/dist/widgets/builtInWidgets.js.map +1 -0
- package/dist/widgets/consentWidgets.d.ts +3 -0
- package/dist/widgets/consentWidgets.js +8 -0
- package/dist/widgets/consentWidgets.js.map +1 -0
- package/dist/widgets/homeWidgetUtils.d.ts +3 -0
- package/dist/widgets/homeWidgetUtils.js +37 -0
- package/dist/widgets/homeWidgetUtils.js.map +1 -0
- package/package.json +3 -2
- package/src/AdminActionMenu.test.tsx +78 -0
- package/src/AdminActionMenu.tsx +106 -0
- package/src/AdminFieldRenderer.tsx +2 -0
- package/src/AdminFieldRendererCore.tsx +54 -133
- package/src/AdminFilterDrawer.test.tsx +89 -0
- package/src/AdminFilterDrawer.tsx +333 -0
- package/src/AdminHome.tsx +38 -325
- package/src/AdminModelForm.test.tsx +78 -0
- package/src/AdminModelForm.tsx +49 -10
- package/src/AdminModelList.tsx +7 -2
- package/src/AdminModelTable.test.tsx +73 -0
- package/src/AdminModelTable.tsx +108 -195
- package/src/AdminObjectPicker.tsx +49 -9
- package/src/AdminPrimitiveArrayField.tsx +5 -0
- package/src/AdminProvider.test.tsx +25 -0
- package/src/AdminProvider.tsx +121 -0
- package/src/AdminRefField.tsx +4 -0
- package/src/AdminRolesField.tsx +129 -0
- package/src/AdminRolesList.test.tsx +339 -0
- package/src/AdminRolesList.tsx +434 -0
- package/src/AdminScreenRouter.test.tsx +112 -0
- package/src/AdminScreenRouter.tsx +104 -0
- package/src/AdminScriptList.tsx +42 -30
- package/src/AdminShell.test.tsx +196 -1
- package/src/AdminShell.tsx +166 -69
- package/src/Constants.ts +5 -0
- package/src/adminModelListQueryParams.test.ts +69 -0
- package/src/adminModelListQueryParams.ts +49 -3
- package/src/adminPageAccess.test.ts +18 -0
- package/src/adminPageAccess.ts +18 -0
- package/src/index.tsx +51 -0
- package/src/isolated/AdminObjectPicker.isolated.tsx +10 -1
- package/src/types.ts +79 -0
- package/src/useAdminRoles.ts +146 -0
- package/src/useDocumentStorageApi.ts +2 -2
- package/src/widgets/AIRequestsScreenWidget.tsx +93 -0
- package/src/widgets/CustomScreensListWidget.tsx +56 -0
- package/src/widgets/DocumentsScreenWidget.tsx +11 -0
- package/src/widgets/FeatureFlagsOverridesWidget.tsx +48 -0
- package/src/widgets/MissingWidget.tsx +17 -0
- package/src/widgets/ModelsGridWidget.tsx +94 -0
- package/src/widgets/RecentActivityWidget.tsx +81 -0
- package/src/widgets/ScriptRunnerWidget.tsx +26 -0
- package/src/widgets/VersionConfigScreenWidget.tsx +12 -0
- package/src/widgets/VersionConfigWidget.tsx +7 -0
- package/src/widgets/builtInFieldWidgets.tsx +180 -0
- package/src/widgets/builtInWidgets.ts +51 -0
- package/src/widgets/consentWidgets.ts +13 -0
- package/src/widgets/homeWidgetUtils.ts +38 -0
- package/src/widgets/pluginWidgets.test.tsx +29 -0
package/src/AdminHome.tsx
CHANGED
|
@@ -1,72 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Heading,
|
|
6
|
-
IconButton,
|
|
7
|
-
Page,
|
|
8
|
-
printDateAndTime,
|
|
9
|
-
Spinner,
|
|
10
|
-
Text,
|
|
11
|
-
} from "@terreno/ui";
|
|
12
|
-
import type {Href} from "expo-router";
|
|
13
|
-
import {router} from "expo-router";
|
|
14
|
-
import React, {useCallback, useMemo} from "react";
|
|
15
|
-
import {AdminVersionConfig} from "./AdminVersionConfig";
|
|
16
|
-
import type {AdminApi, AdminFieldValue, AdminModelConfig} from "./types";
|
|
1
|
+
import {Box, Heading, Page, Spinner, Text} from "@terreno/ui";
|
|
2
|
+
import React, {useMemo} from "react";
|
|
3
|
+
import {useHomeWidget} from "./AdminProvider";
|
|
4
|
+
import type {AdminApi, AdminModelConfig} from "./types";
|
|
17
5
|
import {resolveAdminBases} from "./types";
|
|
18
|
-
import {useAdminApi} from "./useAdminApi";
|
|
19
6
|
import {useAdminConfig} from "./useAdminConfig";
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
"modelStats",
|
|
23
|
-
"modelsGrid",
|
|
24
|
-
"feature-flags-overrides",
|
|
25
|
-
"versionConfig",
|
|
26
|
-
"scriptRunner",
|
|
27
|
-
"recentActivity",
|
|
28
|
-
]);
|
|
29
|
-
|
|
30
|
-
const normalizeWidgetIds = (ids: string[] | undefined): string[] => {
|
|
31
|
-
if (!ids?.length) {
|
|
32
|
-
return [];
|
|
33
|
-
}
|
|
34
|
-
const out: string[] = [];
|
|
35
|
-
const seen = new Set<string>();
|
|
36
|
-
for (const id of ids) {
|
|
37
|
-
const normalized = id === "modelStats" ? "modelsGrid" : id;
|
|
38
|
-
if (seen.has(normalized)) {
|
|
39
|
-
continue;
|
|
40
|
-
}
|
|
41
|
-
seen.add(normalized);
|
|
42
|
-
out.push(normalized);
|
|
43
|
-
}
|
|
44
|
-
return out;
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
const normalizeSidebarWidgets = (ids: string[] | undefined): string[] => {
|
|
48
|
-
const normalized = normalizeWidgetIds(ids);
|
|
49
|
-
if (!normalized.length) {
|
|
50
|
-
return normalized;
|
|
51
|
-
}
|
|
52
|
-
const tail = "recentActivity";
|
|
53
|
-
const without = normalized.filter((id) => id !== tail);
|
|
54
|
-
if (normalized.includes(tail)) {
|
|
55
|
-
return [...without, tail];
|
|
56
|
-
}
|
|
57
|
-
return normalized;
|
|
58
|
-
};
|
|
59
|
-
|
|
60
|
-
const warnUnknownWidget = (widgetId: string): void => {
|
|
61
|
-
if (BUILTIN_WIDGET_IDS.has(widgetId)) {
|
|
62
|
-
return;
|
|
63
|
-
}
|
|
64
|
-
if (typeof __DEV__ !== "undefined" && __DEV__) {
|
|
65
|
-
console.warn(
|
|
66
|
-
`[AdminHome] Unknown home widget id "${widgetId}". Register a built-in or remove it from admin config.`
|
|
67
|
-
);
|
|
68
|
-
}
|
|
69
|
-
};
|
|
7
|
+
import {normalizeSidebarWidgets, normalizeWidgetIds} from "./widgets/homeWidgetUtils";
|
|
8
|
+
import {MissingWidget} from "./widgets/MissingWidget";
|
|
70
9
|
|
|
71
10
|
interface AdminHomeProps {
|
|
72
11
|
/** @deprecated Use `apiBase`/`routeBase`. */
|
|
@@ -81,268 +20,36 @@ interface AdminHomeProps {
|
|
|
81
20
|
embedded?: boolean;
|
|
82
21
|
}
|
|
83
22
|
|
|
84
|
-
const
|
|
85
|
-
api: AdminApi;
|
|
86
|
-
model: AdminModelConfig;
|
|
87
|
-
routeBase: string;
|
|
88
|
-
}> = ({api, model, routeBase}) => {
|
|
89
|
-
const {useListQuery} = useAdminApi(api, model.routePath, model.name);
|
|
90
|
-
const {data, isLoading} = useListQuery({limit: 1, page: 1}, {skip: !model.routePath});
|
|
91
|
-
const total = (data as {total?: number} | undefined)?.total;
|
|
92
|
-
const fieldCount = Object.keys(model.fields).length;
|
|
93
|
-
const createEnabled = model.permissions?.create !== false;
|
|
94
|
-
|
|
95
|
-
const onOpen = useCallback((): void => {
|
|
96
|
-
const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
|
|
97
|
-
const href = `${prefix}/${model.name}` as Href;
|
|
98
|
-
router.push(href);
|
|
99
|
-
}, [routeBase, model.name]);
|
|
100
|
-
|
|
101
|
-
const onCreate = useCallback((): void => {
|
|
102
|
-
if (!createEnabled) {
|
|
103
|
-
return;
|
|
104
|
-
}
|
|
105
|
-
const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
|
|
106
|
-
router.push(`${prefix}/${model.name}/create` as Href);
|
|
107
|
-
}, [createEnabled, routeBase, model.name]);
|
|
108
|
-
|
|
109
|
-
return (
|
|
110
|
-
<Box
|
|
111
|
-
accessibilityHint={`Open ${model.displayName} admin`}
|
|
112
|
-
accessibilityLabel={model.displayName}
|
|
113
|
-
border="default"
|
|
114
|
-
padding={3}
|
|
115
|
-
rounding="md"
|
|
116
|
-
width={220}
|
|
117
|
-
>
|
|
118
|
-
<Box alignItems="start" direction="row" gap={2} justifyContent="between">
|
|
119
|
-
<Box
|
|
120
|
-
accessibilityHint={`View ${model.displayName} list`}
|
|
121
|
-
accessibilityLabel={model.displayName}
|
|
122
|
-
flex="grow"
|
|
123
|
-
minWidth={0}
|
|
124
|
-
onClick={onOpen}
|
|
125
|
-
testID={`admin-home-models-grid-${model.name}`}
|
|
126
|
-
>
|
|
127
|
-
<Text bold>{model.displayName}</Text>
|
|
128
|
-
<Text color="secondaryDark" size="sm">
|
|
129
|
-
{`${fieldCount} fields`}
|
|
130
|
-
</Text>
|
|
131
|
-
<Box marginTop={1}>
|
|
132
|
-
{isLoading ? (
|
|
133
|
-
<Spinner />
|
|
134
|
-
) : (
|
|
135
|
-
<Text
|
|
136
|
-
color="secondaryDark"
|
|
137
|
-
size="sm"
|
|
138
|
-
testID={`admin-home-model-count-${model.name}`}
|
|
139
|
-
>{`${total != null ? total : "—"} rows`}</Text>
|
|
140
|
-
)}
|
|
141
|
-
</Box>
|
|
142
|
-
</Box>
|
|
143
|
-
{createEnabled ? (
|
|
144
|
-
<IconButton
|
|
145
|
-
accessibilityHint={`Create new ${model.displayName}`}
|
|
146
|
-
accessibilityLabel={`Add ${model.displayName}`}
|
|
147
|
-
iconName="plus"
|
|
148
|
-
onClick={onCreate}
|
|
149
|
-
testID={`admin-home-model-add-${model.name}`}
|
|
150
|
-
tooltipText="Add new"
|
|
151
|
-
variant="secondary"
|
|
152
|
-
/>
|
|
153
|
-
) : null}
|
|
154
|
-
</Box>
|
|
155
|
-
</Box>
|
|
156
|
-
);
|
|
157
|
-
};
|
|
158
|
-
|
|
159
|
-
const ModelsGridWidget: React.FC<{
|
|
23
|
+
const HomeSlotWidget: React.FC<{
|
|
160
24
|
api: AdminApi;
|
|
25
|
+
apiBase: string;
|
|
26
|
+
auditModel?: AdminModelConfig;
|
|
27
|
+
config: NonNullable<ReturnType<typeof useAdminConfig>["config"]>;
|
|
28
|
+
featureFlagModel?: AdminModelConfig;
|
|
161
29
|
models: AdminModelConfig[];
|
|
162
30
|
routeBase: string;
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
{models.map((m) => (
|
|
169
|
-
<ModelGridCard api={api} key={m.name} model={m} routeBase={routeBase} />
|
|
170
|
-
))}
|
|
171
|
-
</Box>
|
|
172
|
-
</Card>
|
|
173
|
-
);
|
|
174
|
-
};
|
|
175
|
-
|
|
176
|
-
const FeatureFlagsOverridesWidget: React.FC<{
|
|
177
|
-
model?: AdminModelConfig;
|
|
178
|
-
routeBase: string;
|
|
179
|
-
}> = ({model, routeBase}) => {
|
|
180
|
-
const onOpen = useCallback((): void => {
|
|
181
|
-
if (!model) {
|
|
182
|
-
return;
|
|
183
|
-
}
|
|
184
|
-
const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
|
|
185
|
-
router.push(`${prefix}/${model.name}` as Href);
|
|
186
|
-
}, [routeBase, model]);
|
|
187
|
-
|
|
188
|
-
return (
|
|
189
|
-
<Card padding={4} testID="admin-home-widget-feature-flags-overrides">
|
|
190
|
-
<Heading size="sm">Feature flags</Heading>
|
|
191
|
-
{model ? (
|
|
192
|
-
<Box marginTop={2}>
|
|
193
|
-
<Text color="secondaryDark" size="sm">
|
|
194
|
-
Quick access to feature flag records.
|
|
195
|
-
</Text>
|
|
196
|
-
<Box marginTop={2}>
|
|
197
|
-
<Button onClick={onOpen} text={`Open ${model.displayName}`} variant="outline" />
|
|
198
|
-
</Box>
|
|
199
|
-
</Box>
|
|
200
|
-
) : (
|
|
201
|
-
<Box marginTop={2}>
|
|
202
|
-
<Text color="secondaryDark" size="sm">
|
|
203
|
-
No FeatureFlag model is registered in this admin config.
|
|
204
|
-
</Text>
|
|
205
|
-
</Box>
|
|
206
|
-
)}
|
|
207
|
-
</Card>
|
|
208
|
-
);
|
|
209
|
-
};
|
|
210
|
-
|
|
211
|
-
const RecentActivityWidget: React.FC<{
|
|
212
|
-
api: AdminApi;
|
|
213
|
-
auditModel?: AdminModelConfig;
|
|
214
|
-
}> = ({api, auditModel}) => {
|
|
215
|
-
const {useListQuery} = useAdminApi(api, auditModel?.routePath ?? "", auditModel?.name ?? "");
|
|
216
|
-
const {data, isLoading, isError} = useListQuery(
|
|
217
|
-
{limit: 8, page: 1, sort: "-createdAt"},
|
|
218
|
-
{skip: !auditModel?.routePath}
|
|
219
|
-
);
|
|
220
|
-
|
|
221
|
-
const rows = useMemo((): Record<string, AdminFieldValue>[] => {
|
|
222
|
-
const body = data as {data?: Record<string, AdminFieldValue>[]} | undefined;
|
|
223
|
-
return Array.isArray(body?.data) ? body.data : [];
|
|
224
|
-
}, [data]);
|
|
225
|
-
|
|
226
|
-
if (!auditModel) {
|
|
227
|
-
return (
|
|
228
|
-
<Card padding={4} testID="admin-home-widget-recentActivity">
|
|
229
|
-
<Heading size="sm">Recent activity</Heading>
|
|
230
|
-
<Box marginTop={2}>
|
|
231
|
-
<Text color="secondaryDark" size="sm">
|
|
232
|
-
Register an AdminAuditLog model to show recent mutations here.
|
|
233
|
-
</Text>
|
|
234
|
-
</Box>
|
|
235
|
-
</Card>
|
|
236
|
-
);
|
|
31
|
+
widgetId: string;
|
|
32
|
+
}> = ({api, apiBase, auditModel, config, featureFlagModel, models, routeBase, widgetId}) => {
|
|
33
|
+
const Widget = useHomeWidget(widgetId);
|
|
34
|
+
if (!Widget) {
|
|
35
|
+
return <MissingWidget bucket="home" widgetId={widgetId} />;
|
|
237
36
|
}
|
|
238
|
-
|
|
239
37
|
return (
|
|
240
|
-
<
|
|
241
|
-
|
|
242
|
-
{
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
{
|
|
248
|
-
|
|
249
|
-
<Text color="error" size="sm">
|
|
250
|
-
Could not load audit entries.
|
|
251
|
-
</Text>
|
|
252
|
-
</Box>
|
|
253
|
-
) : null}
|
|
254
|
-
{!isLoading && !isError && rows.length === 0 ? (
|
|
255
|
-
<Box marginTop={2}>
|
|
256
|
-
<Text color="secondaryDark" size="sm">
|
|
257
|
-
No audit entries yet.
|
|
258
|
-
</Text>
|
|
259
|
-
</Box>
|
|
260
|
-
) : null}
|
|
261
|
-
{!isLoading && !isError && rows.length > 0 ? (
|
|
262
|
-
<Box gap={2} marginTop={2}>
|
|
263
|
-
{rows.map((row) => {
|
|
264
|
-
const id = String(row._id ?? row.id ?? "");
|
|
265
|
-
const verb = String(row.verb ?? "");
|
|
266
|
-
const modelName = String(row.modelName ?? "");
|
|
267
|
-
const label = String(row.recordLabel ?? row.recordId ?? "");
|
|
268
|
-
const created = row.createdAt ?? row.created;
|
|
269
|
-
const when =
|
|
270
|
-
typeof created === "string" ? printDateAndTime(created, {defaultValue: created}) : "";
|
|
271
|
-
return (
|
|
272
|
-
<Box border="default" key={id || `${verb}-${label}`} padding={2} rounding="sm">
|
|
273
|
-
<Text size="sm">
|
|
274
|
-
<Text bold>{verb}</Text> {modelName}
|
|
275
|
-
{label ? ` — ${label}` : ""}
|
|
276
|
-
</Text>
|
|
277
|
-
{when ? (
|
|
278
|
-
<Text color="secondaryDark" size="sm">
|
|
279
|
-
{when}
|
|
280
|
-
</Text>
|
|
281
|
-
) : null}
|
|
282
|
-
</Box>
|
|
283
|
-
);
|
|
284
|
-
})}
|
|
285
|
-
</Box>
|
|
286
|
-
) : null}
|
|
287
|
-
</Card>
|
|
38
|
+
<Widget
|
|
39
|
+
api={api}
|
|
40
|
+
apiBase={apiBase}
|
|
41
|
+
auditModel={auditModel}
|
|
42
|
+
config={config}
|
|
43
|
+
featureFlagModel={featureFlagModel}
|
|
44
|
+
models={models}
|
|
45
|
+
routeBase={routeBase}
|
|
46
|
+
/>
|
|
288
47
|
);
|
|
289
48
|
};
|
|
290
49
|
|
|
291
|
-
const ScriptRunnerWidget: React.FC<{routeBase: string}> = ({routeBase}) => {
|
|
292
|
-
const onScripts = useCallback((): void => {
|
|
293
|
-
const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
|
|
294
|
-
router.push(`${prefix}/__scripts` as Href);
|
|
295
|
-
}, [routeBase]);
|
|
296
|
-
|
|
297
|
-
return (
|
|
298
|
-
<Card padding={4} testID="admin-home-widget-scriptRunner">
|
|
299
|
-
<Heading size="sm">Scripts</Heading>
|
|
300
|
-
<Box marginTop={1}>
|
|
301
|
-
<Text color="secondaryDark" size="sm">
|
|
302
|
-
Run registered admin maintenance scripts.
|
|
303
|
-
</Text>
|
|
304
|
-
</Box>
|
|
305
|
-
<Box marginTop={2}>
|
|
306
|
-
<Button onClick={onScripts} text="Open scripts" variant="primary" />
|
|
307
|
-
</Box>
|
|
308
|
-
</Card>
|
|
309
|
-
);
|
|
310
|
-
};
|
|
311
|
-
|
|
312
|
-
const renderWidget = (params: {
|
|
313
|
-
api: AdminApi;
|
|
314
|
-
apiBase: string;
|
|
315
|
-
routeBase: string;
|
|
316
|
-
widgetId: string;
|
|
317
|
-
models: AdminModelConfig[];
|
|
318
|
-
auditModel?: AdminModelConfig;
|
|
319
|
-
featureFlagModel?: AdminModelConfig;
|
|
320
|
-
}): React.ReactNode => {
|
|
321
|
-
const {api, apiBase, routeBase, widgetId, models, auditModel, featureFlagModel} = params;
|
|
322
|
-
warnUnknownWidget(widgetId);
|
|
323
|
-
switch (widgetId) {
|
|
324
|
-
case "modelStats":
|
|
325
|
-
return <ModelsGridWidget api={api} models={models} routeBase={routeBase} />;
|
|
326
|
-
case "modelsGrid":
|
|
327
|
-
return <ModelsGridWidget api={api} models={models} routeBase={routeBase} />;
|
|
328
|
-
case "feature-flags-overrides":
|
|
329
|
-
return <FeatureFlagsOverridesWidget model={featureFlagModel} routeBase={routeBase} />;
|
|
330
|
-
case "versionConfig":
|
|
331
|
-
return <AdminVersionConfig api={api} apiBase={apiBase} embedded routeBase={routeBase} />;
|
|
332
|
-
case "scriptRunner":
|
|
333
|
-
return <ScriptRunnerWidget routeBase={routeBase} />;
|
|
334
|
-
case "recentActivity":
|
|
335
|
-
return <RecentActivityWidget api={api} auditModel={auditModel} />;
|
|
336
|
-
default:
|
|
337
|
-
return null;
|
|
338
|
-
}
|
|
339
|
-
};
|
|
340
|
-
|
|
341
50
|
/**
|
|
342
|
-
* Config-driven admin home dashboard: renders `home.slots` from `/admin/config`
|
|
343
|
-
*
|
|
344
|
-
* `navGlobal` and `contentTop` widget ids render together in one top row (same flex line, wrapping
|
|
345
|
-
* as needed) so strips like scripts + feature flags stay side by side.
|
|
51
|
+
* Config-driven admin home dashboard: renders `home.slots` from `/admin/config` using the
|
|
52
|
+
* three-bucket widget registry (`AdminProvider.widgets.home` + built-ins).
|
|
346
53
|
*/
|
|
347
54
|
export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
348
55
|
baseUrl,
|
|
@@ -371,7 +78,6 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
371
78
|
const slots = config?.home?.slots;
|
|
372
79
|
const navGlobal = normalizeWidgetIds(slots?.navGlobal);
|
|
373
80
|
const contentTop = normalizeWidgetIds(slots?.contentTop);
|
|
374
|
-
/** Shown in one horizontal band so scripts, feature flags, etc. align on the same row. */
|
|
375
81
|
const topBandWidgetIds = useMemo(() => [...navGlobal, ...contentTop], [navGlobal, contentTop]);
|
|
376
82
|
const main = normalizeWidgetIds(slots?.main);
|
|
377
83
|
const sidebar = normalizeSidebarWidgets(slots?.sidebar);
|
|
@@ -410,10 +116,11 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
410
116
|
|
|
411
117
|
const title = config.home?.title ?? "Admin";
|
|
412
118
|
|
|
413
|
-
const
|
|
119
|
+
const slotWidgetProps = {
|
|
414
120
|
api,
|
|
415
121
|
apiBase: resolvedApiBase,
|
|
416
122
|
auditModel,
|
|
123
|
+
config,
|
|
417
124
|
featureFlagModel,
|
|
418
125
|
models,
|
|
419
126
|
routeBase: resolvedRouteBase,
|
|
@@ -426,7 +133,9 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
426
133
|
{topBandWidgetIds.length > 0 ? (
|
|
427
134
|
<Box direction="row" gap={3} testID="admin-home-slot-top" wrap>
|
|
428
135
|
{topBandWidgetIds.map((id) => (
|
|
429
|
-
<Box key={`top-${id}`}>
|
|
136
|
+
<Box key={`top-${id}`}>
|
|
137
|
+
<HomeSlotWidget {...slotWidgetProps} widgetId={id} />
|
|
138
|
+
</Box>
|
|
430
139
|
))}
|
|
431
140
|
</Box>
|
|
432
141
|
) : null}
|
|
@@ -441,7 +150,9 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
441
150
|
{...(embedded ? {width: "100%"} : {})}
|
|
442
151
|
>
|
|
443
152
|
{main.map((id) => (
|
|
444
|
-
<Box key={`mn-${id}`}>
|
|
153
|
+
<Box key={`mn-${id}`}>
|
|
154
|
+
<HomeSlotWidget {...slotWidgetProps} widgetId={id} />
|
|
155
|
+
</Box>
|
|
445
156
|
))}
|
|
446
157
|
</Box>
|
|
447
158
|
) : null}
|
|
@@ -454,7 +165,9 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
454
165
|
width={embedded ? "100%" : 320}
|
|
455
166
|
>
|
|
456
167
|
{sidebar.map((id) => (
|
|
457
|
-
<Box key={`sb-${id}`}>
|
|
168
|
+
<Box key={`sb-${id}`}>
|
|
169
|
+
<HomeSlotWidget {...slotWidgetProps} widgetId={id} />
|
|
170
|
+
</Box>
|
|
458
171
|
))}
|
|
459
172
|
</Box>
|
|
460
173
|
) : null}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import {beforeEach, describe, expect, it, mock} from "bun:test";
|
|
4
4
|
import {renderWithTheme} from "@terreno/ui/src/test-utils";
|
|
5
5
|
import {act, fireEvent} from "@testing-library/react-native";
|
|
6
|
+
import {assert} from "chai";
|
|
6
7
|
import React from "react";
|
|
7
8
|
import type {ReactTestInstance} from "react-test-renderer";
|
|
8
9
|
import type {AdminApi, AdminConfigResponse} from "./types";
|
|
@@ -131,6 +132,38 @@ describe("AdminModelForm", () => {
|
|
|
131
132
|
);
|
|
132
133
|
});
|
|
133
134
|
|
|
135
|
+
it("removes save controls when effective model permissions are read-only", () => {
|
|
136
|
+
configState.config = {
|
|
137
|
+
...config,
|
|
138
|
+
models: [{...modelConfig, permissions: {create: true, delete: true, update: true}}],
|
|
139
|
+
};
|
|
140
|
+
readState.data = {
|
|
141
|
+
_adminCapabilities: {delete: false, update: false},
|
|
142
|
+
email: "readonly@example.com",
|
|
143
|
+
name: "Read only",
|
|
144
|
+
};
|
|
145
|
+
let savedHeaderRight: React.ReactElement | null = null;
|
|
146
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
147
|
+
if (opts?.headerRight) {
|
|
148
|
+
savedHeaderRight = opts.headerRight();
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
renderWithTheme(
|
|
153
|
+
<AdminModelForm
|
|
154
|
+
api={{} as unknown as AdminApi}
|
|
155
|
+
baseUrl="/admin"
|
|
156
|
+
itemId="readonly"
|
|
157
|
+
mode="edit"
|
|
158
|
+
modelName="User"
|
|
159
|
+
/>
|
|
160
|
+
);
|
|
161
|
+
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
162
|
+
|
|
163
|
+
assert.isNull(header.queryByTestId("admin-save-button"));
|
|
164
|
+
assert.isNull(header.queryByTestId("admin-delete-button"));
|
|
165
|
+
});
|
|
166
|
+
|
|
134
167
|
it("renders spinner during edit when the item is loading", () => {
|
|
135
168
|
configState.config = config;
|
|
136
169
|
readState.isLoading = true;
|
|
@@ -528,6 +561,51 @@ describe("AdminModelForm", () => {
|
|
|
528
561
|
expect(body.body.tags).toEqual(["a", "b"]);
|
|
529
562
|
});
|
|
530
563
|
|
|
564
|
+
it("omits blank optional enum fields from update payloads", async () => {
|
|
565
|
+
configState.config = {
|
|
566
|
+
...config,
|
|
567
|
+
models: [
|
|
568
|
+
{
|
|
569
|
+
...modelConfig,
|
|
570
|
+
fieldOrder: ["email", "oauthProvider"],
|
|
571
|
+
fields: {
|
|
572
|
+
email: {required: true, type: "string"},
|
|
573
|
+
oauthProvider: {
|
|
574
|
+
enum: ["google", "github", "apple"],
|
|
575
|
+
required: false,
|
|
576
|
+
type: "string",
|
|
577
|
+
},
|
|
578
|
+
},
|
|
579
|
+
},
|
|
580
|
+
],
|
|
581
|
+
};
|
|
582
|
+
readState.data = {email: "e@x.com"};
|
|
583
|
+
let savedHeaderRight: React.ReactElement | null = null;
|
|
584
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
585
|
+
if (opts?.headerRight) {
|
|
586
|
+
savedHeaderRight = opts.headerRight();
|
|
587
|
+
}
|
|
588
|
+
});
|
|
589
|
+
renderWithTheme(
|
|
590
|
+
<AdminModelForm
|
|
591
|
+
api={{} as unknown as AdminApi}
|
|
592
|
+
baseUrl="/admin"
|
|
593
|
+
itemId="u1"
|
|
594
|
+
mode="edit"
|
|
595
|
+
modelName="User"
|
|
596
|
+
/>
|
|
597
|
+
);
|
|
598
|
+
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
599
|
+
await act(async () => {
|
|
600
|
+
fireEvent.press(header.getByTestId("admin-save-button"));
|
|
601
|
+
await new Promise((resolve) => setTimeout(resolve, 600));
|
|
602
|
+
});
|
|
603
|
+
|
|
604
|
+
const body = updateFn.mock.calls[0][0] as {body: Record<string, unknown>; id: string};
|
|
605
|
+
expect(body.body.oauthProvider).toBeUndefined();
|
|
606
|
+
expect(body.body.email).toBe("e@x.com");
|
|
607
|
+
});
|
|
608
|
+
|
|
531
609
|
it("applies field-level onChange via the rendered text field", async () => {
|
|
532
610
|
configState.config = {
|
|
533
611
|
...config,
|
package/src/AdminModelForm.tsx
CHANGED
|
@@ -7,6 +7,7 @@ import type {
|
|
|
7
7
|
AdminFieldConfig,
|
|
8
8
|
AdminFieldValue,
|
|
9
9
|
AdminModelConfig,
|
|
10
|
+
AdminRecordCapabilities,
|
|
10
11
|
RefRendererMap,
|
|
11
12
|
} from "./types";
|
|
12
13
|
import {resolveAdminBases, SYSTEM_FIELDS} from "./types";
|
|
@@ -131,6 +132,24 @@ const sanitizePayloadValue = (value: AdminFieldValue): AdminFieldValue => {
|
|
|
131
132
|
return value;
|
|
132
133
|
};
|
|
133
134
|
|
|
135
|
+
const omitBlankOptionalEnums = (
|
|
136
|
+
payload: Record<string, AdminFieldValue>,
|
|
137
|
+
fields: Record<string, AdminFieldConfig>
|
|
138
|
+
): Record<string, AdminFieldValue> => {
|
|
139
|
+
const nextPayload = {...payload};
|
|
140
|
+
for (const [fieldKey, fieldConfig] of Object.entries(fields)) {
|
|
141
|
+
if (
|
|
142
|
+
nextPayload[fieldKey] === "" &&
|
|
143
|
+
!fieldConfig.required &&
|
|
144
|
+
fieldConfig.enum &&
|
|
145
|
+
fieldConfig.enum.length > 0
|
|
146
|
+
) {
|
|
147
|
+
Reflect.deleteProperty(nextPayload, fieldKey);
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return nextPayload;
|
|
151
|
+
};
|
|
152
|
+
|
|
134
153
|
const DeleteButton: React.FC<{loading: boolean; onDelete: () => void}> = ({loading, onDelete}) => (
|
|
135
154
|
<Button
|
|
136
155
|
confirmationText="Are you sure you want to delete this item?"
|
|
@@ -385,7 +404,10 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
385
404
|
return;
|
|
386
405
|
}
|
|
387
406
|
try {
|
|
388
|
-
const sanitizedPayload =
|
|
407
|
+
const sanitizedPayload = omitBlankOptionalEnums(
|
|
408
|
+
sanitizePayloadValue(formState) as Record<string, AdminFieldValue>,
|
|
409
|
+
modelConfig.fields
|
|
410
|
+
);
|
|
389
411
|
const readonlyKeys = new Set(modelConfig.readonlyFields ?? []);
|
|
390
412
|
const stripped: Record<string, AdminFieldValue> = {};
|
|
391
413
|
for (const [k, v] of Object.entries(sanitizedPayload)) {
|
|
@@ -436,6 +458,14 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
436
458
|
}, [itemId, deleteItem, toast, modelName]);
|
|
437
459
|
|
|
438
460
|
const isSaving = isCreating || isUpdating;
|
|
461
|
+
const recordCapabilities = (
|
|
462
|
+
itemData as {_adminCapabilities?: AdminRecordCapabilities} | undefined
|
|
463
|
+
)?._adminCapabilities;
|
|
464
|
+
const isFormWritable =
|
|
465
|
+
mode === "create"
|
|
466
|
+
? modelConfig?.permissions?.create !== false
|
|
467
|
+
: (recordCapabilities?.update ?? modelConfig?.permissions?.update !== false);
|
|
468
|
+
const canDeleteRecord = recordCapabilities?.delete ?? modelConfig?.permissions?.delete !== false;
|
|
439
469
|
|
|
440
470
|
const navigationTitle = useMemo((): string => {
|
|
441
471
|
if (!modelConfig) {
|
|
@@ -491,16 +521,18 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
491
521
|
navigation.setOptions({
|
|
492
522
|
headerRight: () => (
|
|
493
523
|
<Box alignItems="center" direction="row" gap={2} justifyContent="center" marginRight={3}>
|
|
494
|
-
{mode === "edit" &&
|
|
524
|
+
{mode === "edit" && canDeleteRecord ? (
|
|
495
525
|
<DeleteButton loading={isDeleting} onDelete={handleDelete} />
|
|
496
526
|
) : null}
|
|
497
|
-
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
|
|
501
|
-
|
|
502
|
-
|
|
503
|
-
|
|
527
|
+
{isFormWritable ? (
|
|
528
|
+
<Button
|
|
529
|
+
loading={isSaving}
|
|
530
|
+
onClick={handleSave}
|
|
531
|
+
testID="admin-save-button"
|
|
532
|
+
text={mode === "create" ? "Create" : "Save"}
|
|
533
|
+
variant="primary"
|
|
534
|
+
/>
|
|
535
|
+
) : null}
|
|
504
536
|
</Box>
|
|
505
537
|
),
|
|
506
538
|
title: navigationTitle,
|
|
@@ -514,6 +546,8 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
514
546
|
isDeleting,
|
|
515
547
|
handleSave,
|
|
516
548
|
handleDelete,
|
|
549
|
+
isFormWritable,
|
|
550
|
+
canDeleteRecord,
|
|
517
551
|
]);
|
|
518
552
|
|
|
519
553
|
const visibleFields = useMemo((): [string, AdminFieldConfig][] => {
|
|
@@ -531,8 +565,11 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
531
565
|
if (!modelConfig) {
|
|
532
566
|
return new Set<string>();
|
|
533
567
|
}
|
|
568
|
+
if (!isFormWritable) {
|
|
569
|
+
return new Set(Object.keys(modelConfig.fields));
|
|
570
|
+
}
|
|
534
571
|
return new Set(modelConfig.readonlyFields ?? []);
|
|
535
|
-
}, [modelConfig]);
|
|
572
|
+
}, [isFormWritable, modelConfig]);
|
|
536
573
|
|
|
537
574
|
const fieldSections = useMemo(() => {
|
|
538
575
|
if (!modelConfig?.fieldsets?.length) {
|
|
@@ -598,6 +635,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
598
635
|
<AdminFieldRenderer
|
|
599
636
|
api={api}
|
|
600
637
|
apiBase={resolvedApiBase}
|
|
638
|
+
autocompleteFields={modelConfig.autocompleteFields}
|
|
601
639
|
errorText={errors[fieldKey]}
|
|
602
640
|
fieldConfig={fieldConfig}
|
|
603
641
|
fieldKey={fieldKey}
|
|
@@ -618,6 +656,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
618
656
|
<AdminFieldRenderer
|
|
619
657
|
api={api}
|
|
620
658
|
apiBase={resolvedApiBase}
|
|
659
|
+
autocompleteFields={modelConfig.autocompleteFields}
|
|
621
660
|
errorText={errors[fieldKey]}
|
|
622
661
|
fieldConfig={fieldConfig}
|
|
623
662
|
fieldKey={fieldKey}
|
package/src/AdminModelList.tsx
CHANGED
|
@@ -2,6 +2,7 @@ import {Box, Card, Heading, Page, Spinner, Text} from "@terreno/ui";
|
|
|
2
2
|
import type {Href} from "expo-router";
|
|
3
3
|
import {router} from "expo-router";
|
|
4
4
|
import React, {useCallback} from "react";
|
|
5
|
+
import {useDeprecatedCustomScreensProp} from "./AdminProvider";
|
|
5
6
|
import {
|
|
6
7
|
type AdminApi,
|
|
7
8
|
type AdminCustomScreen,
|
|
@@ -20,7 +21,8 @@ interface AdminModelListProps {
|
|
|
20
21
|
api: AdminApi;
|
|
21
22
|
/** Path to navigate to for the configuration screen. When provided, a Configuration card is shown. */
|
|
22
23
|
configurationPath?: string;
|
|
23
|
-
/** Additional custom screens to display as cards. Merged with any custom screens from the backend config.
|
|
24
|
+
/** Additional custom screens to display as cards. Merged with any custom screens from the backend config.
|
|
25
|
+
* @deprecated When using {@link AdminProvider}, register screens via `widgets.screens` instead. */
|
|
24
26
|
customScreens?: AdminCustomScreen[];
|
|
25
27
|
/** When true, omits the outer {@link Page} wrapper for composition under a parent screen. */
|
|
26
28
|
embedded?: boolean;
|
|
@@ -146,6 +148,7 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
|
|
|
146
148
|
routeBase,
|
|
147
149
|
});
|
|
148
150
|
const {config, isLoading, error} = useAdminConfig(api, resolvedApiBase);
|
|
151
|
+
useDeprecatedCustomScreensProp(propCustomScreens);
|
|
149
152
|
|
|
150
153
|
const handlePress = useCallback(
|
|
151
154
|
(modelName: string) => {
|
|
@@ -187,7 +190,9 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
|
|
|
187
190
|
}
|
|
188
191
|
|
|
189
192
|
const backendScreens = config.customScreens ?? [];
|
|
190
|
-
const allCustomScreens =
|
|
193
|
+
const allCustomScreens = config.platformTools
|
|
194
|
+
? backendScreens
|
|
195
|
+
: [...backendScreens, ...(propCustomScreens ?? [])];
|
|
191
196
|
const scripts = config.scripts ?? [];
|
|
192
197
|
const hasToolCards = allCustomScreens.length > 0 || scripts.length > 0 || !!configurationPath;
|
|
193
198
|
|