@terreno/admin-frontend 57.3.0 → 57.4.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/.ai/guidelines/core.md +5 -1
- package/README.md +4 -2
- package/dist/AdminConflictSheet.d.ts +16 -0
- package/dist/AdminConflictSheet.js +52 -0
- package/dist/AdminConflictSheet.js.map +1 -0
- package/dist/AdminHome.js +2 -1
- package/dist/AdminHome.js.map +1 -1
- package/dist/AdminMigrations.d.ts +3 -0
- package/dist/AdminMigrations.js +19 -0
- package/dist/AdminMigrations.js.map +1 -0
- package/dist/AdminMigrationsView.d.ts +10 -0
- package/dist/AdminMigrationsView.js +94 -0
- package/dist/AdminMigrationsView.js.map +1 -0
- package/dist/AdminModelForm.js +190 -44
- package/dist/AdminModelForm.js.map +1 -1
- package/dist/AdminModelTable.js +315 -27
- package/dist/AdminModelTable.js.map +1 -1
- package/dist/AdminObjectPicker.js +30 -6
- package/dist/AdminObjectPicker.js.map +1 -1
- package/dist/AdminProvider.d.ts +6 -2
- package/dist/AdminProvider.js +29 -7
- package/dist/AdminProvider.js.map +1 -1
- package/dist/AdminScreenRouter.d.ts +1 -1
- package/dist/AdminScreenRouter.js +4 -0
- package/dist/AdminScreenRouter.js.map +1 -1
- package/dist/AdminShell.d.ts +7 -3
- package/dist/AdminShell.js +53 -24
- package/dist/AdminShell.js.map +1 -1
- package/dist/AdminVersionConfig.js +21 -2
- package/dist/AdminVersionConfig.js.map +1 -1
- package/dist/AnnouncementEditor.d.ts +45 -0
- package/dist/AnnouncementEditor.js +370 -0
- package/dist/AnnouncementEditor.js.map +1 -0
- package/dist/AnnouncementList.d.ts +15 -0
- package/dist/AnnouncementList.js +97 -0
- package/dist/AnnouncementList.js.map +1 -0
- package/dist/AnnouncementOverview.d.ts +46 -0
- package/dist/AnnouncementOverview.js +101 -0
- package/dist/AnnouncementOverview.js.map +1 -0
- package/dist/AnnouncementOverviewScreenWidget.d.ts +4 -0
- package/dist/AnnouncementOverviewScreenWidget.js +28 -0
- package/dist/AnnouncementOverviewScreenWidget.js.map +1 -0
- package/dist/ConsentFormEditor.js +20 -3
- package/dist/ConsentFormEditor.js.map +1 -1
- package/dist/DocumentStorageBrowser.js +3 -87
- package/dist/DocumentStorageBrowser.js.map +1 -1
- package/dist/adminApiQueryParams.d.ts +5 -0
- package/dist/adminApiQueryParams.js +25 -0
- package/dist/adminApiQueryParams.js.map +1 -0
- package/dist/adminConflictSheetStack.d.ts +17 -0
- package/dist/adminConflictSheetStack.js +64 -0
- package/dist/adminConflictSheetStack.js.map +1 -0
- package/dist/adminContext.d.ts +3 -0
- package/dist/adminContext.js +6 -0
- package/dist/adminContext.js.map +1 -0
- package/dist/adminModelListQueryParams.d.ts +3 -2
- package/dist/adminModelListQueryParams.js +74 -27
- package/dist/adminModelListQueryParams.js.map +1 -1
- package/dist/adminRequest.d.ts +51 -0
- package/dist/adminRequest.js +161 -0
- package/dist/adminRequest.js.map +1 -0
- package/dist/adminRpc.d.ts +7 -0
- package/dist/adminRpc.js +21 -0
- package/dist/adminRpc.js.map +1 -0
- package/dist/adminShellNav.d.ts +17 -1
- package/dist/adminShellNav.js +41 -9
- package/dist/adminShellNav.js.map +1 -1
- package/dist/adminWindowRefresh.d.ts +31 -0
- package/dist/adminWindowRefresh.js +48 -0
- package/dist/adminWindowRefresh.js.map +1 -0
- package/dist/adminWindowedTable.d.ts +13 -0
- package/dist/adminWindowedTable.js +33 -0
- package/dist/adminWindowedTable.js.map +1 -0
- package/dist/comms/commsDashboardParams.d.ts +0 -4
- package/dist/comms/commsDashboardParams.js +1 -1
- package/dist/comms/commsDashboardParams.js.map +1 -1
- package/dist/comms/commsMessagePayload.d.ts +2 -1
- package/dist/comms/useCommsDashboardApi.d.ts +3 -3
- package/dist/comms/useCommsDashboardApi.js +41 -0
- package/dist/comms/useCommsDashboardApi.js.map +1 -1
- package/dist/index.d.ts +24 -2
- package/dist/index.js +23 -1
- package/dist/index.js.map +1 -1
- package/dist/isAuditLogModel.d.ts +2 -0
- package/dist/isAuditLogModel.js +8 -0
- package/dist/isAuditLogModel.js.map +1 -0
- package/dist/jobs/JobsDashboardScreen.d.ts +10 -0
- package/dist/jobs/JobsDashboardScreen.js +155 -0
- package/dist/jobs/JobsDashboardScreen.js.map +1 -0
- package/dist/jobs/JobsDashboardScreenWidget.d.ts +4 -0
- package/dist/jobs/JobsDashboardScreenWidget.js +11 -0
- package/dist/jobs/JobsDashboardScreenWidget.js.map +1 -0
- package/dist/jobs/JobsHomeWidget.d.ts +4 -0
- package/dist/jobs/JobsHomeWidget.js +21 -0
- package/dist/jobs/JobsHomeWidget.js.map +1 -0
- package/dist/jobs/JobsJobDetail.d.ts +8 -0
- package/dist/jobs/JobsJobDetail.js +78 -0
- package/dist/jobs/JobsJobDetail.js.map +1 -0
- package/dist/jobs/JobsStatusBadge.d.ts +5 -0
- package/dist/jobs/JobsStatusBadge.js +16 -0
- package/dist/jobs/JobsStatusBadge.js.map +1 -0
- package/dist/jobs/jobPayload.d.ts +62 -0
- package/dist/jobs/jobPayload.js +54 -0
- package/dist/jobs/jobPayload.js.map +1 -0
- package/dist/jobs/jobsDashboardParams.d.ts +11 -0
- package/dist/jobs/jobsDashboardParams.js +70 -0
- package/dist/jobs/jobsDashboardParams.js.map +1 -0
- package/dist/jobs/useJobsDashboardApi.d.ts +60 -0
- package/dist/jobs/useJobsDashboardApi.js +88 -0
- package/dist/jobs/useJobsDashboardApi.js.map +1 -0
- package/dist/jobs/useJobsDashboardUrlFilters.d.ts +5 -0
- package/dist/jobs/useJobsDashboardUrlFilters.js +16 -0
- package/dist/jobs/useJobsDashboardUrlFilters.js.map +1 -0
- package/dist/orgs/OrgDirectoryScreen.d.ts +16 -0
- package/dist/orgs/OrgDirectoryScreen.js +81 -0
- package/dist/orgs/OrgDirectoryScreen.js.map +1 -0
- package/dist/orgs/OrgMembersScreen.d.ts +9 -0
- package/dist/orgs/OrgMembersScreen.js +115 -0
- package/dist/orgs/OrgMembersScreen.js.map +1 -0
- package/dist/orgs/OrgSettingsScreen.d.ts +9 -0
- package/dist/orgs/OrgSettingsScreen.js +80 -0
- package/dist/orgs/OrgSettingsScreen.js.map +1 -0
- package/dist/orgs/OrgSwitcher.d.ts +8 -0
- package/dist/orgs/OrgSwitcher.js +58 -0
- package/dist/orgs/OrgSwitcher.js.map +1 -0
- package/dist/orgs/adminModelEndpoints.d.ts +18 -0
- package/dist/orgs/adminModelEndpoints.js +73 -0
- package/dist/orgs/adminModelEndpoints.js.map +1 -0
- package/dist/orgs/normalizeListData.d.ts +9 -0
- package/dist/orgs/normalizeListData.js +8 -0
- package/dist/orgs/normalizeListData.js.map +1 -0
- package/dist/orgs/organizationSettings.d.ts +17 -0
- package/dist/orgs/organizationSettings.js +6 -0
- package/dist/orgs/organizationSettings.js.map +1 -0
- package/dist/orgs/shouldSkipOrgScopedAdminQuery.d.ts +4 -0
- package/dist/orgs/shouldSkipOrgScopedAdminQuery.js +2 -0
- package/dist/orgs/shouldSkipOrgScopedAdminQuery.js.map +1 -0
- package/dist/orgs/sortOrganizations.d.ts +6 -0
- package/dist/orgs/sortOrganizations.js +9 -0
- package/dist/orgs/sortOrganizations.js.map +1 -0
- package/dist/orgs/useOrgContext.d.ts +20 -0
- package/dist/orgs/useOrgContext.js +57 -0
- package/dist/orgs/useOrgContext.js.map +1 -0
- package/dist/orgs/useOrganizationsApi.d.ts +14 -0
- package/dist/orgs/useOrganizationsApi.js +103 -0
- package/dist/orgs/useOrganizationsApi.js.map +1 -0
- package/dist/pdfUtils.d.ts +0 -2
- package/dist/pdfUtils.js +2 -2
- package/dist/pdfUtils.js.map +1 -1
- package/dist/types.d.ts +100 -4
- package/dist/types.js.map +1 -1
- package/dist/useAdminApi.js +7 -61
- package/dist/useAdminApi.js.map +1 -1
- package/dist/useAdminBackgroundTask.d.ts +1 -1
- package/dist/useAdminBackgroundTask.js +18 -3
- package/dist/useAdminBackgroundTask.js.map +1 -1
- package/dist/useAdminConfig.js +16 -1
- package/dist/useAdminConfig.js.map +1 -1
- package/dist/useAdminMigrations.d.ts +40 -0
- package/dist/useAdminMigrations.js +43 -0
- package/dist/useAdminMigrations.js.map +1 -0
- package/dist/useAdminRoles.d.ts +1 -0
- package/dist/useAdminRoles.js +34 -0
- package/dist/useAdminRoles.js.map +1 -1
- package/dist/useAdminRpc.d.ts +28 -0
- package/dist/useAdminRpc.js +128 -0
- package/dist/useAdminRpc.js.map +1 -0
- package/dist/useAdminScripts.js +51 -0
- package/dist/useAdminScripts.js.map +1 -1
- package/dist/useConfigurationApi.js +23 -0
- package/dist/useConfigurationApi.js.map +1 -1
- package/dist/useConsentHistory.js +9 -1
- package/dist/useConsentHistory.js.map +1 -1
- package/dist/useDocumentStorageApi.js +72 -0
- package/dist/useDocumentStorageApi.js.map +1 -1
- package/dist/widgets/AIRequestsScreenWidget.js +17 -7
- package/dist/widgets/AIRequestsScreenWidget.js.map +1 -1
- package/dist/widgets/ModelsGridWidget.js +10 -3
- package/dist/widgets/ModelsGridWidget.js.map +1 -1
- package/dist/widgets/RecentActivityWidget.js +11 -4
- package/dist/widgets/RecentActivityWidget.js.map +1 -1
- package/dist/widgets/builtInWidgets.js +5 -9
- package/dist/widgets/builtInWidgets.js.map +1 -1
- package/dist/widgets/homeWidgetUtils.d.ts +0 -1
- package/dist/widgets/homeWidgetUtils.js +0 -8
- package/dist/widgets/homeWidgetUtils.js.map +1 -1
- package/package.json +6 -4
- package/src/AdminActionMenu.test.tsx +167 -0
- package/src/AdminBreadcrumbs.test.tsx +21 -1
- package/src/AdminConflictSheet.test.tsx +173 -0
- package/src/AdminConflictSheet.tsx +102 -0
- package/src/AdminHome.test.tsx +10 -11
- package/src/AdminHome.tsx +2 -4
- package/src/AdminMigrations.tsx +45 -0
- package/src/AdminMigrationsView.tsx +225 -0
- package/src/{AdminModelForm.test.tsx → AdminModelForm.isolated.tsx} +461 -154
- package/src/AdminModelForm.orgSkip.test.tsx +81 -0
- package/src/AdminModelForm.tsx +227 -56
- package/src/AdminModelForm.updateDepth.test.tsx +427 -0
- package/src/AdminModelList.test.tsx +12 -2
- package/src/AdminModelTable.test.tsx +560 -57
- package/src/AdminModelTable.tsx +430 -73
- package/src/AdminModelTable.windowed.test.tsx +897 -0
- package/src/AdminObjectPicker.tsx +32 -6
- package/src/AdminPrimitiveArrayField.test.tsx +178 -0
- package/src/AdminProvider.test.tsx +213 -3
- package/src/AdminProvider.tsx +39 -7
- package/src/AdminRolesList.test.tsx +197 -0
- package/src/AdminScreenRouter.test.tsx +393 -36
- package/src/AdminScreenRouter.tsx +6 -1
- package/src/AdminScriptList.test.tsx +180 -0
- package/src/AdminShell.test.tsx +595 -1
- package/src/AdminShell.tsx +110 -22
- package/src/AdminVersionConfig.tsx +31 -3
- package/src/AnnouncementEditor.test.tsx +603 -0
- package/src/AnnouncementEditor.tsx +673 -0
- package/src/AnnouncementList.test.tsx +198 -0
- package/src/AnnouncementList.tsx +214 -0
- package/src/AnnouncementOverview.test.tsx +325 -0
- package/src/AnnouncementOverview.tsx +325 -0
- package/src/AnnouncementOverviewScreenWidget.test.tsx +69 -0
- package/src/AnnouncementOverviewScreenWidget.tsx +51 -0
- package/src/CheckboxListEditor.test.tsx +8 -1
- package/src/ConsentFormEditor.test.tsx +28 -29
- package/src/ConsentFormEditor.tsx +27 -3
- package/src/ConsentFormList.test.tsx +12 -11
- package/src/ConsentResponseViewer.test.tsx +10 -11
- package/src/DocumentStorageBrowser.tsx +2 -139
- package/src/adminApiQueryParams.ts +33 -0
- package/src/adminConflictSheetStack.ts +87 -0
- package/src/adminContext.ts +8 -0
- package/src/adminModelListQueryParams.test.ts +60 -1
- package/src/adminModelListQueryParams.ts +89 -30
- package/src/adminRequest.test.ts +216 -0
- package/src/adminRequest.ts +213 -0
- package/src/adminRpc.test.ts +18 -0
- package/src/adminRpc.ts +31 -0
- package/src/adminScriptsHarness.test.ts +21 -0
- package/src/adminShellNav.test.ts +72 -6
- package/src/adminShellNav.ts +55 -10
- package/src/adminWindowRefresh.test.ts +65 -0
- package/src/adminWindowRefresh.ts +76 -0
- package/src/adminWindowedTable.test.ts +90 -0
- package/src/adminWindowedTable.ts +55 -0
- package/src/comms/CommsDashboardScreen.test.tsx +2 -2
- package/src/comms/commsDashboardParams.ts +1 -1
- package/src/comms/commsMessagePayload.ts +1 -1
- package/src/comms/useCommsDashboardApi.tsx +57 -4
- package/src/index.tsx +79 -1
- package/src/isAuditLogModel.test.ts +14 -0
- package/src/isAuditLogModel.ts +11 -0
- package/src/isolated/AIRequestsScreenWidget.isolated.tsx +84 -0
- package/src/isolated/AdminFieldRenderer.isolated.tsx +160 -0
- package/src/isolated/AdminFilterDrawer.isolated.tsx +215 -2
- package/src/isolated/AdminFilterDrawerMobile.isolated.tsx +172 -0
- package/src/isolated/AdminHomeWidgets.isolated.tsx +73 -0
- package/src/isolated/AdminObjectPicker.isolated.tsx +7 -0
- package/src/isolated/AdminScriptList.isolated.tsx +124 -0
- package/src/isolated/AdminScriptRunModal.isolated.tsx +274 -4
- package/src/isolated/DocumentStorageBrowser.isolated.tsx +13 -0
- package/src/isolated/RecentActivityWidget.isolated.tsx +138 -0
- package/src/isolated/adminWidgets.isolated.tsx +190 -0
- package/src/isolated/generateConsentHistoryPdf.isolated.ts +251 -0
- package/src/isolated/generateConsentPdfMobile.isolated.ts +87 -0
- package/src/isolated/generateConsentPdfsMobile.isolated.ts +129 -0
- package/src/isolated/hooks.isolated.tsx +245 -3
- package/src/isolated/rpcDualRun.isolated.tsx +449 -0
- package/src/isolated/useAdminScripts.isolated.tsx +156 -0
- package/src/isolated/useJobsDashboardApi.isolated.tsx +60 -0
- package/src/jobs/JobsDashboardScreen.test.tsx +310 -0
- package/src/jobs/JobsDashboardScreen.tsx +461 -0
- package/src/jobs/JobsDashboardScreenWidget.test.tsx +83 -0
- package/src/jobs/JobsDashboardScreenWidget.tsx +20 -0
- package/src/jobs/JobsHomeWidget.test.tsx +92 -0
- package/src/jobs/JobsHomeWidget.tsx +53 -0
- package/src/jobs/JobsJobDetail.test.tsx +253 -0
- package/src/jobs/JobsJobDetail.tsx +278 -0
- package/src/jobs/JobsStatusBadge.tsx +16 -0
- package/src/jobs/jobPayload.ts +114 -0
- package/src/jobs/jobsDashboardParams.test.ts +80 -0
- package/src/jobs/jobsDashboardParams.ts +84 -0
- package/src/jobs/useJobsDashboardApi.test.tsx +152 -0
- package/src/jobs/useJobsDashboardApi.tsx +132 -0
- package/src/jobs/useJobsDashboardUrlFilters.test.tsx +31 -0
- package/src/jobs/useJobsDashboardUrlFilters.tsx +31 -0
- package/src/orgs/OrgDirectoryScreen.test.tsx +184 -0
- package/src/orgs/OrgDirectoryScreen.tsx +200 -0
- package/src/orgs/OrgManagementScreens.test.tsx +270 -0
- package/src/orgs/OrgMembersScreen.tsx +254 -0
- package/src/orgs/OrgSettingsScreen.tsx +145 -0
- package/src/orgs/OrgSwitcher.test.tsx +145 -0
- package/src/orgs/OrgSwitcher.tsx +101 -0
- package/src/orgs/adminModelEndpoints.test.ts +156 -0
- package/src/orgs/adminModelEndpoints.ts +96 -0
- package/src/orgs/normalizeListData.test.ts +17 -0
- package/src/orgs/normalizeListData.ts +13 -0
- package/src/orgs/orgSwitcherOscillation.test.tsx +107 -0
- package/src/orgs/organizationSettings.test.ts +11 -0
- package/src/orgs/organizationSettings.ts +22 -0
- package/src/orgs/shouldSkipOrgScopedAdminQuery.test.ts +22 -0
- package/src/orgs/shouldSkipOrgScopedAdminQuery.ts +7 -0
- package/src/orgs/sortOrganizations.test.ts +13 -0
- package/src/orgs/sortOrganizations.ts +14 -0
- package/src/orgs/useOrgContext.test.tsx +94 -0
- package/src/orgs/useOrgContext.tsx +90 -0
- package/src/orgs/useOrganizationsApi.test.tsx +165 -0
- package/src/orgs/useOrganizationsApi.ts +118 -0
- package/src/pdfUtils.test.ts +37 -0
- package/src/pdfUtils.ts +2 -2
- package/src/testing/useAdminApiDouble.ts +70 -0
- package/src/types.ts +92 -4
- package/src/useAdminApi.test.ts +88 -0
- package/src/useAdminApi.ts +7 -65
- package/src/useAdminBackgroundTask.ts +20 -4
- package/src/useAdminConfig.ts +20 -2
- package/src/useAdminMigrations.test.tsx +75 -0
- package/src/useAdminMigrations.ts +77 -0
- package/src/useAdminRoles.test.ts +28 -0
- package/src/useAdminRoles.ts +40 -0
- package/src/useAdminRpc.test.tsx +250 -0
- package/src/useAdminRpc.ts +173 -0
- package/src/useAdminScripts.ts +67 -0
- package/src/useConfigurationApi.ts +24 -0
- package/src/useConsentHistory.ts +15 -2
- package/src/useDocumentStorageApi.ts +77 -0
- package/src/widgets/AIRequestsScreenWidget.test.tsx +154 -0
- package/src/widgets/AIRequestsScreenWidget.tsx +21 -7
- package/src/widgets/ModelsGridWidget.test.tsx +91 -0
- package/src/widgets/ModelsGridWidget.tsx +11 -1
- package/src/widgets/RecentActivityWidget.tsx +10 -3
- package/src/widgets/builtInFieldWidgets.test.tsx +166 -0
- package/src/widgets/builtInWidgets.ts +6 -0
- package/src/widgets/homeWidgetUtils.ts +0 -9
- package/src/widgets/pluginWidgets.test.tsx +10 -1
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import {beforeEach, describe, it, mock} from "bun:test";
|
|
2
|
+
import {assert} from "chai";
|
|
3
|
+
import React from "react";
|
|
4
|
+
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
5
|
+
import {configureUseAdminApiDouble, resetUseAdminApiDouble} from "./testing/useAdminApiDouble";
|
|
6
|
+
import type {AdminApi, AdminConfigResponse} from "./types";
|
|
7
|
+
|
|
8
|
+
const routerBack = mock(() => {});
|
|
9
|
+
const routerPush = mock(() => {});
|
|
10
|
+
|
|
11
|
+
mock.module("expo-router", () => ({
|
|
12
|
+
router: {back: routerBack, push: routerPush},
|
|
13
|
+
useNavigation: () => ({setOptions: mock(() => {})}),
|
|
14
|
+
}));
|
|
15
|
+
|
|
16
|
+
const configState: {config: AdminConfigResponse | null; isLoading: boolean} = {
|
|
17
|
+
config: null,
|
|
18
|
+
isLoading: false,
|
|
19
|
+
};
|
|
20
|
+
mock.module("./useAdminConfig", () => ({
|
|
21
|
+
useAdminConfig: () => ({
|
|
22
|
+
config: configState.config,
|
|
23
|
+
error: null,
|
|
24
|
+
isLoading: configState.isLoading,
|
|
25
|
+
}),
|
|
26
|
+
}));
|
|
27
|
+
|
|
28
|
+
const readSkipCalls: boolean[] = [];
|
|
29
|
+
|
|
30
|
+
import {AdminModelForm} from "./AdminModelForm";
|
|
31
|
+
import {AdminProvider} from "./AdminProvider";
|
|
32
|
+
|
|
33
|
+
const orgScopedModel = {
|
|
34
|
+
adminBroadcast: false,
|
|
35
|
+
defaultSort: "-created",
|
|
36
|
+
displayName: "Projects",
|
|
37
|
+
fieldOrder: ["name"],
|
|
38
|
+
fields: {
|
|
39
|
+
_id: {required: true, type: "string"},
|
|
40
|
+
name: {required: true, type: "string"},
|
|
41
|
+
},
|
|
42
|
+
listFields: ["name"],
|
|
43
|
+
name: "Project",
|
|
44
|
+
organizationScoped: true,
|
|
45
|
+
routePath: "/admin/projects",
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
describe("AdminModelForm org-scoped read skip", () => {
|
|
49
|
+
beforeEach(() => {
|
|
50
|
+
readSkipCalls.length = 0;
|
|
51
|
+
resetUseAdminApiDouble();
|
|
52
|
+
configureUseAdminApiDouble({
|
|
53
|
+
useReadQuery: (_id: string, opts: {skip?: boolean}) => {
|
|
54
|
+
readSkipCalls.push(Boolean(opts.skip));
|
|
55
|
+
return {data: null, error: null, isLoading: false};
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
configState.isLoading = false;
|
|
59
|
+
configState.config = {
|
|
60
|
+
models: [orgScopedModel],
|
|
61
|
+
schemaVersion: 1,
|
|
62
|
+
} as unknown as AdminConfigResponse;
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it("skips edit reads until organization context is selected", () => {
|
|
66
|
+
renderWithTheme(
|
|
67
|
+
<AdminProvider api={{} as unknown as AdminApi} apiBase="/admin" getAuthHeaders={() => ({})}>
|
|
68
|
+
<AdminModelForm
|
|
69
|
+
api={{} as unknown as AdminApi}
|
|
70
|
+
apiBase="/admin"
|
|
71
|
+
itemId="item-1"
|
|
72
|
+
mode="edit"
|
|
73
|
+
modelName="Project"
|
|
74
|
+
/>
|
|
75
|
+
</AdminProvider>
|
|
76
|
+
);
|
|
77
|
+
|
|
78
|
+
assert.isAtLeast(readSkipCalls.length, 1);
|
|
79
|
+
assert.isTrue(readSkipCalls[readSkipCalls.length - 1]);
|
|
80
|
+
});
|
|
81
|
+
});
|
package/src/AdminModelForm.tsx
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import {Accordion, Box, Button, Page, Spinner, Text, useToast} from "@terreno/ui";
|
|
2
2
|
import {router, useNavigation} from "expo-router";
|
|
3
|
-
import React, {useCallback, useEffect, useMemo, useState} from "react";
|
|
3
|
+
import React, {useCallback, useEffect, useMemo, useRef, useState} from "react";
|
|
4
|
+
import {AdminConflictSheet} from "./AdminConflictSheet";
|
|
4
5
|
import {AdminFieldRenderer} from "./AdminFieldRenderer";
|
|
6
|
+
import {useAdminContext} from "./adminContext";
|
|
7
|
+
import {isWindowedAdminTable} from "./adminWindowedTable";
|
|
8
|
+
import {markAdminWindowMembershipStale} from "./adminWindowRefresh";
|
|
9
|
+
import {shouldSkipOrgScopedAdminQuery} from "./orgs/shouldSkipOrgScopedAdminQuery";
|
|
10
|
+
import {useOptionalOrgContext} from "./orgs/useOrgContext";
|
|
5
11
|
import type {
|
|
6
12
|
AdminApi,
|
|
7
13
|
AdminFieldConfig,
|
|
@@ -166,6 +172,9 @@ const EmptyFields: React.FC = () => <Text color="secondaryDark">No editable fiel
|
|
|
166
172
|
|
|
167
173
|
const TITLE_PREFERENCE_KEYS = ["name", "title", "label", "email", "username", "displayName"];
|
|
168
174
|
|
|
175
|
+
/** Debounce dynamic getScreenTitle updates so setOptions does not rerender parents per keystroke. */
|
|
176
|
+
const NAVIGATION_TITLE_DEBOUNCE_MS = 300;
|
|
177
|
+
|
|
169
178
|
const readScalarTitleFromRecord = (
|
|
170
179
|
record: Record<string, unknown>,
|
|
171
180
|
fieldKey: string
|
|
@@ -181,20 +190,6 @@ const readScalarTitleFromRecord = (
|
|
|
181
190
|
return s;
|
|
182
191
|
};
|
|
183
192
|
|
|
184
|
-
const mergeItemAndFormState = (
|
|
185
|
-
itemData: unknown,
|
|
186
|
-
formState: Record<string, AdminFieldValue>
|
|
187
|
-
): Record<string, unknown> => {
|
|
188
|
-
const out: Record<string, unknown> = {};
|
|
189
|
-
if (itemData && typeof itemData === "object" && !Array.isArray(itemData)) {
|
|
190
|
-
Object.assign(out, itemData as Record<string, unknown>);
|
|
191
|
-
}
|
|
192
|
-
for (const [k, v] of Object.entries(formState)) {
|
|
193
|
-
out[k] = v;
|
|
194
|
-
}
|
|
195
|
-
return out;
|
|
196
|
-
};
|
|
197
|
-
|
|
198
193
|
const inferEditRecordTitle = (params: {
|
|
199
194
|
displayName: string;
|
|
200
195
|
explicitField: string | undefined;
|
|
@@ -308,10 +303,19 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
308
303
|
routeBase,
|
|
309
304
|
});
|
|
310
305
|
const {config, isLoading: isConfigLoading} = useAdminConfig(api, resolvedApiBase);
|
|
306
|
+
const adminContext = useAdminContext();
|
|
307
|
+
const organizationId = useOptionalOrgContext()?.organizationId;
|
|
311
308
|
const [formState, setFormState] = useState<Record<string, AdminFieldValue>>({});
|
|
312
309
|
const [errors, setErrors] = useState<Record<string, string>>({});
|
|
313
310
|
const [isInitialized, setIsInitialized] = useState(false);
|
|
311
|
+
const [isWindowMutationPending, setIsWindowMutationPending] = useState(false);
|
|
312
|
+
const windowMutationPendingRef = useRef(false);
|
|
314
313
|
const navigation = useNavigation();
|
|
314
|
+
const navigationRef = useRef(navigation);
|
|
315
|
+
navigationRef.current = navigation;
|
|
316
|
+
const prevNavigationTitleRef = useRef<string | undefined>(undefined);
|
|
317
|
+
const hasAppliedNavigationTitleRef = useRef(false);
|
|
318
|
+
const navigationTitleDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
315
319
|
|
|
316
320
|
const modelConfig: AdminModelConfig | undefined = useMemo(
|
|
317
321
|
() => config?.models.find((m: AdminModelConfig) => m.name === modelName),
|
|
@@ -326,13 +330,23 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
326
330
|
modelName
|
|
327
331
|
);
|
|
328
332
|
|
|
333
|
+
const skipOrgScopedQuery = shouldSkipOrgScopedAdminQuery({
|
|
334
|
+
organizationId,
|
|
335
|
+
organizationScoped: modelConfig?.organizationScoped,
|
|
336
|
+
});
|
|
337
|
+
|
|
329
338
|
const {data: itemData, isLoading: isItemLoading} = useReadQuery(itemId ?? "", {
|
|
330
|
-
skip: mode !== "edit" || !itemId || !modelConfig,
|
|
339
|
+
skip: mode !== "edit" || !itemId || !modelConfig || skipOrgScopedQuery,
|
|
331
340
|
});
|
|
332
341
|
|
|
333
342
|
const [createItem, {isLoading: isCreating}] = useCreateMutation();
|
|
334
343
|
const [updateItem, {isLoading: isUpdating}] = useUpdateMutation();
|
|
335
344
|
const [deleteItem, {isLoading: isDeleting}] = useDeleteMutation();
|
|
345
|
+
const isWindowed = isWindowedAdminTable({
|
|
346
|
+
hasFetchClient: Boolean(adminContext?.adminRpc),
|
|
347
|
+
modelConfig,
|
|
348
|
+
syncDb: adminContext?.syncDb,
|
|
349
|
+
});
|
|
336
350
|
|
|
337
351
|
// Initialize form state from fetched item data in edit mode
|
|
338
352
|
useEffect(() => {
|
|
@@ -370,14 +384,42 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
370
384
|
}, [mode, modelConfig, isInitialized]);
|
|
371
385
|
|
|
372
386
|
const handleFieldChange = useCallback((fieldKey: string, value: AdminFieldValue) => {
|
|
373
|
-
setFormState((prev) =>
|
|
387
|
+
setFormState((prev) => {
|
|
388
|
+
if (prev[fieldKey] === value) {
|
|
389
|
+
return prev;
|
|
390
|
+
}
|
|
391
|
+
return {...prev, [fieldKey]: value};
|
|
392
|
+
});
|
|
374
393
|
setErrors((prev) => {
|
|
394
|
+
if (!Object.hasOwn(prev, fieldKey)) {
|
|
395
|
+
return prev;
|
|
396
|
+
}
|
|
375
397
|
const next = {...prev};
|
|
376
398
|
delete next[fieldKey];
|
|
377
399
|
return next;
|
|
378
400
|
});
|
|
379
401
|
}, []);
|
|
380
402
|
|
|
403
|
+
const handleFieldChangeRef = useRef(handleFieldChange);
|
|
404
|
+
handleFieldChangeRef.current = handleFieldChange;
|
|
405
|
+
|
|
406
|
+
const stableFieldChangeHandlersRef = useRef(new Map<string, (value: AdminFieldValue) => void>());
|
|
407
|
+
|
|
408
|
+
const getStableFieldChangeHandler = useCallback(
|
|
409
|
+
(fieldKey: string): ((value: AdminFieldValue) => void) => {
|
|
410
|
+
const cached = stableFieldChangeHandlersRef.current.get(fieldKey);
|
|
411
|
+
if (cached) {
|
|
412
|
+
return cached;
|
|
413
|
+
}
|
|
414
|
+
const handler = (value: AdminFieldValue): void => {
|
|
415
|
+
handleFieldChangeRef.current(fieldKey, value);
|
|
416
|
+
};
|
|
417
|
+
stableFieldChangeHandlersRef.current.set(fieldKey, handler);
|
|
418
|
+
return handler;
|
|
419
|
+
},
|
|
420
|
+
[]
|
|
421
|
+
);
|
|
422
|
+
|
|
381
423
|
const validate = useCallback((): boolean => {
|
|
382
424
|
if (!modelConfig) {
|
|
383
425
|
return false;
|
|
@@ -400,9 +442,16 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
400
442
|
if (!modelConfig) {
|
|
401
443
|
return;
|
|
402
444
|
}
|
|
445
|
+
if (windowMutationPendingRef.current) {
|
|
446
|
+
return;
|
|
447
|
+
}
|
|
403
448
|
if (!validate()) {
|
|
404
449
|
return;
|
|
405
450
|
}
|
|
451
|
+
if (isWindowed) {
|
|
452
|
+
windowMutationPendingRef.current = true;
|
|
453
|
+
setIsWindowMutationPending(true);
|
|
454
|
+
}
|
|
406
455
|
try {
|
|
407
456
|
const sanitizedPayload = omitBlankOptionalEnums(
|
|
408
457
|
sanitizePayloadValue(formState) as Record<string, AdminFieldValue>,
|
|
@@ -419,7 +468,31 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
419
468
|
? await transformPayload({mode, payload: stripped})
|
|
420
469
|
: stripped;
|
|
421
470
|
let result: AdminFieldValue;
|
|
422
|
-
if (
|
|
471
|
+
if (isWindowed && modelConfig.syncCollection && adminContext?.syncDb) {
|
|
472
|
+
if (mode === "edit" && itemId) {
|
|
473
|
+
await adminContext.syncDb.hydrateWindow({
|
|
474
|
+
collection: modelConfig.syncCollection,
|
|
475
|
+
ids: [itemId],
|
|
476
|
+
restRows:
|
|
477
|
+
itemData && typeof itemData === "object"
|
|
478
|
+
? {[itemId]: itemData as Record<string, unknown>}
|
|
479
|
+
: undefined,
|
|
480
|
+
});
|
|
481
|
+
}
|
|
482
|
+
const mutation = adminContext.syncDb.mutate({
|
|
483
|
+
collection: modelConfig.syncCollection,
|
|
484
|
+
data: payload,
|
|
485
|
+
...(itemId ? {id: itemId} : {}),
|
|
486
|
+
operation: mode === "create" ? "create" : "update",
|
|
487
|
+
});
|
|
488
|
+
result = {...payload, _id: mutation.id};
|
|
489
|
+
if (mode === "create") {
|
|
490
|
+
markAdminWindowMembershipStale({
|
|
491
|
+
awaitId: mutation.id,
|
|
492
|
+
collection: modelConfig.syncCollection,
|
|
493
|
+
});
|
|
494
|
+
}
|
|
495
|
+
} else if (mode === "create") {
|
|
423
496
|
result = await createItem(payload).unwrap();
|
|
424
497
|
} else if (itemId) {
|
|
425
498
|
result = await updateItem({body: payload, id: itemId}).unwrap();
|
|
@@ -430,13 +503,19 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
430
503
|
router.back();
|
|
431
504
|
} catch (err) {
|
|
432
505
|
toast.catch(err, `Failed to ${mode === "create" ? "create" : "update"} ${modelName}`);
|
|
506
|
+
} finally {
|
|
507
|
+
windowMutationPendingRef.current = false;
|
|
508
|
+
setIsWindowMutationPending(false);
|
|
433
509
|
}
|
|
434
510
|
}, [
|
|
435
511
|
mode,
|
|
436
512
|
formState,
|
|
437
513
|
itemId,
|
|
514
|
+
itemData,
|
|
438
515
|
modelConfig,
|
|
516
|
+
adminContext?.syncDb,
|
|
439
517
|
createItem,
|
|
518
|
+
isWindowed,
|
|
440
519
|
updateItem,
|
|
441
520
|
validate,
|
|
442
521
|
toast,
|
|
@@ -449,15 +528,52 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
449
528
|
if (!itemId) {
|
|
450
529
|
return;
|
|
451
530
|
}
|
|
531
|
+
if (windowMutationPendingRef.current) {
|
|
532
|
+
return;
|
|
533
|
+
}
|
|
534
|
+
if (isWindowed) {
|
|
535
|
+
windowMutationPendingRef.current = true;
|
|
536
|
+
setIsWindowMutationPending(true);
|
|
537
|
+
}
|
|
452
538
|
try {
|
|
453
|
-
|
|
539
|
+
if (isWindowed && modelConfig?.syncCollection && adminContext?.syncDb) {
|
|
540
|
+
await adminContext.syncDb.hydrateWindow({
|
|
541
|
+
collection: modelConfig.syncCollection,
|
|
542
|
+
ids: [itemId],
|
|
543
|
+
restRows:
|
|
544
|
+
itemData && typeof itemData === "object"
|
|
545
|
+
? {[itemId]: itemData as Record<string, unknown>}
|
|
546
|
+
: undefined,
|
|
547
|
+
});
|
|
548
|
+
adminContext.syncDb.mutate({
|
|
549
|
+
collection: modelConfig.syncCollection,
|
|
550
|
+
id: itemId,
|
|
551
|
+
operation: "delete",
|
|
552
|
+
});
|
|
553
|
+
markAdminWindowMembershipStale({collection: modelConfig.syncCollection});
|
|
554
|
+
} else {
|
|
555
|
+
await deleteItem(itemId).unwrap();
|
|
556
|
+
}
|
|
454
557
|
router.back();
|
|
455
558
|
} catch (err) {
|
|
456
559
|
toast.catch(err, `Failed to delete ${modelName}`);
|
|
560
|
+
} finally {
|
|
561
|
+
windowMutationPendingRef.current = false;
|
|
562
|
+
setIsWindowMutationPending(false);
|
|
457
563
|
}
|
|
458
|
-
}, [
|
|
564
|
+
}, [
|
|
565
|
+
adminContext?.syncDb,
|
|
566
|
+
deleteItem,
|
|
567
|
+
isWindowed,
|
|
568
|
+
itemId,
|
|
569
|
+
itemData,
|
|
570
|
+
modelConfig?.syncCollection,
|
|
571
|
+
modelName,
|
|
572
|
+
toast,
|
|
573
|
+
]);
|
|
459
574
|
|
|
460
|
-
const isSaving = isCreating || isUpdating;
|
|
575
|
+
const isSaving = isCreating || isUpdating || isWindowMutationPending;
|
|
576
|
+
const isDeletePending = isDeleting || isWindowMutationPending;
|
|
461
577
|
const recordCapabilities = (
|
|
462
578
|
itemData as {_adminCapabilities?: AdminRecordCapabilities} | undefined
|
|
463
579
|
)?._adminCapabilities;
|
|
@@ -492,7 +608,12 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
492
608
|
}
|
|
493
609
|
const explicitField = recordTitleFieldProp ?? modelConfig.recordTitleField;
|
|
494
610
|
const fieldKeys = new Set(Object.keys(modelConfig.fields));
|
|
495
|
-
|
|
611
|
+
// Use persisted item data only — not live formState — so typing the title field does not
|
|
612
|
+
// call navigation.setOptions on every keystroke (RN Web rerenders parents and corrupts input).
|
|
613
|
+
const record =
|
|
614
|
+
itemData && typeof itemData === "object" && !Array.isArray(itemData)
|
|
615
|
+
? (itemData as Record<string, unknown>)
|
|
616
|
+
: {};
|
|
496
617
|
return inferEditRecordTitle({
|
|
497
618
|
displayName: modelConfig.displayName,
|
|
498
619
|
explicitField,
|
|
@@ -513,42 +634,68 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
513
634
|
screenTitle,
|
|
514
635
|
]);
|
|
515
636
|
|
|
516
|
-
//
|
|
637
|
+
// Reset navigation title bookkeeping when the edited record changes.
|
|
638
|
+
useEffect(() => {
|
|
639
|
+
hasAppliedNavigationTitleRef.current = false;
|
|
640
|
+
prevNavigationTitleRef.current = undefined;
|
|
641
|
+
}, [itemId, mode, modelName]);
|
|
642
|
+
|
|
643
|
+
// Set stack / document title. Save and delete live in the form chrome because
|
|
644
|
+
// admin Expo stacks use headerShown: false (same as Create on the table).
|
|
645
|
+
// navigation is read from a ref so unstable useNavigation() identities cannot
|
|
646
|
+
// retrigger setOptions and feed back into controlled field inputs.
|
|
517
647
|
useEffect(() => {
|
|
518
648
|
if (!modelConfig) {
|
|
519
649
|
return;
|
|
520
650
|
}
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
651
|
+
|
|
652
|
+
const applyNavigationTitle = (title: string): void => {
|
|
653
|
+
if (prevNavigationTitleRef.current === title) {
|
|
654
|
+
return;
|
|
655
|
+
}
|
|
656
|
+
prevNavigationTitleRef.current = title;
|
|
657
|
+
navigationRef.current.setOptions({title});
|
|
658
|
+
};
|
|
659
|
+
|
|
660
|
+
const shouldDebounceDynamicTitle = screenTitle === undefined && getScreenTitle !== undefined;
|
|
661
|
+
|
|
662
|
+
if (!shouldDebounceDynamicTitle) {
|
|
663
|
+
applyNavigationTitle(navigationTitle);
|
|
664
|
+
hasAppliedNavigationTitleRef.current = true;
|
|
665
|
+
return;
|
|
666
|
+
}
|
|
667
|
+
|
|
668
|
+
if (!hasAppliedNavigationTitleRef.current) {
|
|
669
|
+
applyNavigationTitle(navigationTitle);
|
|
670
|
+
hasAppliedNavigationTitleRef.current = true;
|
|
671
|
+
return;
|
|
672
|
+
}
|
|
673
|
+
|
|
674
|
+
if (navigationTitleDebounceRef.current) {
|
|
675
|
+
clearTimeout(navigationTitleDebounceRef.current);
|
|
676
|
+
}
|
|
677
|
+
navigationTitleDebounceRef.current = setTimeout(() => {
|
|
678
|
+
navigationTitleDebounceRef.current = null;
|
|
679
|
+
applyNavigationTitle(navigationTitle);
|
|
680
|
+
}, NAVIGATION_TITLE_DEBOUNCE_MS);
|
|
681
|
+
|
|
682
|
+
return () => {
|
|
683
|
+
if (navigationTitleDebounceRef.current) {
|
|
684
|
+
clearTimeout(navigationTitleDebounceRef.current);
|
|
685
|
+
navigationTitleDebounceRef.current = null;
|
|
686
|
+
}
|
|
687
|
+
};
|
|
688
|
+
}, [getScreenTitle, modelConfig, navigationTitle, screenTitle]);
|
|
689
|
+
|
|
690
|
+
// Flush a pending debounced title when the form unmounts.
|
|
691
|
+
useEffect(() => {
|
|
692
|
+
return () => {
|
|
693
|
+
if (navigationTitleDebounceRef.current) {
|
|
694
|
+
clearTimeout(navigationTitleDebounceRef.current);
|
|
695
|
+
navigationTitleDebounceRef.current = null;
|
|
696
|
+
}
|
|
697
|
+
};
|
|
698
|
+
}, []);
|
|
552
699
|
|
|
553
700
|
const visibleFields = useMemo((): [string, AdminFieldConfig][] => {
|
|
554
701
|
if (!modelConfig) {
|
|
@@ -623,7 +770,31 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
623
770
|
|
|
624
771
|
return (
|
|
625
772
|
<Page color="transparent" maxWidth="100%" padding={0} scroll>
|
|
773
|
+
{isWindowed && itemId && modelConfig.syncCollection && adminContext?.syncConflicts ? (
|
|
774
|
+
<AdminConflictSheet
|
|
775
|
+
collection={modelConfig.syncCollection}
|
|
776
|
+
conflicts={adminContext.syncConflicts.conflicts}
|
|
777
|
+
loadedIds={[itemId]}
|
|
778
|
+
resolve={adminContext.syncConflicts.resolve}
|
|
779
|
+
/>
|
|
780
|
+
) : null}
|
|
626
781
|
<Box gap={3} padding={4}>
|
|
782
|
+
{isFormWritable || (mode === "edit" && canDeleteRecord) ? (
|
|
783
|
+
<Box alignItems="center" direction="row" gap={2} wrap>
|
|
784
|
+
{isFormWritable ? (
|
|
785
|
+
<Button
|
|
786
|
+
loading={isSaving}
|
|
787
|
+
onClick={handleSave}
|
|
788
|
+
testID="admin-save-button"
|
|
789
|
+
text={mode === "create" ? "Create" : "Save"}
|
|
790
|
+
variant="primary"
|
|
791
|
+
/>
|
|
792
|
+
) : null}
|
|
793
|
+
{mode === "edit" && canDeleteRecord ? (
|
|
794
|
+
<DeleteButton loading={isDeletePending} onDelete={handleDelete} />
|
|
795
|
+
) : null}
|
|
796
|
+
</Box>
|
|
797
|
+
) : null}
|
|
627
798
|
{fieldSections
|
|
628
799
|
? fieldSections.map((section, sectionIndex) => (
|
|
629
800
|
<Accordion
|
|
@@ -641,7 +812,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
641
812
|
fieldKey={fieldKey}
|
|
642
813
|
key={fieldKey}
|
|
643
814
|
modelConfigs={modelConfigs}
|
|
644
|
-
onChange={(
|
|
815
|
+
onChange={getStableFieldChangeHandler(fieldKey)}
|
|
645
816
|
parentFormState={formState}
|
|
646
817
|
readOnly={readonlyKeySet.has(fieldKey)}
|
|
647
818
|
refRenderers={refRenderers}
|
|
@@ -662,7 +833,7 @@ export const AdminModelForm: React.FC<AdminModelFormProps> = ({
|
|
|
662
833
|
fieldKey={fieldKey}
|
|
663
834
|
key={fieldKey}
|
|
664
835
|
modelConfigs={modelConfigs}
|
|
665
|
-
onChange={(
|
|
836
|
+
onChange={getStableFieldChangeHandler(fieldKey)}
|
|
666
837
|
parentFormState={formState}
|
|
667
838
|
readOnly={readonlyKeySet.has(fieldKey)}
|
|
668
839
|
refRenderers={refRenderers}
|