@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/AdminModelTable.tsx
CHANGED
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
DataTable,
|
|
7
7
|
type DataTableCellData,
|
|
8
8
|
type DataTableColumn,
|
|
9
|
+
type DataTableColumnFilter,
|
|
9
10
|
type DataTableCustomComponentMap,
|
|
10
11
|
IconButton,
|
|
11
12
|
Link,
|
|
@@ -13,22 +14,38 @@ import {
|
|
|
13
14
|
printDateAndTime,
|
|
14
15
|
Spinner,
|
|
15
16
|
Text,
|
|
16
|
-
TextField,
|
|
17
17
|
useToast,
|
|
18
18
|
} from "@terreno/ui";
|
|
19
19
|
import type {Href} from "expo-router";
|
|
20
20
|
import {router, useNavigation} from "expo-router";
|
|
21
21
|
import startCase from "lodash/startCase";
|
|
22
|
-
import React, {
|
|
22
|
+
import React, {
|
|
23
|
+
useCallback,
|
|
24
|
+
useEffect,
|
|
25
|
+
useMemo,
|
|
26
|
+
useRef,
|
|
27
|
+
useState,
|
|
28
|
+
useSyncExternalStore,
|
|
29
|
+
} from "react";
|
|
23
30
|
import {Pressable} from "react-native";
|
|
24
31
|
import {AdminActionMenu} from "./AdminActionMenu";
|
|
25
|
-
import {
|
|
32
|
+
import {AdminConflictSheet} from "./AdminConflictSheet";
|
|
33
|
+
import {AdminRefField} from "./AdminRefField";
|
|
34
|
+
import {useAdminContext} from "./adminContext";
|
|
26
35
|
import {
|
|
27
36
|
ADMIN_LIST_MAX_SELECTION,
|
|
28
37
|
type AdminListFilterState,
|
|
29
38
|
buildAdminListQueryParams,
|
|
30
39
|
} from "./adminModelListQueryParams";
|
|
40
|
+
import {isWindowedAdminTable, resolveWindowedTableRows} from "./adminWindowedTable";
|
|
41
|
+
import {
|
|
42
|
+
clearAdminWindowMembershipStale,
|
|
43
|
+
getAdminWindowMembershipStale,
|
|
44
|
+
subscribeAdminWindowRefresh,
|
|
45
|
+
} from "./adminWindowRefresh";
|
|
31
46
|
import {ADMIN_SEARCH_DEBOUNCE_MS} from "./Constants";
|
|
47
|
+
import {shouldSkipOrgScopedAdminQuery} from "./orgs/shouldSkipOrgScopedAdminQuery";
|
|
48
|
+
import {useOptionalOrgContext} from "./orgs/useOrgContext";
|
|
32
49
|
import {
|
|
33
50
|
type AdminApi,
|
|
34
51
|
type AdminFieldConfig,
|
|
@@ -63,8 +80,82 @@ const ACTIONS_COLUMN_TYPE = "adminActions";
|
|
|
63
80
|
const LINK_COLUMN_TYPE = "adminLink";
|
|
64
81
|
const SELECT_COLUMN_TYPE = "adminSelect";
|
|
65
82
|
const INLINE_BOOL_COLUMN_TYPE = "adminInlineBool";
|
|
83
|
+
|
|
84
|
+
interface RefreshMembershipOptions {
|
|
85
|
+
/** When false, skip the Refresh-failed toast. Settle retries stay silent until the last attempt. */
|
|
86
|
+
reportError?: boolean;
|
|
87
|
+
}
|
|
66
88
|
const DATE_FIELD_NAMES = new Set(["created", "updated", "deleted"]);
|
|
67
89
|
|
|
90
|
+
const getRefRoutePath = (
|
|
91
|
+
modelConfigs: Array<{name: string; routePath: string}> | undefined,
|
|
92
|
+
refModelName: string | undefined
|
|
93
|
+
): string => {
|
|
94
|
+
if (!refModelName) {
|
|
95
|
+
return "";
|
|
96
|
+
}
|
|
97
|
+
return modelConfigs?.find((m) => m.name === refModelName)?.routePath ?? "";
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
const toColumnFilter = (
|
|
101
|
+
filter: NonNullable<AdminModelConfig["filters"]>[number],
|
|
102
|
+
api: AdminApi,
|
|
103
|
+
fields: Record<string, AdminFieldConfig>,
|
|
104
|
+
modelConfigs: Array<{name: string; routePath: string}>
|
|
105
|
+
): DataTableColumnFilter | undefined => {
|
|
106
|
+
const label = filter.label ?? startCase(filter.field);
|
|
107
|
+
if (filter.kind === "text") {
|
|
108
|
+
return {field: filter.field, kind: "text", label};
|
|
109
|
+
}
|
|
110
|
+
if (filter.kind === "boolean") {
|
|
111
|
+
return {field: filter.field, kind: "boolean", label};
|
|
112
|
+
}
|
|
113
|
+
if (filter.kind === "dateRange") {
|
|
114
|
+
return {field: filter.field, kind: "dateRange", label};
|
|
115
|
+
}
|
|
116
|
+
if (filter.kind === "choice") {
|
|
117
|
+
return {
|
|
118
|
+
allowEmpty: filter.allowEmpty === true,
|
|
119
|
+
field: filter.field,
|
|
120
|
+
kind: "choice",
|
|
121
|
+
label,
|
|
122
|
+
options: filter.choices ?? [],
|
|
123
|
+
};
|
|
124
|
+
}
|
|
125
|
+
if (filter.kind === "ref") {
|
|
126
|
+
const refModelName =
|
|
127
|
+
(filter as {refModel?: string}).refModel ?? fields[filter.field]?.ref ?? undefined;
|
|
128
|
+
const routePath = getRefRoutePath(modelConfigs, refModelName);
|
|
129
|
+
return {
|
|
130
|
+
field: filter.field,
|
|
131
|
+
kind: "choice",
|
|
132
|
+
label,
|
|
133
|
+
renderFilter: ({onChange, value}) => (
|
|
134
|
+
<AdminRefField
|
|
135
|
+
api={api}
|
|
136
|
+
autocomplete
|
|
137
|
+
onChange={(next: string) => onChange(next)}
|
|
138
|
+
refModelName={refModelName ?? "Unknown"}
|
|
139
|
+
routePath={routePath}
|
|
140
|
+
testID={`admin-filter-${filter.field}`}
|
|
141
|
+
title={label}
|
|
142
|
+
value={String(value ?? "")}
|
|
143
|
+
/>
|
|
144
|
+
),
|
|
145
|
+
};
|
|
146
|
+
}
|
|
147
|
+
return undefined;
|
|
148
|
+
};
|
|
149
|
+
|
|
150
|
+
/** A windowed create is queued in the outbox, so membership may need a few tries to catch up. */
|
|
151
|
+
const MEMBERSHIP_SETTLE_ATTEMPTS = 3;
|
|
152
|
+
const MEMBERSHIP_SETTLE_RETRY_MS = 700;
|
|
153
|
+
|
|
154
|
+
interface AdminListEnvelope {
|
|
155
|
+
data: Array<Record<string, AdminFieldValue>>;
|
|
156
|
+
total: number;
|
|
157
|
+
}
|
|
158
|
+
|
|
68
159
|
const getColumnType = (fieldKey: string, fieldConfig?: AdminFieldConfig): string => {
|
|
69
160
|
if (fieldConfig) {
|
|
70
161
|
if (fieldConfig.type === "boolean") {
|
|
@@ -260,8 +351,11 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
260
351
|
baseUrl,
|
|
261
352
|
routeBase,
|
|
262
353
|
});
|
|
354
|
+
const adminContext = useAdminContext();
|
|
263
355
|
const {config, isLoading: isConfigLoading} = useAdminConfig(api, resolvedApiBase);
|
|
264
356
|
const toast = useToast();
|
|
357
|
+
const toastRef = useRef(toast);
|
|
358
|
+
toastRef.current = toast;
|
|
265
359
|
const [page, setPage] = useState(1);
|
|
266
360
|
const [sortColumn, setSortColumn] = useState<ColumnSortInterface | undefined>();
|
|
267
361
|
const [searchText, setSearchText] = useState("");
|
|
@@ -270,10 +364,21 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
270
364
|
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
|
|
271
365
|
const navigation = useNavigation();
|
|
272
366
|
|
|
367
|
+
const organizationId = useOptionalOrgContext()?.organizationId;
|
|
273
368
|
const modelConfig: AdminModelConfig | undefined = useMemo(
|
|
274
369
|
() => config?.models.find((m: AdminModelConfig) => m.name === modelName),
|
|
275
370
|
[config, modelName]
|
|
276
371
|
);
|
|
372
|
+
const skipOrgScopedQuery = shouldSkipOrgScopedAdminQuery({
|
|
373
|
+
organizationId,
|
|
374
|
+
organizationScoped: modelConfig?.organizationScoped,
|
|
375
|
+
});
|
|
376
|
+
const isWindowed = isWindowedAdminTable({
|
|
377
|
+
hasFetchClient: Boolean(adminContext?.adminRpc),
|
|
378
|
+
modelConfig,
|
|
379
|
+
syncDb: adminContext?.syncDb,
|
|
380
|
+
});
|
|
381
|
+
const syncCollection = modelConfig?.syncCollection;
|
|
277
382
|
|
|
278
383
|
// Debounce search text for list queries.
|
|
279
384
|
useEffect(() => {
|
|
@@ -369,12 +474,59 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
369
474
|
modelConfig?.routePath ?? "",
|
|
370
475
|
modelName
|
|
371
476
|
);
|
|
372
|
-
const {
|
|
477
|
+
const {
|
|
478
|
+
data: listData,
|
|
479
|
+
isLoading: isListLoading,
|
|
480
|
+
refetch,
|
|
481
|
+
} = useListQuery(listParams, {skip: !modelConfig || skipOrgScopedQuery});
|
|
482
|
+
const [storeEpoch, setStoreEpoch] = useState(0);
|
|
483
|
+
const listParamsRef = useRef(listParams);
|
|
484
|
+
listParamsRef.current = listParams;
|
|
485
|
+
const refreshGenerationRef = useRef(0);
|
|
373
486
|
const [deleteItem] = useDeleteMutation();
|
|
487
|
+
|
|
488
|
+
// Invalidate in-flight Refresh when membership query params change or the table unmounts.
|
|
489
|
+
useEffect(() => {
|
|
490
|
+
return () => {
|
|
491
|
+
refreshGenerationRef.current += 1;
|
|
492
|
+
};
|
|
493
|
+
}, [listParams]);
|
|
374
494
|
const [patchItem] = useUpdateMutation();
|
|
375
495
|
const [bulkPatch] = useBulkPatchMutation();
|
|
376
496
|
const [enqueueBackground] = useAdminBackgroundTaskMutation(api, resolvedApiBase);
|
|
377
497
|
|
|
498
|
+
const membershipRows = useMemo((): Array<Record<string, AdminFieldValue>> => {
|
|
499
|
+
const envelope = listData as AdminListEnvelope | undefined;
|
|
500
|
+
return (envelope?.data ?? []) as Array<Record<string, AdminFieldValue>>;
|
|
501
|
+
}, [listData]);
|
|
502
|
+
|
|
503
|
+
const membershipTotal = useMemo((): number => {
|
|
504
|
+
const envelope = listData as AdminListEnvelope | undefined;
|
|
505
|
+
return (envelope?.total as number | undefined) ?? 0;
|
|
506
|
+
}, [listData]);
|
|
507
|
+
|
|
508
|
+
const tableItems = useMemo((): Array<Record<string, AdminFieldValue>> => {
|
|
509
|
+
if (!isWindowed || !adminContext?.syncDb || !syncCollection) {
|
|
510
|
+
return membershipRows;
|
|
511
|
+
}
|
|
512
|
+
const restById = new Map<string, Record<string, AdminFieldValue>>();
|
|
513
|
+
const membershipIds: string[] = [];
|
|
514
|
+
for (const row of membershipRows) {
|
|
515
|
+
const id = String(row._id ?? "");
|
|
516
|
+
if (id.length === 0) {
|
|
517
|
+
continue;
|
|
518
|
+
}
|
|
519
|
+
membershipIds.push(id);
|
|
520
|
+
restById.set(id, row);
|
|
521
|
+
}
|
|
522
|
+
return resolveWindowedTableRows({
|
|
523
|
+
collection: syncCollection,
|
|
524
|
+
getEntity: adminContext.syncDb.store.getEntity,
|
|
525
|
+
membershipIds,
|
|
526
|
+
restById,
|
|
527
|
+
});
|
|
528
|
+
}, [adminContext?.syncDb, isWindowed, membershipRows, storeEpoch, syncCollection]);
|
|
529
|
+
|
|
378
530
|
const deleteEnabled = modelConfig?.permissions?.delete !== false;
|
|
379
531
|
const createEnabled = modelConfig?.permissions?.create !== false;
|
|
380
532
|
const visibleActions = useMemo(
|
|
@@ -388,11 +540,172 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
388
540
|
[config]
|
|
389
541
|
);
|
|
390
542
|
|
|
391
|
-
const
|
|
392
|
-
setFilterState(next);
|
|
543
|
+
const handleFilterValuesChange = useCallback((next: Record<string, unknown>) => {
|
|
544
|
+
setFilterState(next as AdminListFilterState);
|
|
393
545
|
setPage(1);
|
|
394
546
|
}, []);
|
|
395
547
|
|
|
548
|
+
const handleSearchChange = useCallback((next: string) => {
|
|
549
|
+
setSearchText(next);
|
|
550
|
+
}, []);
|
|
551
|
+
|
|
552
|
+
// Re-read the TinyBase overlay when known rows receive realtime admin deltas.
|
|
553
|
+
useEffect(() => {
|
|
554
|
+
if (!isWindowed || !adminContext?.syncDb || !syncCollection) {
|
|
555
|
+
return;
|
|
556
|
+
}
|
|
557
|
+
const listenerId = adminContext.syncDb.store.raw.addTableListener(syncCollection, () => {
|
|
558
|
+
setStoreEpoch((current) => current + 1);
|
|
559
|
+
});
|
|
560
|
+
return () => {
|
|
561
|
+
adminContext.syncDb?.store.raw.delListener(listenerId);
|
|
562
|
+
};
|
|
563
|
+
}, [adminContext?.syncDb, isWindowed, syncCollection]);
|
|
564
|
+
|
|
565
|
+
// Upsert the REST membership page into TinyBase for windowed admin lists.
|
|
566
|
+
useEffect(() => {
|
|
567
|
+
if (!isWindowed || !adminContext?.syncDb || !syncCollection) {
|
|
568
|
+
return;
|
|
569
|
+
}
|
|
570
|
+
const ids: string[] = [];
|
|
571
|
+
const restRows: Record<string, unknown> = {};
|
|
572
|
+
for (const row of membershipRows) {
|
|
573
|
+
const id = String(row._id ?? "");
|
|
574
|
+
if (id.length === 0) {
|
|
575
|
+
continue;
|
|
576
|
+
}
|
|
577
|
+
ids.push(id);
|
|
578
|
+
restRows[id] = row;
|
|
579
|
+
}
|
|
580
|
+
let cancelled = false;
|
|
581
|
+
void adminContext.syncDb
|
|
582
|
+
.hydrateWindow({collection: syncCollection, ids, restRows})
|
|
583
|
+
.then(() => {
|
|
584
|
+
if (!cancelled) {
|
|
585
|
+
setStoreEpoch((n) => n + 1);
|
|
586
|
+
}
|
|
587
|
+
})
|
|
588
|
+
.catch((err: unknown) => {
|
|
589
|
+
if (!cancelled) {
|
|
590
|
+
toastRef.current.catch(err, "Failed to load local rows");
|
|
591
|
+
}
|
|
592
|
+
});
|
|
593
|
+
return () => {
|
|
594
|
+
cancelled = true;
|
|
595
|
+
};
|
|
596
|
+
}, [adminContext?.syncDb, isWindowed, membershipRows, syncCollection]);
|
|
597
|
+
|
|
598
|
+
/** Resolves to the refetched membership ids, or undefined when the refresh was abandoned. */
|
|
599
|
+
const handleRefresh = useCallback(
|
|
600
|
+
async (options?: RefreshMembershipOptions): Promise<string[] | undefined> => {
|
|
601
|
+
if (!isWindowed || !adminContext?.syncDb || !syncCollection) {
|
|
602
|
+
return undefined;
|
|
603
|
+
}
|
|
604
|
+
const shouldReportError = options?.reportError !== false;
|
|
605
|
+
const generation = refreshGenerationRef.current + 1;
|
|
606
|
+
refreshGenerationRef.current = generation;
|
|
607
|
+
const paramsAtStart = listParamsRef.current;
|
|
608
|
+
try {
|
|
609
|
+
const result = (await refetch()) as
|
|
610
|
+
| {data?: AdminListEnvelope; error?: unknown; isError?: boolean}
|
|
611
|
+
| undefined;
|
|
612
|
+
if (
|
|
613
|
+
generation !== refreshGenerationRef.current ||
|
|
614
|
+
paramsAtStart !== listParamsRef.current
|
|
615
|
+
) {
|
|
616
|
+
return undefined;
|
|
617
|
+
}
|
|
618
|
+
if (result?.isError || result?.error) {
|
|
619
|
+
if (shouldReportError) {
|
|
620
|
+
toast.catch(result.error ?? new Error("Refresh failed"), "Refresh failed");
|
|
621
|
+
}
|
|
622
|
+
return undefined;
|
|
623
|
+
}
|
|
624
|
+
const rows = (result?.data?.data ?? membershipRows) as Array<
|
|
625
|
+
Record<string, AdminFieldValue>
|
|
626
|
+
>;
|
|
627
|
+
const ids: string[] = [];
|
|
628
|
+
const restRows: Record<string, unknown> = {};
|
|
629
|
+
for (const row of rows) {
|
|
630
|
+
const id = String(row._id ?? "");
|
|
631
|
+
if (id.length === 0) {
|
|
632
|
+
continue;
|
|
633
|
+
}
|
|
634
|
+
ids.push(id);
|
|
635
|
+
restRows[id] = row;
|
|
636
|
+
}
|
|
637
|
+
await adminContext.syncDb.hydrateWindow({collection: syncCollection, ids, restRows});
|
|
638
|
+
if (
|
|
639
|
+
generation !== refreshGenerationRef.current ||
|
|
640
|
+
paramsAtStart !== listParamsRef.current
|
|
641
|
+
) {
|
|
642
|
+
return undefined;
|
|
643
|
+
}
|
|
644
|
+
setStoreEpoch((n) => n + 1);
|
|
645
|
+
return ids;
|
|
646
|
+
} catch (err) {
|
|
647
|
+
if (
|
|
648
|
+
generation !== refreshGenerationRef.current ||
|
|
649
|
+
paramsAtStart !== listParamsRef.current
|
|
650
|
+
) {
|
|
651
|
+
return undefined;
|
|
652
|
+
}
|
|
653
|
+
if (shouldReportError) {
|
|
654
|
+
toast.catch(err, "Refresh failed");
|
|
655
|
+
}
|
|
656
|
+
return undefined;
|
|
657
|
+
}
|
|
658
|
+
},
|
|
659
|
+
[adminContext?.syncDb, isWindowed, membershipRows, refetch, syncCollection, toast]
|
|
660
|
+
);
|
|
661
|
+
|
|
662
|
+
const handleRefreshRef = useRef(handleRefresh);
|
|
663
|
+
handleRefreshRef.current = handleRefresh;
|
|
664
|
+
const isMountedRef = useRef(true);
|
|
665
|
+
|
|
666
|
+
// Stop the membership settle loop from scheduling work after the table goes away.
|
|
667
|
+
useEffect(() => {
|
|
668
|
+
isMountedRef.current = true;
|
|
669
|
+
return () => {
|
|
670
|
+
isMountedRef.current = false;
|
|
671
|
+
};
|
|
672
|
+
}, []);
|
|
673
|
+
const membershipStale = useSyncExternalStore(
|
|
674
|
+
subscribeAdminWindowRefresh,
|
|
675
|
+
() => getAdminWindowMembershipStale(syncCollection),
|
|
676
|
+
() => undefined
|
|
677
|
+
);
|
|
678
|
+
|
|
679
|
+
// Refetch membership after a windowed create or delete, which never touches the list cache.
|
|
680
|
+
useEffect(() => {
|
|
681
|
+
if (!isWindowed || !membershipStale || !syncCollection) {
|
|
682
|
+
return;
|
|
683
|
+
}
|
|
684
|
+
// Claim the flag before awaiting so a remount does not start a second settle loop.
|
|
685
|
+
clearAdminWindowMembershipStale({collection: syncCollection});
|
|
686
|
+
const awaitId = membershipStale.awaitId;
|
|
687
|
+
const settleMembership = async (): Promise<void> => {
|
|
688
|
+
for (let attempt = 0; attempt < MEMBERSHIP_SETTLE_ATTEMPTS; attempt += 1) {
|
|
689
|
+
const isLastAttempt = attempt === MEMBERSHIP_SETTLE_ATTEMPTS - 1;
|
|
690
|
+
const ids = await handleRefreshRef.current({reportError: isLastAttempt});
|
|
691
|
+
if (ids !== undefined && (!awaitId || ids.includes(awaitId))) {
|
|
692
|
+
return;
|
|
693
|
+
}
|
|
694
|
+
// Failed refreshes and creates that have not appeared yet keep retrying
|
|
695
|
+
// while mounted. An unmount is the only safe signal that this table no
|
|
696
|
+
// longer owns settlement.
|
|
697
|
+
if (!isMountedRef.current) {
|
|
698
|
+
return;
|
|
699
|
+
}
|
|
700
|
+
await new Promise((resolve) => setTimeout(resolve, MEMBERSHIP_SETTLE_RETRY_MS));
|
|
701
|
+
if (!isMountedRef.current) {
|
|
702
|
+
return;
|
|
703
|
+
}
|
|
704
|
+
}
|
|
705
|
+
};
|
|
706
|
+
void settleMembership();
|
|
707
|
+
}, [isWindowed, membershipStale, syncCollection]);
|
|
708
|
+
|
|
396
709
|
const handleDelete = useCallback(
|
|
397
710
|
async (id: string) => {
|
|
398
711
|
try {
|
|
@@ -424,7 +737,7 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
424
737
|
);
|
|
425
738
|
|
|
426
739
|
const toggleSelectPage = useCallback(() => {
|
|
427
|
-
const ids =
|
|
740
|
+
const ids = tableItems.map((row) => String(row._id));
|
|
428
741
|
const allSelected = ids.length > 0 && ids.every((id: string) => selectedIds.has(id));
|
|
429
742
|
if (allSelected) {
|
|
430
743
|
setSelectedIds((prev) => {
|
|
@@ -449,7 +762,23 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
449
762
|
}
|
|
450
763
|
return n;
|
|
451
764
|
});
|
|
452
|
-
}, [
|
|
765
|
+
}, [selectedIds, tableItems, toast]);
|
|
766
|
+
|
|
767
|
+
// Drop selections a live admin tombstone removed, so bulk actions never target them.
|
|
768
|
+
useEffect(() => {
|
|
769
|
+
const visibleIds = new Set(tableItems.map((row) => String(row._id)));
|
|
770
|
+
setSelectedIds((prev) => {
|
|
771
|
+
let changed = false;
|
|
772
|
+
const next = new Set(prev);
|
|
773
|
+
for (const row of membershipRows) {
|
|
774
|
+
const id = String(row._id ?? "");
|
|
775
|
+
if (id.length > 0 && !visibleIds.has(id) && next.delete(id)) {
|
|
776
|
+
changed = true;
|
|
777
|
+
}
|
|
778
|
+
}
|
|
779
|
+
return changed ? next : prev;
|
|
780
|
+
});
|
|
781
|
+
}, [membershipRows, tableItems]);
|
|
453
782
|
|
|
454
783
|
const runBulkAction = useCallback(
|
|
455
784
|
async (actionId: string) => {
|
|
@@ -477,7 +806,15 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
477
806
|
for (const k of action.patchKeys) {
|
|
478
807
|
patch[k] = true;
|
|
479
808
|
}
|
|
480
|
-
const result = (
|
|
809
|
+
const result = (
|
|
810
|
+
isWindowed && adminContext?.adminRpc
|
|
811
|
+
? await adminContext.adminRpc({
|
|
812
|
+
body: {ids, patch},
|
|
813
|
+
method: "POST",
|
|
814
|
+
url: `${modelConfig.routePath}/bulk-patch`,
|
|
815
|
+
})
|
|
816
|
+
: await bulkPatch({ids, patch}).unwrap()
|
|
817
|
+
) as {
|
|
481
818
|
failures?: {id: string; title: string}[];
|
|
482
819
|
updated?: number;
|
|
483
820
|
};
|
|
@@ -491,7 +828,16 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
491
828
|
}
|
|
492
829
|
setSelectedIds(new Set());
|
|
493
830
|
},
|
|
494
|
-
[
|
|
831
|
+
[
|
|
832
|
+
adminContext?.adminRpc,
|
|
833
|
+
bulkPatch,
|
|
834
|
+
enqueueBackground,
|
|
835
|
+
isWindowed,
|
|
836
|
+
modelConfig,
|
|
837
|
+
selectedIds,
|
|
838
|
+
toast,
|
|
839
|
+
visibleActions,
|
|
840
|
+
]
|
|
495
841
|
);
|
|
496
842
|
|
|
497
843
|
const handleInlineBooleanToggle = useCallback(
|
|
@@ -509,22 +855,8 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
509
855
|
if (!modelConfig) {
|
|
510
856
|
return;
|
|
511
857
|
}
|
|
512
|
-
navigation.setOptions({
|
|
513
|
-
|
|
514
|
-
<Box alignItems="center" justifyContent="center" marginRight={3}>
|
|
515
|
-
{createEnabled ? (
|
|
516
|
-
<Button
|
|
517
|
-
onClick={() => router.push(`${resolvedRouteBase}/${modelName}/create` as Href)}
|
|
518
|
-
testID="admin-create-button"
|
|
519
|
-
text="Create"
|
|
520
|
-
variant="primary"
|
|
521
|
-
/>
|
|
522
|
-
) : null}
|
|
523
|
-
</Box>
|
|
524
|
-
),
|
|
525
|
-
title: modelConfig.displayName,
|
|
526
|
-
});
|
|
527
|
-
}, [createEnabled, navigation, modelConfig, resolvedRouteBase, modelName]);
|
|
858
|
+
navigation.setOptions({title: modelConfig.displayName});
|
|
859
|
+
}, [navigation, modelConfig]);
|
|
528
860
|
|
|
529
861
|
const customColumnComponentMap: DataTableCustomComponentMap = useMemo(
|
|
530
862
|
() => ({
|
|
@@ -536,6 +868,14 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
536
868
|
[]
|
|
537
869
|
);
|
|
538
870
|
|
|
871
|
+
const additionalFilters = useMemo((): DataTableColumnFilter[] => {
|
|
872
|
+
const adminFilters = modelConfig?.filters ?? [];
|
|
873
|
+
return adminFilters
|
|
874
|
+
.filter((filter) => !displayFields.includes(filter.field))
|
|
875
|
+
.map((filter) => toColumnFilter(filter, api, modelConfig?.fields ?? {}, modelConfigs))
|
|
876
|
+
.filter((filter): filter is DataTableColumnFilter => Boolean(filter));
|
|
877
|
+
}, [api, displayFields, modelConfig, modelConfigs]);
|
|
878
|
+
|
|
539
879
|
if (isConfigLoading || !modelConfig) {
|
|
540
880
|
return (
|
|
541
881
|
<Page color="transparent" maxWidth="100%" padding={0}>
|
|
@@ -544,6 +884,7 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
544
884
|
);
|
|
545
885
|
}
|
|
546
886
|
|
|
887
|
+
const adminFilters = modelConfig.filters ?? [];
|
|
547
888
|
const dataColumns: DataTableColumn[] = displayFields.map((fieldKey) => {
|
|
548
889
|
const fieldConfig = modelConfig.fields[fieldKey];
|
|
549
890
|
const columnType = getColumnType(fieldKey, fieldConfig);
|
|
@@ -553,11 +894,19 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
553
894
|
const isLink = linkFieldSet.has(fieldKey);
|
|
554
895
|
const isInlineBool =
|
|
555
896
|
fieldConfig?.type === "boolean" && modelConfig.permissions?.update !== false;
|
|
897
|
+
const declaredFilter = adminFilters.find((filter) => filter.field === fieldKey);
|
|
898
|
+
const filter = declaredFilter
|
|
899
|
+
? toColumnFilter(declaredFilter, api, modelConfig.fields, modelConfigs)
|
|
900
|
+
: undefined;
|
|
556
901
|
return {
|
|
557
902
|
columnType: isInlineBool ? INLINE_BOOL_COLUMN_TYPE : isLink ? LINK_COLUMN_TYPE : columnType,
|
|
903
|
+
filter,
|
|
558
904
|
sortable,
|
|
559
905
|
title: startCase(fieldKey),
|
|
560
|
-
width:
|
|
906
|
+
width: Math.max(
|
|
907
|
+
widthOverride ?? getColumnWidth(fieldKey, columnType),
|
|
908
|
+
declaredFilter ? 180 : 0
|
|
909
|
+
),
|
|
561
910
|
};
|
|
562
911
|
});
|
|
563
912
|
|
|
@@ -581,7 +930,7 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
581
930
|
},
|
|
582
931
|
];
|
|
583
932
|
|
|
584
|
-
const listItems =
|
|
933
|
+
const listItems = tableItems;
|
|
585
934
|
const data = listItems.map((item) => {
|
|
586
935
|
const id = String(item._id ?? "");
|
|
587
936
|
const selected = selectedIds.has(id);
|
|
@@ -633,32 +982,46 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
633
982
|
return [...selectCell, ...fieldCells, actionsCell];
|
|
634
983
|
});
|
|
635
984
|
|
|
636
|
-
const totalPages =
|
|
637
|
-
|
|
638
|
-
const searchHelperText =
|
|
639
|
-
modelConfig.searchFields && modelConfig.searchFields.length > 0
|
|
640
|
-
? `Searching ${modelConfig.searchFields.map((f) => startCase(f)).join(", ")}`
|
|
641
|
-
: undefined;
|
|
985
|
+
const totalPages = membershipTotal ? Math.ceil(membershipTotal / pageLimit) : 1;
|
|
642
986
|
|
|
643
987
|
const pageIds = listItems.map((row) => String(row._id));
|
|
644
988
|
const allPageSelected = pageIds.length > 0 && pageIds.every((id: string) => selectedIds.has(id));
|
|
645
989
|
|
|
646
990
|
return (
|
|
647
991
|
<Page color="transparent" maxWidth="100%" padding={0}>
|
|
992
|
+
{isWindowed && syncCollection && adminContext?.syncConflicts ? (
|
|
993
|
+
<AdminConflictSheet
|
|
994
|
+
collection={syncCollection}
|
|
995
|
+
conflicts={adminContext.syncConflicts.conflicts}
|
|
996
|
+
loadedIds={pageIds}
|
|
997
|
+
resolve={adminContext.syncConflicts.resolve}
|
|
998
|
+
/>
|
|
999
|
+
) : null}
|
|
648
1000
|
<Box gap={3} padding={0} testID={`admin-list-${modelName}`}>
|
|
649
|
-
{
|
|
650
|
-
<
|
|
651
|
-
|
|
652
|
-
|
|
653
|
-
|
|
654
|
-
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
1001
|
+
{createEnabled || isWindowed ? (
|
|
1002
|
+
<Box alignItems="center" direction="row" gap={2} wrap>
|
|
1003
|
+
{createEnabled ? (
|
|
1004
|
+
<Button
|
|
1005
|
+
onClick={() => router.push(`${resolvedRouteBase}/${modelName}/create` as Href)}
|
|
1006
|
+
testID="admin-create-button"
|
|
1007
|
+
text="Create"
|
|
1008
|
+
variant="primary"
|
|
1009
|
+
/>
|
|
1010
|
+
) : null}
|
|
1011
|
+
{isWindowed ? (
|
|
1012
|
+
<Button
|
|
1013
|
+
onClick={() => {
|
|
1014
|
+
void handleRefresh();
|
|
1015
|
+
}}
|
|
1016
|
+
testID="admin-table-refresh"
|
|
1017
|
+
text="Refresh"
|
|
1018
|
+
variant="outline"
|
|
1019
|
+
/>
|
|
1020
|
+
) : null}
|
|
1021
|
+
</Box>
|
|
659
1022
|
) : null}
|
|
660
1023
|
|
|
661
|
-
<Box alignItems="stretch" direction="column" gap={3}
|
|
1024
|
+
<Box alignItems="stretch" direction="column" gap={3} width="100%">
|
|
662
1025
|
<Box direction="column" flex="grow" gap={3} minWidth={0} width="100%">
|
|
663
1026
|
{showSelectColumn ? (
|
|
664
1027
|
<Card padding={3}>
|
|
@@ -686,36 +1049,30 @@ export const AdminModelTable: React.FC<AdminModelTableProps> = ({
|
|
|
686
1049
|
) : null}
|
|
687
1050
|
|
|
688
1051
|
<Card padding={2}>
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
<
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
1052
|
+
<DataTable
|
|
1053
|
+
additionalFilters={additionalFilters}
|
|
1054
|
+
columns={columns}
|
|
1055
|
+
customColumnComponentMap={customColumnComponentMap}
|
|
1056
|
+
data={isListLoading ? [] : data}
|
|
1057
|
+
emptyContent={isListLoading ? <LoadingContent /> : <EmptyContent />}
|
|
1058
|
+
filterValues={filterState}
|
|
1059
|
+
onFilterValuesChange={handleFilterValuesChange}
|
|
1060
|
+
onSearchChange={
|
|
1061
|
+
modelConfig.searchFields && modelConfig.searchFields.length > 0
|
|
1062
|
+
? handleSearchChange
|
|
1063
|
+
: undefined
|
|
1064
|
+
}
|
|
1065
|
+
page={page}
|
|
1066
|
+
pinnedColumns={selectColumn ? 1 : 0}
|
|
1067
|
+
search={searchText}
|
|
1068
|
+
searchFields={modelConfig.searchFields}
|
|
1069
|
+
setPage={setPage}
|
|
1070
|
+
setSortColumn={setSortColumn}
|
|
1071
|
+
sortColumn={sortColumn}
|
|
1072
|
+
totalPages={totalPages}
|
|
1073
|
+
/>
|
|
706
1074
|
</Card>
|
|
707
1075
|
</Box>
|
|
708
|
-
|
|
709
|
-
{(modelConfig.filters ?? []).length > 0 ? (
|
|
710
|
-
<AdminFilterDrawer
|
|
711
|
-
api={api}
|
|
712
|
-
appliedFilterState={filterState}
|
|
713
|
-
fields={modelConfig.fields}
|
|
714
|
-
filters={modelConfig.filters ?? []}
|
|
715
|
-
modelConfigs={modelConfigs}
|
|
716
|
-
onApply={handleApplyFilters}
|
|
717
|
-
/>
|
|
718
|
-
) : null}
|
|
719
1076
|
</Box>
|
|
720
1077
|
</Box>
|
|
721
1078
|
</Page>
|