@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
package/src/useAdminApi.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import {useMemo} from "react";
|
|
2
2
|
import {asDynamicHookApi} from "./dynamicHookApi";
|
|
3
|
+
import {adminOrganizationHeaders, buildAdminModelEndpoints} from "./orgs/adminModelEndpoints";
|
|
4
|
+
import {useOptionalOrgContext} from "./orgs/useOrgContext";
|
|
3
5
|
import type {AdminApi, EndpointBuilder} from "./types";
|
|
4
6
|
|
|
5
|
-
type AdminPayload = Record<string, unknown>;
|
|
6
|
-
type TagArg = unknown;
|
|
7
|
-
|
|
8
7
|
/**
|
|
9
8
|
* Hook that generates RTK Query CRUD hooks for a specific admin model.
|
|
10
9
|
*
|
|
@@ -49,74 +48,17 @@ type TagArg = unknown;
|
|
|
49
48
|
* @see AdminModelTable for usage in the table view
|
|
50
49
|
*/
|
|
51
50
|
export const useAdminApi = (api: AdminApi, routePath: string, modelName: string) => {
|
|
51
|
+
const organizationId = useOptionalOrgContext()?.organizationId;
|
|
52
|
+
const headers = useMemo(() => adminOrganizationHeaders(organizationId), [organizationId]);
|
|
52
53
|
const enhancedApi = useMemo(() => {
|
|
53
|
-
const listKey = `adminList_${modelName}`;
|
|
54
|
-
const readKey = `adminRead_${modelName}`;
|
|
55
|
-
const createKey = `adminCreate_${modelName}`;
|
|
56
|
-
const updateKey = `adminUpdate_${modelName}`;
|
|
57
|
-
const deleteKey = `adminDelete_${modelName}`;
|
|
58
|
-
const bulkPatchKey = `adminBulkPatch_${modelName}`;
|
|
59
|
-
|
|
60
54
|
const tagType = `admin_${modelName}`;
|
|
61
55
|
return api.enhanceEndpoints({addTagTypes: [tagType]}).injectEndpoints({
|
|
62
|
-
endpoints: (build: EndpointBuilder) =>
|
|
63
|
-
|
|
64
|
-
providesTags: [`admin_${modelName}`],
|
|
65
|
-
query: (params: Record<string, unknown> | undefined) => ({
|
|
66
|
-
method: "GET",
|
|
67
|
-
params: params ?? {},
|
|
68
|
-
url: routePath,
|
|
69
|
-
}),
|
|
70
|
-
}),
|
|
71
|
-
[readKey]: build.query({
|
|
72
|
-
providesTags: (_result: TagArg, _error: TagArg, id: string) => [
|
|
73
|
-
{id, type: `admin_${modelName}`},
|
|
74
|
-
],
|
|
75
|
-
query: (id: string) => ({
|
|
76
|
-
method: "GET",
|
|
77
|
-
url: `${routePath}/${id}`,
|
|
78
|
-
}),
|
|
79
|
-
}),
|
|
80
|
-
[createKey]: build.mutation({
|
|
81
|
-
invalidatesTags: [`admin_${modelName}`],
|
|
82
|
-
query: (body: AdminPayload) => ({
|
|
83
|
-
body,
|
|
84
|
-
method: "POST",
|
|
85
|
-
url: routePath,
|
|
86
|
-
}),
|
|
87
|
-
}),
|
|
88
|
-
[updateKey]: build.mutation({
|
|
89
|
-
invalidatesTags: (_result: TagArg, _error: TagArg, {id}: {id: string}) => [
|
|
90
|
-
{id, type: `admin_${modelName}`},
|
|
91
|
-
`admin_${modelName}`,
|
|
92
|
-
],
|
|
93
|
-
query: ({id, body}: {id: string; body: AdminPayload}) => ({
|
|
94
|
-
body,
|
|
95
|
-
method: "PATCH",
|
|
96
|
-
url: `${routePath}/${id}`,
|
|
97
|
-
}),
|
|
98
|
-
}),
|
|
99
|
-
[deleteKey]: build.mutation({
|
|
100
|
-
invalidatesTags: [`admin_${modelName}`],
|
|
101
|
-
query: (id: string) => ({
|
|
102
|
-
method: "DELETE",
|
|
103
|
-
url: `${routePath}/${id}`,
|
|
104
|
-
}),
|
|
105
|
-
}),
|
|
106
|
-
[bulkPatchKey]: build.mutation({
|
|
107
|
-
invalidatesTags: [`admin_${modelName}`],
|
|
108
|
-
query: ({ids, patch}: {ids: string[]; patch: Record<string, unknown>}) => ({
|
|
109
|
-
body: {ids, patch},
|
|
110
|
-
method: "POST",
|
|
111
|
-
url: `${routePath}/bulk-patch`,
|
|
112
|
-
}),
|
|
113
|
-
}),
|
|
114
|
-
}),
|
|
56
|
+
endpoints: (build: EndpointBuilder) =>
|
|
57
|
+
buildAdminModelEndpoints(build, {headers, modelName, organizationId, routePath}),
|
|
115
58
|
overrideExisting: true,
|
|
116
59
|
});
|
|
117
|
-
}, [api,
|
|
60
|
+
}, [api, headers, modelName, organizationId, routePath]);
|
|
118
61
|
|
|
119
|
-
// Extract the generated hooks dynamically
|
|
120
62
|
const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1);
|
|
121
63
|
const listKey = `adminList_${modelName}`;
|
|
122
64
|
const readKey = `adminRead_${modelName}`;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import {useMemo} from "react";
|
|
2
|
+
import {asJsonBody} from "./adminRpc";
|
|
2
3
|
|
|
3
4
|
import {asDynamicHookApi} from "./dynamicHookApi";
|
|
4
5
|
import type {AdminApi, EndpointBuilder} from "./types";
|
|
6
|
+
import {useAdminRpc, useAdminRpcMutation} from "./useAdminRpc";
|
|
5
7
|
|
|
6
|
-
|
|
8
|
+
interface AdminBackgroundTaskBody {
|
|
7
9
|
ids?: string[];
|
|
8
10
|
kind: string;
|
|
9
11
|
metadata?: Record<string, unknown>;
|
|
@@ -22,8 +24,10 @@ export const useAdminBackgroundTaskMutation = (
|
|
|
22
24
|
api: AdminApi,
|
|
23
25
|
adminApiRoot: string
|
|
24
26
|
): AdminBackgroundTaskMutation => {
|
|
27
|
+
const rpc = useAdminRpc();
|
|
28
|
+
const root = adminApiRoot.replace(/\/$/, "");
|
|
29
|
+
const [rpcTrigger, rpcMeta] = useAdminRpcMutation(rpc);
|
|
25
30
|
const enhancedApi = useMemo(() => {
|
|
26
|
-
const root = adminApiRoot.replace(/\/$/, "");
|
|
27
31
|
return api.enhanceEndpoints({addTagTypes: ["AdminBackgroundTask"]}).injectEndpoints({
|
|
28
32
|
endpoints: (build: EndpointBuilder) => ({
|
|
29
33
|
adminPostBackgroundTask: build.mutation({
|
|
@@ -37,8 +41,20 @@ export const useAdminBackgroundTaskMutation = (
|
|
|
37
41
|
}),
|
|
38
42
|
overrideExisting: true,
|
|
39
43
|
});
|
|
40
|
-
}, [api,
|
|
44
|
+
}, [api, root]);
|
|
41
45
|
|
|
42
46
|
const enhanced = asDynamicHookApi(enhancedApi);
|
|
43
|
-
|
|
47
|
+
const rtkMutation = enhanced.useAdminPostBackgroundTaskMutation() as AdminBackgroundTaskMutation;
|
|
48
|
+
if (rpc) {
|
|
49
|
+
return [
|
|
50
|
+
(body: AdminBackgroundTaskBody) =>
|
|
51
|
+
rpcTrigger({
|
|
52
|
+
body: asJsonBody(body),
|
|
53
|
+
method: "POST",
|
|
54
|
+
url: `${root}/background-tasks`,
|
|
55
|
+
}),
|
|
56
|
+
rpcMeta,
|
|
57
|
+
];
|
|
58
|
+
}
|
|
59
|
+
return rtkMutation;
|
|
44
60
|
};
|
package/src/useAdminConfig.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {useMemo} from "react";
|
|
2
2
|
import {asDynamicHookApi} from "./dynamicHookApi";
|
|
3
3
|
import type {AdminApi, AdminConfigResponse, EndpointBuilder} from "./types";
|
|
4
|
+
import {useAdminRpc, useAdminRpcQuery} from "./useAdminRpc";
|
|
4
5
|
|
|
5
6
|
const ENDPOINT_NAME = "adminConfig";
|
|
6
7
|
|
|
@@ -34,6 +35,12 @@ const ENDPOINT_NAME = "adminConfig";
|
|
|
34
35
|
* @see AdminModelList for usage in the model list screen
|
|
35
36
|
*/
|
|
36
37
|
export const useAdminConfig = (api: AdminApi, apiBase: string) => {
|
|
38
|
+
const rpc = useAdminRpc();
|
|
39
|
+
const fetchState = useAdminRpcQuery<AdminConfigResponse>({
|
|
40
|
+
rpc,
|
|
41
|
+
skip: !rpc,
|
|
42
|
+
url: `${apiBase}/config`,
|
|
43
|
+
});
|
|
37
44
|
const enhancedApi = useMemo(() => {
|
|
38
45
|
return api.injectEndpoints({
|
|
39
46
|
endpoints: (build: EndpointBuilder) => ({
|
|
@@ -48,13 +55,24 @@ export const useAdminConfig = (api: AdminApi, apiBase: string) => {
|
|
|
48
55
|
});
|
|
49
56
|
}, [api, apiBase]);
|
|
50
57
|
|
|
51
|
-
const useConfigQuery = asDynamicHookApi(enhancedApi).useAdminConfigQuery as (
|
|
58
|
+
const useConfigQuery = asDynamicHookApi(enhancedApi).useAdminConfigQuery as (
|
|
59
|
+
arg?: unknown,
|
|
60
|
+
options?: {skip?: boolean}
|
|
61
|
+
) => {
|
|
52
62
|
data?: AdminConfigResponse;
|
|
53
63
|
error: unknown;
|
|
54
64
|
isLoading: boolean;
|
|
55
65
|
};
|
|
56
66
|
|
|
57
|
-
const {data, isLoading, error} = useConfigQuery();
|
|
67
|
+
const {data, isLoading, error} = useConfigQuery(undefined, {skip: Boolean(rpc)});
|
|
68
|
+
|
|
69
|
+
if (rpc) {
|
|
70
|
+
return {
|
|
71
|
+
config: fetchState.data ?? null,
|
|
72
|
+
error: fetchState.error,
|
|
73
|
+
isLoading: fetchState.isLoading,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
58
76
|
|
|
59
77
|
return {config: data as AdminConfigResponse | null, error, isLoading};
|
|
60
78
|
};
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import {describe, expect, it, mock} from "bun:test";
|
|
2
|
+
import {renderHook} from "@testing-library/react-native";
|
|
3
|
+
import type {AdminApi, EndpointBuilder} from "./types";
|
|
4
|
+
import {useAdminMigrations} from "./useAdminMigrations";
|
|
5
|
+
|
|
6
|
+
interface CapturedQuery {
|
|
7
|
+
method: string;
|
|
8
|
+
url: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
interface CapturedEndpoint {
|
|
12
|
+
invalidatesTags?: string[];
|
|
13
|
+
providesTags?: unknown;
|
|
14
|
+
query: (arg: never) => CapturedQuery;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
const createApiDouble = (): {
|
|
18
|
+
addTagTypes: string[][];
|
|
19
|
+
api: AdminApi;
|
|
20
|
+
endpoints: Record<string, CapturedEndpoint>;
|
|
21
|
+
} => {
|
|
22
|
+
const endpoints: Record<string, CapturedEndpoint> = {};
|
|
23
|
+
const addTagTypes: string[][] = [];
|
|
24
|
+
const api = {
|
|
25
|
+
enhanceEndpoints: ({addTagTypes: tags}: {addTagTypes: string[]}) => {
|
|
26
|
+
addTagTypes.push(tags);
|
|
27
|
+
return api;
|
|
28
|
+
},
|
|
29
|
+
injectEndpoints: ({
|
|
30
|
+
endpoints: build,
|
|
31
|
+
}: {
|
|
32
|
+
endpoints: (builder: EndpointBuilder) => Record<string, CapturedEndpoint>;
|
|
33
|
+
}) => {
|
|
34
|
+
const builder = {
|
|
35
|
+
mutation: (spec: CapturedEndpoint) => spec,
|
|
36
|
+
query: (spec: CapturedEndpoint) => spec,
|
|
37
|
+
} as unknown as EndpointBuilder;
|
|
38
|
+
Object.assign(endpoints, build(builder));
|
|
39
|
+
return {
|
|
40
|
+
useAdminGetMigrationsQuery: mock(() => ({isLoading: false})),
|
|
41
|
+
useAdminRunMigrationsMutation: mock(() => [mock(() => ({})), {isLoading: false}]),
|
|
42
|
+
};
|
|
43
|
+
},
|
|
44
|
+
} as unknown as AdminApi & {injectEndpoints: unknown};
|
|
45
|
+
return {addTagTypes, api: api as AdminApi, endpoints};
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
describe("useAdminMigrations", () => {
|
|
49
|
+
it("injects status and run endpoints against the admin migrations path", () => {
|
|
50
|
+
const {addTagTypes, api, endpoints} = createApiDouble();
|
|
51
|
+
const {result} = renderHook(() => useAdminMigrations(api, "/admin"));
|
|
52
|
+
|
|
53
|
+
expect(addTagTypes[0]).toEqual(["admin_migrations"]);
|
|
54
|
+
expect(endpoints.adminGetMigrations.query(undefined as never)).toEqual({
|
|
55
|
+
method: "GET",
|
|
56
|
+
url: "/admin/migrations/status",
|
|
57
|
+
});
|
|
58
|
+
expect(endpoints.adminRunMigrations.query({wetRun: true} as never)).toEqual({
|
|
59
|
+
method: "POST",
|
|
60
|
+
url: "/admin/migrations/run?wetRun=true",
|
|
61
|
+
});
|
|
62
|
+
expect(result.current.useGetMigrationsQuery).toBeDefined();
|
|
63
|
+
expect(result.current.useRunMigrationsMutation).toBeDefined();
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it("falls back when injectEndpoints is missing", async () => {
|
|
67
|
+
const {result} = renderHook(() => useAdminMigrations({} as AdminApi, "/admin"));
|
|
68
|
+
const query = result.current.useGetMigrationsQuery();
|
|
69
|
+
expect(query.data).toBeUndefined();
|
|
70
|
+
expect(query.isLoading).toBe(false);
|
|
71
|
+
const [run, state] = result.current.useRunMigrationsMutation();
|
|
72
|
+
expect(state.isLoading).toBe(false);
|
|
73
|
+
await expect(run({wetRun: false}).unwrap()).resolves.toEqual({taskId: ""});
|
|
74
|
+
});
|
|
75
|
+
});
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import {useMemo} from "react";
|
|
2
|
+
import {asDynamicHookApi} from "./dynamicHookApi";
|
|
3
|
+
import type {AdminApi, EndpointBuilder} from "./types";
|
|
4
|
+
|
|
5
|
+
interface MigrationStatusRecord {
|
|
6
|
+
appliedAt?: string;
|
|
7
|
+
checksum: string;
|
|
8
|
+
id: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
interface MigrationLockStatus {
|
|
12
|
+
expiresAt: string;
|
|
13
|
+
holder: string;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
interface AdminMigrationStatus {
|
|
17
|
+
applied: MigrationStatusRecord[];
|
|
18
|
+
lock: MigrationLockStatus | null;
|
|
19
|
+
pending: Array<{checksum: string; id: string}>;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
interface MigrationQueryResult {
|
|
23
|
+
data: AdminMigrationStatus | undefined;
|
|
24
|
+
error: unknown;
|
|
25
|
+
isLoading: boolean;
|
|
26
|
+
refetch?: () => void;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const EMPTY_STATUS_HOOK = (): MigrationQueryResult => ({
|
|
30
|
+
data: undefined,
|
|
31
|
+
error: null,
|
|
32
|
+
isLoading: false,
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
export const useAdminMigrations = (api: AdminApi, apiBase: string) => {
|
|
36
|
+
const enhancedApi = useMemo(() => {
|
|
37
|
+
if (typeof api?.injectEndpoints !== "function") {
|
|
38
|
+
return null;
|
|
39
|
+
}
|
|
40
|
+
return api.enhanceEndpoints({addTagTypes: ["admin_migrations"]}).injectEndpoints({
|
|
41
|
+
endpoints: (build: EndpointBuilder) => ({
|
|
42
|
+
adminGetMigrations: build.query({
|
|
43
|
+
providesTags: ["admin_migrations"],
|
|
44
|
+
query: () => ({
|
|
45
|
+
method: "GET",
|
|
46
|
+
url: `${apiBase}/migrations/status`,
|
|
47
|
+
}),
|
|
48
|
+
}),
|
|
49
|
+
adminRunMigrations: build.mutation({
|
|
50
|
+
invalidatesTags: ["admin_migrations"],
|
|
51
|
+
query: ({wetRun}: {wetRun: boolean}) => ({
|
|
52
|
+
method: "POST",
|
|
53
|
+
url: `${apiBase}/migrations/run?wetRun=${wetRun}`,
|
|
54
|
+
}),
|
|
55
|
+
}),
|
|
56
|
+
}),
|
|
57
|
+
overrideExisting: true,
|
|
58
|
+
});
|
|
59
|
+
}, [api, apiBase]);
|
|
60
|
+
|
|
61
|
+
const enhanced = asDynamicHookApi(enhancedApi);
|
|
62
|
+
|
|
63
|
+
return {
|
|
64
|
+
useGetMigrationsQuery: (enhanced?.useAdminGetMigrationsQuery ?? EMPTY_STATUS_HOOK) as (
|
|
65
|
+
arg?: undefined,
|
|
66
|
+
options?: {skip?: boolean; pollingInterval?: number}
|
|
67
|
+
) => MigrationQueryResult,
|
|
68
|
+
useRunMigrationsMutation: (enhanced?.useAdminRunMigrationsMutation ??
|
|
69
|
+
(() => [
|
|
70
|
+
() => ({unwrap: () => Promise.resolve({taskId: ""})}),
|
|
71
|
+
{isLoading: false},
|
|
72
|
+
])) as () => [
|
|
73
|
+
(args: {wetRun: boolean}) => {unwrap: () => Promise<{taskId: string}>},
|
|
74
|
+
{isLoading: boolean},
|
|
75
|
+
],
|
|
76
|
+
};
|
|
77
|
+
};
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import {describe, expect, it} from "bun:test";
|
|
2
|
+
|
|
3
|
+
import {normalizeRoles, normalizeStatements} from "./useAdminRoles";
|
|
4
|
+
|
|
5
|
+
describe("normalizeRoles", () => {
|
|
6
|
+
it("returns arrays unchanged", () => {
|
|
7
|
+
const rows = [{displayName: "Admin", name: "admin"}];
|
|
8
|
+
expect(normalizeRoles(rows)).toEqual(rows);
|
|
9
|
+
});
|
|
10
|
+
|
|
11
|
+
it("unwraps a data envelope and defaults to an empty list", () => {
|
|
12
|
+
expect(normalizeRoles({data: [{displayName: "A", name: "a"}]})).toEqual([
|
|
13
|
+
{displayName: "A", name: "a"},
|
|
14
|
+
]);
|
|
15
|
+
expect(normalizeRoles(undefined)).toEqual([]);
|
|
16
|
+
expect(normalizeRoles({})).toEqual([]);
|
|
17
|
+
});
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
describe("normalizeStatements", () => {
|
|
21
|
+
it("reads statements from either envelope shape", () => {
|
|
22
|
+
expect(normalizeStatements({statements: {users: ["read"]}})).toEqual({users: ["read"]});
|
|
23
|
+
expect(normalizeStatements({data: {statements: {users: ["write"]}}})).toEqual({
|
|
24
|
+
users: ["write"],
|
|
25
|
+
});
|
|
26
|
+
expect(normalizeStatements(undefined)).toEqual({});
|
|
27
|
+
});
|
|
28
|
+
});
|
package/src/useAdminRoles.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import {useMemo} from "react";
|
|
2
|
+
import {asJsonBody} from "./adminRpc";
|
|
2
3
|
import {asDynamicHookApi} from "./dynamicHookApi";
|
|
3
4
|
import type {AdminApi, EndpointBuilder} from "./types";
|
|
5
|
+
import {useAdminRpc, useAdminRpcMutation, useAdminRpcQuery} from "./useAdminRpc";
|
|
4
6
|
|
|
5
7
|
export interface RbacRoleRow {
|
|
6
8
|
name: string;
|
|
@@ -45,6 +47,7 @@ interface StatementsQueryResult {
|
|
|
45
47
|
*/
|
|
46
48
|
export type RolesQueryData = RbacRoleRow[] | {data?: RbacRoleRow[]} | undefined;
|
|
47
49
|
|
|
50
|
+
/** @internal */
|
|
48
51
|
export interface RolesQueryResult {
|
|
49
52
|
data: RolesQueryData;
|
|
50
53
|
isLoading: boolean;
|
|
@@ -98,6 +101,8 @@ export const normalizeStatements = (data: StatementsQueryResult["data"]): RbacSt
|
|
|
98
101
|
const resolveRbacBase = (apiBase: string): string => apiBase.replace(/\/admin\/?$/, "");
|
|
99
102
|
|
|
100
103
|
export const useAdminRoles = (api: AdminApi, apiBase: string) => {
|
|
104
|
+
const rpc = useAdminRpc();
|
|
105
|
+
const rbacBase = resolveRbacBase(apiBase);
|
|
101
106
|
const enhancedApi = useMemo(() => {
|
|
102
107
|
// Guard: some call sites (and tests) pass a type-erased API double without
|
|
103
108
|
// `injectEndpoints`. Return null so we can fall back to no-op hooks.
|
|
@@ -133,6 +138,41 @@ export const useAdminRoles = (api: AdminApi, apiBase: string) => {
|
|
|
133
138
|
|
|
134
139
|
const enhanced = asDynamicHookApi(enhancedApi);
|
|
135
140
|
|
|
141
|
+
if (rpc) {
|
|
142
|
+
return {
|
|
143
|
+
useCreateRoleMutation: () => {
|
|
144
|
+
const [trigger, meta] = useAdminRpcMutation(rpc);
|
|
145
|
+
return [
|
|
146
|
+
(input: RoleInput) =>
|
|
147
|
+
trigger({body: asJsonBody(input), method: "POST", url: `${rbacBase}/rbac/roles`}),
|
|
148
|
+
meta,
|
|
149
|
+
] as CreateRoleMutation;
|
|
150
|
+
},
|
|
151
|
+
useListRolesQuery: () =>
|
|
152
|
+
useAdminRpcQuery<RolesQueryData>({
|
|
153
|
+
rpc,
|
|
154
|
+
url: `${rbacBase}/rbac/roles`,
|
|
155
|
+
}),
|
|
156
|
+
useListStatementsQuery: () =>
|
|
157
|
+
useAdminRpcQuery<StatementsQueryResult["data"]>({
|
|
158
|
+
rpc,
|
|
159
|
+
url: `${rbacBase}/rbac/statements`,
|
|
160
|
+
}),
|
|
161
|
+
useUpdateRoleMutation: () => {
|
|
162
|
+
const [trigger, meta] = useAdminRpcMutation(rpc);
|
|
163
|
+
return [
|
|
164
|
+
({changes, roleName}: {changes: Omit<RoleInput, "name">; roleName: string}) =>
|
|
165
|
+
trigger({
|
|
166
|
+
body: asJsonBody(changes),
|
|
167
|
+
method: "PATCH",
|
|
168
|
+
url: `${rbacBase}/rbac/roles/${encodeURIComponent(roleName)}`,
|
|
169
|
+
}),
|
|
170
|
+
meta,
|
|
171
|
+
] as UpdateRoleMutation;
|
|
172
|
+
},
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
|
|
136
176
|
return {
|
|
137
177
|
useCreateRoleMutation: (enhanced?.useAdminCreateRbacRoleMutation ??
|
|
138
178
|
EMPTY_CREATE_MUTATION_HOOK) as () => CreateRoleMutation,
|
|
@@ -0,0 +1,250 @@
|
|
|
1
|
+
import {afterEach, describe, it} from "bun:test";
|
|
2
|
+
import {act} from "@testing-library/react-native";
|
|
3
|
+
import {assert} from "chai";
|
|
4
|
+
import React from "react";
|
|
5
|
+
import {renderWithTheme} from "../../ui/src/test-utils";
|
|
6
|
+
import {AdminProvider} from "./AdminProvider";
|
|
7
|
+
import type {AdminApi} from "./types";
|
|
8
|
+
import {useAdminRpc, useAdminRpcMutation, useAdminRpcQuery} from "./useAdminRpc";
|
|
9
|
+
|
|
10
|
+
const api = {} as unknown as AdminApi;
|
|
11
|
+
|
|
12
|
+
const Probe: React.FC<{onValue: (value: unknown) => void; renderValue: () => unknown}> = ({
|
|
13
|
+
onValue,
|
|
14
|
+
renderValue,
|
|
15
|
+
}) => {
|
|
16
|
+
onValue(renderValue());
|
|
17
|
+
return null;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
describe("useAdminRpc", () => {
|
|
21
|
+
const originalFetch = globalThis.fetch;
|
|
22
|
+
|
|
23
|
+
afterEach(() => {
|
|
24
|
+
globalThis.fetch = originalFetch;
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("returns undefined rpc outside a fetch-capable provider", () => {
|
|
28
|
+
let rpc: unknown;
|
|
29
|
+
renderWithTheme(
|
|
30
|
+
<AdminProvider api={api} apiBase="/admin" routeBase="/admin">
|
|
31
|
+
<Probe
|
|
32
|
+
onValue={(value) => {
|
|
33
|
+
rpc = value;
|
|
34
|
+
}}
|
|
35
|
+
renderValue={useAdminRpc}
|
|
36
|
+
/>
|
|
37
|
+
</AdminProvider>
|
|
38
|
+
);
|
|
39
|
+
assert.isUndefined(rpc);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
it("skips queries when rpc is missing or skip is true", () => {
|
|
43
|
+
let state: {isLoading?: boolean; data?: unknown} | undefined;
|
|
44
|
+
renderWithTheme(
|
|
45
|
+
<AdminProvider api={api} apiBase="/admin" routeBase="/admin">
|
|
46
|
+
<Probe
|
|
47
|
+
onValue={(value) => {
|
|
48
|
+
state = value as {isLoading?: boolean; data?: unknown};
|
|
49
|
+
}}
|
|
50
|
+
renderValue={() => useAdminRpcQuery({rpc: undefined, skip: true, url: "/x"})}
|
|
51
|
+
/>
|
|
52
|
+
</AdminProvider>
|
|
53
|
+
);
|
|
54
|
+
assert.isFalse(state?.isLoading);
|
|
55
|
+
assert.isUndefined(state?.data);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it("loads GET data, surfaces errors, and refetches", async () => {
|
|
59
|
+
let calls = 0;
|
|
60
|
+
globalThis.fetch = (async () => {
|
|
61
|
+
calls += 1;
|
|
62
|
+
if (calls === 1) {
|
|
63
|
+
return new Response(JSON.stringify({ok: true}), {
|
|
64
|
+
headers: {"Content-Type": "application/json"},
|
|
65
|
+
status: 200,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
return new Response("nope", {status: 500});
|
|
69
|
+
}) as typeof fetch;
|
|
70
|
+
|
|
71
|
+
let latest: {
|
|
72
|
+
data?: {ok: boolean};
|
|
73
|
+
error?: unknown;
|
|
74
|
+
refetch: () => void;
|
|
75
|
+
} = {refetch: () => undefined};
|
|
76
|
+
|
|
77
|
+
const Harness: React.FC = () => {
|
|
78
|
+
const rpc = useAdminRpc();
|
|
79
|
+
latest = useAdminRpcQuery<{ok: boolean}>({rpc, url: "/ping"});
|
|
80
|
+
return null;
|
|
81
|
+
};
|
|
82
|
+
|
|
83
|
+
renderWithTheme(
|
|
84
|
+
<AdminProvider
|
|
85
|
+
api={api}
|
|
86
|
+
apiBase="/admin"
|
|
87
|
+
credentials="same-origin"
|
|
88
|
+
getAuthHeaders={() => ({})}
|
|
89
|
+
routeBase="/admin"
|
|
90
|
+
>
|
|
91
|
+
<Harness />
|
|
92
|
+
</AdminProvider>
|
|
93
|
+
);
|
|
94
|
+
|
|
95
|
+
await act(async () => {
|
|
96
|
+
await Promise.resolve();
|
|
97
|
+
});
|
|
98
|
+
assert.deepEqual(latest.data, {ok: true});
|
|
99
|
+
|
|
100
|
+
await act(async () => {
|
|
101
|
+
latest.refetch();
|
|
102
|
+
await Promise.resolve();
|
|
103
|
+
});
|
|
104
|
+
assert.isOk(latest.error);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("refetches mounted queries after a successful tagged mutation", async () => {
|
|
108
|
+
let gets = 0;
|
|
109
|
+
let resolveRefetch: ((response: Response) => void) | undefined;
|
|
110
|
+
globalThis.fetch = (async (_url: string, init?: RequestInit) => {
|
|
111
|
+
if ((init?.method ?? "GET") === "POST") {
|
|
112
|
+
return new Response(JSON.stringify({saved: true}), {
|
|
113
|
+
headers: {"Content-Type": "application/json"},
|
|
114
|
+
status: 200,
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
gets += 1;
|
|
118
|
+
if (gets === 2) {
|
|
119
|
+
return await new Promise<Response>((resolve) => {
|
|
120
|
+
resolveRefetch = resolve;
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
return new Response(JSON.stringify({n: gets}), {
|
|
124
|
+
headers: {"Content-Type": "application/json"},
|
|
125
|
+
status: 200,
|
|
126
|
+
});
|
|
127
|
+
}) as typeof fetch;
|
|
128
|
+
|
|
129
|
+
let trigger:
|
|
130
|
+
| ((args: {method: "POST"; url: string}) => {unwrap: () => Promise<unknown>})
|
|
131
|
+
| undefined;
|
|
132
|
+
let queryState:
|
|
133
|
+
| {
|
|
134
|
+
data?: {n: number};
|
|
135
|
+
isFetching: boolean;
|
|
136
|
+
isLoading: boolean;
|
|
137
|
+
}
|
|
138
|
+
| undefined;
|
|
139
|
+
const tags = ["items"] as const;
|
|
140
|
+
const Harness: React.FC = () => {
|
|
141
|
+
const rpc = useAdminRpc();
|
|
142
|
+
queryState = useAdminRpcQuery<{n: number}>({providesTags: tags, rpc, url: "/items"});
|
|
143
|
+
const [mutate] = useAdminRpcMutation(rpc, {invalidatesTags: tags});
|
|
144
|
+
trigger = mutate;
|
|
145
|
+
return null;
|
|
146
|
+
};
|
|
147
|
+
|
|
148
|
+
const rendered = renderWithTheme(
|
|
149
|
+
<AdminProvider
|
|
150
|
+
api={api}
|
|
151
|
+
apiBase="/admin"
|
|
152
|
+
credentials="same-origin"
|
|
153
|
+
getAuthHeaders={() => ({})}
|
|
154
|
+
routeBase="/admin"
|
|
155
|
+
>
|
|
156
|
+
<Harness />
|
|
157
|
+
</AdminProvider>
|
|
158
|
+
);
|
|
159
|
+
await act(async () => {
|
|
160
|
+
await Promise.resolve();
|
|
161
|
+
});
|
|
162
|
+
assert.equal(gets, 1);
|
|
163
|
+
|
|
164
|
+
await act(async () => {
|
|
165
|
+
await trigger?.({method: "POST", url: "/items"}).unwrap();
|
|
166
|
+
await Promise.resolve();
|
|
167
|
+
});
|
|
168
|
+
assert.equal(gets, 2);
|
|
169
|
+
assert.deepEqual(queryState?.data, {n: 1});
|
|
170
|
+
assert.isFalse(queryState?.isLoading);
|
|
171
|
+
assert.isTrue(queryState?.isFetching);
|
|
172
|
+
|
|
173
|
+
await act(async () => {
|
|
174
|
+
resolveRefetch?.(
|
|
175
|
+
new Response(JSON.stringify({n: 2}), {
|
|
176
|
+
headers: {"Content-Type": "application/json"},
|
|
177
|
+
status: 200,
|
|
178
|
+
})
|
|
179
|
+
);
|
|
180
|
+
await Promise.resolve();
|
|
181
|
+
});
|
|
182
|
+
assert.deepEqual(queryState?.data, {n: 2});
|
|
183
|
+
assert.isFalse(queryState?.isFetching);
|
|
184
|
+
rendered.unmount();
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
it("polls on an interval and mutations unwrap or throw", async () => {
|
|
188
|
+
let gets = 0;
|
|
189
|
+
globalThis.fetch = (async (_url: string, init?: RequestInit) => {
|
|
190
|
+
if ((init?.method ?? "GET") === "POST") {
|
|
191
|
+
return new Response(JSON.stringify({saved: true}), {
|
|
192
|
+
headers: {"Content-Type": "application/json"},
|
|
193
|
+
status: 200,
|
|
194
|
+
});
|
|
195
|
+
}
|
|
196
|
+
gets += 1;
|
|
197
|
+
return new Response(JSON.stringify({n: gets}), {
|
|
198
|
+
headers: {"Content-Type": "application/json"},
|
|
199
|
+
status: 200,
|
|
200
|
+
});
|
|
201
|
+
}) as typeof fetch;
|
|
202
|
+
|
|
203
|
+
let trigger:
|
|
204
|
+
| ((args: {method: "POST"; url: string}) => {unwrap: () => Promise<unknown>})
|
|
205
|
+
| undefined;
|
|
206
|
+
let missingRpcTrigger:
|
|
207
|
+
| ((args: {method: "POST"; url: string}) => {unwrap: () => Promise<unknown>})
|
|
208
|
+
| undefined;
|
|
209
|
+
|
|
210
|
+
const Harness: React.FC = () => {
|
|
211
|
+
const rpc = useAdminRpc();
|
|
212
|
+
useAdminRpcQuery({pollingInterval: 20, rpc, url: "/poll"});
|
|
213
|
+
const [mutate] = useAdminRpcMutation(rpc);
|
|
214
|
+
const [mutateMissing] = useAdminRpcMutation(undefined);
|
|
215
|
+
trigger = mutate;
|
|
216
|
+
missingRpcTrigger = mutateMissing;
|
|
217
|
+
return null;
|
|
218
|
+
};
|
|
219
|
+
|
|
220
|
+
const rendered = renderWithTheme(
|
|
221
|
+
<AdminProvider
|
|
222
|
+
api={api}
|
|
223
|
+
apiBase="/admin"
|
|
224
|
+
credentials="same-origin"
|
|
225
|
+
getAuthHeaders={() => ({})}
|
|
226
|
+
routeBase="/admin"
|
|
227
|
+
>
|
|
228
|
+
<Harness />
|
|
229
|
+
</AdminProvider>
|
|
230
|
+
);
|
|
231
|
+
|
|
232
|
+
await act(async () => {
|
|
233
|
+
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
234
|
+
});
|
|
235
|
+
assert.isAtLeast(gets, 2);
|
|
236
|
+
|
|
237
|
+
const saved = await trigger?.({method: "POST", url: "/save"}).unwrap();
|
|
238
|
+
assert.deepEqual(saved, {saved: true});
|
|
239
|
+
|
|
240
|
+
let threw = false;
|
|
241
|
+
try {
|
|
242
|
+
await missingRpcTrigger?.({method: "POST", url: "/save"}).unwrap();
|
|
243
|
+
} catch (err) {
|
|
244
|
+
threw = true;
|
|
245
|
+
assert.include(String(err), "unavailable");
|
|
246
|
+
}
|
|
247
|
+
assert.isTrue(threw);
|
|
248
|
+
rendered.unmount();
|
|
249
|
+
});
|
|
250
|
+
});
|