@terreno/admin-frontend 57.18.0 → 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 +2074 -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 +3 -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
|
@@ -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
|
+
});
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import {Box, Heading, Text} from "@terreno/ui";
|
|
2
|
+
import startCase from "lodash/startCase";
|
|
3
|
+
import React, {useCallback, useMemo} from "react";
|
|
4
|
+
import type {AdminFieldConfig, AdminFieldValue} from "./types";
|
|
5
|
+
import {SYSTEM_FIELDS} from "./types";
|
|
6
|
+
|
|
7
|
+
export interface AdminNestedObjectSubFieldArgs {
|
|
8
|
+
/** Dotted path of the subfield, e.g. `tasks.enabled`. */
|
|
9
|
+
fieldKey: string;
|
|
10
|
+
/** Humanized label of the subfield's own key. */
|
|
11
|
+
label: string;
|
|
12
|
+
fieldConfig: AdminFieldConfig;
|
|
13
|
+
value: AdminFieldValue;
|
|
14
|
+
onChange: (value: AdminFieldValue) => void;
|
|
15
|
+
readOnly?: boolean;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
interface AdminNestedObjectFieldProps {
|
|
19
|
+
/** Dotted path of the object field, used as the prefix for subfield keys and test IDs. */
|
|
20
|
+
fieldKey: string;
|
|
21
|
+
title: string;
|
|
22
|
+
helperText?: string;
|
|
23
|
+
errorText?: string;
|
|
24
|
+
fields: Record<string, AdminFieldConfig>;
|
|
25
|
+
value: AdminFieldValue;
|
|
26
|
+
onChange: (value: Record<string, AdminFieldValue>) => void;
|
|
27
|
+
readOnly?: boolean;
|
|
28
|
+
/**
|
|
29
|
+
* Renders one subfield. Passed in by the caller so subfields can use the full renderer
|
|
30
|
+
* (including nested arrays and deeper objects) without a require cycle.
|
|
31
|
+
*/
|
|
32
|
+
renderSubField: (args: AdminNestedObjectSubFieldArgs) => React.ReactElement;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
/** Whether a field config describes a nested object whose subfields can be rendered as a group. */
|
|
36
|
+
export const isNestedObjectField = (fieldConfig: AdminFieldConfig): boolean => {
|
|
37
|
+
return (
|
|
38
|
+
fieldConfig.type === "object" &&
|
|
39
|
+
!fieldConfig.widget &&
|
|
40
|
+
fieldConfig.items != null &&
|
|
41
|
+
Object.keys(fieldConfig.items).length > 0
|
|
42
|
+
);
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Initial value for a nested object in a create form: each subfield's schema default, or the
|
|
47
|
+
* same blank value a top-level field of that type starts with. Enums, refs, dates, and Mixed
|
|
48
|
+
* subfields without a default are left out so a blank value never fails a cast or enum check.
|
|
49
|
+
*/
|
|
50
|
+
export const buildNestedObjectDefault = (
|
|
51
|
+
fields: Record<string, AdminFieldConfig>
|
|
52
|
+
): Record<string, AdminFieldValue> => {
|
|
53
|
+
const result: Record<string, AdminFieldValue> = {};
|
|
54
|
+
for (const [key, config] of Object.entries(fields)) {
|
|
55
|
+
if (SYSTEM_FIELDS.has(key)) {
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (config.default !== undefined) {
|
|
59
|
+
result[key] = config.default;
|
|
60
|
+
} else if (isNestedObjectField(config) && config.items) {
|
|
61
|
+
result[key] = buildNestedObjectDefault(config.items);
|
|
62
|
+
} else if (config.type === "boolean") {
|
|
63
|
+
result[key] = false;
|
|
64
|
+
} else if (config.type === "number") {
|
|
65
|
+
result[key] = 0;
|
|
66
|
+
} else if (config.type === "array") {
|
|
67
|
+
result[key] = [];
|
|
68
|
+
} else if (config.type === "string" && !config.ref && !config.enum?.length) {
|
|
69
|
+
result[key] = "";
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return result;
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
const toObjectValue = (value: AdminFieldValue): Record<string, AdminFieldValue> => {
|
|
76
|
+
if (value && typeof value === "object" && !Array.isArray(value)) {
|
|
77
|
+
return value as Record<string, AdminFieldValue>;
|
|
78
|
+
}
|
|
79
|
+
return {};
|
|
80
|
+
};
|
|
81
|
+
|
|
82
|
+
/**
|
|
83
|
+
* Renders a nested (non-array) object path as a titled group of its subfields, each with its
|
|
84
|
+
* type-appropriate control. Editing a subfield writes the merged object back to the parent.
|
|
85
|
+
*/
|
|
86
|
+
export const AdminNestedObjectField: React.FC<AdminNestedObjectFieldProps> = ({
|
|
87
|
+
fieldKey,
|
|
88
|
+
title,
|
|
89
|
+
helperText,
|
|
90
|
+
errorText,
|
|
91
|
+
fields,
|
|
92
|
+
value,
|
|
93
|
+
onChange,
|
|
94
|
+
readOnly,
|
|
95
|
+
renderSubField,
|
|
96
|
+
}) => {
|
|
97
|
+
const objectValue = useMemo((): Record<string, AdminFieldValue> => toObjectValue(value), [value]);
|
|
98
|
+
|
|
99
|
+
const subFieldEntries = useMemo((): [string, AdminFieldConfig][] => {
|
|
100
|
+
return Object.entries(fields).filter(([key]) => !SYSTEM_FIELDS.has(key));
|
|
101
|
+
}, [fields]);
|
|
102
|
+
|
|
103
|
+
const handleSubFieldChange = useCallback(
|
|
104
|
+
(subKey: string, subValue: AdminFieldValue): void => {
|
|
105
|
+
onChange({...objectValue, [subKey]: subValue});
|
|
106
|
+
},
|
|
107
|
+
[objectValue, onChange]
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
return (
|
|
111
|
+
<Box
|
|
112
|
+
border="default"
|
|
113
|
+
gap={3}
|
|
114
|
+
padding={3}
|
|
115
|
+
rounding="md"
|
|
116
|
+
testID={`admin-field-group-${fieldKey}`}
|
|
117
|
+
>
|
|
118
|
+
<Box gap={1}>
|
|
119
|
+
<Heading size="sm">{title}</Heading>
|
|
120
|
+
{helperText ? (
|
|
121
|
+
<Text color="secondaryDark" size="sm">
|
|
122
|
+
{helperText}
|
|
123
|
+
</Text>
|
|
124
|
+
) : null}
|
|
125
|
+
{errorText ? (
|
|
126
|
+
<Text color="error" size="sm">
|
|
127
|
+
{errorText}
|
|
128
|
+
</Text>
|
|
129
|
+
) : null}
|
|
130
|
+
</Box>
|
|
131
|
+
{subFieldEntries.map(([subKey, subConfig]) => (
|
|
132
|
+
<React.Fragment key={subKey}>
|
|
133
|
+
{renderSubField({
|
|
134
|
+
fieldConfig: subConfig,
|
|
135
|
+
fieldKey: `${fieldKey}.${subKey}`,
|
|
136
|
+
label: startCase(subKey),
|
|
137
|
+
onChange: (subValue: AdminFieldValue) => handleSubFieldChange(subKey, subValue),
|
|
138
|
+
readOnly,
|
|
139
|
+
value: objectValue[subKey] ?? subConfig.default,
|
|
140
|
+
})}
|
|
141
|
+
</React.Fragment>
|
|
142
|
+
))}
|
|
143
|
+
</Box>
|
|
144
|
+
);
|
|
145
|
+
};
|
package/src/AdminRolesField.tsx
CHANGED
|
@@ -15,7 +15,9 @@ const roleNamesFromValue = (value: unknown): string[] => {
|
|
|
15
15
|
* User-role editor backed by the RBAC role collection.
|
|
16
16
|
*
|
|
17
17
|
* Existing assignments remain visible and removable while the select only offers roles that
|
|
18
|
-
* are not already assigned.
|
|
18
|
+
* are not already assigned. A read-only field lists the assigned role names without loading the
|
|
19
|
+
* role catalog, so staff who may view a user but not read RBAC roles (such as an operator) see
|
|
20
|
+
* the record without a refused `/rbac/roles` request.
|
|
19
21
|
*/
|
|
20
22
|
export const AdminRolesField: React.FC<AdminFieldWidgetProps> = ({
|
|
21
23
|
api,
|
|
@@ -29,7 +31,9 @@ export const AdminRolesField: React.FC<AdminFieldWidgetProps> = ({
|
|
|
29
31
|
}) => {
|
|
30
32
|
const {apiBase: resolvedApiBase} = resolveAdminBases({apiBase, baseUrl});
|
|
31
33
|
const {useListRolesQuery} = useAdminRoles(api, resolvedApiBase);
|
|
32
|
-
|
|
34
|
+
// The catalog only supplies display names and the options to add; a read-only field needs
|
|
35
|
+
// neither, and its viewer may lack `rbac:read`.
|
|
36
|
+
const {data, error, isLoading} = useListRolesQuery(undefined, {skip: Boolean(readOnly)});
|
|
33
37
|
const roles = normalizeRoles(data);
|
|
34
38
|
const selectedRoleNames = roleNamesFromValue(value);
|
|
35
39
|
const selectedRoleSet = useMemo(() => new Set(selectedRoleNames), [selectedRoleNames]);
|
|
@@ -12,7 +12,11 @@ import type {AdminApi} from "./types";
|
|
|
12
12
|
import {normalizeRoles, normalizeStatements, type RolesQueryResult} from "./useAdminRoles";
|
|
13
13
|
|
|
14
14
|
const mockUseListRolesQuery = mock(
|
|
15
|
-
(): RolesQueryResult => ({
|
|
15
|
+
(_arg?: undefined, _options?: {skip?: boolean}): RolesQueryResult => ({
|
|
16
|
+
data: undefined,
|
|
17
|
+
error: null,
|
|
18
|
+
isLoading: false,
|
|
19
|
+
})
|
|
16
20
|
);
|
|
17
21
|
const mockRefetch = mock(() => {});
|
|
18
22
|
const mockCreateRole = mock(() => ({unwrap: async () => ({})}));
|
|
@@ -573,6 +577,26 @@ describe("AdminRolesField", () => {
|
|
|
573
577
|
expect(onChange).toHaveBeenCalledWith(["member", "manager"]);
|
|
574
578
|
});
|
|
575
579
|
|
|
580
|
+
it("does not load the role catalog for a read-only field", () => {
|
|
581
|
+
mockUseListRolesQuery.mockClear();
|
|
582
|
+
const {getByTestId, queryByTestId} = renderWithTheme(
|
|
583
|
+
<AdminRolesField
|
|
584
|
+
api={mockApi}
|
|
585
|
+
apiBase="/admin"
|
|
586
|
+
fieldConfig={fieldConfig}
|
|
587
|
+
fieldKey="roles"
|
|
588
|
+
onChange={mock(() => undefined)}
|
|
589
|
+
readOnly
|
|
590
|
+
value={["member"]}
|
|
591
|
+
/>
|
|
592
|
+
);
|
|
593
|
+
|
|
594
|
+
expect(mockUseListRolesQuery.mock.calls.at(-1)).toEqual([undefined, {skip: true}]);
|
|
595
|
+
expect(getByTestId("admin-field-roles-selected-member")).toBeTruthy();
|
|
596
|
+
expect(queryByTestId("admin-field-roles-add")).toBeNull();
|
|
597
|
+
expect(queryByTestId("admin-field-roles-load-error")).toBeNull();
|
|
598
|
+
});
|
|
599
|
+
|
|
576
600
|
it("removes an assigned role without changing other assignments", async () => {
|
|
577
601
|
const onChange = mock((_value: unknown) => undefined);
|
|
578
602
|
const {getByTestId} = renderWithTheme(
|
package/src/AdminShell.test.tsx
CHANGED
|
@@ -113,6 +113,20 @@ describe("AdminShell", () => {
|
|
|
113
113
|
restoreWindowWidth = undefined;
|
|
114
114
|
});
|
|
115
115
|
|
|
116
|
+
it("keeps the hamburger header between the old 768 cutoff and the desktop floor", () => {
|
|
117
|
+
restoreWindowWidth?.();
|
|
118
|
+
restoreWindowWidth = setWindowWidth(800);
|
|
119
|
+
|
|
120
|
+
const {getByTestId, queryByTestId} = renderWithTheme(
|
|
121
|
+
<AdminShell api={mockApi} apiBase="/admin" routeBase="/admin">
|
|
122
|
+
<React.Fragment />
|
|
123
|
+
</AdminShell>
|
|
124
|
+
);
|
|
125
|
+
|
|
126
|
+
expect(queryByTestId("admin-shell-sidebar")).toBeNull();
|
|
127
|
+
expect(getByTestId("admin-shell-mobile-header")).toBeTruthy();
|
|
128
|
+
});
|
|
129
|
+
|
|
116
130
|
it("shows the fixed sidebar on desktop widths", () => {
|
|
117
131
|
restoreWindowWidth?.();
|
|
118
132
|
restoreWindowWidth = setWindowWidth(1024);
|
|
@@ -197,7 +211,7 @@ describe("AdminShell", () => {
|
|
|
197
211
|
expect(rendered.getByTestId("admin-shell-error")).toBeTruthy();
|
|
198
212
|
});
|
|
199
213
|
|
|
200
|
-
it("hides the fixed sidebar and shows a hamburger header below
|
|
214
|
+
it("hides the fixed sidebar and shows a hamburger header below the desktop floor", () => {
|
|
201
215
|
const {getByTestId, getByLabelText, queryByTestId, UNSAFE_root} = renderWithTheme(
|
|
202
216
|
<AdminShell api={mockApi} apiBase="/admin" routeBase="/admin">
|
|
203
217
|
<React.Fragment />
|
package/src/AdminShell.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {Box, Heading, Icon, Spinner, Text, useTheme} from "@terreno/ui";
|
|
1
|
+
import {Box, Heading, Icon, isSupportedDesktopWidth, Spinner, Text, useTheme} from "@terreno/ui";
|
|
2
2
|
import type {Href} from "expo-router";
|
|
3
3
|
import {router} from "expo-router";
|
|
4
4
|
import React, {useCallback, useEffect, useState} from "react";
|
|
@@ -16,12 +16,9 @@ import type {AdminApi, AdminConfigResponse, AdminCustomScreen, AdminModelConfig}
|
|
|
16
16
|
import {resolveAdminBases} from "./types";
|
|
17
17
|
import {useAdminConfig} from "./useAdminConfig";
|
|
18
18
|
|
|
19
|
-
/** Sidebar chrome
|
|
19
|
+
/** Sidebar chrome for the admin shell. */
|
|
20
20
|
export type AdminShellSidebarVariant = "clinical" | "colorful";
|
|
21
21
|
|
|
22
|
-
/** Viewport widths below this use the hamburger + drawer navigation. */
|
|
23
|
-
const ADMIN_SHELL_MOBILE_BREAKPOINT = 768;
|
|
24
|
-
|
|
25
22
|
export interface AdminShellProps {
|
|
26
23
|
/** @deprecated Use `apiBase`/`routeBase`. */
|
|
27
24
|
baseUrl?: string;
|
|
@@ -359,8 +356,8 @@ const AdminShellSidebarNav: React.FC<AdminShellSidebarNavProps> = ({
|
|
|
359
356
|
* Intended for standalone admin SPA or embedded admin: pair with list/table/form screens
|
|
360
357
|
* as `children`. Fetches `/admin/config` once for the sidebar (Platform, grouped Models, Screens).
|
|
361
358
|
*
|
|
362
|
-
* Below
|
|
363
|
-
* left slide-over drawer.
|
|
359
|
+
* Below the desktop floor (web `lg` / native `xl`, 1024pt), the fixed sidebar becomes a
|
|
360
|
+
* hamburger-triggered left slide-over drawer.
|
|
364
361
|
*
|
|
365
362
|
* For Expo Router admin roots, prefer {@link AdminShellLayout}: it wraps `children` in a flex
|
|
366
363
|
* main column so a nested `<Stack />` fills the area beside the sidebar without repeating layout
|
|
@@ -389,7 +386,7 @@ export const AdminShell: React.FC<AdminShellProps> = ({
|
|
|
389
386
|
const sidebarVariant: AdminShellSidebarVariant =
|
|
390
387
|
colorScheme === "dark" ? "clinical" : requestedSidebarVariant;
|
|
391
388
|
const {width: windowWidth} = useWindowDimensions();
|
|
392
|
-
const isMobileLayout = windowWidth
|
|
389
|
+
const isMobileLayout = !isSupportedDesktopWidth({width: windowWidth});
|
|
393
390
|
const [isNavOpen, setIsNavOpen] = useState(false);
|
|
394
391
|
const {apiBase: resolvedApiBase, routeBase: resolvedRouteBase} = resolveAdminBases({
|
|
395
392
|
apiBase,
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
Box,
|
|
4
4
|
Button,
|
|
5
5
|
Card,
|
|
6
|
+
FormContainer,
|
|
6
7
|
Heading,
|
|
7
8
|
MarkdownEditorField,
|
|
8
9
|
Page,
|
|
@@ -111,6 +112,8 @@ const ConfigField: React.FC<{
|
|
|
111
112
|
if (fieldMeta.secret) {
|
|
112
113
|
return (
|
|
113
114
|
<TextField
|
|
115
|
+
accessibilityLabel={`${label} (Secret)`}
|
|
116
|
+
autoComplete="off"
|
|
114
117
|
helperText={helperText ? `${helperText} (secret)` : "Secret value"}
|
|
115
118
|
onChange={onChange}
|
|
116
119
|
testID={testID}
|
|
@@ -316,7 +319,8 @@ export const ConfigurationScreen: React.FC<ConfigurationScreenProps> = ({
|
|
|
316
319
|
scroll
|
|
317
320
|
title={title}
|
|
318
321
|
>
|
|
319
|
-
|
|
322
|
+
{/* A form holds the secret (password-type) fields, so browsers do not warn about them. */}
|
|
323
|
+
<FormContainer gap={4} padding={4} testID="config-form">
|
|
320
324
|
{sections.length === 0 ? (
|
|
321
325
|
<EmptySections />
|
|
322
326
|
) : (
|
|
@@ -329,7 +333,7 @@ export const ConfigurationScreen: React.FC<ConfigurationScreenProps> = ({
|
|
|
329
333
|
/>
|
|
330
334
|
))
|
|
331
335
|
)}
|
|
332
|
-
</
|
|
336
|
+
</FormContainer>
|
|
333
337
|
</Page>
|
|
334
338
|
);
|
|
335
339
|
};
|
|
@@ -1,7 +1,16 @@
|
|
|
1
|
-
import {describe, expect, it, mock} from "bun:test";
|
|
1
|
+
import {afterAll, describe, expect, it, mock, spyOn} from "bun:test";
|
|
2
|
+
import * as terrenoUi from "@terreno/ui";
|
|
2
3
|
import {act, fireEvent, waitFor} from "@testing-library/react-native";
|
|
3
4
|
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
4
5
|
|
|
6
|
+
const printedHtml: string[] = [];
|
|
7
|
+
// Capture what the print button hands to @terreno/ui's printConsentHtml.
|
|
8
|
+
const printSpy = spyOn(terrenoUi, "printConsentHtml").mockImplementation(
|
|
9
|
+
async ({html}: {html: string}) => {
|
|
10
|
+
printedHtml.push(html);
|
|
11
|
+
}
|
|
12
|
+
);
|
|
13
|
+
|
|
5
14
|
import {ConsentHistory} from "./ConsentHistory";
|
|
6
15
|
import type {ConsentHistoryEntry} from "./useConsentHistory";
|
|
7
16
|
|
|
@@ -158,4 +167,63 @@ describe("ConsentHistory", () => {
|
|
|
158
167
|
);
|
|
159
168
|
expect(getByTestId("consent-history-item-entry-1")).toBeTruthy();
|
|
160
169
|
});
|
|
170
|
+
describe("provisional entries", () => {
|
|
171
|
+
const provisionalEntry = (): ConsentHistoryEntry =>
|
|
172
|
+
makeEntry({
|
|
173
|
+
_id: "entry-prov",
|
|
174
|
+
agreedAt: "2026-10-20T15:30:00.000Z",
|
|
175
|
+
provisional: true,
|
|
176
|
+
provisionalSignedBy: {name: "Dana Rivera"},
|
|
177
|
+
});
|
|
178
|
+
|
|
179
|
+
it("shows the provisional badge and signer", () => {
|
|
180
|
+
const {getByTestId, getByText} = renderWithTheme(
|
|
181
|
+
<ConsentHistory api={createApi({data: [provisionalEntry()]})} />
|
|
182
|
+
);
|
|
183
|
+
expect(getByTestId("consent-history-provisional-entry-prov")).toBeTruthy();
|
|
184
|
+
expect(getByText("Provisional")).toBeTruthy();
|
|
185
|
+
expect(getByText("Signed on your behalf by Dana Rivera")).toBeTruthy();
|
|
186
|
+
});
|
|
187
|
+
|
|
188
|
+
it("marks a voided provisional entry", () => {
|
|
189
|
+
const {getByText} = renderWithTheme(
|
|
190
|
+
<ConsentHistory
|
|
191
|
+
api={createApi({
|
|
192
|
+
data: [{...provisionalEntry(), voidedAt: "2026-10-21T09:00:00.000Z"}],
|
|
193
|
+
})}
|
|
194
|
+
/>
|
|
195
|
+
);
|
|
196
|
+
expect(getByText("Voided")).toBeTruthy();
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
it("shows no provisional badge on the user's own entries", () => {
|
|
200
|
+
const {queryByTestId} = renderWithTheme(
|
|
201
|
+
<ConsentHistory api={createApi({data: [makeEntry()]})} />
|
|
202
|
+
);
|
|
203
|
+
expect(queryByTestId("consent-history-provisional-entry-1")).toBeNull();
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
it("prints the entry with the provisional block and no note", async () => {
|
|
207
|
+
printedHtml.length = 0;
|
|
208
|
+
const {getByTestId} = renderWithTheme(
|
|
209
|
+
<ConsentHistory api={createApi({data: [provisionalEntry()]})} />
|
|
210
|
+
);
|
|
211
|
+
fireEvent.press(getByTestId("consent-history-item-toggle-entry-prov"));
|
|
212
|
+
await act(async () => {
|
|
213
|
+
fireEvent.press(getByTestId("consent-history-print-entry-prov"));
|
|
214
|
+
await new Promise((r) => setTimeout(r, 100));
|
|
215
|
+
});
|
|
216
|
+
await waitFor(() => {
|
|
217
|
+
expect(printedHtml).toHaveLength(1);
|
|
218
|
+
});
|
|
219
|
+
expect(printedHtml[0]).toContain("<h2>Provisional signature</h2>");
|
|
220
|
+
expect(printedHtml[0]).toContain("Dana Rivera");
|
|
221
|
+
expect(printedHtml[0]).toContain("Terms of Service");
|
|
222
|
+
expect(printedHtml[0]).not.toContain("Note:");
|
|
223
|
+
});
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
afterAll(() => {
|
|
228
|
+
printSpy.mockRestore();
|
|
161
229
|
});
|