@terreno/admin-frontend 0.20.2 → 0.21.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.
Files changed (117) hide show
  1. package/.ai/guidelines/core.md +10 -0
  2. package/dist/AdminBreadcrumbs.d.ts +13 -0
  3. package/dist/AdminBreadcrumbs.js +22 -0
  4. package/dist/AdminBreadcrumbs.js.map +1 -0
  5. package/dist/AdminFieldRenderer.js +3 -3
  6. package/dist/AdminFieldRenderer.js.map +1 -1
  7. package/dist/AdminFieldRendererCore.d.ts +2 -0
  8. package/dist/AdminFieldRendererCore.js +28 -18
  9. package/dist/AdminFieldRendererCore.js.map +1 -1
  10. package/dist/AdminHome.d.ts +22 -0
  11. package/dist/AdminHome.js +189 -0
  12. package/dist/AdminHome.js.map +1 -0
  13. package/dist/AdminModelForm.d.ts +24 -1
  14. package/dist/AdminModelForm.js +185 -14
  15. package/dist/AdminModelForm.js.map +1 -1
  16. package/dist/AdminModelList.d.ts +4 -0
  17. package/dist/AdminModelList.js +19 -4
  18. package/dist/AdminModelList.js.map +1 -1
  19. package/dist/AdminModelTable.d.ts +2 -27
  20. package/dist/AdminModelTable.js +316 -60
  21. package/dist/AdminModelTable.js.map +1 -1
  22. package/dist/AdminNestedArrayField.d.ts +1 -0
  23. package/dist/AdminNestedArrayField.js +26 -6
  24. package/dist/AdminNestedArrayField.js.map +1 -1
  25. package/dist/AdminObjectPicker.d.ts +1 -0
  26. package/dist/AdminObjectPicker.js +6 -2
  27. package/dist/AdminObjectPicker.js.map +1 -1
  28. package/dist/AdminPrimitiveArrayField.d.ts +1 -0
  29. package/dist/AdminPrimitiveArrayField.js +9 -8
  30. package/dist/AdminPrimitiveArrayField.js.map +1 -1
  31. package/dist/AdminRefField.js +2 -2
  32. package/dist/AdminRefField.js.map +1 -1
  33. package/dist/AdminScriptList.js +114 -7
  34. package/dist/AdminScriptList.js.map +1 -1
  35. package/dist/AdminScriptRunModal.d.ts +5 -0
  36. package/dist/AdminScriptRunModal.js +136 -30
  37. package/dist/AdminScriptRunModal.js.map +1 -1
  38. package/dist/AdminShell.d.ts +39 -0
  39. package/dist/AdminShell.js +80 -0
  40. package/dist/AdminShell.js.map +1 -0
  41. package/dist/AdminShellLayout.d.ts +23 -0
  42. package/dist/AdminShellLayout.js +32 -0
  43. package/dist/AdminShellLayout.js.map +1 -0
  44. package/dist/AdminVersionConfig.d.ts +5 -0
  45. package/dist/AdminVersionConfig.js +15 -5
  46. package/dist/AdminVersionConfig.js.map +1 -1
  47. package/dist/ConfigurationScreen.js +3 -3
  48. package/dist/ConfigurationScreen.js.map +1 -1
  49. package/dist/ConsentFormEditor.js +2 -2
  50. package/dist/ConsentFormEditor.js.map +1 -1
  51. package/dist/ConsentFormList.js +1 -1
  52. package/dist/ConsentFormList.js.map +1 -1
  53. package/dist/ConsentResponseViewer.js +3 -3
  54. package/dist/ConsentResponseViewer.js.map +1 -1
  55. package/dist/DocumentStorageBrowser.js +1 -1
  56. package/dist/DocumentStorageBrowser.js.map +1 -1
  57. package/dist/adminModelListQueryParams.d.ts +14 -0
  58. package/dist/adminModelListQueryParams.js +51 -0
  59. package/dist/adminModelListQueryParams.js.map +1 -0
  60. package/dist/adminShellNav.d.ts +10 -0
  61. package/dist/adminShellNav.js +29 -0
  62. package/dist/adminShellNav.js.map +1 -0
  63. package/dist/index.d.ts +6 -1
  64. package/dist/index.js +5 -0
  65. package/dist/index.js.map +1 -1
  66. package/dist/scriptRunUtils.d.ts +36 -0
  67. package/dist/scriptRunUtils.js +121 -0
  68. package/dist/scriptRunUtils.js.map +1 -0
  69. package/dist/types.d.ts +70 -0
  70. package/dist/types.js.map +1 -1
  71. package/dist/useAdminApi.d.ts +1 -0
  72. package/dist/useAdminApi.js +11 -0
  73. package/dist/useAdminApi.js.map +1 -1
  74. package/dist/useAdminBackgroundTask.d.ts +12 -0
  75. package/dist/useAdminBackgroundTask.js +26 -0
  76. package/dist/useAdminBackgroundTask.js.map +1 -0
  77. package/dist/useAdminScripts.d.ts +19 -1
  78. package/dist/useAdminScripts.js +33 -4
  79. package/dist/useAdminScripts.js.map +1 -1
  80. package/package.json +4 -3
  81. package/src/AdminBreadcrumbs.test.tsx +27 -0
  82. package/src/AdminBreadcrumbs.tsx +63 -0
  83. package/src/AdminFieldRenderer.tsx +3 -0
  84. package/src/AdminFieldRendererCore.tsx +59 -1
  85. package/src/AdminHome.test.tsx +208 -0
  86. package/src/AdminHome.tsx +474 -0
  87. package/src/AdminModelForm.test.tsx +81 -1
  88. package/src/AdminModelForm.tsx +282 -34
  89. package/src/AdminModelList.test.tsx +1 -1
  90. package/src/AdminModelList.tsx +72 -39
  91. package/src/AdminModelTable.test.tsx +11 -0
  92. package/src/AdminModelTable.tsx +530 -92
  93. package/src/AdminNestedArrayField.tsx +59 -9
  94. package/src/AdminObjectPicker.tsx +19 -1
  95. package/src/AdminPrimitiveArrayField.tsx +30 -15
  96. package/src/AdminRefField.tsx +2 -0
  97. package/src/AdminScriptList.tsx +307 -30
  98. package/src/AdminScriptRunModal.tsx +410 -95
  99. package/src/AdminShell.tsx +296 -0
  100. package/src/AdminShellLayout.tsx +34 -0
  101. package/src/AdminVersionConfig.tsx +120 -76
  102. package/src/ConfigurationScreen.tsx +4 -2
  103. package/src/ConsentFormEditor.tsx +3 -1
  104. package/src/ConsentFormList.tsx +1 -1
  105. package/src/ConsentResponseViewer.tsx +3 -3
  106. package/src/DocumentStorageBrowser.tsx +1 -1
  107. package/src/adminModelListQueryParams.ts +61 -0
  108. package/src/adminShellNav.test.ts +29 -0
  109. package/src/adminShellNav.ts +33 -0
  110. package/src/index.tsx +6 -1
  111. package/src/isolated/AdminScriptRunModal.isolated.tsx +152 -1
  112. package/src/scriptRunUtils.test.ts +146 -0
  113. package/src/scriptRunUtils.ts +149 -0
  114. package/src/types.ts +69 -0
  115. package/src/useAdminApi.ts +11 -0
  116. package/src/useAdminBackgroundTask.ts +40 -0
  117. package/src/useAdminScripts.ts +56 -5
@@ -1,4 +1,4 @@
1
- import {Box, Button, Page, Spinner, Text, useToast} from "@terreno/ui";
1
+ import {Accordion, Box, Button, Page, Spinner, Text, useToast} from "@terreno/ui";
2
2
  import {router, useNavigation} from "expo-router";
3
3
  import React, {useCallback, useEffect, useMemo, useState} from "react";
4
4
  import {AdminFieldRenderer} from "./AdminFieldRenderer";
@@ -13,6 +13,15 @@ import {resolveAdminBases, SYSTEM_FIELDS} from "./types";
13
13
  import {useAdminApi} from "./useAdminApi";
14
14
  import {useAdminConfig} from "./useAdminConfig";
15
15
 
16
+ /** Parameters for {@link AdminModelFormProps.getScreenTitle}. */
17
+ export interface AdminModelFormScreenTitleParams {
18
+ mode: "create" | "edit";
19
+ modelConfig: AdminModelConfig;
20
+ formState: Record<string, AdminFieldValue>;
21
+ itemData: Record<string, AdminFieldValue> | undefined;
22
+ itemId?: string;
23
+ }
24
+
16
25
  interface AdminModelFormProps {
17
26
  /** @deprecated Use `apiBase`/`routeBase`. Kept as a backward-compatible alias. */
18
27
  baseUrl?: string;
@@ -41,6 +50,18 @@ interface AdminModelFormProps {
41
50
  * inside nested/primitive arrays) can be rendered with a consumer-provided component.
42
51
  */
43
52
  refRenderers?: RefRendererMap;
53
+ /** When set, used as the stack / document title as-is (including empty string). */
54
+ screenTitle?: string;
55
+ /**
56
+ * Field key for the edit-mode title. Overrides {@link AdminModelConfig.recordTitleField}
57
+ * from the server config.
58
+ */
59
+ recordTitleField?: string;
60
+ /**
61
+ * Custom title resolver. Return a non-empty string to override defaults; return undefined to
62
+ * fall back to {@link screenTitle}, config, or built-in heuristics.
63
+ */
64
+ getScreenTitle?: (params: AdminModelFormScreenTitleParams) => string | undefined;
44
65
  }
45
66
 
46
67
  const getEditableFields = (
@@ -67,6 +88,16 @@ const getEditableFields = (
67
88
  return ordered;
68
89
  };
69
90
 
91
+ /** Non-system fields minus `hiddenFields` (still includes readonly keys for display). */
92
+ const getVisibleFieldEntries = (
93
+ fields: Record<string, AdminFieldConfig>,
94
+ fieldOrder: string[] | undefined,
95
+ hiddenFields: string[] | undefined
96
+ ): [string, AdminFieldConfig][] => {
97
+ const hidden = new Set(hiddenFields ?? []);
98
+ return getEditableFields(fields, fieldOrder).filter(([key]) => !hidden.has(key));
99
+ };
100
+
70
101
  const getFieldDefault = (fieldConfig: AdminFieldConfig): AdminFieldValue => {
71
102
  if (fieldConfig.default !== undefined) {
72
103
  return fieldConfig.default;
@@ -114,6 +145,74 @@ const DeleteButton: React.FC<{loading: boolean; onDelete: () => void}> = ({loadi
114
145
 
115
146
  const EmptyFields: React.FC = () => <Text color="secondaryDark">No editable fields.</Text>;
116
147
 
148
+ const TITLE_PREFERENCE_KEYS = ["name", "title", "label", "email", "username", "displayName"];
149
+
150
+ const readScalarTitleFromRecord = (
151
+ record: Record<string, unknown>,
152
+ fieldKey: string
153
+ ): string | undefined => {
154
+ const fieldValue = record[fieldKey];
155
+ if (fieldValue == null || typeof fieldValue === "object") {
156
+ return undefined;
157
+ }
158
+ const s = String(fieldValue).trim();
159
+ if (s.length === 0) {
160
+ return undefined;
161
+ }
162
+ return s;
163
+ };
164
+
165
+ const mergeItemAndFormState = (
166
+ itemData: unknown,
167
+ formState: Record<string, AdminFieldValue>
168
+ ): Record<string, unknown> => {
169
+ const out: Record<string, unknown> = {};
170
+ if (itemData && typeof itemData === "object" && !Array.isArray(itemData)) {
171
+ Object.assign(out, itemData as Record<string, unknown>);
172
+ }
173
+ for (const [k, v] of Object.entries(formState)) {
174
+ out[k] = v;
175
+ }
176
+ return out;
177
+ };
178
+
179
+ const inferEditRecordTitle = (params: {
180
+ displayName: string;
181
+ explicitField: string | undefined;
182
+ fieldKeys: Set<string>;
183
+ itemId: string | undefined;
184
+ listFields: string[];
185
+ record: Record<string, unknown>;
186
+ }): string => {
187
+ const {displayName, explicitField, fieldKeys, itemId, listFields, record} = params;
188
+ if (explicitField) {
189
+ const fromExplicit = readScalarTitleFromRecord(record, explicitField);
190
+ if (fromExplicit) {
191
+ return fromExplicit;
192
+ }
193
+ }
194
+ for (const key of TITLE_PREFERENCE_KEYS) {
195
+ if (!fieldKeys.has(key)) {
196
+ continue;
197
+ }
198
+ const fromPreferred = readScalarTitleFromRecord(record, key);
199
+ if (fromPreferred) {
200
+ return fromPreferred;
201
+ }
202
+ }
203
+ for (const key of listFields) {
204
+ const fromList = readScalarTitleFromRecord(record, key);
205
+ if (fromList) {
206
+ return fromList;
207
+ }
208
+ }
209
+ if (itemId) {
210
+ const short = itemId.length > 12 ? `${itemId.slice(0, 8)}…` : itemId;
211
+ return `${displayName} · ${short}`;
212
+ }
213
+ return displayName;
214
+ };
215
+
117
216
  /**
118
217
  * Form screen for creating or editing a model instance in the admin panel.
119
218
  *
@@ -128,6 +227,9 @@ const EmptyFields: React.FC = () => <Text color="secondaryDark">No editable fiel
128
227
  * @param props.modelName - Name of the model to create/edit (e.g., "User")
129
228
  * @param props.mode - Form mode: "create" for new items, "edit" for existing items
130
229
  * @param props.itemId - ID of the item to edit (required when mode is "edit")
230
+ * @param props.screenTitle - Optional fixed stack / document title (overrides all title logic)
231
+ * @param props.recordTitleField - Optional field key for edit-mode title (overrides server `recordTitleField`)
232
+ * @param props.getScreenTitle - Optional callback to derive the title; return undefined to use defaults
131
233
  *
132
234
  * @example
133
235
  * ```typescript
@@ -177,6 +279,9 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
177
279
  transformPayload,
178
280
  onSaveSuccess,
179
281
  refRenderers,
282
+ screenTitle,
283
+ recordTitleField: recordTitleFieldProp,
284
+ getScreenTitle,
180
285
  }) => {
181
286
  const {apiBase: resolvedApiBase, routeBase: resolvedRouteBase} = resolveAdminBases({
182
287
  apiBase,
@@ -215,9 +320,10 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
215
320
  if (mode === "edit" && itemData && !isInitialized) {
216
321
  const initial: Record<string, AdminFieldValue> = {};
217
322
  if (modelConfig) {
218
- for (const [key, fieldConfig] of getEditableFields(
323
+ for (const [key, fieldConfig] of getVisibleFieldEntries(
219
324
  modelConfig.fields,
220
- modelConfig.fieldOrder
325
+ modelConfig.fieldOrder,
326
+ modelConfig.hiddenFields
221
327
  )) {
222
328
  const raw = itemData[key];
223
329
  initial[key] = raw ?? getFieldDefault(fieldConfig);
@@ -232,9 +338,10 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
232
338
  useEffect(() => {
233
339
  if (mode === "create" && modelConfig && !isInitialized) {
234
340
  const initial: Record<string, AdminFieldValue> = {};
235
- for (const [key, fieldConfig] of getEditableFields(
341
+ for (const [key, fieldConfig] of getVisibleFieldEntries(
236
342
  modelConfig.fields,
237
- modelConfig.fieldOrder
343
+ modelConfig.fieldOrder,
344
+ modelConfig.hiddenFields
238
345
  )) {
239
346
  initial[key] = getFieldDefault(fieldConfig);
240
347
  }
@@ -257,9 +364,10 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
257
364
  return false;
258
365
  }
259
366
  const newErrors: Record<string, string> = {};
260
- for (const [key, fieldConfig] of getEditableFields(
367
+ for (const [key, fieldConfig] of getVisibleFieldEntries(
261
368
  modelConfig.fields,
262
- modelConfig.fieldOrder
369
+ modelConfig.fieldOrder,
370
+ modelConfig.hiddenFields
263
371
  )) {
264
372
  if (fieldConfig.required && (formState[key] == null || formState[key] === "")) {
265
373
  newErrors[key] = `${key} is required`;
@@ -270,14 +378,24 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
270
378
  }, [modelConfig, formState]);
271
379
 
272
380
  const handleSave = useCallback(async () => {
381
+ if (!modelConfig) {
382
+ return;
383
+ }
273
384
  if (!validate()) {
274
385
  return;
275
386
  }
276
387
  try {
277
388
  const sanitizedPayload = sanitizePayloadValue(formState) as Record<string, AdminFieldValue>;
389
+ const readonlyKeys = new Set(modelConfig.readonlyFields ?? []);
390
+ const stripped: Record<string, AdminFieldValue> = {};
391
+ for (const [k, v] of Object.entries(sanitizedPayload)) {
392
+ if (!readonlyKeys.has(k)) {
393
+ stripped[k] = v;
394
+ }
395
+ }
278
396
  const payload = transformPayload
279
- ? await transformPayload({mode, payload: sanitizedPayload})
280
- : sanitizedPayload;
397
+ ? await transformPayload({mode, payload: stripped})
398
+ : stripped;
281
399
  let result: AdminFieldValue;
282
400
  if (mode === "create") {
283
401
  result = await createItem(payload).unwrap();
@@ -295,6 +413,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
295
413
  mode,
296
414
  formState,
297
415
  itemId,
416
+ modelConfig,
298
417
  createItem,
299
418
  updateItem,
300
419
  validate,
@@ -318,7 +437,53 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
318
437
 
319
438
  const isSaving = isCreating || isUpdating;
320
439
 
321
- // Set header action buttons (save/delete)
440
+ const navigationTitle = useMemo((): string => {
441
+ if (!modelConfig) {
442
+ return "";
443
+ }
444
+ if (screenTitle !== undefined) {
445
+ return screenTitle;
446
+ }
447
+ const fromCallback = getScreenTitle?.({
448
+ formState,
449
+ itemData: itemData as Record<string, AdminFieldValue> | undefined,
450
+ itemId,
451
+ mode,
452
+ modelConfig,
453
+ });
454
+ if (typeof fromCallback === "string" && fromCallback.trim().length > 0) {
455
+ return fromCallback.trim();
456
+ }
457
+ if (mode === "create") {
458
+ return `New ${modelConfig.displayName}`;
459
+ }
460
+ if (isItemLoading) {
461
+ return modelConfig.displayName;
462
+ }
463
+ const explicitField = recordTitleFieldProp ?? modelConfig.recordTitleField;
464
+ const fieldKeys = new Set(Object.keys(modelConfig.fields));
465
+ const record = mergeItemAndFormState(itemData, formState);
466
+ return inferEditRecordTitle({
467
+ displayName: modelConfig.displayName,
468
+ explicitField,
469
+ fieldKeys,
470
+ itemId,
471
+ listFields: modelConfig.listFields ?? [],
472
+ record,
473
+ });
474
+ }, [
475
+ formState,
476
+ getScreenTitle,
477
+ itemData,
478
+ itemId,
479
+ isItemLoading,
480
+ mode,
481
+ modelConfig,
482
+ recordTitleFieldProp,
483
+ screenTitle,
484
+ ]);
485
+
486
+ // Set stack / document title and header action buttons (save/delete)
322
487
  useEffect(() => {
323
488
  if (!modelConfig) {
324
489
  return;
@@ -326,7 +491,9 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
326
491
  navigation.setOptions({
327
492
  headerRight: () => (
328
493
  <Box alignItems="center" direction="row" gap={2} justifyContent="center" marginRight={3}>
329
- {mode === "edit" && <DeleteButton loading={isDeleting} onDelete={handleDelete} />}
494
+ {mode === "edit" && modelConfig.permissions?.delete !== false ? (
495
+ <DeleteButton loading={isDeleting} onDelete={handleDelete} />
496
+ ) : null}
330
497
  <Button
331
498
  loading={isSaving}
332
499
  onClick={handleSave}
@@ -336,12 +503,67 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
336
503
  />
337
504
  </Box>
338
505
  ),
506
+ title: navigationTitle,
339
507
  });
340
- }, [navigation, modelConfig, mode, isSaving, isDeleting, handleSave, handleDelete]);
508
+ }, [
509
+ navigation,
510
+ navigationTitle,
511
+ modelConfig,
512
+ mode,
513
+ isSaving,
514
+ isDeleting,
515
+ handleSave,
516
+ handleDelete,
517
+ ]);
518
+
519
+ const visibleFields = useMemo((): [string, AdminFieldConfig][] => {
520
+ if (!modelConfig) {
521
+ return [];
522
+ }
523
+ return getVisibleFieldEntries(
524
+ modelConfig.fields,
525
+ modelConfig.fieldOrder,
526
+ modelConfig.hiddenFields
527
+ );
528
+ }, [modelConfig]);
529
+
530
+ const readonlyKeySet = useMemo(() => {
531
+ if (!modelConfig) {
532
+ return new Set<string>();
533
+ }
534
+ return new Set(modelConfig.readonlyFields ?? []);
535
+ }, [modelConfig]);
536
+
537
+ const fieldSections = useMemo(() => {
538
+ if (!modelConfig?.fieldsets?.length) {
539
+ return null;
540
+ }
541
+ const visibleMap = new Map(visibleFields);
542
+ const used = new Set<string>();
543
+ const sections: {title: string; entries: [string, AdminFieldConfig][]}[] = [];
544
+ for (const fs of modelConfig.fieldsets) {
545
+ const entries: [string, AdminFieldConfig][] = [];
546
+ for (const key of fs.fields) {
547
+ const cfg = visibleMap.get(key);
548
+ if (cfg) {
549
+ entries.push([key, cfg]);
550
+ used.add(key);
551
+ }
552
+ }
553
+ if (entries.length > 0) {
554
+ sections.push({entries, title: fs.title});
555
+ }
556
+ }
557
+ const remaining = visibleFields.filter(([k]) => !used.has(k));
558
+ if (remaining.length > 0) {
559
+ sections.push({entries: remaining, title: "Other"});
560
+ }
561
+ return sections;
562
+ }, [modelConfig?.fieldsets, visibleFields]);
341
563
 
342
564
  if (isConfigLoading || !modelConfig) {
343
565
  return (
344
- <Page maxWidth="100%">
566
+ <Page color="transparent" maxWidth="100%" padding={0}>
345
567
  <Box alignItems="center" justifyContent="center" padding={6}>
346
568
  <Spinner />
347
569
  </Box>
@@ -351,7 +573,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
351
573
 
352
574
  if (mode === "edit" && isItemLoading) {
353
575
  return (
354
- <Page maxWidth="100%">
576
+ <Page color="transparent" maxWidth="100%" padding={0}>
355
577
  <Box alignItems="center" justifyContent="center" padding={6}>
356
578
  <Spinner />
357
579
  </Box>
@@ -359,31 +581,57 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
359
581
  );
360
582
  }
361
583
 
362
- const editableFields = getEditableFields(modelConfig.fields, modelConfig.fieldOrder);
363
-
364
584
  const modelConfigs =
365
585
  config?.models.map((m: AdminModelConfig) => ({name: m.name, routePath: m.routePath})) ?? [];
366
586
 
367
587
  return (
368
- <Page maxWidth="100%" scroll>
588
+ <Page color="transparent" maxWidth="100%" padding={0} scroll>
369
589
  <Box gap={3} padding={4}>
370
- {editableFields.map(([fieldKey, fieldConfig]) => (
371
- <AdminFieldRenderer
372
- api={api}
373
- apiBase={resolvedApiBase}
374
- errorText={errors[fieldKey]}
375
- fieldConfig={fieldConfig}
376
- fieldKey={fieldKey}
377
- key={fieldKey}
378
- modelConfigs={modelConfigs}
379
- onChange={(value: AdminFieldValue) => handleFieldChange(fieldKey, value)}
380
- parentFormState={formState}
381
- refRenderers={refRenderers}
382
- routeBase={resolvedRouteBase}
383
- value={formState[fieldKey]}
384
- />
385
- ))}
386
- {editableFields.length === 0 && <EmptyFields />}
590
+ {fieldSections
591
+ ? fieldSections.map((section, sectionIndex) => (
592
+ <Accordion
593
+ key={`admin-fieldset-${sectionIndex}-${section.title}`}
594
+ title={section.title}
595
+ >
596
+ <Box gap={3}>
597
+ {section.entries.map(([fieldKey, fieldConfig]) => (
598
+ <AdminFieldRenderer
599
+ api={api}
600
+ apiBase={resolvedApiBase}
601
+ errorText={errors[fieldKey]}
602
+ fieldConfig={fieldConfig}
603
+ fieldKey={fieldKey}
604
+ key={fieldKey}
605
+ modelConfigs={modelConfigs}
606
+ onChange={(value: AdminFieldValue) => handleFieldChange(fieldKey, value)}
607
+ parentFormState={formState}
608
+ readOnly={readonlyKeySet.has(fieldKey)}
609
+ refRenderers={refRenderers}
610
+ routeBase={resolvedRouteBase}
611
+ value={formState[fieldKey]}
612
+ />
613
+ ))}
614
+ </Box>
615
+ </Accordion>
616
+ ))
617
+ : visibleFields.map(([fieldKey, fieldConfig]) => (
618
+ <AdminFieldRenderer
619
+ api={api}
620
+ apiBase={resolvedApiBase}
621
+ errorText={errors[fieldKey]}
622
+ fieldConfig={fieldConfig}
623
+ fieldKey={fieldKey}
624
+ key={fieldKey}
625
+ modelConfigs={modelConfigs}
626
+ onChange={(value: AdminFieldValue) => handleFieldChange(fieldKey, value)}
627
+ parentFormState={formState}
628
+ readOnly={readonlyKeySet.has(fieldKey)}
629
+ refRenderers={refRenderers}
630
+ routeBase={resolvedRouteBase}
631
+ value={formState[fieldKey]}
632
+ />
633
+ ))}
634
+ {visibleFields.length === 0 && <EmptyFields />}
387
635
  {footerContent}
388
636
  </Box>
389
637
  </Page>
@@ -75,7 +75,7 @@ describe("AdminModelList", () => {
75
75
  expect(toJSON()).toBeDefined();
76
76
  });
77
77
 
78
- it("groups tools before models when tool cards are configured", () => {
78
+ it("renders models before tools when both sections are present", () => {
79
79
  mockConfigState.data = baseConfig;
80
80
  const {getByTestId, getByText} = renderWithTheme(
81
81
  <AdminModelList
@@ -22,6 +22,10 @@ interface AdminModelListProps {
22
22
  configurationPath?: string;
23
23
  /** Additional custom screens to display as cards. Merged with any custom screens from the backend config. */
24
24
  customScreens?: AdminCustomScreen[];
25
+ /** When true, omits the outer {@link Page} wrapper for composition under a parent screen. */
26
+ embedded?: boolean;
27
+ /** When true, hides the model grid (for example when models are shown in {@link AdminHome}). */
28
+ hideModelsSection?: boolean;
25
29
  }
26
30
 
27
31
  const ScriptsCard: React.FC<{count: number; onPress: () => void}> = ({count, onPress}) => (
@@ -133,6 +137,8 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
133
137
  api,
134
138
  configurationPath,
135
139
  customScreens: propCustomScreens,
140
+ embedded = false,
141
+ hideModelsSection = false,
136
142
  }) => {
137
143
  const {apiBase: resolvedApiBase, routeBase: resolvedRouteBase} = resolveAdminBases({
138
144
  apiBase,
@@ -149,21 +155,33 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
149
155
  );
150
156
 
151
157
  if (isLoading) {
158
+ const loadingBody = (
159
+ <Box alignItems="center" justifyContent="center" padding={6}>
160
+ <Spinner />
161
+ </Box>
162
+ );
163
+ if (embedded) {
164
+ return loadingBody;
165
+ }
152
166
  return (
153
- <Page maxWidth="100%" title="Admin">
154
- <Box alignItems="center" justifyContent="center" padding={6}>
155
- <Spinner />
156
- </Box>
167
+ <Page color="transparent" maxWidth="100%" padding={0} title="Admin">
168
+ {loadingBody}
157
169
  </Page>
158
170
  );
159
171
  }
160
172
 
161
173
  if (error || !config) {
174
+ const errorBody = (
175
+ <Box padding={4}>
176
+ <Text color="error">Failed to load admin configuration.</Text>
177
+ </Box>
178
+ );
179
+ if (embedded) {
180
+ return errorBody;
181
+ }
162
182
  return (
163
- <Page maxWidth="100%" title="Admin">
164
- <Box padding={4}>
165
- <Text color="error">Failed to load admin configuration.</Text>
166
- </Box>
183
+ <Page color="transparent" maxWidth="100%" padding={0} title="Admin">
184
+ {errorBody}
167
185
  </Page>
168
186
  );
169
187
  }
@@ -173,38 +191,53 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
173
191
  const scripts = config.scripts ?? [];
174
192
  const hasToolCards = allCustomScreens.length > 0 || scripts.length > 0 || !!configurationPath;
175
193
 
176
- return (
177
- <Page maxWidth="100%" scroll title="Admin">
178
- <Box gap={4} padding={4}>
179
- {hasToolCards && (
180
- <Box gap={2}>
181
- <Heading size="sm">Tools</Heading>
182
- <Box direction="row" gap={4} wrap>
183
- {allCustomScreens.map((screen) => (
184
- <CustomScreenCard
185
- key={screen.name}
186
- onPress={() => handlePress(screen.name)}
187
- screen={screen}
188
- />
189
- ))}
190
- {scripts.length > 0 && (
191
- <ScriptsCard count={scripts.length} onPress={() => handlePress("__scripts")} />
192
- )}
193
- {configurationPath && (
194
- <ConfigurationCard onPress={() => router.push(configurationPath as Href)} />
195
- )}
196
- </Box>
197
- </Box>
198
- )}
199
- <Box gap={2}>
200
- <Heading size="sm">Models</Heading>
201
- <Box direction="row" gap={4} wrap>
202
- {config.models.map((model: AdminModelConfig) => (
203
- <ModelCard key={model.name} model={model} onPress={handlePress} />
204
- ))}
205
- </Box>
206
- </Box>
194
+ const toolsSection = hasToolCards ? (
195
+ <Box gap={2} width="100%">
196
+ <Heading size="sm">Tools</Heading>
197
+ <Box direction="row" gap={4} width="100%" wrap>
198
+ {allCustomScreens.map((screen) => (
199
+ <CustomScreenCard
200
+ key={screen.name}
201
+ onPress={() => handlePress(screen.name)}
202
+ screen={screen}
203
+ />
204
+ ))}
205
+ {scripts.length > 0 ? (
206
+ <ScriptsCard count={scripts.length} onPress={() => handlePress("__scripts")} />
207
+ ) : null}
208
+ {configurationPath ? (
209
+ <ConfigurationCard onPress={() => router.push(configurationPath as Href)} />
210
+ ) : null}
211
+ </Box>
212
+ </Box>
213
+ ) : null;
214
+
215
+ const modelsSection = !hideModelsSection ? (
216
+ <Box gap={2} width="100%">
217
+ <Heading size="sm">Models</Heading>
218
+ <Box direction="row" gap={4} width="100%" wrap>
219
+ {config.models.map((model: AdminModelConfig) => (
220
+ <ModelCard key={model.name} model={model} onPress={handlePress} />
221
+ ))}
207
222
  </Box>
223
+ </Box>
224
+ ) : null;
225
+
226
+ /** Models first so embedded home + list layouts read top-to-bottom; tools stay full-width below. */
227
+ const listBody = (
228
+ <Box gap={4} padding={embedded ? 0 : 4} width="100%">
229
+ {modelsSection}
230
+ {toolsSection}
231
+ </Box>
232
+ );
233
+
234
+ if (embedded) {
235
+ return listBody;
236
+ }
237
+
238
+ return (
239
+ <Page color="transparent" maxWidth="100%" padding={0} scroll title="Admin">
240
+ {listBody}
208
241
  </Page>
209
242
  );
210
243
  };
@@ -39,6 +39,10 @@ const listState: {data: unknown; isLoading: boolean} = {
39
39
  const deleteFn = mock(() => ({unwrap: async () => ({})}));
40
40
  mock.module("./useAdminApi", () => ({
41
41
  useAdminApi: () => ({
42
+ useBulkPatchMutation: () => [
43
+ mock(() => ({unwrap: async () => ({updated: 0})})),
44
+ {isLoading: false},
45
+ ],
42
46
  useCreateMutation: () => [mock(() => ({unwrap: async () => ({})})), {isLoading: false}],
43
47
  useDeleteMutation: () => [deleteFn, {isLoading: false}],
44
48
  useListQuery: () => ({
@@ -51,6 +55,13 @@ mock.module("./useAdminApi", () => ({
51
55
  }),
52
56
  }));
53
57
 
58
+ mock.module("./useAdminBackgroundTask", () => ({
59
+ useAdminBackgroundTaskMutation: () => [
60
+ mock(() => ({unwrap: async () => ({taskId: "t1"})})),
61
+ {isLoading: false},
62
+ ],
63
+ }));
64
+
54
65
  import {AdminModelTable} from "./AdminModelTable";
55
66
 
56
67
  const fullConfig = {