@terreno/admin-frontend 57.19.2 → 57.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +443 -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 +4 -1
- 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 +7 -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 +7 -3
- package/src/AdminBreadcrumbs.test.tsx +1 -1
- package/src/AdminFieldRenderer.test.tsx +2 -1
- package/src/AdminFieldRenderer.tsx +48 -3
- package/src/AdminFieldRendererCore.tsx +12 -5
- package/src/AdminFilterDrawer.tsx +3 -4
- package/src/AdminHome.test.tsx +65 -1
- package/src/AdminHome.tsx +14 -6
- package/src/AdminModelForm.tsx +4 -0
- package/src/AdminModelTable.test.tsx +16 -12
- package/src/AdminModelTable.windowed.test.tsx +11 -5
- package/src/AdminNestedArrayField.tsx +116 -44
- package/src/AdminNestedObjectField.test.tsx +239 -0
- package/src/AdminNestedObjectField.tsx +145 -0
- package/src/AdminPrimitiveArrayField.test.tsx +3 -3
- package/src/AdminProvider.test.tsx +11 -6
- package/src/AdminRolesField.tsx +6 -2
- package/src/AdminRolesList.test.tsx +47 -14
- package/src/AdminScreenPage.test.tsx +1 -1
- package/src/AdminScreenRouter.test.tsx +15 -5
- package/src/AdminScriptList.test.tsx +9 -2
- package/src/AdminShell.test.tsx +16 -2
- package/src/AdminShell.tsx +5 -8
- package/src/AdminVersionConfig.test.tsx +4 -4
- package/src/AnnouncementOverviewScreenWidget.test.tsx +6 -1
- package/src/CheckboxListEditor.test.tsx +11 -9
- package/src/ConfigurationScreen.test.tsx +2 -2
- 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/adminRequest.test.ts +3 -3
- package/src/adminWindowedTable.test.ts +4 -2
- package/src/comms/CommsDashboardScreen.test.tsx +5 -5
- package/src/comms/CommsMessageDetail.test.tsx +1 -1
- 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 +20 -0
- package/src/isolated/AdminFieldRenderer.isolated.tsx +11 -6
- package/src/isolated/AdminFilterDrawer.isolated.tsx +8 -6
- package/src/isolated/AdminFilterDrawerMobile.isolated.tsx +3 -1
- package/src/isolated/AdminHomeWidgets.isolated.tsx +2 -0
- package/src/isolated/AdminNestedArrayField.isolated.tsx +103 -10
- package/src/isolated/AdminObjectPicker.isolated.tsx +9 -10
- package/src/isolated/AiPromptsListScreen.isolated.tsx +1 -1
- package/src/isolated/DocumentStorageBrowser.isolated.tsx +16 -8
- package/src/isolated/RecentActivityWidget.isolated.tsx +2 -0
- package/src/isolated/UserSecurityScreen.isolated.tsx +365 -0
- package/src/isolated/adminWidgets.isolated.tsx +46 -6
- package/src/isolated/aiObservabilityScreens.isolated.tsx +18 -9
- package/src/isolated/generateConsentHistoryPdf.isolated.ts +60 -7
- package/src/isolated/generateConsentPdf.isolated.ts +47 -0
- package/src/isolated/generateConsentPdfMobile.isolated.ts +28 -0
- package/src/isolated/generateConsentPdfsMobile.isolated.ts +59 -2
- package/src/isolated/hooks.isolated.tsx +163 -42
- package/src/isolated/rpcDualRun.isolated.tsx +9 -2
- package/src/jobs/JobsDashboardScreen.test.tsx +3 -3
- package/src/jobs/JobsHomeWidget.test.tsx +1 -1
- package/src/jobs/JobsJobDetail.test.tsx +1 -1
- package/src/orgs/MemberSecurityPanel.test.tsx +584 -0
- package/src/orgs/MemberSecurityPanel.tsx +520 -0
- package/src/orgs/OrgManagementScreens.test.tsx +121 -2
- package/src/orgs/OrgMembersScreen.tsx +71 -4
- package/src/orgs/adminModelEndpoints.test.ts +1 -1
- 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/testing/useAdminApiDouble.ts +2 -1
- package/src/types.ts +7 -1
- package/src/useAdminApi.ts +23 -3
- package/src/useAdminRoles.ts +11 -3
- package/src/useAdminRpc.test.tsx +116 -2
- package/src/useAdminRpc.ts +19 -3
- package/src/useConsentHistory.ts +5 -0
- package/src/widgets/AIRequestsScreenWidget.test.tsx +20 -3
- package/src/widgets/ModelsGridWidget.test.tsx +25 -5
- package/src/widgets/aiObservability/datasets/AiDatasetDetailView.test.tsx +4 -2
- package/src/widgets/aiObservability/datasets/datasetTypes.test.ts +0 -1
- package/src/widgets/aiObservability/evaluators/AiEvaluatorPanels.test.tsx +89 -23
- package/src/widgets/aiObservability/experiments/AiExperimentNewView.test.tsx +4 -0
- package/src/widgets/aiObservability/shell/ObservabilityTable.test.tsx +7 -1
- package/src/widgets/builtInFieldWidgets.test.tsx +16 -3
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";
|
|
@@ -71,6 +73,7 @@ const buildConfig = (overrides?: Partial<AdminConfigResponse>): AdminConfigRespo
|
|
|
71
73
|
routePath: "/admin/widgets",
|
|
72
74
|
},
|
|
73
75
|
{
|
|
76
|
+
defaultSort: "-created",
|
|
74
77
|
displayName: "Audit log",
|
|
75
78
|
fields: {},
|
|
76
79
|
listFields: ["verb"],
|
|
@@ -103,7 +106,38 @@ const countTestIdInSubtree = (root: ReactTestInstance, testId: string): number =
|
|
|
103
106
|
return count;
|
|
104
107
|
};
|
|
105
108
|
|
|
109
|
+
type WindowDimensionsImpl = () => ScaledSize;
|
|
110
|
+
type MockableUseWindowDimensions = WindowDimensionsImpl & {
|
|
111
|
+
mockImplementation?: (impl: WindowDimensionsImpl) => void;
|
|
112
|
+
};
|
|
113
|
+
|
|
114
|
+
const getScaledSize =
|
|
115
|
+
(width: number): WindowDimensionsImpl =>
|
|
116
|
+
(): ScaledSize => ({
|
|
117
|
+
fontScale: 1,
|
|
118
|
+
height: 1000,
|
|
119
|
+
scale: 2,
|
|
120
|
+
width,
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
const setWindowWidth = (width: number): (() => void) => {
|
|
124
|
+
const useWindowDimensionsMock = useWindowDimensions as MockableUseWindowDimensions;
|
|
125
|
+
const dimensionsImpl = getScaledSize(width);
|
|
126
|
+
|
|
127
|
+
if (typeof useWindowDimensionsMock.mockImplementation === "function") {
|
|
128
|
+
useWindowDimensionsMock.mockImplementation(dimensionsImpl);
|
|
129
|
+
|
|
130
|
+
return (): void => {
|
|
131
|
+
useWindowDimensionsMock.mockImplementation?.(getScaledSize(375));
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
return (): void => {};
|
|
136
|
+
};
|
|
137
|
+
|
|
106
138
|
describe("AdminHome", () => {
|
|
139
|
+
let restoreWindowWidth: (() => void) | undefined;
|
|
140
|
+
|
|
107
141
|
beforeEach(() => {
|
|
108
142
|
resetUseAdminApiDouble();
|
|
109
143
|
configureUseAdminApiDouble({
|
|
@@ -116,6 +150,12 @@ describe("AdminHome", () => {
|
|
|
116
150
|
});
|
|
117
151
|
configState.config = null;
|
|
118
152
|
configState.isLoading = false;
|
|
153
|
+
restoreWindowWidth = setWindowWidth(375);
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
afterEach(() => {
|
|
157
|
+
restoreWindowWidth?.();
|
|
158
|
+
restoreWindowWidth = undefined;
|
|
119
159
|
});
|
|
120
160
|
|
|
121
161
|
it("renders scriptRunner in the top band with contentTop widgets on the same row, not inside main", () => {
|
|
@@ -215,4 +255,28 @@ describe("AdminHome", () => {
|
|
|
215
255
|
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
216
256
|
expect(getByTestId("admin-version-config-widget")).toBeTruthy();
|
|
217
257
|
});
|
|
258
|
+
|
|
259
|
+
it("stacks the home columns below the desktop floor", () => {
|
|
260
|
+
restoreWindowWidth?.();
|
|
261
|
+
restoreWindowWidth = setWindowWidth(800);
|
|
262
|
+
configState.config = buildConfig();
|
|
263
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
264
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("column");
|
|
265
|
+
});
|
|
266
|
+
|
|
267
|
+
it("places the home columns side by side at the desktop floor", () => {
|
|
268
|
+
restoreWindowWidth?.();
|
|
269
|
+
restoreWindowWidth = setWindowWidth(1024);
|
|
270
|
+
configState.config = buildConfig();
|
|
271
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" />);
|
|
272
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("row");
|
|
273
|
+
});
|
|
274
|
+
|
|
275
|
+
it("keeps an embedded dashboard stacked at desktop width", () => {
|
|
276
|
+
restoreWindowWidth?.();
|
|
277
|
+
restoreWindowWidth = setWindowWidth(1024);
|
|
278
|
+
configState.config = buildConfig();
|
|
279
|
+
const {getByTestId} = renderWithTheme(<AdminHome api={adminApi} baseUrl="/admin" embedded />);
|
|
280
|
+
expect(getByTestId("admin-home-columns").props.style.flexDirection).toBe("column");
|
|
281
|
+
});
|
|
218
282
|
});
|
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
|
}
|
|
@@ -8,9 +8,9 @@ import type {ReactTestInstance} from "react-test-renderer";
|
|
|
8
8
|
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
9
9
|
import {ADMIN_SEARCH_DEBOUNCE_MS} from "./Constants";
|
|
10
10
|
import {configureUseAdminApiDouble, resetUseAdminApiDouble} from "./testing/useAdminApiDouble";
|
|
11
|
-
import type {AdminApi, AdminConfigResponse} from "./types";
|
|
11
|
+
import type {AdminApi, AdminConfigResponse, AdminModelConfig} from "./types";
|
|
12
12
|
|
|
13
|
-
const routerPush = mock(() => {});
|
|
13
|
+
const routerPush = mock((_href: unknown) => {});
|
|
14
14
|
const setOptions = mock((_: unknown) => {});
|
|
15
15
|
mock.module("expo-router", () => ({
|
|
16
16
|
router: {push: routerPush},
|
|
@@ -41,9 +41,9 @@ const listState: {data: unknown; isLoading: boolean} = {
|
|
|
41
41
|
};
|
|
42
42
|
const listQueryArgs: unknown[] = [];
|
|
43
43
|
const deleteFn = mock(() => ({unwrap: async () => ({})}));
|
|
44
|
-
const patchFn = mock(() => ({unwrap: async () => ({})}));
|
|
45
|
-
const bulkPatchFn = mock(() => ({unwrap: async () => ({updated: 0})}));
|
|
46
|
-
const enqueueBackgroundFn = mock(() => ({unwrap: async () => ({taskId: "t1"})}));
|
|
44
|
+
const patchFn = mock((_arg: unknown) => ({unwrap: async () => ({})}));
|
|
45
|
+
const bulkPatchFn = mock((_arg: unknown) => ({unwrap: async () => ({updated: 0})}));
|
|
46
|
+
const enqueueBackgroundFn = mock((_arg: unknown) => ({unwrap: async () => ({taskId: "t1"})}));
|
|
47
47
|
|
|
48
48
|
mock.module("./useAdminBackgroundTask", () => ({
|
|
49
49
|
useAdminBackgroundTaskMutation: () => [enqueueBackgroundFn, {isLoading: false}],
|
|
@@ -51,6 +51,9 @@ mock.module("./useAdminBackgroundTask", () => ({
|
|
|
51
51
|
|
|
52
52
|
import {AdminModelTable} from "./AdminModelTable";
|
|
53
53
|
|
|
54
|
+
const withoutDefaultSort = (model: Omit<AdminModelConfig, "defaultSort">): AdminModelConfig =>
|
|
55
|
+
model as AdminModelConfig;
|
|
56
|
+
|
|
54
57
|
const fullConfig = {
|
|
55
58
|
customScreens: [],
|
|
56
59
|
models: [
|
|
@@ -237,10 +240,11 @@ describe("AdminModelTable", () => {
|
|
|
237
240
|
...fullConfig.models[0].fields,
|
|
238
241
|
ownerId: {ref: "Group", required: false, type: "objectid"},
|
|
239
242
|
},
|
|
240
|
-
filters: [{field: "ownerId", kind: "ref"
|
|
243
|
+
filters: [{field: "ownerId", kind: "ref", refModel: "Group"}],
|
|
241
244
|
listFields: ["email"],
|
|
242
245
|
},
|
|
243
246
|
{
|
|
247
|
+
defaultSort: "-created",
|
|
244
248
|
displayName: "Groups",
|
|
245
249
|
fields: {},
|
|
246
250
|
listFields: ["name"],
|
|
@@ -253,7 +257,7 @@ describe("AdminModelTable", () => {
|
|
|
253
257
|
<AdminModelTable api={{} as unknown as AdminApi} baseUrl="/admin" modelName="User" />
|
|
254
258
|
);
|
|
255
259
|
const [refFilter] = findDataTable(UNSAFE_root).props.additionalFilters;
|
|
256
|
-
const onChange = mock(() => {});
|
|
260
|
+
const onChange = mock((_value: unknown) => {});
|
|
257
261
|
const rendered = refFilter.renderFilter({
|
|
258
262
|
field: "ownerId",
|
|
259
263
|
onChange,
|
|
@@ -329,8 +333,8 @@ describe("AdminModelTable", () => {
|
|
|
329
333
|
configState.config = {
|
|
330
334
|
customScreens: [],
|
|
331
335
|
models: [
|
|
332
|
-
|
|
333
|
-
|
|
336
|
+
// A model the server sends without a default sort.
|
|
337
|
+
withoutDefaultSort({
|
|
334
338
|
displayName: "Plain",
|
|
335
339
|
fields: {
|
|
336
340
|
_id: {required: true, type: "string"},
|
|
@@ -343,7 +347,7 @@ describe("AdminModelTable", () => {
|
|
|
343
347
|
listFields: ["_id", "name", "created", "updated"],
|
|
344
348
|
name: "Plain",
|
|
345
349
|
routePath: "/admin/plain",
|
|
346
|
-
},
|
|
350
|
+
}),
|
|
347
351
|
],
|
|
348
352
|
scripts: [],
|
|
349
353
|
};
|
|
@@ -799,7 +803,7 @@ describe("AdminModelTable", () => {
|
|
|
799
803
|
| {disabled?: boolean; onToggle?: () => void; value?: boolean}
|
|
800
804
|
| undefined;
|
|
801
805
|
return (
|
|
802
|
-
value &&
|
|
806
|
+
!!value &&
|
|
803
807
|
typeof value.onToggle === "function" &&
|
|
804
808
|
typeof value.value === "boolean" &&
|
|
805
809
|
typeof value.disabled === "boolean"
|
|
@@ -837,7 +841,7 @@ describe("AdminModelTable", () => {
|
|
|
837
841
|
|
|
838
842
|
const linkCells = UNSAFE_root.findAll((n: ReactTestInstance) => {
|
|
839
843
|
const value = n.props?.cellData?.value as {href?: string; text?: string} | undefined;
|
|
840
|
-
return value && typeof value.href === "string" && typeof value.text === "string";
|
|
844
|
+
return !!value && typeof value.href === "string" && typeof value.text === "string";
|
|
841
845
|
});
|
|
842
846
|
assert.isAtLeast(linkCells.length, 1);
|
|
843
847
|
const linkCell = linkCells[0] as ReactTestInstance;
|
|
@@ -29,7 +29,13 @@ mock.module("./useAdminConfig", () => ({
|
|
|
29
29
|
const listState: {data: {data: Array<Record<string, unknown>>; total: number}} = {
|
|
30
30
|
data: {data: [], total: 0},
|
|
31
31
|
};
|
|
32
|
-
|
|
32
|
+
// Refetch results are RTK Query envelopes: data on success, error/isError on failure, or empty.
|
|
33
|
+
interface RefetchResult {
|
|
34
|
+
data?: typeof listState.data;
|
|
35
|
+
error?: unknown;
|
|
36
|
+
isError?: boolean;
|
|
37
|
+
}
|
|
38
|
+
const listRefetch = mock(async (): Promise<RefetchResult> => ({data: listState.data}));
|
|
33
39
|
const bulkPatchFn = mock(() => ({unwrap: async () => ({updated: 1})}));
|
|
34
40
|
|
|
35
41
|
mock.module("./useAdminBackgroundTask", () => ({
|
|
@@ -826,7 +832,7 @@ describe("AdminModelTable windowed path", () => {
|
|
|
826
832
|
};
|
|
827
833
|
const originalFetch = globalThis.fetch;
|
|
828
834
|
const fetchMock = mock(
|
|
829
|
-
async () =>
|
|
835
|
+
async (_input: string | URL | Request, _init?: RequestInit) =>
|
|
830
836
|
new Response(JSON.stringify({updated: 1}), {
|
|
831
837
|
headers: {"Content-Type": "application/json"},
|
|
832
838
|
status: 200,
|
|
@@ -849,9 +855,9 @@ describe("AdminModelTable windowed path", () => {
|
|
|
849
855
|
|
|
850
856
|
assert.equal(fetchMock.mock.calls.length, 1);
|
|
851
857
|
assert.equal(fetchMock.mock.calls[0]?.[0], "/admin/todos/bulk-patch");
|
|
852
|
-
const request = fetchMock.mock.calls[0]?.[1]
|
|
853
|
-
assert.equal(request
|
|
854
|
-
assert.deepEqual(JSON.parse(String(request
|
|
858
|
+
const request = fetchMock.mock.calls[0]?.[1];
|
|
859
|
+
assert.equal(request?.method, "POST");
|
|
860
|
+
assert.deepEqual(JSON.parse(String(request?.body)), {
|
|
855
861
|
ids: ["todo-1"],
|
|
856
862
|
patch: {active: true},
|
|
857
863
|
});
|
|
@@ -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,
|