@terreno/admin-frontend 57.19.2 → 57.20.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/CHANGELOG.md +393 -0
- package/dist/AdminFieldRenderer.d.ts +3 -2
- package/dist/AdminFieldRenderer.d.ts.map +1 -1
- package/dist/AdminFieldRenderer.js +12 -5
- package/dist/AdminFieldRenderer.js.map +1 -1
- package/dist/AdminFieldRendererCore.d.ts +6 -3
- package/dist/AdminFieldRendererCore.d.ts.map +1 -1
- package/dist/AdminFieldRendererCore.js +10 -7
- package/dist/AdminFieldRendererCore.js.map +1 -1
- package/dist/AdminFilterDrawer.d.ts.map +1 -1
- package/dist/AdminFilterDrawer.js +2 -3
- package/dist/AdminFilterDrawer.js.map +1 -1
- package/dist/AdminHome.d.ts.map +1 -1
- package/dist/AdminHome.js +5 -2
- package/dist/AdminHome.js.map +1 -1
- package/dist/AdminModelForm.d.ts.map +1 -1
- package/dist/AdminModelForm.js +4 -0
- package/dist/AdminModelForm.js.map +1 -1
- package/dist/AdminNestedArrayField.d.ts +2 -0
- package/dist/AdminNestedArrayField.d.ts.map +1 -1
- package/dist/AdminNestedArrayField.js +51 -25
- package/dist/AdminNestedArrayField.js.map +1 -1
- package/dist/AdminNestedObjectField.d.ts +43 -0
- package/dist/AdminNestedObjectField.d.ts.map +1 -0
- package/dist/AdminNestedObjectField.js +72 -0
- package/dist/AdminNestedObjectField.js.map +1 -0
- package/dist/AdminRolesField.d.ts +3 -1
- package/dist/AdminRolesField.d.ts.map +1 -1
- package/dist/AdminRolesField.js +6 -2
- package/dist/AdminRolesField.js.map +1 -1
- package/dist/AdminShell.d.ts +3 -3
- package/dist/AdminShell.d.ts.map +1 -1
- package/dist/AdminShell.js +4 -6
- package/dist/AdminShell.js.map +1 -1
- package/dist/ConfigurationScreen.d.ts.map +1 -1
- package/dist/ConfigurationScreen.js +3 -3
- package/dist/ConfigurationScreen.js.map +1 -1
- package/dist/ConsentHistory.d.ts.map +1 -1
- package/dist/ConsentHistory.js +17 -2
- package/dist/ConsentHistory.js.map +1 -1
- package/dist/ConsentResponseViewer.d.ts.map +1 -1
- package/dist/ConsentResponseViewer.js +20 -2
- package/dist/ConsentResponseViewer.js.map +1 -1
- package/dist/Constants.d.ts +5 -2
- package/dist/Constants.d.ts.map +1 -1
- package/dist/Constants.js +5 -2
- package/dist/Constants.js.map +1 -1
- package/dist/UserSecurityScreen.d.ts +45 -0
- package/dist/UserSecurityScreen.d.ts.map +1 -0
- package/dist/UserSecurityScreen.js +66 -0
- package/dist/UserSecurityScreen.js.map +1 -0
- package/dist/consentPdfTemplates.d.ts +64 -0
- package/dist/consentPdfTemplates.d.ts.map +1 -0
- package/dist/consentPdfTemplates.js +160 -0
- package/dist/consentPdfTemplates.js.map +1 -0
- package/dist/generateConsentHistoryPdf.d.ts.map +1 -1
- package/dist/generateConsentHistoryPdf.js +7 -55
- package/dist/generateConsentHistoryPdf.js.map +1 -1
- package/dist/generateConsentPdf.d.ts +1 -26
- package/dist/generateConsentPdf.d.ts.map +1 -1
- package/dist/generateConsentPdf.js +7 -69
- package/dist/generateConsentPdf.js.map +1 -1
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -1
- package/dist/orgs/MemberSecurityPanel.d.ts +34 -0
- package/dist/orgs/MemberSecurityPanel.d.ts.map +1 -0
- package/dist/orgs/MemberSecurityPanel.js +204 -0
- package/dist/orgs/MemberSecurityPanel.js.map +1 -0
- package/dist/orgs/OrgMembersScreen.d.ts.map +1 -1
- package/dist/orgs/OrgMembersScreen.js +33 -6
- package/dist/orgs/OrgMembersScreen.js.map +1 -1
- package/dist/orgs/adminModelEndpoints.d.ts +13 -1
- package/dist/orgs/adminModelEndpoints.d.ts.map +1 -1
- package/dist/orgs/adminModelEndpoints.js +30 -13
- package/dist/orgs/adminModelEndpoints.js.map +1 -1
- package/dist/orgs/useMemberSecurityApi.d.ts +97 -0
- package/dist/orgs/useMemberSecurityApi.d.ts.map +1 -0
- package/dist/orgs/useMemberSecurityApi.js +98 -0
- package/dist/orgs/useMemberSecurityApi.js.map +1 -0
- package/dist/pdfUtils.d.ts +15 -0
- package/dist/pdfUtils.d.ts.map +1 -1
- package/dist/pdfUtils.js +70 -0
- package/dist/pdfUtils.js.map +1 -1
- package/dist/types.d.ts +5 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/useAdminApi.d.ts +8 -2
- package/dist/useAdminApi.d.ts.map +1 -1
- package/dist/useAdminApi.js +11 -46
- package/dist/useAdminApi.js.map +1 -1
- package/dist/useAdminRoles.d.ts +5 -1
- package/dist/useAdminRoles.d.ts.map +1 -1
- package/dist/useAdminRoles.js +3 -3
- package/dist/useAdminRoles.js.map +1 -1
- package/dist/useAdminRpc.d.ts.map +1 -1
- package/dist/useAdminRpc.js +18 -3
- package/dist/useAdminRpc.js.map +1 -1
- package/dist/useConsentHistory.d.ts +7 -0
- package/dist/useConsentHistory.d.ts.map +1 -1
- package/dist/useConsentHistory.js.map +1 -1
- package/package.json +2 -2
- package/src/AdminFieldRenderer.tsx +48 -3
- package/src/AdminFieldRendererCore.tsx +12 -5
- package/src/AdminFilterDrawer.tsx +2 -2
- package/src/AdminHome.test.tsx +64 -1
- package/src/AdminHome.tsx +14 -6
- package/src/AdminModelForm.tsx +4 -0
- package/src/AdminNestedArrayField.tsx +116 -44
- package/src/AdminNestedObjectField.test.tsx +239 -0
- package/src/AdminNestedObjectField.tsx +145 -0
- package/src/AdminRolesField.tsx +6 -2
- package/src/AdminRolesList.test.tsx +25 -1
- package/src/AdminShell.test.tsx +15 -1
- package/src/AdminShell.tsx +5 -8
- package/src/ConfigurationScreen.tsx +6 -2
- package/src/ConsentHistory.test.tsx +69 -1
- package/src/ConsentHistory.tsx +39 -1
- package/src/ConsentResponseViewer.test.tsx +113 -1
- package/src/ConsentResponseViewer.tsx +106 -8
- package/src/Constants.ts +5 -2
- package/src/UserSecurityScreen.tsx +184 -0
- package/src/consentPdfTemplates.test.ts +180 -0
- package/src/consentPdfTemplates.ts +228 -0
- package/src/generateConsentHistoryPdf.ts +9 -63
- package/src/generateConsentPdf.ts +14 -107
- package/src/index.tsx +18 -0
- package/src/isolated/AdminNestedArrayField.isolated.tsx +93 -1
- package/src/isolated/UserSecurityScreen.isolated.tsx +365 -0
- package/src/isolated/generateConsentHistoryPdf.isolated.ts +33 -0
- package/src/isolated/generateConsentPdf.isolated.ts +47 -0
- package/src/isolated/generateConsentPdfMobile.isolated.ts +28 -0
- package/src/isolated/generateConsentPdfsMobile.isolated.ts +36 -0
- package/src/isolated/hooks.isolated.tsx +97 -0
- package/src/orgs/MemberSecurityPanel.test.tsx +584 -0
- package/src/orgs/MemberSecurityPanel.tsx +520 -0
- package/src/orgs/OrgManagementScreens.test.tsx +120 -1
- package/src/orgs/OrgMembersScreen.tsx +71 -4
- package/src/orgs/adminModelEndpoints.ts +56 -15
- package/src/orgs/useMemberSecurityApi.ts +198 -0
- package/src/pdfUtils.test.ts +24 -1
- package/src/pdfUtils.ts +93 -0
- package/src/types.ts +5 -1
- package/src/useAdminApi.ts +23 -3
- package/src/useAdminRoles.ts +11 -3
- package/src/useAdminRpc.test.tsx +115 -1
- package/src/useAdminRpc.ts +19 -3
- package/src/useConsentHistory.ts +5 -0
package/src/AdminHome.test.tsx
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
// noExplicitAny: test harness doubles
|
|
2
2
|
// biome-ignore-all lint/suspicious/noExplicitAny: test harness doubles
|
|
3
|
-
import {beforeEach, describe, expect, it, mock} from "bun:test";
|
|
3
|
+
import {afterEach, beforeEach, describe, expect, it, mock} from "bun:test";
|
|
4
4
|
import React from "react";
|
|
5
|
+
import type {ScaledSize} from "react-native";
|
|
6
|
+
import {useWindowDimensions} from "react-native";
|
|
5
7
|
import type {ReactTestInstance} from "react-test-renderer";
|
|
6
8
|
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
7
9
|
import {configureUseAdminApiDouble, resetUseAdminApiDouble} from "./testing/useAdminApiDouble";
|
|
@@ -103,7 +105,38 @@ const countTestIdInSubtree = (root: ReactTestInstance, testId: string): number =
|
|
|
103
105
|
return count;
|
|
104
106
|
};
|
|
105
107
|
|
|
108
|
+
type WindowDimensionsImpl = () => ScaledSize;
|
|
109
|
+
type MockableUseWindowDimensions = WindowDimensionsImpl & {
|
|
110
|
+
mockImplementation?: (impl: WindowDimensionsImpl) => void;
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
const getScaledSize =
|
|
114
|
+
(width: number): WindowDimensionsImpl =>
|
|
115
|
+
(): ScaledSize => ({
|
|
116
|
+
fontScale: 1,
|
|
117
|
+
height: 1000,
|
|
118
|
+
scale: 2,
|
|
119
|
+
width,
|
|
120
|
+
});
|
|
121
|
+
|
|
122
|
+
const setWindowWidth = (width: number): (() => void) => {
|
|
123
|
+
const useWindowDimensionsMock = useWindowDimensions as MockableUseWindowDimensions;
|
|
124
|
+
const dimensionsImpl = getScaledSize(width);
|
|
125
|
+
|
|
126
|
+
if (typeof useWindowDimensionsMock.mockImplementation === "function") {
|
|
127
|
+
useWindowDimensionsMock.mockImplementation(dimensionsImpl);
|
|
128
|
+
|
|
129
|
+
return (): void => {
|
|
130
|
+
useWindowDimensionsMock.mockImplementation(getScaledSize(375));
|
|
131
|
+
};
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
return (): void => {};
|
|
135
|
+
};
|
|
136
|
+
|
|
106
137
|
describe("AdminHome", () => {
|
|
138
|
+
let restoreWindowWidth: (() => void) | undefined;
|
|
139
|
+
|
|
107
140
|
beforeEach(() => {
|
|
108
141
|
resetUseAdminApiDouble();
|
|
109
142
|
configureUseAdminApiDouble({
|
|
@@ -116,6 +149,12 @@ describe("AdminHome", () => {
|
|
|
116
149
|
});
|
|
117
150
|
configState.config = null;
|
|
118
151
|
configState.isLoading = false;
|
|
152
|
+
restoreWindowWidth = setWindowWidth(375);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
afterEach(() => {
|
|
156
|
+
restoreWindowWidth?.();
|
|
157
|
+
restoreWindowWidth = undefined;
|
|
119
158
|
});
|
|
120
159
|
|
|
121
160
|
it("renders scriptRunner in the top band with contentTop widgets on the same row, not inside main", () => {
|
|
@@ -215,4 +254,28 @@ describe("AdminHome", () => {
|
|
|
215
254
|
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
216
255
|
expect(getByTestId("admin-version-config-widget")).toBeTruthy();
|
|
217
256
|
});
|
|
257
|
+
|
|
258
|
+
it("stacks the home columns below the desktop floor", () => {
|
|
259
|
+
restoreWindowWidth?.();
|
|
260
|
+
restoreWindowWidth = setWindowWidth(800);
|
|
261
|
+
configState.config = buildConfig();
|
|
262
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
263
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("column");
|
|
264
|
+
});
|
|
265
|
+
|
|
266
|
+
it("places the home columns side by side at the desktop floor", () => {
|
|
267
|
+
restoreWindowWidth?.();
|
|
268
|
+
restoreWindowWidth = setWindowWidth(1024);
|
|
269
|
+
configState.config = buildConfig();
|
|
270
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
271
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("row");
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
it("keeps an embedded dashboard stacked at desktop width", () => {
|
|
275
|
+
restoreWindowWidth?.();
|
|
276
|
+
restoreWindowWidth = setWindowWidth(1024);
|
|
277
|
+
configState.config = buildConfig();
|
|
278
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" embedded />);
|
|
279
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("column");
|
|
280
|
+
});
|
|
218
281
|
});
|
package/src/AdminHome.tsx
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {Box, Heading, Page, Spinner, Text} from "@terreno/ui";
|
|
1
|
+
import {Box, Heading, isSupportedDesktopWidth, Page, Spinner, Text} from "@terreno/ui";
|
|
2
2
|
import React, {useMemo} from "react";
|
|
3
|
+
import {useWindowDimensions} from "react-native";
|
|
3
4
|
import {useHomeWidget} from "./AdminProvider";
|
|
4
5
|
import {isAuditLogModel} from "./isAuditLogModel";
|
|
5
6
|
import type {AdminApi, AdminModelConfig} from "./types";
|
|
@@ -59,6 +60,8 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
59
60
|
api,
|
|
60
61
|
embedded = false,
|
|
61
62
|
}) => {
|
|
63
|
+
const {width: windowWidth} = useWindowDimensions();
|
|
64
|
+
const isDesktopLayout = !embedded && isSupportedDesktopWidth({width: windowWidth});
|
|
62
65
|
const {apiBase: resolvedApiBase, routeBase: resolvedRouteBase} = resolveAdminBases({
|
|
63
66
|
apiBase,
|
|
64
67
|
baseUrl,
|
|
@@ -138,14 +141,19 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
138
141
|
</Box>
|
|
139
142
|
) : null}
|
|
140
143
|
|
|
141
|
-
<Box
|
|
144
|
+
<Box
|
|
145
|
+
alignItems="start"
|
|
146
|
+
direction={isDesktopLayout ? "row" : "column"}
|
|
147
|
+
gap={4}
|
|
148
|
+
testID="admin-home-columns"
|
|
149
|
+
>
|
|
142
150
|
{main.length > 0 ? (
|
|
143
151
|
<Box
|
|
144
152
|
flex="grow"
|
|
145
153
|
gap={3}
|
|
146
|
-
minWidth={
|
|
154
|
+
minWidth={isDesktopLayout ? 280 : 0}
|
|
147
155
|
testID="admin-home-slot-main"
|
|
148
|
-
{...(
|
|
156
|
+
{...(isDesktopLayout ? {} : {width: "100%"})}
|
|
149
157
|
>
|
|
150
158
|
{main.map((id) => (
|
|
151
159
|
<Box key={`mn-${id}`}>
|
|
@@ -158,9 +166,9 @@ export const AdminHome: React.FC<AdminHomeProps> = ({
|
|
|
158
166
|
<Box
|
|
159
167
|
direction="column"
|
|
160
168
|
gap={3}
|
|
161
|
-
minWidth={
|
|
169
|
+
minWidth={isDesktopLayout ? 280 : 0}
|
|
162
170
|
testID="admin-home-slot-sidebar"
|
|
163
|
-
width={
|
|
171
|
+
width={isDesktopLayout ? 320 : "100%"}
|
|
164
172
|
>
|
|
165
173
|
{sidebar.map((id) => (
|
|
166
174
|
<Box key={`sb-${id}`}>
|
package/src/AdminModelForm.tsx
CHANGED
|
@@ -3,6 +3,7 @@ import {router, useNavigation} from "expo-router";
|
|
|
3
3
|
import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
|
|
4
4
|
import {AdminConflictSheet} from "./AdminConflictSheet";
|
|
5
5
|
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
6
|
+
import {buildNestedObjectDefault, isNestedObjectField} from "./AdminNestedObjectField";
|
|
6
7
|
import {useAdminContext} from "./adminContext";
|
|
7
8
|
import {isWindowedAdminTable} from "./adminWindowedTable";
|
|
8
9
|
import {markAdminWindowMembershipStale} from "./adminWindowRefresh";
|
|
@@ -109,6 +110,9 @@ const getFieldDefault = (fieldConfig: AdminFieldConfig): AdminFieldValue => {
|
|
|
109
110
|
if (fieldConfig.default !== undefined) {
|
|
110
111
|
return fieldConfig.default;
|
|
111
112
|
}
|
|
113
|
+
if (isNestedObjectField(fieldConfig) && fieldConfig.items) {
|
|
114
|
+
return buildNestedObjectDefault(fieldConfig.items);
|
|
115
|
+
}
|
|
112
116
|
if (fieldConfig.type === "boolean") {
|
|
113
117
|
return false;
|
|
114
118
|
}
|
|
@@ -2,15 +2,25 @@ import {Box, Button, Card, DraggableList, Heading, IconButton, Text, useTheme} f
|
|
|
2
2
|
import startCase from "lodash/startCase";
|
|
3
3
|
import React, {useCallback, useMemo, useRef} from "react";
|
|
4
4
|
import {AdminFieldRendererCore} from "./AdminFieldRendererCore";
|
|
5
|
+
import {
|
|
6
|
+
AdminNestedObjectField,
|
|
7
|
+
buildNestedObjectDefault,
|
|
8
|
+
isNestedObjectField,
|
|
9
|
+
} from "./AdminNestedObjectField";
|
|
5
10
|
import type {AdminApi, AdminFieldConfig, AdminFieldValue, RefRendererMap} from "./types";
|
|
11
|
+
import {SYSTEM_FIELDS} from "./types";
|
|
6
12
|
|
|
7
13
|
const FIELD_HEIGHT_ESTIMATE = 76;
|
|
8
14
|
const CARD_HEADER_HEIGHT = 44;
|
|
9
15
|
const CARD_PADDING = 24;
|
|
10
16
|
const ITEMS_GAP = 8;
|
|
17
|
+
/** Border, padding, heading, and helper text of a nested object group. */
|
|
18
|
+
const NESTED_GROUP_CHROME_HEIGHT = 84;
|
|
11
19
|
|
|
12
20
|
interface AdminNestedArrayFieldProps {
|
|
13
21
|
title: string;
|
|
22
|
+
/** Dotted path of the array field; prefixes nested object group test IDs inside items. */
|
|
23
|
+
fieldKey?: string;
|
|
14
24
|
helperText?: string;
|
|
15
25
|
errorText?: string;
|
|
16
26
|
items: Record<string, AdminFieldConfig>;
|
|
@@ -31,62 +41,99 @@ interface AdminNestedArrayFieldProps {
|
|
|
31
41
|
readOnly?: boolean;
|
|
32
42
|
}
|
|
33
43
|
|
|
34
|
-
|
|
35
|
-
* Renders a single sub-field of a nested array item. Nested arrays-of-subdocuments
|
|
36
|
-
* recurse into another {@link AdminNestedArrayField}; everything else is rendered
|
|
37
|
-
* by {@link AdminFieldRendererCore} directly so we avoid a require cycle through
|
|
38
|
-
* the AdminFieldRenderer wrapper.
|
|
39
|
-
*/
|
|
40
|
-
const renderNestedSubField = ({
|
|
41
|
-
api,
|
|
42
|
-
baseUrl,
|
|
43
|
-
apiBase,
|
|
44
|
-
routeBase,
|
|
45
|
-
fieldKey,
|
|
46
|
-
fieldConfig,
|
|
47
|
-
fieldValue,
|
|
48
|
-
index,
|
|
49
|
-
modelConfigs,
|
|
50
|
-
onSubFieldChange,
|
|
51
|
-
parentFormState,
|
|
52
|
-
refRenderers,
|
|
53
|
-
readOnly,
|
|
54
|
-
}: {
|
|
44
|
+
interface ItemFieldArgs {
|
|
55
45
|
api: AdminApi;
|
|
56
46
|
baseUrl?: string;
|
|
57
47
|
apiBase?: string;
|
|
58
48
|
routeBase?: string;
|
|
59
49
|
fieldKey: string;
|
|
50
|
+
/**
|
|
51
|
+
* Prefix for nested object group keys, e.g. `servers.0`, so test IDs stay unique per item.
|
|
52
|
+
* Leaf fields directly on the item keep their bare key.
|
|
53
|
+
*/
|
|
54
|
+
groupKeyPrefix?: string;
|
|
55
|
+
label: string;
|
|
60
56
|
fieldConfig: AdminFieldConfig;
|
|
61
57
|
fieldValue: AdminFieldValue;
|
|
62
|
-
index: number;
|
|
63
58
|
modelConfigs?: Array<{name: string; routePath: string}>;
|
|
64
|
-
|
|
59
|
+
onChange: (fieldValue: AdminFieldValue) => void;
|
|
65
60
|
parentFormState?: Record<string, AdminFieldValue>;
|
|
66
61
|
refRenderers?: RefRendererMap;
|
|
67
62
|
readOnly?: boolean;
|
|
68
|
-
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Renders one field inside a nested array item. Nested arrays-of-subdocuments recurse into
|
|
67
|
+
* another {@link AdminNestedArrayField} and nested objects into {@link AdminNestedObjectField};
|
|
68
|
+
* everything else is rendered by {@link AdminFieldRendererCore} directly so we avoid a require
|
|
69
|
+
* cycle through the AdminFieldRenderer wrapper.
|
|
70
|
+
*/
|
|
71
|
+
const renderItemField = (args: ItemFieldArgs): React.ReactElement => {
|
|
72
|
+
const {
|
|
73
|
+
api,
|
|
74
|
+
baseUrl,
|
|
75
|
+
apiBase,
|
|
76
|
+
routeBase,
|
|
77
|
+
fieldKey,
|
|
78
|
+
groupKeyPrefix,
|
|
79
|
+
label,
|
|
80
|
+
fieldConfig,
|
|
81
|
+
fieldValue,
|
|
82
|
+
modelConfigs,
|
|
83
|
+
onChange,
|
|
84
|
+
parentFormState,
|
|
85
|
+
refRenderers,
|
|
86
|
+
readOnly,
|
|
87
|
+
} = args;
|
|
69
88
|
if (fieldConfig.type === "array" && fieldConfig.items) {
|
|
70
89
|
return (
|
|
71
90
|
<AdminNestedArrayField
|
|
72
91
|
api={api}
|
|
73
92
|
apiBase={apiBase}
|
|
74
93
|
baseUrl={baseUrl}
|
|
94
|
+
fieldKey={groupKeyPrefix ? `${groupKeyPrefix}.${fieldKey}` : fieldKey}
|
|
75
95
|
helperText={fieldConfig.description}
|
|
76
96
|
items={fieldConfig.items}
|
|
77
97
|
key={fieldKey}
|
|
78
98
|
modelConfigs={modelConfigs}
|
|
79
|
-
onChange={
|
|
99
|
+
onChange={onChange}
|
|
80
100
|
parentFormState={parentFormState}
|
|
81
101
|
readOnly={readOnly}
|
|
82
102
|
refRenderers={refRenderers}
|
|
83
103
|
routeBase={routeBase}
|
|
84
|
-
title={
|
|
104
|
+
title={label}
|
|
85
105
|
value={Array.isArray(fieldValue) ? (fieldValue as Record<string, AdminFieldValue>[]) : []}
|
|
86
106
|
/>
|
|
87
107
|
);
|
|
88
108
|
}
|
|
89
109
|
|
|
110
|
+
if (isNestedObjectField(fieldConfig) && fieldConfig.items) {
|
|
111
|
+
return (
|
|
112
|
+
<AdminNestedObjectField
|
|
113
|
+
fieldKey={groupKeyPrefix ? `${groupKeyPrefix}.${fieldKey}` : fieldKey}
|
|
114
|
+
fields={fieldConfig.items}
|
|
115
|
+
helperText={fieldConfig.description}
|
|
116
|
+
key={fieldKey}
|
|
117
|
+
onChange={onChange}
|
|
118
|
+
readOnly={readOnly}
|
|
119
|
+
renderSubField={(sub) =>
|
|
120
|
+
renderItemField({
|
|
121
|
+
...args,
|
|
122
|
+
fieldConfig: sub.fieldConfig,
|
|
123
|
+
fieldKey: sub.fieldKey,
|
|
124
|
+
fieldValue: sub.value,
|
|
125
|
+
groupKeyPrefix: undefined,
|
|
126
|
+
label: sub.label,
|
|
127
|
+
onChange: sub.onChange,
|
|
128
|
+
readOnly: sub.readOnly,
|
|
129
|
+
})
|
|
130
|
+
}
|
|
131
|
+
title={label}
|
|
132
|
+
value={fieldValue}
|
|
133
|
+
/>
|
|
134
|
+
);
|
|
135
|
+
}
|
|
136
|
+
|
|
90
137
|
return (
|
|
91
138
|
<AdminFieldRendererCore
|
|
92
139
|
api={api}
|
|
@@ -95,8 +142,9 @@ const renderNestedSubField = ({
|
|
|
95
142
|
fieldConfig={fieldConfig}
|
|
96
143
|
fieldKey={fieldKey}
|
|
97
144
|
key={fieldKey}
|
|
145
|
+
label={label}
|
|
98
146
|
modelConfigs={modelConfigs}
|
|
99
|
-
onChange={
|
|
147
|
+
onChange={onChange}
|
|
100
148
|
parentFormState={parentFormState}
|
|
101
149
|
readOnly={readOnly}
|
|
102
150
|
refRenderers={refRenderers}
|
|
@@ -106,24 +154,44 @@ const renderNestedSubField = ({
|
|
|
106
154
|
);
|
|
107
155
|
};
|
|
108
156
|
|
|
109
|
-
const
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
157
|
+
const renderNestedSubField = ({
|
|
158
|
+
index,
|
|
159
|
+
itemKeyPrefix,
|
|
160
|
+
onSubFieldChange,
|
|
161
|
+
...rest
|
|
162
|
+
}: Omit<ItemFieldArgs, "groupKeyPrefix" | "label" | "onChange"> & {
|
|
163
|
+
index: number;
|
|
164
|
+
itemKeyPrefix: string;
|
|
165
|
+
onSubFieldChange: (index: number, fieldKey: string, fieldValue: AdminFieldValue) => void;
|
|
166
|
+
}): React.ReactElement => {
|
|
167
|
+
return renderItemField({
|
|
168
|
+
...rest,
|
|
169
|
+
groupKeyPrefix: `${itemKeyPrefix}.${index}`,
|
|
170
|
+
label: startCase(rest.fieldKey),
|
|
171
|
+
onChange: (val) => onSubFieldChange(index, rest.fieldKey, val),
|
|
172
|
+
});
|
|
173
|
+
};
|
|
174
|
+
|
|
175
|
+
/**
|
|
176
|
+
* Estimated rendered height of an item's subfields. DraggableList positions rows at a fixed
|
|
177
|
+
* height, so nested object groups count their own subfields plus the group's chrome.
|
|
178
|
+
*/
|
|
179
|
+
const estimateSubFieldsHeight = (
|
|
180
|
+
items: Record<string, AdminFieldConfig>,
|
|
181
|
+
isNestedGroup = false
|
|
182
|
+
): number => {
|
|
183
|
+
let height = 0;
|
|
113
184
|
for (const [key, config] of Object.entries(items)) {
|
|
114
|
-
if (
|
|
115
|
-
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
newItem[key] = 0;
|
|
120
|
-
} else if (config.type === "array") {
|
|
121
|
-
newItem[key] = [];
|
|
185
|
+
if (isNestedGroup && SYSTEM_FIELDS.has(key)) {
|
|
186
|
+
continue;
|
|
187
|
+
}
|
|
188
|
+
if (isNestedObjectField(config) && config.items) {
|
|
189
|
+
height += NESTED_GROUP_CHROME_HEIGHT + estimateSubFieldsHeight(config.items, true);
|
|
122
190
|
} else {
|
|
123
|
-
|
|
191
|
+
height += FIELD_HEIGHT_ESTIMATE;
|
|
124
192
|
}
|
|
125
193
|
}
|
|
126
|
-
return
|
|
194
|
+
return height;
|
|
127
195
|
};
|
|
128
196
|
|
|
129
197
|
/**
|
|
@@ -133,6 +201,7 @@ const buildDefaultItem = (
|
|
|
133
201
|
*/
|
|
134
202
|
export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
135
203
|
title,
|
|
204
|
+
fieldKey: arrayFieldKey,
|
|
136
205
|
helperText,
|
|
137
206
|
errorText,
|
|
138
207
|
items,
|
|
@@ -153,8 +222,8 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
153
222
|
return Array.isArray(value) ? value : [];
|
|
154
223
|
}, [value]);
|
|
155
224
|
|
|
156
|
-
const
|
|
157
|
-
const itemHeight = CARD_HEADER_HEIGHT +
|
|
225
|
+
const itemKeyPrefix = arrayFieldKey ?? "item";
|
|
226
|
+
const itemHeight = CARD_HEADER_HEIGHT + estimateSubFieldsHeight(items) + CARD_PADDING;
|
|
158
227
|
|
|
159
228
|
// Stable ID counter so new items get unique IDs across the component lifetime
|
|
160
229
|
const nextIdRef = useRef(arrayValue.length);
|
|
@@ -181,7 +250,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
181
250
|
}, [arrayValue.length]);
|
|
182
251
|
|
|
183
252
|
const handleAddItem = useCallback((): void => {
|
|
184
|
-
const newItem =
|
|
253
|
+
const newItem = buildNestedObjectDefault(items);
|
|
185
254
|
const newId = String(nextIdRef.current++);
|
|
186
255
|
itemIdsRef.current = [...itemIdsRef.current, newId];
|
|
187
256
|
onChange([...arrayValue, newItem]);
|
|
@@ -266,6 +335,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
266
335
|
fieldKey,
|
|
267
336
|
fieldValue: itemData[fieldKey],
|
|
268
337
|
index,
|
|
338
|
+
itemKeyPrefix,
|
|
269
339
|
modelConfigs,
|
|
270
340
|
onSubFieldChange: handleSubFieldChange,
|
|
271
341
|
parentFormState: subFieldParentFormState,
|
|
@@ -292,6 +362,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
292
362
|
handleRemoveItem,
|
|
293
363
|
handleSubFieldChange,
|
|
294
364
|
isReadOnly,
|
|
365
|
+
itemKeyPrefix,
|
|
295
366
|
]
|
|
296
367
|
);
|
|
297
368
|
|
|
@@ -344,6 +415,7 @@ export const AdminNestedArrayField: React.FC<AdminNestedArrayFieldProps> = ({
|
|
|
344
415
|
fieldKey,
|
|
345
416
|
fieldValue: itemData[fieldKey],
|
|
346
417
|
index,
|
|
418
|
+
itemKeyPrefix,
|
|
347
419
|
modelConfigs,
|
|
348
420
|
onSubFieldChange: handleSubFieldChange,
|
|
349
421
|
parentFormState: subFieldParentFormState,
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
import {describe, expect, it, mock} from "bun:test";
|
|
2
|
+
import {fireEvent} from "@testing-library/react-native";
|
|
3
|
+
import React from "react";
|
|
4
|
+
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
5
|
+
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
6
|
+
import {buildNestedObjectDefault, isNestedObjectField} from "./AdminNestedObjectField";
|
|
7
|
+
import type {AdminApi, AdminFieldConfig, AdminFieldValue} from "./types";
|
|
8
|
+
|
|
9
|
+
const api = {} as unknown as AdminApi;
|
|
10
|
+
|
|
11
|
+
const TASKS_CONFIG: AdminFieldConfig = {
|
|
12
|
+
description: "Project task settings",
|
|
13
|
+
items: {
|
|
14
|
+
enabled: {
|
|
15
|
+
default: false,
|
|
16
|
+
description: "Turn on project tasks",
|
|
17
|
+
required: false,
|
|
18
|
+
type: "boolean",
|
|
19
|
+
},
|
|
20
|
+
intakePollMs: {
|
|
21
|
+
default: 300000,
|
|
22
|
+
description: "How often intake polls, in ms",
|
|
23
|
+
required: false,
|
|
24
|
+
type: "number",
|
|
25
|
+
},
|
|
26
|
+
labels: {itemType: "string", required: false, type: "array"},
|
|
27
|
+
},
|
|
28
|
+
required: false,
|
|
29
|
+
type: "object",
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
const MCP_MEDIA_CONFIG: AdminFieldConfig = {
|
|
33
|
+
items: {
|
|
34
|
+
port: {required: false, type: "number"},
|
|
35
|
+
sonarr: {
|
|
36
|
+
items: {
|
|
37
|
+
apiKey: {required: false, type: "string"},
|
|
38
|
+
url: {required: false, type: "string"},
|
|
39
|
+
},
|
|
40
|
+
required: false,
|
|
41
|
+
type: "object",
|
|
42
|
+
},
|
|
43
|
+
},
|
|
44
|
+
required: false,
|
|
45
|
+
type: "object",
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
describe("AdminNestedObjectField via AdminFieldRenderer", () => {
|
|
49
|
+
it("renders each leaf with its own control instead of a JSON box", () => {
|
|
50
|
+
const {getByTestId, getByText, queryByText} = renderWithTheme(
|
|
51
|
+
<AdminFieldRenderer
|
|
52
|
+
api={api}
|
|
53
|
+
fieldConfig={TASKS_CONFIG}
|
|
54
|
+
fieldKey="tasks"
|
|
55
|
+
onChange={() => {}}
|
|
56
|
+
value={{enabled: true, intakePollMs: 1000, labels: ["a"]}}
|
|
57
|
+
/>
|
|
58
|
+
);
|
|
59
|
+
expect(getByTestId("admin-field-group-tasks")).toBeTruthy();
|
|
60
|
+
expect(getByText("Tasks")).toBeTruthy();
|
|
61
|
+
expect(getByText("Project task settings")).toBeTruthy();
|
|
62
|
+
expect(getByTestId("admin-field-tasks.enabled")).toBeTruthy();
|
|
63
|
+
expect(getByTestId("admin-field-tasks.intakePollMs").props.value).toBe("1000");
|
|
64
|
+
expect(getByText("Enabled")).toBeTruthy();
|
|
65
|
+
expect(getByText("Intake Poll Ms")).toBeTruthy();
|
|
66
|
+
expect(getByText("How often intake polls, in ms")).toBeTruthy();
|
|
67
|
+
expect(getByText("Labels")).toBeTruthy();
|
|
68
|
+
expect(queryByText("JSON value (string, number, boolean, object, or array)")).toBeNull();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
it("shows subfield defaults when the stored object is missing a leaf", () => {
|
|
72
|
+
const {getByTestId} = renderWithTheme(
|
|
73
|
+
<AdminFieldRenderer
|
|
74
|
+
api={api}
|
|
75
|
+
fieldConfig={TASKS_CONFIG}
|
|
76
|
+
fieldKey="tasks"
|
|
77
|
+
onChange={() => {}}
|
|
78
|
+
value={{enabled: true}}
|
|
79
|
+
/>
|
|
80
|
+
);
|
|
81
|
+
expect(getByTestId("admin-field-tasks.intakePollMs").props.value).toBe("300000");
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
it("merges an edited leaf into the parent object", () => {
|
|
85
|
+
const onChange = mock((_: AdminFieldValue) => {});
|
|
86
|
+
const {getByTestId} = renderWithTheme(
|
|
87
|
+
<AdminFieldRenderer
|
|
88
|
+
api={api}
|
|
89
|
+
fieldConfig={TASKS_CONFIG}
|
|
90
|
+
fieldKey="tasks"
|
|
91
|
+
onChange={onChange}
|
|
92
|
+
value={{enabled: true, intakePollMs: 1000}}
|
|
93
|
+
/>
|
|
94
|
+
);
|
|
95
|
+
fireEvent.changeText(getByTestId("admin-field-tasks.intakePollMs"), "2500");
|
|
96
|
+
expect(onChange).toHaveBeenCalledWith({enabled: true, intakePollMs: 2500});
|
|
97
|
+
});
|
|
98
|
+
|
|
99
|
+
it("recurses into deeper nested objects", () => {
|
|
100
|
+
const onChange = mock((_: AdminFieldValue) => {});
|
|
101
|
+
const {getByTestId} = renderWithTheme(
|
|
102
|
+
<AdminFieldRenderer
|
|
103
|
+
api={api}
|
|
104
|
+
fieldConfig={MCP_MEDIA_CONFIG}
|
|
105
|
+
fieldKey="mcpMedia"
|
|
106
|
+
onChange={onChange}
|
|
107
|
+
value={{port: 8080, sonarr: {apiKey: "k", url: "http://old"}}}
|
|
108
|
+
/>
|
|
109
|
+
);
|
|
110
|
+
expect(getByTestId("admin-field-group-mcpMedia.sonarr")).toBeTruthy();
|
|
111
|
+
fireEvent.changeText(getByTestId("admin-field-mcpMedia.sonarr.url"), "http://new");
|
|
112
|
+
expect(onChange).toHaveBeenCalledWith({
|
|
113
|
+
port: 8080,
|
|
114
|
+
sonarr: {apiKey: "k", url: "http://new"},
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it("renders a nested object with no stored value", () => {
|
|
119
|
+
const onChange = mock((_: AdminFieldValue) => {});
|
|
120
|
+
const {getByTestId} = renderWithTheme(
|
|
121
|
+
<AdminFieldRenderer
|
|
122
|
+
api={api}
|
|
123
|
+
fieldConfig={MCP_MEDIA_CONFIG}
|
|
124
|
+
fieldKey="mcpMedia"
|
|
125
|
+
onChange={onChange}
|
|
126
|
+
value={undefined}
|
|
127
|
+
/>
|
|
128
|
+
);
|
|
129
|
+
fireEvent.changeText(getByTestId("admin-field-mcpMedia.port"), "9000");
|
|
130
|
+
expect(onChange).toHaveBeenCalledWith({port: 9000});
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
it("groups nested objects inside array-of-subdocument items", () => {
|
|
134
|
+
const {getByTestId, queryByText} = renderWithTheme(
|
|
135
|
+
<AdminFieldRenderer
|
|
136
|
+
api={api}
|
|
137
|
+
fieldConfig={{items: {media: MCP_MEDIA_CONFIG}, required: false, type: "array"}}
|
|
138
|
+
fieldKey="servers"
|
|
139
|
+
onChange={() => {}}
|
|
140
|
+
readOnly
|
|
141
|
+
value={[
|
|
142
|
+
{media: {port: 1, sonarr: {apiKey: "k", url: "http://x"}}},
|
|
143
|
+
{media: {port: 2, sonarr: {apiKey: "j", url: "http://y"}}},
|
|
144
|
+
]}
|
|
145
|
+
/>
|
|
146
|
+
);
|
|
147
|
+
expect(getByTestId("admin-field-group-servers.0.media")).toBeTruthy();
|
|
148
|
+
expect(getByTestId("admin-field-servers.0.media.sonarr.url").props.value).toBe("http://x");
|
|
149
|
+
expect(getByTestId("admin-field-servers.1.media.sonarr.url").props.value).toBe("http://y");
|
|
150
|
+
expect(queryByText("JSON value (string, number, boolean, object, or array)")).toBeNull();
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
it("keeps a string leaf a text field when only its parent's name contains 'date'", () => {
|
|
154
|
+
const onChange = mock((_: AdminFieldValue) => {});
|
|
155
|
+
const {getByTestId} = renderWithTheme(
|
|
156
|
+
<AdminFieldRenderer
|
|
157
|
+
api={api}
|
|
158
|
+
fieldConfig={{
|
|
159
|
+
items: {note: {required: false, type: "string"}},
|
|
160
|
+
required: false,
|
|
161
|
+
type: "object",
|
|
162
|
+
}}
|
|
163
|
+
fieldKey="updates"
|
|
164
|
+
onChange={onChange}
|
|
165
|
+
value={{note: "hello"}}
|
|
166
|
+
/>
|
|
167
|
+
);
|
|
168
|
+
const noteInput = getByTestId("admin-field-updates.note");
|
|
169
|
+
expect(noteInput.props.value).toBe("hello");
|
|
170
|
+
fireEvent.changeText(noteInput, "bye");
|
|
171
|
+
expect(onChange).toHaveBeenCalledWith({note: "bye"});
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
it("keeps the JSON editor for objects without subfields and for mixed", () => {
|
|
175
|
+
const {getAllByText} = renderWithTheme(
|
|
176
|
+
<>
|
|
177
|
+
<AdminFieldRenderer
|
|
178
|
+
api={api}
|
|
179
|
+
fieldConfig={{required: false, type: "object"}}
|
|
180
|
+
fieldKey="selectors"
|
|
181
|
+
onChange={() => {}}
|
|
182
|
+
value={{a: 1}}
|
|
183
|
+
/>
|
|
184
|
+
<AdminFieldRenderer
|
|
185
|
+
api={api}
|
|
186
|
+
fieldConfig={{items: {}, required: false, type: "object"}}
|
|
187
|
+
fieldKey="emptyItems"
|
|
188
|
+
onChange={() => {}}
|
|
189
|
+
value={{}}
|
|
190
|
+
/>
|
|
191
|
+
<AdminFieldRenderer
|
|
192
|
+
api={api}
|
|
193
|
+
fieldConfig={{required: false, type: "mixed"}}
|
|
194
|
+
fieldKey="data"
|
|
195
|
+
onChange={() => {}}
|
|
196
|
+
value={{b: 2}}
|
|
197
|
+
/>
|
|
198
|
+
</>
|
|
199
|
+
);
|
|
200
|
+
expect(getAllByText("JSON value (string, number, boolean, object, or array)")).toHaveLength(3);
|
|
201
|
+
});
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
describe("isNestedObjectField", () => {
|
|
205
|
+
it("is true only for objects with subfields and no custom widget", () => {
|
|
206
|
+
expect(isNestedObjectField(TASKS_CONFIG)).toBe(true);
|
|
207
|
+
expect(isNestedObjectField({required: false, type: "object"})).toBe(false);
|
|
208
|
+
expect(isNestedObjectField({...TASKS_CONFIG, widget: "locale-content"})).toBe(false);
|
|
209
|
+
expect(isNestedObjectField({...TASKS_CONFIG, type: "mixed"})).toBe(false);
|
|
210
|
+
expect(isNestedObjectField({...TASKS_CONFIG, type: "array"})).toBe(false);
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
|
|
214
|
+
describe("buildNestedObjectDefault", () => {
|
|
215
|
+
it("uses schema defaults and blank values, recursing into nested objects", () => {
|
|
216
|
+
expect(buildNestedObjectDefault(TASKS_CONFIG.items ?? {})).toEqual({
|
|
217
|
+
enabled: false,
|
|
218
|
+
intakePollMs: 300000,
|
|
219
|
+
labels: [],
|
|
220
|
+
});
|
|
221
|
+
expect(buildNestedObjectDefault(MCP_MEDIA_CONFIG.items ?? {})).toEqual({
|
|
222
|
+
port: 0,
|
|
223
|
+
sonarr: {apiKey: "", url: ""},
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
it("omits enums, refs, dates, mixed, and system fields without a default", () => {
|
|
228
|
+
expect(
|
|
229
|
+
buildNestedObjectDefault({
|
|
230
|
+
_id: {required: false, type: "objectid"},
|
|
231
|
+
kind: {enum: ["a", "b"], required: false, type: "string"},
|
|
232
|
+
name: {required: false, type: "string"},
|
|
233
|
+
owner: {ref: "User", required: false, type: "string"},
|
|
234
|
+
payload: {required: false, type: "mixed"},
|
|
235
|
+
when: {required: false, type: "date"},
|
|
236
|
+
})
|
|
237
|
+
).toEqual({name: ""});
|
|
238
|
+
});
|
|
239
|
+
});
|