@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,254 @@
|
|
|
1
|
+
import {
|
|
2
|
+
Box,
|
|
3
|
+
Button,
|
|
4
|
+
DataTable,
|
|
5
|
+
type DataTableCellData,
|
|
6
|
+
type DataTableColumn,
|
|
7
|
+
type DataTableCustomComponentMap,
|
|
8
|
+
Modal,
|
|
9
|
+
Spinner,
|
|
10
|
+
Text,
|
|
11
|
+
TextField,
|
|
12
|
+
} from "@terreno/ui";
|
|
13
|
+
import React, {useCallback, useMemo, useState} from "react";
|
|
14
|
+
import {AdminScreenPage} from "../AdminScreenPage";
|
|
15
|
+
import type {AdminApi} from "../types";
|
|
16
|
+
import {normalizeListData} from "./normalizeListData";
|
|
17
|
+
import {useOrganizationsApi} from "./useOrganizationsApi";
|
|
18
|
+
|
|
19
|
+
export interface OrgMembersScreenProps {
|
|
20
|
+
api: AdminApi;
|
|
21
|
+
basePath?: string;
|
|
22
|
+
organizationId: string;
|
|
23
|
+
routeBase?: string;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
interface MembershipUser {
|
|
27
|
+
_id?: string;
|
|
28
|
+
email?: string;
|
|
29
|
+
name?: string;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
interface OrgMembership {
|
|
33
|
+
_id: string;
|
|
34
|
+
roleName: "member" | "org-admin";
|
|
35
|
+
status: "active" | "suspended";
|
|
36
|
+
userId: MembershipUser | string;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const ACTION_COLUMN = "organizationMemberActions";
|
|
40
|
+
const COLUMNS: DataTableColumn[] = [
|
|
41
|
+
{columnType: "text", sortable: false, title: "Member", width: 240},
|
|
42
|
+
{columnType: "text", sortable: false, title: "Email", width: 240},
|
|
43
|
+
{columnType: "text", sortable: false, title: "Role", width: 130},
|
|
44
|
+
{columnType: "text", sortable: false, title: "Status", width: 120},
|
|
45
|
+
{columnType: ACTION_COLUMN, sortable: false, title: "", width: 320},
|
|
46
|
+
];
|
|
47
|
+
|
|
48
|
+
const mutationErrorTitle = (error: unknown, fallback: string): string => {
|
|
49
|
+
if (typeof error !== "object" || error === null) {
|
|
50
|
+
return fallback;
|
|
51
|
+
}
|
|
52
|
+
const data = (error as {data?: unknown}).data;
|
|
53
|
+
if (typeof data !== "object" || data === null) {
|
|
54
|
+
return fallback;
|
|
55
|
+
}
|
|
56
|
+
const title = (data as {title?: unknown}).title;
|
|
57
|
+
return typeof title === "string" ? title : fallback;
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
const membershipUser = (membership: OrgMembership): MembershipUser => {
|
|
61
|
+
if (typeof membership.userId === "string") {
|
|
62
|
+
return {_id: membership.userId};
|
|
63
|
+
}
|
|
64
|
+
return membership.userId;
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
export const OrgMembersScreen: React.FC<OrgMembersScreenProps> = ({
|
|
68
|
+
api,
|
|
69
|
+
basePath,
|
|
70
|
+
organizationId,
|
|
71
|
+
routeBase = "/admin",
|
|
72
|
+
}) => {
|
|
73
|
+
const [isAddOpen, setIsAddOpen] = useState(false);
|
|
74
|
+
const [email, setEmail] = useState("");
|
|
75
|
+
const [attachError, setAttachError] = useState<string>();
|
|
76
|
+
const [actionError, setActionError] = useState<string>();
|
|
77
|
+
const {
|
|
78
|
+
useMemberAttachMutation,
|
|
79
|
+
useMemberRemoveMutation,
|
|
80
|
+
useMemberUpdateMutation,
|
|
81
|
+
useMembersQuery,
|
|
82
|
+
} = useOrganizationsApi(api, basePath, organizationId);
|
|
83
|
+
const {data, error, isLoading} = useMembersQuery(organizationId);
|
|
84
|
+
const memberships = normalizeListData<OrgMembership>(data);
|
|
85
|
+
const [attachMember, {isLoading: isAttaching}] = useMemberAttachMutation();
|
|
86
|
+
const [updateMember, {isLoading: isUpdating}] = useMemberUpdateMutation();
|
|
87
|
+
const [removeMember, {isLoading: isRemoving}] = useMemberRemoveMutation();
|
|
88
|
+
const handleInvite = useCallback((): void => {}, []);
|
|
89
|
+
|
|
90
|
+
const handleDismiss = useCallback((): void => {
|
|
91
|
+
setIsAddOpen(false);
|
|
92
|
+
setEmail("");
|
|
93
|
+
setAttachError(undefined);
|
|
94
|
+
}, []);
|
|
95
|
+
|
|
96
|
+
const handleAttach = useCallback(async (): Promise<void> => {
|
|
97
|
+
const normalizedEmail = email.trim().toLowerCase();
|
|
98
|
+
if (!normalizedEmail) {
|
|
99
|
+
setAttachError("Email is required.");
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
try {
|
|
103
|
+
setAttachError(undefined);
|
|
104
|
+
await attachMember({
|
|
105
|
+
body: {email: normalizedEmail, roleName: "member"},
|
|
106
|
+
id: organizationId,
|
|
107
|
+
}).unwrap();
|
|
108
|
+
handleDismiss();
|
|
109
|
+
} catch (mutationError) {
|
|
110
|
+
setAttachError(mutationErrorTitle(mutationError, "Could not add member."));
|
|
111
|
+
}
|
|
112
|
+
}, [attachMember, email, handleDismiss, organizationId]);
|
|
113
|
+
|
|
114
|
+
const handleToggleRole = useCallback(
|
|
115
|
+
async (membership: OrgMembership): Promise<void> => {
|
|
116
|
+
try {
|
|
117
|
+
setActionError(undefined);
|
|
118
|
+
await updateMember({
|
|
119
|
+
body: {roleName: membership.roleName === "org-admin" ? "member" : "org-admin"},
|
|
120
|
+
id: organizationId,
|
|
121
|
+
memberId: membership._id,
|
|
122
|
+
}).unwrap();
|
|
123
|
+
} catch (mutationError) {
|
|
124
|
+
setActionError(mutationErrorTitle(mutationError, "Could not update member."));
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
[organizationId, updateMember]
|
|
128
|
+
);
|
|
129
|
+
|
|
130
|
+
const handleRemove = useCallback(
|
|
131
|
+
async (membership: OrgMembership): Promise<void> => {
|
|
132
|
+
try {
|
|
133
|
+
setActionError(undefined);
|
|
134
|
+
await removeMember({
|
|
135
|
+
body: {},
|
|
136
|
+
id: organizationId,
|
|
137
|
+
memberId: membership._id,
|
|
138
|
+
}).unwrap();
|
|
139
|
+
} catch (mutationError) {
|
|
140
|
+
setActionError(mutationErrorTitle(mutationError, "Could not remove member."));
|
|
141
|
+
}
|
|
142
|
+
},
|
|
143
|
+
[organizationId, removeMember]
|
|
144
|
+
);
|
|
145
|
+
|
|
146
|
+
const ActionsCell: React.FC<{
|
|
147
|
+
cellData: DataTableCellData;
|
|
148
|
+
column: DataTableColumn;
|
|
149
|
+
}> = useCallback(
|
|
150
|
+
({cellData}) => {
|
|
151
|
+
const membership = cellData.value as OrgMembership;
|
|
152
|
+
return (
|
|
153
|
+
<Box direction="row" gap={2}>
|
|
154
|
+
<Button
|
|
155
|
+
disabled={isUpdating}
|
|
156
|
+
onClick={() => {
|
|
157
|
+
void handleToggleRole(membership);
|
|
158
|
+
}}
|
|
159
|
+
size="sm"
|
|
160
|
+
text={membership.roleName === "org-admin" ? "Make member" : "Make org-admin"}
|
|
161
|
+
variant="outline"
|
|
162
|
+
/>
|
|
163
|
+
<Button
|
|
164
|
+
disabled={isRemoving}
|
|
165
|
+
onClick={() => {
|
|
166
|
+
void handleRemove(membership);
|
|
167
|
+
}}
|
|
168
|
+
size="sm"
|
|
169
|
+
text="Remove"
|
|
170
|
+
variant="ghost"
|
|
171
|
+
/>
|
|
172
|
+
</Box>
|
|
173
|
+
);
|
|
174
|
+
},
|
|
175
|
+
[handleRemove, handleToggleRole, isRemoving, isUpdating]
|
|
176
|
+
);
|
|
177
|
+
const customColumns: DataTableCustomComponentMap = useMemo(
|
|
178
|
+
() => ({[ACTION_COLUMN]: ActionsCell}),
|
|
179
|
+
[ActionsCell]
|
|
180
|
+
);
|
|
181
|
+
const rows = memberships.map((membership) => {
|
|
182
|
+
const user = membershipUser(membership);
|
|
183
|
+
return [
|
|
184
|
+
{value: user.name ?? user.email ?? user._id ?? "Unknown user"},
|
|
185
|
+
{value: user.email ?? ""},
|
|
186
|
+
{value: membership.roleName},
|
|
187
|
+
{value: membership.status},
|
|
188
|
+
{value: membership},
|
|
189
|
+
];
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
return (
|
|
193
|
+
<AdminScreenPage
|
|
194
|
+
backHref={`${routeBase}/orgs/${organizationId}`}
|
|
195
|
+
color="transparent"
|
|
196
|
+
maxWidth="100%"
|
|
197
|
+
padding={0}
|
|
198
|
+
title="Organization members"
|
|
199
|
+
>
|
|
200
|
+
<Box gap={4} padding={4}>
|
|
201
|
+
<Box direction="row" gap={2} justifyContent="end">
|
|
202
|
+
<Button disabled onClick={handleInvite} text="Invite" variant="outline" />
|
|
203
|
+
<Button
|
|
204
|
+
onClick={() => setIsAddOpen(true)}
|
|
205
|
+
testID="org-members-add"
|
|
206
|
+
text="Add existing user"
|
|
207
|
+
/>
|
|
208
|
+
</Box>
|
|
209
|
+
<Text color="secondaryDark">Invitations will be available in a future release.</Text>
|
|
210
|
+
{actionError ? (
|
|
211
|
+
<Text color="error" testID="org-members-action-error">
|
|
212
|
+
{actionError}
|
|
213
|
+
</Text>
|
|
214
|
+
) : null}
|
|
215
|
+
{isLoading ? (
|
|
216
|
+
<Box alignItems="center" padding={6}>
|
|
217
|
+
<Spinner />
|
|
218
|
+
</Box>
|
|
219
|
+
) : error ? (
|
|
220
|
+
<Text color="error">Could not load organization members.</Text>
|
|
221
|
+
) : rows.length === 0 ? (
|
|
222
|
+
<Text color="secondaryDark">No members yet.</Text>
|
|
223
|
+
) : (
|
|
224
|
+
<DataTable
|
|
225
|
+
columns={COLUMNS}
|
|
226
|
+
customColumnComponentMap={customColumns}
|
|
227
|
+
data={rows}
|
|
228
|
+
testID="org-members-table"
|
|
229
|
+
/>
|
|
230
|
+
)}
|
|
231
|
+
</Box>
|
|
232
|
+
<Modal
|
|
233
|
+
onDismiss={handleDismiss}
|
|
234
|
+
primaryButtonDisabled={isAttaching}
|
|
235
|
+
primaryButtonOnClick={handleAttach}
|
|
236
|
+
primaryButtonText="Add member"
|
|
237
|
+
secondaryButtonOnClick={handleDismiss}
|
|
238
|
+
secondaryButtonText="Cancel"
|
|
239
|
+
testID="org-members-add-modal"
|
|
240
|
+
title="Add existing user"
|
|
241
|
+
visible={isAddOpen}
|
|
242
|
+
>
|
|
243
|
+
<Box gap={2}>
|
|
244
|
+
<TextField onChange={setEmail} testID="org-members-email" title="Email" value={email} />
|
|
245
|
+
{attachError ? (
|
|
246
|
+
<Text color="error" testID="org-members-attach-error">
|
|
247
|
+
{attachError}
|
|
248
|
+
</Text>
|
|
249
|
+
) : null}
|
|
250
|
+
</Box>
|
|
251
|
+
</Modal>
|
|
252
|
+
</AdminScreenPage>
|
|
253
|
+
);
|
|
254
|
+
};
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import {Box, Button, Card, Spinner, Text, TextField} from "@terreno/ui";
|
|
2
|
+
import type {Href} from "expo-router";
|
|
3
|
+
import {router} from "expo-router";
|
|
4
|
+
import React, {useCallback, useEffect, useState} from "react";
|
|
5
|
+
import {AdminScreenPage} from "../AdminScreenPage";
|
|
6
|
+
import type {AdminApi} from "../types";
|
|
7
|
+
import type {OrganizationSummary} from "./OrgDirectoryScreen";
|
|
8
|
+
import {type OrganizationSettings, organizationSettingsOf} from "./organizationSettings";
|
|
9
|
+
import {useOrganizationsApi} from "./useOrganizationsApi";
|
|
10
|
+
import {organizationMatchesRoute} from "./useOrgContext";
|
|
11
|
+
|
|
12
|
+
export interface OrgSettingsScreenProps {
|
|
13
|
+
api: AdminApi;
|
|
14
|
+
basePath?: string;
|
|
15
|
+
organizationId: string;
|
|
16
|
+
routeBase?: string;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
interface OrganizationDetail extends OrganizationSummary {
|
|
20
|
+
settings?: OrganizationSettings;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const errorTitle = (error: unknown, fallback: string): string => {
|
|
24
|
+
if (typeof error !== "object" || error === null) {
|
|
25
|
+
return fallback;
|
|
26
|
+
}
|
|
27
|
+
const data = (error as {data?: unknown}).data;
|
|
28
|
+
if (typeof data !== "object" || data === null) {
|
|
29
|
+
return fallback;
|
|
30
|
+
}
|
|
31
|
+
const title = (data as {title?: unknown}).title;
|
|
32
|
+
return typeof title === "string" ? title : fallback;
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
export const OrgSettingsScreen: React.FC<OrgSettingsScreenProps> = ({
|
|
36
|
+
api,
|
|
37
|
+
basePath,
|
|
38
|
+
organizationId,
|
|
39
|
+
routeBase = "/admin",
|
|
40
|
+
}) => {
|
|
41
|
+
const {useReadQuery, useUpdateMutation} = useOrganizationsApi(api, basePath, organizationId);
|
|
42
|
+
const {data, error, isLoading} = useReadQuery(organizationId);
|
|
43
|
+
const loadedOrganization = (data?.data ?? data) as OrganizationDetail | undefined;
|
|
44
|
+
const isStaleOrganization =
|
|
45
|
+
loadedOrganization !== undefined &&
|
|
46
|
+
!organizationMatchesRoute(loadedOrganization, organizationId);
|
|
47
|
+
const organization = organizationMatchesRoute(loadedOrganization, organizationId)
|
|
48
|
+
? loadedOrganization
|
|
49
|
+
: undefined;
|
|
50
|
+
const [name, setName] = useState("");
|
|
51
|
+
const [settingsText, setSettingsText] = useState("{}");
|
|
52
|
+
const [saveError, setSaveError] = useState<string>();
|
|
53
|
+
const [updateOrganization, {isLoading: isSaving}] = useUpdateMutation();
|
|
54
|
+
|
|
55
|
+
// Reconcile editable fields when the route-scoped organization response changes.
|
|
56
|
+
useEffect(() => {
|
|
57
|
+
if (!organization) {
|
|
58
|
+
return;
|
|
59
|
+
}
|
|
60
|
+
setName(organization.name);
|
|
61
|
+
setSettingsText(JSON.stringify(organizationSettingsOf(organization), null, 2));
|
|
62
|
+
}, [organization, organizationId]);
|
|
63
|
+
|
|
64
|
+
const handleSave = useCallback(async (): Promise<void> => {
|
|
65
|
+
let settings: OrganizationSettings;
|
|
66
|
+
try {
|
|
67
|
+
const parsed = JSON.parse(settingsText) as unknown;
|
|
68
|
+
if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
|
|
69
|
+
setSaveError("Settings must be a JSON object.");
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
72
|
+
settings = parsed as OrganizationSettings;
|
|
73
|
+
} catch {
|
|
74
|
+
setSaveError("Settings must be valid JSON.");
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
setSaveError(undefined);
|
|
79
|
+
await updateOrganization({
|
|
80
|
+
body: {name: name.trim(), settings},
|
|
81
|
+
id: organizationId,
|
|
82
|
+
}).unwrap();
|
|
83
|
+
} catch (mutationError) {
|
|
84
|
+
setSaveError(errorTitle(mutationError, "Could not save organization settings."));
|
|
85
|
+
}
|
|
86
|
+
}, [name, organizationId, settingsText, updateOrganization]);
|
|
87
|
+
const handleOpenMembers = useCallback((): void => {
|
|
88
|
+
router.push(`${routeBase}/orgs/${organizationId}/members` as Href);
|
|
89
|
+
}, [organizationId, routeBase]);
|
|
90
|
+
|
|
91
|
+
if (isLoading || isStaleOrganization) {
|
|
92
|
+
return (
|
|
93
|
+
<Box alignItems="center" padding={6}>
|
|
94
|
+
<Spinner />
|
|
95
|
+
</Box>
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
if (error || !organization) {
|
|
99
|
+
return <Text color="error">{errorTitle(error, "Could not load organization settings.")}</Text>;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
return (
|
|
103
|
+
<AdminScreenPage
|
|
104
|
+
backHref={`${routeBase}/orgs`}
|
|
105
|
+
color="transparent"
|
|
106
|
+
padding={0}
|
|
107
|
+
title={`${organization.name} settings`}
|
|
108
|
+
>
|
|
109
|
+
<Box gap={4} padding={4}>
|
|
110
|
+
<Card gap={3} padding={4}>
|
|
111
|
+
<TextField onChange={setName} testID="org-settings-name" title="Name" value={name} />
|
|
112
|
+
<TextField
|
|
113
|
+
multiline
|
|
114
|
+
onChange={setSettingsText}
|
|
115
|
+
testID="org-settings-json"
|
|
116
|
+
title="Settings (JSON)"
|
|
117
|
+
value={settingsText}
|
|
118
|
+
/>
|
|
119
|
+
{saveError ? (
|
|
120
|
+
<Text color="error" testID="org-settings-error">
|
|
121
|
+
{saveError}
|
|
122
|
+
</Text>
|
|
123
|
+
) : null}
|
|
124
|
+
<Button
|
|
125
|
+
loading={isSaving}
|
|
126
|
+
onClick={() => {
|
|
127
|
+
void handleSave();
|
|
128
|
+
}}
|
|
129
|
+
testID="org-settings-save"
|
|
130
|
+
text="Save settings"
|
|
131
|
+
/>
|
|
132
|
+
</Card>
|
|
133
|
+
<Card gap={2} padding={4}>
|
|
134
|
+
<Text bold>Members</Text>
|
|
135
|
+
<Text color="secondaryDark">Manage organization roles and access.</Text>
|
|
136
|
+
<Button onClick={handleOpenMembers} text="Manage members" variant="outline" />
|
|
137
|
+
</Card>
|
|
138
|
+
<Card gap={2} padding={4}>
|
|
139
|
+
<Text bold>Billing</Text>
|
|
140
|
+
<Text color="secondaryDark">Billing is not available yet.</Text>
|
|
141
|
+
</Card>
|
|
142
|
+
</Box>
|
|
143
|
+
</AdminScreenPage>
|
|
144
|
+
);
|
|
145
|
+
};
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import {beforeEach, describe, expect, it, mock} from "bun:test";
|
|
2
|
+
import {act, fireEvent} from "@testing-library/react-native";
|
|
3
|
+
import {assert} from "chai";
|
|
4
|
+
import React from "react";
|
|
5
|
+
import {renderWithTheme} from "../../../ui/src/test-utils";
|
|
6
|
+
|
|
7
|
+
const mineState: {data?: unknown; error?: unknown; isLoading: boolean} = {isLoading: false};
|
|
8
|
+
const routerPush = mock(() => {});
|
|
9
|
+
|
|
10
|
+
mock.module("expo-router", () => ({router: {push: routerPush}}));
|
|
11
|
+
|
|
12
|
+
import type {AdminApi} from "../types";
|
|
13
|
+
import {OrgSwitcher} from "./OrgSwitcher";
|
|
14
|
+
import {OrgContextProvider} from "./useOrgContext";
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Stands in for the host RTK Query API so the real `useOrganizationsApi` runs.
|
|
18
|
+
* Mocking that module instead would leak process-wide and make the suite order-dependent.
|
|
19
|
+
*/
|
|
20
|
+
const createOrganizationsApi = (): AdminApi => {
|
|
21
|
+
const api = {
|
|
22
|
+
enhanceEndpoints: () => api,
|
|
23
|
+
injectEndpoints: () => ({
|
|
24
|
+
useOrgCreateMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
25
|
+
useOrgDeleteMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
26
|
+
useOrgListQuery: () => ({isLoading: false}),
|
|
27
|
+
useOrgMemberAttachMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
28
|
+
useOrgMemberRemoveMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
29
|
+
useOrgMembersQuery: () => ({isLoading: false}),
|
|
30
|
+
useOrgMemberUpdateMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
31
|
+
useOrgMineQuery: () => mineState,
|
|
32
|
+
useOrgReadQuery: () => ({isLoading: false}),
|
|
33
|
+
useOrgUpdateMutation: () => [mock(() => ({})), {isLoading: false}],
|
|
34
|
+
}),
|
|
35
|
+
};
|
|
36
|
+
return api as unknown as AdminApi;
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
const api = createOrganizationsApi();
|
|
40
|
+
|
|
41
|
+
describe("OrgSwitcher", () => {
|
|
42
|
+
beforeEach(() => {
|
|
43
|
+
mineState.data = {data: []};
|
|
44
|
+
mineState.error = undefined;
|
|
45
|
+
mineState.isLoading = false;
|
|
46
|
+
routerPush.mockClear();
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("renders the organization name for a single-org admin", async () => {
|
|
50
|
+
mineState.data = {data: [{_id: "org-1", name: "Only Org"}]};
|
|
51
|
+
const changed = mock(() => {});
|
|
52
|
+
const screen = renderWithTheme(
|
|
53
|
+
<OrgContextProvider onOrganizationChange={changed}>
|
|
54
|
+
<OrgSwitcher api={api} />
|
|
55
|
+
</OrgContextProvider>
|
|
56
|
+
);
|
|
57
|
+
|
|
58
|
+
expect(screen.getByText("Only Org")).toBeTruthy();
|
|
59
|
+
assert.equal(screen.getByText("Organization").props.style.color, "#FFFFFF");
|
|
60
|
+
await act(async () => {});
|
|
61
|
+
expect(changed).toHaveBeenCalledWith({_id: "org-1", name: "Only Org"});
|
|
62
|
+
fireEvent(screen.getByTestId("org-switcher-single-open"), "click");
|
|
63
|
+
expect(routerPush).toHaveBeenCalledWith("/admin/orgs/org-1");
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
it("renders organizations from RTK-unwrapped list data", async () => {
|
|
67
|
+
mineState.data = [{_id: "org-1", name: "Only Org"}];
|
|
68
|
+
const changed = mock(() => {});
|
|
69
|
+
const screen = renderWithTheme(
|
|
70
|
+
<OrgContextProvider onOrganizationChange={changed}>
|
|
71
|
+
<OrgSwitcher api={api} />
|
|
72
|
+
</OrgContextProvider>
|
|
73
|
+
);
|
|
74
|
+
|
|
75
|
+
expect(screen.getByText("Only Org")).toBeTruthy();
|
|
76
|
+
await act(async () => {});
|
|
77
|
+
expect(changed).toHaveBeenCalledWith({_id: "org-1", name: "Only Org"});
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("renders nothing when /orgs/mine returns 403", () => {
|
|
81
|
+
mineState.error = {status: 403};
|
|
82
|
+
mineState.data = undefined;
|
|
83
|
+
const screen = renderWithTheme(
|
|
84
|
+
<OrgContextProvider onOrganizationChange={mock(() => {})}>
|
|
85
|
+
<OrgSwitcher api={api} />
|
|
86
|
+
</OrgContextProvider>
|
|
87
|
+
);
|
|
88
|
+
|
|
89
|
+
expect(screen.queryByText("Organizations unavailable")).toBeNull();
|
|
90
|
+
expect(screen.queryByTestId("org-switcher")).toBeNull();
|
|
91
|
+
expect(screen.queryByTestId("org-switcher-single")).toBeNull();
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it("shows unavailable text for non-403 /orgs/mine errors", () => {
|
|
95
|
+
mineState.error = {status: 500};
|
|
96
|
+
mineState.data = undefined;
|
|
97
|
+
const screen = renderWithTheme(
|
|
98
|
+
<OrgContextProvider onOrganizationChange={mock(() => {})}>
|
|
99
|
+
<OrgSwitcher api={api} />
|
|
100
|
+
</OrgContextProvider>
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
expect(screen.getByText("Organizations unavailable")).toBeTruthy();
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
it("auto-selects the first organization alphabetically when none is selected", async () => {
|
|
107
|
+
mineState.data = {
|
|
108
|
+
data: [
|
|
109
|
+
{_id: "org-z", name: "Zulu Org"},
|
|
110
|
+
{_id: "org-a", name: "Alpha Org"},
|
|
111
|
+
],
|
|
112
|
+
};
|
|
113
|
+
const changed = mock(() => {});
|
|
114
|
+
renderWithTheme(
|
|
115
|
+
<OrgContextProvider onOrganizationChange={changed}>
|
|
116
|
+
<OrgSwitcher api={api} />
|
|
117
|
+
</OrgContextProvider>
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
await act(async () => {});
|
|
121
|
+
expect(changed).toHaveBeenCalledWith({_id: "org-a", name: "Alpha Org"});
|
|
122
|
+
});
|
|
123
|
+
|
|
124
|
+
it("selects an organization and navigates to its URL", async () => {
|
|
125
|
+
mineState.data = {
|
|
126
|
+
data: [
|
|
127
|
+
{_id: "org-1", name: "First"},
|
|
128
|
+
{_id: "org-2", name: "Second"},
|
|
129
|
+
],
|
|
130
|
+
};
|
|
131
|
+
const changed = mock(() => {});
|
|
132
|
+
const screen = renderWithTheme(
|
|
133
|
+
<OrgContextProvider onOrganizationChange={changed}>
|
|
134
|
+
<OrgSwitcher api={api} routeBase="/admin" />
|
|
135
|
+
</OrgContextProvider>
|
|
136
|
+
);
|
|
137
|
+
|
|
138
|
+
assert.equal(screen.getByText("Organization").props.style.color, "#FFFFFF");
|
|
139
|
+
await act(async () => {
|
|
140
|
+
fireEvent(screen.getByTestId("web_dropdown_option_org-2"), "press");
|
|
141
|
+
});
|
|
142
|
+
expect(changed).toHaveBeenCalledWith({_id: "org-2", name: "Second"});
|
|
143
|
+
expect(routerPush).toHaveBeenCalledWith("/admin/orgs/org-2");
|
|
144
|
+
});
|
|
145
|
+
});
|
|
@@ -0,0 +1,101 @@
|
|
|
1
|
+
import {Box, Button, SelectField, Spinner, Text} from "@terreno/ui";
|
|
2
|
+
import type {Href} from "expo-router";
|
|
3
|
+
import {router} from "expo-router";
|
|
4
|
+
import React, {useCallback, useEffect} from "react";
|
|
5
|
+
import type {AdminApi} from "../types";
|
|
6
|
+
import {normalizeListData} from "./normalizeListData";
|
|
7
|
+
import type {OrganizationSummary} from "./OrgDirectoryScreen";
|
|
8
|
+
import {sortOrganizations} from "./sortOrganizations";
|
|
9
|
+
import {useOrganizationsApi} from "./useOrganizationsApi";
|
|
10
|
+
import {useOrgContext} from "./useOrgContext";
|
|
11
|
+
|
|
12
|
+
export interface OrgSwitcherProps {
|
|
13
|
+
api: AdminApi;
|
|
14
|
+
basePath?: string;
|
|
15
|
+
routeBase?: string;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
const isForbiddenMineQuery = (error: unknown): boolean => {
|
|
19
|
+
if (!error || typeof error !== "object") {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
return (error as {status?: number}).status === 403;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
export const OrgSwitcher: React.FC<OrgSwitcherProps> = ({api, basePath, routeBase = "/admin"}) => {
|
|
26
|
+
const {organization, selectOrganization} = useOrgContext();
|
|
27
|
+
const {useMineQuery} = useOrganizationsApi(api, basePath);
|
|
28
|
+
const {data, error, isLoading} = useMineQuery();
|
|
29
|
+
const organizations = normalizeListData<OrganizationSummary>(data);
|
|
30
|
+
|
|
31
|
+
const handleChange = useCallback(
|
|
32
|
+
(organizationId: string): void => {
|
|
33
|
+
const nextOrganization = organizations.find((candidate) => candidate._id === organizationId);
|
|
34
|
+
if (!nextOrganization) {
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
selectOrganization(nextOrganization);
|
|
38
|
+
const prefix = routeBase.endsWith("/") ? routeBase.slice(0, -1) : routeBase;
|
|
39
|
+
router.push(`${prefix}/orgs/${nextOrganization._id}` as Href);
|
|
40
|
+
},
|
|
41
|
+
[organizations, routeBase, selectOrganization]
|
|
42
|
+
);
|
|
43
|
+
|
|
44
|
+
// Deterministic default: pick the first org from /orgs/mine so org-scoped admin REST
|
|
45
|
+
// has X-Organization-Id before home widgets mount (multi-org operators included).
|
|
46
|
+
useEffect(() => {
|
|
47
|
+
if (organization || organizations.length === 0) {
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
selectOrganization(sortOrganizations(organizations)[0]);
|
|
51
|
+
}, [organization, organizations, selectOrganization]);
|
|
52
|
+
|
|
53
|
+
if (isLoading) {
|
|
54
|
+
return <Spinner size="sm" />;
|
|
55
|
+
}
|
|
56
|
+
if (error) {
|
|
57
|
+
if (isForbiddenMineQuery(error)) {
|
|
58
|
+
return null;
|
|
59
|
+
}
|
|
60
|
+
return (
|
|
61
|
+
<Text color="error" size="sm">
|
|
62
|
+
Organizations unavailable
|
|
63
|
+
</Text>
|
|
64
|
+
);
|
|
65
|
+
}
|
|
66
|
+
if (organizations.length === 0) {
|
|
67
|
+
return null;
|
|
68
|
+
}
|
|
69
|
+
if (organizations.length === 1) {
|
|
70
|
+
return (
|
|
71
|
+
<Box gap={1} testID="org-switcher-single">
|
|
72
|
+
<Text bold color="inverted" size="sm">
|
|
73
|
+
Organization
|
|
74
|
+
</Text>
|
|
75
|
+
<Button
|
|
76
|
+
onClick={() => handleChange(organizations[0]._id)}
|
|
77
|
+
testID="org-switcher-single-open"
|
|
78
|
+
text={organizations[0].name}
|
|
79
|
+
variant="outline"
|
|
80
|
+
/>
|
|
81
|
+
</Box>
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
return (
|
|
85
|
+
<Box gap={1}>
|
|
86
|
+
<Text bold color="inverted" size="sm">
|
|
87
|
+
Organization
|
|
88
|
+
</Text>
|
|
89
|
+
<SelectField
|
|
90
|
+
onChange={handleChange}
|
|
91
|
+
options={organizations.map((candidate) => ({
|
|
92
|
+
label: candidate.name,
|
|
93
|
+
value: candidate._id,
|
|
94
|
+
}))}
|
|
95
|
+
placeholder="Select organization"
|
|
96
|
+
testID="org-switcher"
|
|
97
|
+
value={organization?._id ?? ""}
|
|
98
|
+
/>
|
|
99
|
+
</Box>
|
|
100
|
+
);
|
|
101
|
+
};
|