@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
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"url": "https://github.com/TerrenoLabs/terreno/issues"
|
|
4
4
|
},
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@terreno/ui": "57.
|
|
6
|
+
"@terreno/ui": "57.20.0",
|
|
7
7
|
"expo-router": "~57.0.14",
|
|
8
8
|
"jspdf": "^4.2.0",
|
|
9
9
|
"lodash": "^4.18.1",
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"files": [
|
|
30
30
|
"LICENSE",
|
|
31
|
+
"CHANGELOG.md",
|
|
31
32
|
"dist/**/*",
|
|
32
33
|
"src/**/*",
|
|
33
34
|
".ai/**/*"
|
|
@@ -73,5 +74,5 @@
|
|
|
73
74
|
"test:coverage": "bun run ../scripts/check-coverage.ts"
|
|
74
75
|
},
|
|
75
76
|
"types": "dist/index.d.ts",
|
|
76
|
-
"version": "57.
|
|
77
|
+
"version": "57.20.0"
|
|
77
78
|
}
|
|
@@ -2,6 +2,11 @@ import startCase from "lodash/startCase";
|
|
|
2
2
|
import React from "react";
|
|
3
3
|
import {AdminFieldRendererCore, type AdminFieldRendererCoreProps} from "./AdminFieldRendererCore";
|
|
4
4
|
import {AdminNestedArrayField} from "./AdminNestedArrayField";
|
|
5
|
+
import {
|
|
6
|
+
AdminNestedObjectField,
|
|
7
|
+
type AdminNestedObjectSubFieldArgs,
|
|
8
|
+
isNestedObjectField,
|
|
9
|
+
} from "./AdminNestedObjectField";
|
|
5
10
|
import type {AdminFieldValue} from "./types";
|
|
6
11
|
|
|
7
12
|
export type AdminFieldRendererProps = AdminFieldRendererCoreProps;
|
|
@@ -9,14 +14,16 @@ export type AdminFieldRendererProps = AdminFieldRendererCoreProps;
|
|
|
9
14
|
/**
|
|
10
15
|
* Renders an appropriate input field for a given model field in the admin form.
|
|
11
16
|
*
|
|
12
|
-
* Delegates arrays of sub-documents to {@link AdminNestedArrayField}
|
|
13
|
-
* field types are rendered by
|
|
17
|
+
* Delegates arrays of sub-documents to {@link AdminNestedArrayField} and nested objects with
|
|
18
|
+
* subfield metadata to {@link AdminNestedObjectField}; all other field types are rendered by
|
|
19
|
+
* {@link AdminFieldRendererCore}.
|
|
14
20
|
*
|
|
15
21
|
* @see AdminFieldRendererCore for supported field type mappings
|
|
16
22
|
* @see AdminModelForm for form usage
|
|
17
23
|
*/
|
|
18
24
|
export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
19
25
|
fieldKey,
|
|
26
|
+
label,
|
|
20
27
|
fieldConfig,
|
|
21
28
|
value,
|
|
22
29
|
onChange,
|
|
@@ -31,6 +38,8 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
31
38
|
readOnly,
|
|
32
39
|
autocompleteFields,
|
|
33
40
|
}) => {
|
|
41
|
+
const title = label ?? startCase(fieldKey);
|
|
42
|
+
|
|
34
43
|
if (fieldConfig.type === "array" && fieldConfig.items) {
|
|
35
44
|
return (
|
|
36
45
|
<AdminNestedArrayField
|
|
@@ -38,6 +47,7 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
38
47
|
apiBase={apiBase}
|
|
39
48
|
baseUrl={baseUrl}
|
|
40
49
|
errorText={errorText}
|
|
50
|
+
fieldKey={fieldKey}
|
|
41
51
|
helperText={fieldConfig.description}
|
|
42
52
|
items={fieldConfig.items}
|
|
43
53
|
modelConfigs={modelConfigs}
|
|
@@ -46,12 +56,46 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
46
56
|
readOnly={readOnly}
|
|
47
57
|
refRenderers={refRenderers}
|
|
48
58
|
routeBase={routeBase}
|
|
49
|
-
title={
|
|
59
|
+
title={title}
|
|
50
60
|
value={Array.isArray(value) ? (value as Record<string, AdminFieldValue>[]) : []}
|
|
51
61
|
/>
|
|
52
62
|
);
|
|
53
63
|
}
|
|
54
64
|
|
|
65
|
+
if (isNestedObjectField(fieldConfig) && fieldConfig.items) {
|
|
66
|
+
const renderSubField = (sub: AdminNestedObjectSubFieldArgs): React.ReactElement => (
|
|
67
|
+
<AdminFieldRenderer
|
|
68
|
+
api={api}
|
|
69
|
+
apiBase={apiBase}
|
|
70
|
+
autocompleteFields={autocompleteFields}
|
|
71
|
+
baseUrl={baseUrl}
|
|
72
|
+
fieldConfig={sub.fieldConfig}
|
|
73
|
+
fieldKey={sub.fieldKey}
|
|
74
|
+
label={sub.label}
|
|
75
|
+
modelConfigs={modelConfigs}
|
|
76
|
+
onChange={sub.onChange}
|
|
77
|
+
parentFormState={parentFormState}
|
|
78
|
+
readOnly={sub.readOnly}
|
|
79
|
+
refRenderers={refRenderers}
|
|
80
|
+
routeBase={routeBase}
|
|
81
|
+
value={sub.value}
|
|
82
|
+
/>
|
|
83
|
+
);
|
|
84
|
+
return (
|
|
85
|
+
<AdminNestedObjectField
|
|
86
|
+
errorText={errorText}
|
|
87
|
+
fieldKey={fieldKey}
|
|
88
|
+
fields={fieldConfig.items}
|
|
89
|
+
helperText={fieldConfig.description}
|
|
90
|
+
onChange={onChange}
|
|
91
|
+
readOnly={readOnly}
|
|
92
|
+
renderSubField={renderSubField}
|
|
93
|
+
title={title}
|
|
94
|
+
value={value}
|
|
95
|
+
/>
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
|
|
55
99
|
return (
|
|
56
100
|
<AdminFieldRendererCore
|
|
57
101
|
api={api}
|
|
@@ -61,6 +105,7 @@ export const AdminFieldRenderer: React.FC<AdminFieldRendererProps> = ({
|
|
|
61
105
|
errorText={errorText}
|
|
62
106
|
fieldConfig={fieldConfig}
|
|
63
107
|
fieldKey={fieldKey}
|
|
108
|
+
label={label}
|
|
64
109
|
modelConfigs={modelConfigs}
|
|
65
110
|
onChange={onChange}
|
|
66
111
|
parentFormState={parentFormState}
|
|
@@ -66,6 +66,8 @@ const getRefModel = (
|
|
|
66
66
|
|
|
67
67
|
export interface AdminFieldRendererCoreProps extends AdminScreenProps {
|
|
68
68
|
fieldKey: string;
|
|
69
|
+
/** Field label. Defaults to the humanized `fieldKey`; nested subfields pass their own key's label. */
|
|
70
|
+
label?: string;
|
|
69
71
|
fieldConfig: AdminFieldConfig;
|
|
70
72
|
value: AdminFieldValue;
|
|
71
73
|
onChange: (value: AdminFieldValue) => void;
|
|
@@ -85,12 +87,14 @@ export interface AdminFieldRendererCoreProps extends AdminScreenProps {
|
|
|
85
87
|
}
|
|
86
88
|
|
|
87
89
|
/**
|
|
88
|
-
* Renders admin form fields for all types except arrays of sub-documents
|
|
89
|
-
*
|
|
90
|
-
* {@link AdminFieldRenderer} to avoid a circular import.
|
|
90
|
+
* Renders admin form fields for all types except arrays of sub-documents and nested objects
|
|
91
|
+
* with subfield metadata. Those are handled by {@link AdminNestedArrayField} and
|
|
92
|
+
* {@link AdminNestedObjectField} via {@link AdminFieldRenderer} to avoid a circular import.
|
|
93
|
+
* Objects without `items` (Mixed, Map) fall back to the JSON editor.
|
|
91
94
|
*/
|
|
92
95
|
export const AdminFieldRendererCore: React.FC<AdminFieldRendererCoreProps> = ({
|
|
93
96
|
fieldKey,
|
|
97
|
+
label: labelProp,
|
|
94
98
|
fieldConfig,
|
|
95
99
|
value,
|
|
96
100
|
onChange,
|
|
@@ -105,7 +109,9 @@ export const AdminFieldRendererCore: React.FC<AdminFieldRendererCoreProps> = ({
|
|
|
105
109
|
readOnly,
|
|
106
110
|
autocompleteFields,
|
|
107
111
|
}) => {
|
|
108
|
-
const label = startCase(fieldKey);
|
|
112
|
+
const label = labelProp ?? startCase(fieldKey);
|
|
113
|
+
// Name heuristics read the subfield's own key: a dotted path also carries its parents' names.
|
|
114
|
+
const leafKey = fieldKey.split(".").pop() ?? fieldKey;
|
|
109
115
|
const helperText = fieldConfig.description;
|
|
110
116
|
const refModel = getRefModel(modelConfigs, USER_REF_MODEL_NAME);
|
|
111
117
|
const isReadOnly = Boolean(readOnly);
|
|
@@ -296,6 +302,7 @@ export const AdminFieldRendererCore: React.FC<AdminFieldRendererCoreProps> = ({
|
|
|
296
302
|
errorText={errorText}
|
|
297
303
|
helperText={helperText}
|
|
298
304
|
onChange={onChange}
|
|
305
|
+
testID={`admin-field-${fieldKey}`}
|
|
299
306
|
title={label}
|
|
300
307
|
value={typeof value === "boolean" ? value : false}
|
|
301
308
|
/>
|
|
@@ -324,7 +331,7 @@ export const AdminFieldRendererCore: React.FC<AdminFieldRendererCoreProps> = ({
|
|
|
324
331
|
if (
|
|
325
332
|
fieldConfig.type === "date" ||
|
|
326
333
|
fieldConfig.type === "datetime" ||
|
|
327
|
-
(fieldConfig.type === "string" &&
|
|
334
|
+
(fieldConfig.type === "string" && leafKey.toLowerCase().includes("date"))
|
|
328
335
|
) {
|
|
329
336
|
return (
|
|
330
337
|
<DateTimeField
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
DateTimeField,
|
|
7
7
|
Heading,
|
|
8
8
|
IconButton,
|
|
9
|
+
isSupportedDesktopWidth,
|
|
9
10
|
Modal,
|
|
10
11
|
SelectField,
|
|
11
12
|
Text,
|
|
@@ -20,7 +21,6 @@ import {
|
|
|
20
21
|
adminFilterStateHasValues,
|
|
21
22
|
areAdminFilterStatesEqual,
|
|
22
23
|
} from "./adminModelListQueryParams";
|
|
23
|
-
import {ADMIN_FILTER_MOBILE_BREAKPOINT} from "./Constants";
|
|
24
24
|
import type {AdminApi, AdminFieldConfig, AdminModelConfig} from "./types";
|
|
25
25
|
|
|
26
26
|
interface AdminFilterDrawerProps {
|
|
@@ -194,7 +194,7 @@ export const AdminFilterDrawer: React.FC<AdminFilterDrawerProps> = ({
|
|
|
194
194
|
onApply,
|
|
195
195
|
}) => {
|
|
196
196
|
const {width: windowWidth} = useWindowDimensions();
|
|
197
|
-
const isMobileLayout = windowWidth
|
|
197
|
+
const isMobileLayout = !isSupportedDesktopWidth({width: windowWidth});
|
|
198
198
|
const [isExpanded, setIsExpanded] = useState(true);
|
|
199
199
|
const [draftState, setDraftState] = useState<AdminListFilterState>(appliedFilterState);
|
|
200
200
|
const [isSheetOpen, setIsSheetOpen] = useState(false);
|
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,
|