@terreno/admin-frontend 0.13.3 → 0.14.1
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/dist/AdminFieldRenderer.d.ts +5 -53
- package/dist/AdminFieldRenderer.js +6 -168
- package/dist/AdminFieldRenderer.js.map +1 -1
- package/dist/AdminFieldRendererCore.d.ts +26 -0
- package/dist/AdminFieldRendererCore.js +138 -0
- package/dist/AdminFieldRendererCore.js.map +1 -0
- package/dist/AdminModelForm.d.ts +6 -7
- package/dist/AdminModelForm.js.map +1 -1
- package/dist/AdminModelList.d.ts +2 -3
- package/dist/AdminModelList.js.map +1 -1
- package/dist/AdminModelTable.d.ts +2 -2
- package/dist/AdminModelTable.js +2 -1
- package/dist/AdminModelTable.js.map +1 -1
- package/dist/AdminNestedArrayField.d.ts +6 -7
- package/dist/AdminNestedArrayField.js +26 -2
- package/dist/AdminNestedArrayField.js.map +1 -1
- package/dist/AdminObjectPicker.d.ts +2 -2
- package/dist/AdminObjectPicker.js +13 -7
- package/dist/AdminObjectPicker.js.map +1 -1
- package/dist/AdminPrimitiveArrayField.d.ts +2 -3
- package/dist/AdminPrimitiveArrayField.js.map +1 -1
- package/dist/AdminScriptList.d.ts +2 -2
- package/dist/AdminScriptList.js.map +1 -1
- package/dist/AdminScriptRunModal.d.ts +2 -2
- package/dist/AdminScriptRunModal.js.map +1 -1
- package/dist/AdminVersionConfig.d.ts +2 -2
- package/dist/AdminVersionConfig.js +16 -10
- package/dist/AdminVersionConfig.js.map +1 -1
- package/dist/ConfigurationScreen.d.ts +2 -2
- package/dist/ConfigurationScreen.js +18 -9
- package/dist/ConfigurationScreen.js.map +1 -1
- package/dist/ConsentFormEditor.d.ts +27 -2
- package/dist/ConsentFormEditor.js +48 -32
- package/dist/ConsentFormEditor.js.map +1 -1
- package/dist/ConsentFormList.d.ts +2 -1
- package/dist/ConsentFormList.js.map +1 -1
- package/dist/ConsentResponseViewer.d.ts +2 -1
- package/dist/ConsentResponseViewer.js.map +1 -1
- package/dist/DocumentStorageBrowser.js.map +1 -1
- package/dist/types.d.ts +29 -4
- package/dist/types.js.map +1 -1
- package/dist/useAdminApi.d.ts +2 -2
- package/dist/useAdminApi.js +8 -5
- package/dist/useAdminApi.js.map +1 -1
- package/dist/useAdminConfig.d.ts +2 -3
- package/dist/useAdminConfig.js +2 -0
- package/dist/useAdminConfig.js.map +1 -1
- package/dist/useAdminScripts.d.ts +2 -3
- package/dist/useAdminScripts.js +6 -3
- package/dist/useAdminScripts.js.map +1 -1
- package/dist/useConfigurationApi.d.ts +11 -8
- package/dist/useConfigurationApi.js +7 -4
- package/dist/useConfigurationApi.js.map +1 -1
- package/dist/useDocumentStorageApi.d.ts +2 -2
- package/dist/useDocumentStorageApi.js +9 -6
- package/dist/useDocumentStorageApi.js.map +1 -1
- package/package.json +2 -2
- package/src/AdminFieldRenderer.test.tsx +48 -22
- package/src/AdminFieldRenderer.tsx +18 -371
- package/src/AdminFieldRendererCore.tsx +356 -0
- package/src/AdminModelForm.test.tsx +146 -40
- package/src/AdminModelForm.tsx +22 -17
- package/src/AdminModelList.test.tsx +14 -5
- package/src/AdminModelList.tsx +5 -5
- package/src/AdminModelTable.test.tsx +58 -31
- package/src/AdminModelTable.tsx +11 -10
- package/src/AdminNestedArrayField.tsx +91 -26
- package/src/AdminObjectPicker.tsx +33 -16
- package/src/AdminPrimitiveArrayField.test.tsx +14 -10
- package/src/AdminPrimitiveArrayField.tsx +2 -3
- package/src/AdminScriptList.test.tsx +7 -4
- package/src/AdminScriptList.tsx +2 -3
- package/src/AdminScriptRunModal.test.tsx +5 -2
- package/src/AdminScriptRunModal.tsx +2 -3
- package/src/AdminVersionConfig.test.tsx +47 -21
- package/src/AdminVersionConfig.tsx +29 -5
- package/src/CheckboxListEditor.test.tsx +9 -6
- package/src/ConfigurationScreen.test.tsx +16 -11
- package/src/ConfigurationScreen.tsx +43 -29
- package/src/ConsentFormEditor.test.tsx +95 -75
- package/src/ConsentFormEditor.tsx +76 -49
- package/src/ConsentFormList.test.tsx +28 -10
- package/src/ConsentFormList.tsx +14 -2
- package/src/ConsentResponseViewer.test.tsx +15 -12
- package/src/ConsentResponseViewer.tsx +3 -2
- package/src/DocumentStorageBrowser.test.tsx +69 -42
- package/src/DocumentStorageBrowser.tsx +4 -4
- package/src/LocaleContentEditor.test.tsx +28 -18
- package/src/isolated/AdminFieldRenderer.isolated.tsx +5 -2
- package/src/isolated/AdminNestedArrayField.isolated.tsx +49 -36
- package/src/isolated/AdminObjectPicker.isolated.tsx +31 -26
- package/src/isolated/AdminRefField.isolated.tsx +4 -1
- package/src/isolated/AdminScriptRunModal.isolated.tsx +24 -17
- package/src/isolated/DocumentStorageBrowser.isolated.tsx +80 -63
- package/src/isolated/hooks.isolated.tsx +40 -33
- package/src/types.ts +34 -4
- package/src/useAdminApi.ts +21 -13
- package/src/useAdminConfig.ts +5 -4
- package/src/useAdminScripts.ts +9 -7
- package/src/useConfigurationApi.ts +26 -12
- package/src/useDocumentStorageApi.ts +12 -9
|
@@ -1,11 +1,15 @@
|
|
|
1
|
+
// noExplicitAny: test mocks use type-erased RTK Query API doubles and UNSAFE_root traversal
|
|
2
|
+
// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
|
|
1
3
|
import {beforeEach, describe, expect, it, mock} from "bun:test";
|
|
2
4
|
import {renderWithTheme} from "@terreno/ui/src/test-utils";
|
|
3
5
|
import React from "react";
|
|
6
|
+
import type {ReactTestInstance} from "react-test-renderer";
|
|
4
7
|
import {act, fireEvent} from "../../ui/node_modules/@testing-library/react-native";
|
|
8
|
+
import type {AdminApi, AdminConfigResponse} from "./types";
|
|
5
9
|
|
|
6
10
|
const routerBack = mock(() => {});
|
|
7
11
|
const routerPush = mock(() => {});
|
|
8
|
-
const setOptions = mock((opts:
|
|
12
|
+
const setOptions = mock((opts: Record<string, unknown>) => {
|
|
9
13
|
// Invoke the headerRight render function so its children execute and we
|
|
10
14
|
// exercise the save/delete button useCallbacks when fired elsewhere.
|
|
11
15
|
if (opts?.headerRight) {
|
|
@@ -17,7 +21,7 @@ mock.module("expo-router", () => ({
|
|
|
17
21
|
useNavigation: () => ({setOptions}),
|
|
18
22
|
}));
|
|
19
23
|
|
|
20
|
-
const configState: {config:
|
|
24
|
+
const configState: {config: AdminConfigResponse | null; isLoading: boolean} = {
|
|
21
25
|
config: null,
|
|
22
26
|
isLoading: false,
|
|
23
27
|
};
|
|
@@ -29,7 +33,10 @@ mock.module("./useAdminConfig", () => ({
|
|
|
29
33
|
}),
|
|
30
34
|
}));
|
|
31
35
|
|
|
32
|
-
const readState: {data:
|
|
36
|
+
const readState: {data: Record<string, unknown> | null; isLoading: boolean} = {
|
|
37
|
+
data: null,
|
|
38
|
+
isLoading: false,
|
|
39
|
+
};
|
|
33
40
|
const createFn = mock((_: unknown) => ({unwrap: async () => ({_id: "new"})}));
|
|
34
41
|
const updateFn = mock((_: unknown) => ({unwrap: async () => ({_id: "u"})}));
|
|
35
42
|
const deleteFn = mock((_: unknown) => ({unwrap: async () => ({})}));
|
|
@@ -82,7 +89,12 @@ describe("AdminModelForm", () => {
|
|
|
82
89
|
it("renders loading state while config loads", () => {
|
|
83
90
|
configState.isLoading = true;
|
|
84
91
|
const {toJSON} = renderWithTheme(
|
|
85
|
-
<AdminModelForm
|
|
92
|
+
<AdminModelForm
|
|
93
|
+
api={{} as unknown as AdminApi}
|
|
94
|
+
baseUrl="/admin"
|
|
95
|
+
mode="create"
|
|
96
|
+
modelName="User"
|
|
97
|
+
/>
|
|
86
98
|
);
|
|
87
99
|
expect(toJSON()).toBeDefined();
|
|
88
100
|
});
|
|
@@ -90,7 +102,12 @@ describe("AdminModelForm", () => {
|
|
|
90
102
|
it("renders loading state when the model config is missing", () => {
|
|
91
103
|
configState.config = {customScreens: [], models: [], scripts: []};
|
|
92
104
|
const {toJSON} = renderWithTheme(
|
|
93
|
-
<AdminModelForm
|
|
105
|
+
<AdminModelForm
|
|
106
|
+
api={{} as unknown as AdminApi}
|
|
107
|
+
baseUrl="/admin"
|
|
108
|
+
mode="create"
|
|
109
|
+
modelName="User"
|
|
110
|
+
/>
|
|
94
111
|
);
|
|
95
112
|
expect(toJSON()).toBeDefined();
|
|
96
113
|
});
|
|
@@ -99,7 +116,7 @@ describe("AdminModelForm", () => {
|
|
|
99
116
|
configState.config = config;
|
|
100
117
|
const {toJSON} = renderWithTheme(
|
|
101
118
|
<AdminModelForm
|
|
102
|
-
api={{} as
|
|
119
|
+
api={{} as unknown as AdminApi}
|
|
103
120
|
baseUrl="/admin"
|
|
104
121
|
footerContent={React.createElement("FooterMarker")}
|
|
105
122
|
mode="create"
|
|
@@ -114,7 +131,13 @@ describe("AdminModelForm", () => {
|
|
|
114
131
|
configState.config = config;
|
|
115
132
|
readState.isLoading = true;
|
|
116
133
|
const {toJSON} = renderWithTheme(
|
|
117
|
-
<AdminModelForm
|
|
134
|
+
<AdminModelForm
|
|
135
|
+
api={{} as unknown as AdminApi}
|
|
136
|
+
baseUrl="/admin"
|
|
137
|
+
itemId="u1"
|
|
138
|
+
mode="edit"
|
|
139
|
+
modelName="User"
|
|
140
|
+
/>
|
|
118
141
|
);
|
|
119
142
|
expect(toJSON()).toBeDefined();
|
|
120
143
|
});
|
|
@@ -128,7 +151,13 @@ describe("AdminModelForm", () => {
|
|
|
128
151
|
name: "Existing",
|
|
129
152
|
};
|
|
130
153
|
const {toJSON} = renderWithTheme(
|
|
131
|
-
<AdminModelForm
|
|
154
|
+
<AdminModelForm
|
|
155
|
+
api={{} as unknown as AdminApi}
|
|
156
|
+
baseUrl="/admin"
|
|
157
|
+
itemId="u1"
|
|
158
|
+
mode="edit"
|
|
159
|
+
modelName="User"
|
|
160
|
+
/>
|
|
132
161
|
);
|
|
133
162
|
expect(toJSON()).toBeDefined();
|
|
134
163
|
});
|
|
@@ -146,7 +175,12 @@ describe("AdminModelForm", () => {
|
|
|
146
175
|
scripts: [],
|
|
147
176
|
};
|
|
148
177
|
const {toJSON, getByText} = renderWithTheme(
|
|
149
|
-
<AdminModelForm
|
|
178
|
+
<AdminModelForm
|
|
179
|
+
api={{} as unknown as AdminApi}
|
|
180
|
+
baseUrl="/admin"
|
|
181
|
+
mode="create"
|
|
182
|
+
modelName="User"
|
|
183
|
+
/>
|
|
150
184
|
);
|
|
151
185
|
expect(toJSON()).toBeDefined();
|
|
152
186
|
expect(getByText("No editable fields.")).toBeDefined();
|
|
@@ -159,7 +193,12 @@ describe("AdminModelForm", () => {
|
|
|
159
193
|
scripts: [],
|
|
160
194
|
};
|
|
161
195
|
const {toJSON} = renderWithTheme(
|
|
162
|
-
<AdminModelForm
|
|
196
|
+
<AdminModelForm
|
|
197
|
+
api={{} as unknown as AdminApi}
|
|
198
|
+
baseUrl="/admin"
|
|
199
|
+
mode="create"
|
|
200
|
+
modelName="User"
|
|
201
|
+
/>
|
|
163
202
|
);
|
|
164
203
|
expect(toJSON()).toBeDefined();
|
|
165
204
|
});
|
|
@@ -180,14 +219,19 @@ describe("AdminModelForm", () => {
|
|
|
180
219
|
],
|
|
181
220
|
};
|
|
182
221
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
183
|
-
setOptions.mockImplementation((opts:
|
|
222
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
184
223
|
if (opts?.headerRight) {
|
|
185
224
|
savedHeaderRight = opts.headerRight();
|
|
186
225
|
}
|
|
187
226
|
});
|
|
188
227
|
|
|
189
228
|
renderWithTheme(
|
|
190
|
-
<AdminModelForm
|
|
229
|
+
<AdminModelForm
|
|
230
|
+
api={{} as unknown as AdminApi}
|
|
231
|
+
baseUrl="/admin"
|
|
232
|
+
mode="create"
|
|
233
|
+
modelName="User"
|
|
234
|
+
/>
|
|
191
235
|
);
|
|
192
236
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
193
237
|
await act(async () => {
|
|
@@ -212,13 +256,18 @@ describe("AdminModelForm", () => {
|
|
|
212
256
|
],
|
|
213
257
|
};
|
|
214
258
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
215
|
-
setOptions.mockImplementation((opts:
|
|
259
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
216
260
|
if (opts?.headerRight) {
|
|
217
261
|
savedHeaderRight = opts.headerRight();
|
|
218
262
|
}
|
|
219
263
|
});
|
|
220
264
|
renderWithTheme(
|
|
221
|
-
<AdminModelForm
|
|
265
|
+
<AdminModelForm
|
|
266
|
+
api={{} as unknown as AdminApi}
|
|
267
|
+
baseUrl="/admin"
|
|
268
|
+
mode="create"
|
|
269
|
+
modelName="User"
|
|
270
|
+
/>
|
|
222
271
|
);
|
|
223
272
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
224
273
|
await act(async () => {
|
|
@@ -239,20 +288,20 @@ describe("AdminModelForm", () => {
|
|
|
239
288
|
},
|
|
240
289
|
],
|
|
241
290
|
};
|
|
242
|
-
const transformPayload = mock(async ({payload}: {payload:
|
|
291
|
+
const transformPayload = mock(async ({payload}: {payload: Record<string, unknown>}) => ({
|
|
243
292
|
...payload,
|
|
244
293
|
transformed: true,
|
|
245
294
|
}));
|
|
246
295
|
const onSaveSuccess = mock(async () => undefined);
|
|
247
296
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
248
|
-
setOptions.mockImplementation((opts:
|
|
297
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
249
298
|
if (opts?.headerRight) {
|
|
250
299
|
savedHeaderRight = opts.headerRight();
|
|
251
300
|
}
|
|
252
301
|
});
|
|
253
302
|
renderWithTheme(
|
|
254
303
|
<AdminModelForm
|
|
255
|
-
api={{} as
|
|
304
|
+
api={{} as unknown as AdminApi}
|
|
256
305
|
baseUrl="/admin"
|
|
257
306
|
mode="create"
|
|
258
307
|
modelName="User"
|
|
@@ -277,13 +326,18 @@ describe("AdminModelForm", () => {
|
|
|
277
326
|
},
|
|
278
327
|
}));
|
|
279
328
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
280
|
-
setOptions.mockImplementation((opts:
|
|
329
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
281
330
|
if (opts?.headerRight) {
|
|
282
331
|
savedHeaderRight = opts.headerRight();
|
|
283
332
|
}
|
|
284
333
|
});
|
|
285
334
|
renderWithTheme(
|
|
286
|
-
<AdminModelForm
|
|
335
|
+
<AdminModelForm
|
|
336
|
+
api={{} as unknown as AdminApi}
|
|
337
|
+
baseUrl="/admin"
|
|
338
|
+
mode="create"
|
|
339
|
+
modelName="User"
|
|
340
|
+
/>
|
|
287
341
|
);
|
|
288
342
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
289
343
|
await act(async () => {
|
|
@@ -298,13 +352,19 @@ describe("AdminModelForm", () => {
|
|
|
298
352
|
configState.config = config;
|
|
299
353
|
readState.data = {active: true, age: 1, email: "e@x.com", name: "Name"};
|
|
300
354
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
301
|
-
setOptions.mockImplementation((opts:
|
|
355
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
302
356
|
if (opts?.headerRight) {
|
|
303
357
|
savedHeaderRight = opts.headerRight();
|
|
304
358
|
}
|
|
305
359
|
});
|
|
306
360
|
renderWithTheme(
|
|
307
|
-
<AdminModelForm
|
|
361
|
+
<AdminModelForm
|
|
362
|
+
api={{} as unknown as AdminApi}
|
|
363
|
+
baseUrl="/admin"
|
|
364
|
+
itemId="u1"
|
|
365
|
+
mode="edit"
|
|
366
|
+
modelName="User"
|
|
367
|
+
/>
|
|
308
368
|
);
|
|
309
369
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
310
370
|
// Open confirmation modal.
|
|
@@ -332,13 +392,19 @@ describe("AdminModelForm", () => {
|
|
|
332
392
|
},
|
|
333
393
|
}));
|
|
334
394
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
335
|
-
setOptions.mockImplementation((opts:
|
|
395
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
336
396
|
if (opts?.headerRight) {
|
|
337
397
|
savedHeaderRight = opts.headerRight();
|
|
338
398
|
}
|
|
339
399
|
});
|
|
340
400
|
renderWithTheme(
|
|
341
|
-
<AdminModelForm
|
|
401
|
+
<AdminModelForm
|
|
402
|
+
api={{} as unknown as AdminApi}
|
|
403
|
+
baseUrl="/admin"
|
|
404
|
+
itemId="u1"
|
|
405
|
+
mode="edit"
|
|
406
|
+
modelName="User"
|
|
407
|
+
/>
|
|
342
408
|
);
|
|
343
409
|
// The header render should still succeed in an error-flagged scenario.
|
|
344
410
|
expect(savedHeaderRight).toBeDefined();
|
|
@@ -353,13 +419,19 @@ describe("AdminModelForm", () => {
|
|
|
353
419
|
},
|
|
354
420
|
}));
|
|
355
421
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
356
|
-
setOptions.mockImplementation((opts:
|
|
422
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
357
423
|
if (opts?.headerRight) {
|
|
358
424
|
savedHeaderRight = opts.headerRight();
|
|
359
425
|
}
|
|
360
426
|
});
|
|
361
427
|
renderWithTheme(
|
|
362
|
-
<AdminModelForm
|
|
428
|
+
<AdminModelForm
|
|
429
|
+
api={{} as unknown as AdminApi}
|
|
430
|
+
baseUrl="/admin"
|
|
431
|
+
itemId="u1"
|
|
432
|
+
mode="edit"
|
|
433
|
+
modelName="User"
|
|
434
|
+
/>
|
|
363
435
|
);
|
|
364
436
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
365
437
|
await act(async () => {
|
|
@@ -393,13 +465,19 @@ describe("AdminModelForm", () => {
|
|
|
393
465
|
tags: ["a", null, "b"],
|
|
394
466
|
};
|
|
395
467
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
396
|
-
setOptions.mockImplementation((opts:
|
|
468
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
397
469
|
if (opts?.headerRight) {
|
|
398
470
|
savedHeaderRight = opts.headerRight();
|
|
399
471
|
}
|
|
400
472
|
});
|
|
401
473
|
renderWithTheme(
|
|
402
|
-
<AdminModelForm
|
|
474
|
+
<AdminModelForm
|
|
475
|
+
api={{} as unknown as AdminApi}
|
|
476
|
+
baseUrl="/admin"
|
|
477
|
+
itemId="u1"
|
|
478
|
+
mode="edit"
|
|
479
|
+
modelName="User"
|
|
480
|
+
/>
|
|
403
481
|
);
|
|
404
482
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
405
483
|
await act(async () => {
|
|
@@ -407,7 +485,7 @@ describe("AdminModelForm", () => {
|
|
|
407
485
|
await new Promise((r) => setTimeout(r, 600));
|
|
408
486
|
});
|
|
409
487
|
expect(updateFn).toHaveBeenCalled();
|
|
410
|
-
const body = updateFn.mock.calls[0][0] as {body:
|
|
488
|
+
const body = updateFn.mock.calls[0][0] as {body: Record<string, unknown>; id: string};
|
|
411
489
|
// Array was stripped of null entries.
|
|
412
490
|
expect(body.body.tags).toEqual(["a", "b"]);
|
|
413
491
|
});
|
|
@@ -424,7 +502,12 @@ describe("AdminModelForm", () => {
|
|
|
424
502
|
],
|
|
425
503
|
};
|
|
426
504
|
const {getByTestId} = renderWithTheme(
|
|
427
|
-
<AdminModelForm
|
|
505
|
+
<AdminModelForm
|
|
506
|
+
api={{} as unknown as AdminApi}
|
|
507
|
+
baseUrl="/admin"
|
|
508
|
+
mode="create"
|
|
509
|
+
modelName="User"
|
|
510
|
+
/>
|
|
428
511
|
);
|
|
429
512
|
const nameField = getByTestId("admin-field-name");
|
|
430
513
|
await act(async () => {
|
|
@@ -451,7 +534,12 @@ describe("AdminModelForm", () => {
|
|
|
451
534
|
],
|
|
452
535
|
};
|
|
453
536
|
const {toJSON} = renderWithTheme(
|
|
454
|
-
<AdminModelForm
|
|
537
|
+
<AdminModelForm
|
|
538
|
+
api={{} as unknown as AdminApi}
|
|
539
|
+
baseUrl="/admin"
|
|
540
|
+
mode="create"
|
|
541
|
+
modelName="User"
|
|
542
|
+
/>
|
|
455
543
|
);
|
|
456
544
|
expect(toJSON()).toBeDefined();
|
|
457
545
|
});
|
|
@@ -463,23 +551,29 @@ describe("AdminModelForm", () => {
|
|
|
463
551
|
deleteFn.mockReset();
|
|
464
552
|
deleteFn.mockImplementation(() => ({unwrap: async () => ({})}));
|
|
465
553
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
466
|
-
setOptions.mockImplementation((opts:
|
|
554
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
467
555
|
if (opts?.headerRight) {
|
|
468
556
|
savedHeaderRight = opts.headerRight();
|
|
469
557
|
}
|
|
470
558
|
});
|
|
471
559
|
const {UNSAFE_root} = renderWithTheme(
|
|
472
|
-
<AdminModelForm
|
|
560
|
+
<AdminModelForm
|
|
561
|
+
api={{} as unknown as AdminApi}
|
|
562
|
+
baseUrl="/admin"
|
|
563
|
+
itemId="u1"
|
|
564
|
+
mode="edit"
|
|
565
|
+
modelName="User"
|
|
566
|
+
/>
|
|
473
567
|
);
|
|
474
568
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
475
569
|
// Invoke the delete Button's onClick callback directly so we exercise
|
|
476
570
|
// handleDelete's success branch (calls deleteItem + router.back).
|
|
477
571
|
const deleteBtns = header.UNSAFE_root.findAll(
|
|
478
|
-
(n:
|
|
572
|
+
(n: ReactTestInstance) => n.props?.testID === "admin-delete-button"
|
|
479
573
|
);
|
|
480
574
|
expect(deleteBtns.length).toBeGreaterThan(0);
|
|
481
575
|
await act(async () => {
|
|
482
|
-
(deleteBtns[0] as
|
|
576
|
+
(deleteBtns[0] as ReactTestInstance).props.onClick();
|
|
483
577
|
await new Promise((r) => setTimeout(r, 50));
|
|
484
578
|
});
|
|
485
579
|
expect(deleteFn).toHaveBeenCalledWith("u1");
|
|
@@ -497,20 +591,26 @@ describe("AdminModelForm", () => {
|
|
|
497
591
|
},
|
|
498
592
|
}));
|
|
499
593
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
500
|
-
setOptions.mockImplementation((opts:
|
|
594
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
501
595
|
if (opts?.headerRight) {
|
|
502
596
|
savedHeaderRight = opts.headerRight();
|
|
503
597
|
}
|
|
504
598
|
});
|
|
505
599
|
renderWithTheme(
|
|
506
|
-
<AdminModelForm
|
|
600
|
+
<AdminModelForm
|
|
601
|
+
api={{} as unknown as AdminApi}
|
|
602
|
+
baseUrl="/admin"
|
|
603
|
+
itemId="u1"
|
|
604
|
+
mode="edit"
|
|
605
|
+
modelName="User"
|
|
606
|
+
/>
|
|
507
607
|
);
|
|
508
608
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
509
609
|
const deleteBtns = header.UNSAFE_root.findAll(
|
|
510
|
-
(n:
|
|
610
|
+
(n: ReactTestInstance) => n.props?.testID === "admin-delete-button"
|
|
511
611
|
);
|
|
512
612
|
await act(async () => {
|
|
513
|
-
(deleteBtns[0] as
|
|
613
|
+
(deleteBtns[0] as ReactTestInstance).props.onClick();
|
|
514
614
|
await new Promise((r) => setTimeout(r, 50));
|
|
515
615
|
});
|
|
516
616
|
expect(deleteFn).toHaveBeenCalled();
|
|
@@ -522,13 +622,19 @@ describe("AdminModelForm", () => {
|
|
|
522
622
|
configState.config = config;
|
|
523
623
|
readState.data = {active: true, age: 1, email: "e@x.com", name: "Name"};
|
|
524
624
|
let savedHeaderRight: React.ReactElement | null = null;
|
|
525
|
-
setOptions.mockImplementation((opts:
|
|
625
|
+
setOptions.mockImplementation((opts: Record<string, unknown>) => {
|
|
526
626
|
if (opts?.headerRight) {
|
|
527
627
|
savedHeaderRight = opts.headerRight();
|
|
528
628
|
}
|
|
529
629
|
});
|
|
530
630
|
renderWithTheme(
|
|
531
|
-
<AdminModelForm
|
|
631
|
+
<AdminModelForm
|
|
632
|
+
api={{} as unknown as AdminApi}
|
|
633
|
+
baseUrl="/admin"
|
|
634
|
+
itemId="u1"
|
|
635
|
+
mode="edit"
|
|
636
|
+
modelName="User"
|
|
637
|
+
/>
|
|
532
638
|
);
|
|
533
639
|
const header = renderWithTheme(savedHeaderRight as unknown as React.ReactElement);
|
|
534
640
|
await act(async () => {
|
package/src/AdminModelForm.tsx
CHANGED
|
@@ -1,28 +1,33 @@
|
|
|
1
|
-
import type {Api} from "@reduxjs/toolkit/query/react";
|
|
2
1
|
import {Box, Button, Page, Spinner, Text, useToast} from "@terreno/ui";
|
|
3
2
|
import {router, useNavigation} from "expo-router";
|
|
4
3
|
import React, {useCallback, useEffect, useMemo, useState} from "react";
|
|
5
4
|
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
6
|
-
import type {
|
|
5
|
+
import type {
|
|
6
|
+
AdminApi,
|
|
7
|
+
AdminFieldConfig,
|
|
8
|
+
AdminFieldValue,
|
|
9
|
+
AdminModelConfig,
|
|
10
|
+
RefRendererMap,
|
|
11
|
+
} from "./types";
|
|
7
12
|
import {SYSTEM_FIELDS} from "./types";
|
|
8
13
|
import {useAdminApi} from "./useAdminApi";
|
|
9
14
|
import {useAdminConfig} from "./useAdminConfig";
|
|
10
15
|
|
|
11
16
|
interface AdminModelFormProps {
|
|
12
17
|
baseUrl: string;
|
|
13
|
-
api:
|
|
18
|
+
api: AdminApi;
|
|
14
19
|
modelName: string;
|
|
15
20
|
mode: "create" | "edit";
|
|
16
21
|
itemId?: string;
|
|
17
22
|
footerContent?: React.ReactNode;
|
|
18
23
|
transformPayload?: (params: {
|
|
19
24
|
mode: "create" | "edit";
|
|
20
|
-
payload: Record<string,
|
|
21
|
-
}) => Promise<Record<string,
|
|
25
|
+
payload: Record<string, AdminFieldValue>;
|
|
26
|
+
}) => Promise<Record<string, AdminFieldValue>> | Record<string, AdminFieldValue>;
|
|
22
27
|
onSaveSuccess?: (params: {
|
|
23
28
|
mode: "create" | "edit";
|
|
24
|
-
payload: Record<string,
|
|
25
|
-
result:
|
|
29
|
+
payload: Record<string, AdminFieldValue>;
|
|
30
|
+
result: AdminFieldValue;
|
|
26
31
|
itemId?: string;
|
|
27
32
|
}) => Promise<void> | void;
|
|
28
33
|
/**
|
|
@@ -57,7 +62,7 @@ const getEditableFields = (
|
|
|
57
62
|
return ordered;
|
|
58
63
|
};
|
|
59
64
|
|
|
60
|
-
const getFieldDefault = (fieldConfig: AdminFieldConfig):
|
|
65
|
+
const getFieldDefault = (fieldConfig: AdminFieldConfig): AdminFieldValue => {
|
|
61
66
|
if (fieldConfig.default !== undefined) {
|
|
62
67
|
return fieldConfig.default;
|
|
63
68
|
}
|
|
@@ -70,7 +75,7 @@ const getFieldDefault = (fieldConfig: AdminFieldConfig): any => {
|
|
|
70
75
|
return "";
|
|
71
76
|
};
|
|
72
77
|
|
|
73
|
-
const sanitizePayloadValue = (value:
|
|
78
|
+
const sanitizePayloadValue = (value: AdminFieldValue): AdminFieldValue => {
|
|
74
79
|
if (value === null) {
|
|
75
80
|
return undefined;
|
|
76
81
|
}
|
|
@@ -78,7 +83,7 @@ const sanitizePayloadValue = (value: any): any => {
|
|
|
78
83
|
return value.map((item) => sanitizePayloadValue(item)).filter((item) => item !== undefined);
|
|
79
84
|
}
|
|
80
85
|
if (value && typeof value === "object") {
|
|
81
|
-
const nextValue: Record<string,
|
|
86
|
+
const nextValue: Record<string, AdminFieldValue> = {};
|
|
82
87
|
for (const [key, childValue] of Object.entries(value)) {
|
|
83
88
|
const sanitizedChild = sanitizePayloadValue(childValue);
|
|
84
89
|
if (sanitizedChild !== undefined) {
|
|
@@ -167,7 +172,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
167
172
|
refRenderers,
|
|
168
173
|
}) => {
|
|
169
174
|
const {config, isLoading: isConfigLoading} = useAdminConfig(api, baseUrl);
|
|
170
|
-
const [formState, setFormState] = useState<Record<string,
|
|
175
|
+
const [formState, setFormState] = useState<Record<string, AdminFieldValue>>({});
|
|
171
176
|
const [errors, setErrors] = useState<Record<string, string>>({});
|
|
172
177
|
const [isInitialized, setIsInitialized] = useState(false);
|
|
173
178
|
const navigation = useNavigation();
|
|
@@ -196,7 +201,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
196
201
|
// Initialize form state from fetched item data in edit mode
|
|
197
202
|
useEffect(() => {
|
|
198
203
|
if (mode === "edit" && itemData && !isInitialized) {
|
|
199
|
-
const initial: Record<string,
|
|
204
|
+
const initial: Record<string, AdminFieldValue> = {};
|
|
200
205
|
if (modelConfig) {
|
|
201
206
|
for (const [key, fieldConfig] of getEditableFields(
|
|
202
207
|
modelConfig.fields,
|
|
@@ -214,7 +219,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
214
219
|
// Initialize form state with defaults in create mode
|
|
215
220
|
useEffect(() => {
|
|
216
221
|
if (mode === "create" && modelConfig && !isInitialized) {
|
|
217
|
-
const initial: Record<string,
|
|
222
|
+
const initial: Record<string, AdminFieldValue> = {};
|
|
218
223
|
for (const [key, fieldConfig] of getEditableFields(
|
|
219
224
|
modelConfig.fields,
|
|
220
225
|
modelConfig.fieldOrder
|
|
@@ -226,7 +231,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
226
231
|
}
|
|
227
232
|
}, [mode, modelConfig, isInitialized]);
|
|
228
233
|
|
|
229
|
-
const handleFieldChange = useCallback((fieldKey: string, value:
|
|
234
|
+
const handleFieldChange = useCallback((fieldKey: string, value: AdminFieldValue) => {
|
|
230
235
|
setFormState((prev) => ({...prev, [fieldKey]: value}));
|
|
231
236
|
setErrors((prev) => {
|
|
232
237
|
const next = {...prev};
|
|
@@ -257,11 +262,11 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
257
262
|
return;
|
|
258
263
|
}
|
|
259
264
|
try {
|
|
260
|
-
const sanitizedPayload = sanitizePayloadValue(formState) as Record<string,
|
|
265
|
+
const sanitizedPayload = sanitizePayloadValue(formState) as Record<string, AdminFieldValue>;
|
|
261
266
|
const payload = transformPayload
|
|
262
267
|
? await transformPayload({mode, payload: sanitizedPayload})
|
|
263
268
|
: sanitizedPayload;
|
|
264
|
-
let result:
|
|
269
|
+
let result: AdminFieldValue;
|
|
265
270
|
if (mode === "create") {
|
|
266
271
|
result = await createItem(payload).unwrap();
|
|
267
272
|
} else if (itemId) {
|
|
@@ -359,7 +364,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
359
364
|
fieldKey={fieldKey}
|
|
360
365
|
key={fieldKey}
|
|
361
366
|
modelConfigs={modelConfigs}
|
|
362
|
-
onChange={(value:
|
|
367
|
+
onChange={(value: AdminFieldValue) => handleFieldChange(fieldKey, value)}
|
|
363
368
|
parentFormState={formState}
|
|
364
369
|
refRenderers={refRenderers}
|
|
365
370
|
value={formState[fieldKey]}
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
+
// noExplicitAny: test mocks use type-erased RTK Query API doubles
|
|
2
|
+
// biome-ignore-all lint/suspicious/noExplicitAny: test mock typing
|
|
1
3
|
import {beforeEach, describe, expect, it, mock} from "bun:test";
|
|
2
4
|
import {renderWithTheme} from "@terreno/ui/src/test-utils";
|
|
3
5
|
import React from "react";
|
|
6
|
+
import type {AdminApi, AdminConfigResponse} from "./types";
|
|
4
7
|
|
|
5
8
|
const routerPush = mock(() => {});
|
|
6
9
|
mock.module("expo-router", () => ({
|
|
7
10
|
router: {push: routerPush},
|
|
8
11
|
}));
|
|
9
12
|
|
|
10
|
-
const mockConfigState: {data:
|
|
13
|
+
const mockConfigState: {data: AdminConfigResponse | null; error: unknown; isLoading: boolean} = {
|
|
11
14
|
data: null,
|
|
12
15
|
error: null,
|
|
13
16
|
isLoading: false,
|
|
@@ -50,13 +53,17 @@ describe("AdminModelList", () => {
|
|
|
50
53
|
|
|
51
54
|
it("renders a spinner while loading", () => {
|
|
52
55
|
mockConfigState.isLoading = true;
|
|
53
|
-
const {toJSON} = renderWithTheme(
|
|
56
|
+
const {toJSON} = renderWithTheme(
|
|
57
|
+
<AdminModelList api={{} as unknown as AdminApi} baseUrl="/admin" />
|
|
58
|
+
);
|
|
54
59
|
expect(toJSON()).toBeDefined();
|
|
55
60
|
});
|
|
56
61
|
|
|
57
62
|
it("renders an error message when loading fails", () => {
|
|
58
63
|
mockConfigState.error = new Error("boom");
|
|
59
|
-
const {toJSON} = renderWithTheme(
|
|
64
|
+
const {toJSON} = renderWithTheme(
|
|
65
|
+
<AdminModelList api={{} as unknown as AdminApi} baseUrl="/admin" />
|
|
66
|
+
);
|
|
60
67
|
expect(toJSON()).toBeDefined();
|
|
61
68
|
});
|
|
62
69
|
|
|
@@ -64,7 +71,7 @@ describe("AdminModelList", () => {
|
|
|
64
71
|
mockConfigState.data = baseConfig;
|
|
65
72
|
const {toJSON} = renderWithTheme(
|
|
66
73
|
<AdminModelList
|
|
67
|
-
api={{} as
|
|
74
|
+
api={{} as unknown as AdminApi}
|
|
68
75
|
baseUrl="/admin"
|
|
69
76
|
configurationPath="/admin/configuration"
|
|
70
77
|
customScreens={[{displayName: "Local", name: "local-screen"}]}
|
|
@@ -75,7 +82,9 @@ describe("AdminModelList", () => {
|
|
|
75
82
|
|
|
76
83
|
it("renders the model grid when config has no scripts/custom screens", () => {
|
|
77
84
|
mockConfigState.data = {...baseConfig, customScreens: [], scripts: []};
|
|
78
|
-
const {toJSON} = renderWithTheme(
|
|
85
|
+
const {toJSON} = renderWithTheme(
|
|
86
|
+
<AdminModelList api={{} as unknown as AdminApi} baseUrl="/admin" />
|
|
87
|
+
);
|
|
79
88
|
expect(toJSON()).toBeDefined();
|
|
80
89
|
});
|
|
81
90
|
});
|
package/src/AdminModelList.tsx
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import type {Api} from "@reduxjs/toolkit/query/react";
|
|
2
1
|
import {Box, Card, Heading, Page, Spinner, Text} from "@terreno/ui";
|
|
2
|
+
import type {Href} from "expo-router";
|
|
3
3
|
import {router} from "expo-router";
|
|
4
4
|
import React, {useCallback} from "react";
|
|
5
|
-
import type {AdminCustomScreen, AdminModelConfig} from "./types";
|
|
5
|
+
import type {AdminApi, AdminCustomScreen, AdminModelConfig} from "./types";
|
|
6
6
|
import {useAdminConfig} from "./useAdminConfig";
|
|
7
7
|
|
|
8
8
|
interface AdminModelListProps {
|
|
9
9
|
baseUrl: string;
|
|
10
|
-
api:
|
|
10
|
+
api: AdminApi;
|
|
11
11
|
/** Path to navigate to for the configuration screen. When provided, a Configuration card is shown. */
|
|
12
12
|
configurationPath?: string;
|
|
13
13
|
/** Additional custom screens to display as cards. Merged with any custom screens from the backend config. */
|
|
@@ -126,7 +126,7 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
|
|
|
126
126
|
|
|
127
127
|
const handlePress = useCallback(
|
|
128
128
|
(modelName: string) => {
|
|
129
|
-
router.push(`${baseUrl}/${modelName}` as
|
|
129
|
+
router.push(`${baseUrl}/${modelName}` as Href);
|
|
130
130
|
},
|
|
131
131
|
[baseUrl]
|
|
132
132
|
);
|
|
@@ -172,7 +172,7 @@ export const AdminModelList: React.FC<AdminModelListProps> = ({
|
|
|
172
172
|
<ScriptsCard count={scripts.length} onPress={() => handlePress("__scripts")} />
|
|
173
173
|
)}
|
|
174
174
|
{configurationPath && (
|
|
175
|
-
<ConfigurationCard onPress={() => router.push(configurationPath as
|
|
175
|
+
<ConfigurationCard onPress={() => router.push(configurationPath as Href)} />
|
|
176
176
|
)}
|
|
177
177
|
</Box>
|
|
178
178
|
)}
|