Skip to content

Commit e03f80e

Browse files
committed
UI fixes
1 parent 42d5118 commit e03f80e

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

src/ui/pages/membershipLists/InternalMembershipQuery.tsx

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
import { useState } from "react";
2-
import {
3-
TextInput,
4-
Button,
5-
Stack,
6-
Box,
7-
Text,
8-
Group,
9-
Loader,
10-
} from "@mantine/core";
2+
import { TextInput, Button, Stack, Box, Text, Group } from "@mantine/core";
113
import { IconCircleCheck, IconCircleX } from "@tabler/icons-react";
124

135
interface InternalMembershipQueryProps {
@@ -30,13 +22,12 @@ export const InternalMembershipQuery = ({
3022
}
3123

3224
setIsLoading(true);
33-
setResult(null); // Clear previous results on new query
25+
setResult(null);
3426
try {
35-
const isMember = await queryInternalMembership(netId.trim());
36-
setResult({ netId: netId.trim(), isMember });
37-
} catch (error) {
38-
// The parent component's passed-in function already handles notifications
39-
console.error(`Query failed for ${netId}:`, error);
27+
const isMember = await queryInternalMembership(
28+
netId.trim().toLowerCase(),
29+
);
30+
setResult({ netId: netId.trim().toLowerCase(), isMember });
4031
} finally {
4132
setIsLoading(false);
4233
}
@@ -78,7 +69,7 @@ export const InternalMembershipQuery = ({
7869
) : (
7970
<IconCircleX style={{ color: "var(--mantine-color-red-7)" }} />
8071
)}
81-
<Text c={result.isMember ? "green.9" : "red.9"} fw={500}>
72+
<Text c={result.isMember ? "green.9" : "red.9"} fw={500} size="sm">
8273
<Text span fw={700} inherit>
8374
{result.netId}
8475
</Text>{" "}

src/ui/pages/membershipLists/MembershipListsPage.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import { IconAlertCircle } from "@tabler/icons-react";
2020
import ExternalMemberListManagement from "./ExternalMemberListManagement";
2121
import FullScreenLoader from "@ui/components/AuthContext/LoadingScreen";
2222
import InternalMembershipQuery from "./InternalMembershipQuery";
23+
import { AxiosError } from "axios";
2324

2425
export const ManageExternalMembershipPage = () => {
2526
const api = useApi("core");
@@ -54,6 +55,10 @@ export const ManageExternalMembershipPage = () => {
5455
);
5556
return result.data.isPaidMember;
5657
} catch (error: any) {
58+
if (error instanceof AxiosError && error.status === 400) {
59+
// Invalid NetID.
60+
return false;
61+
}
5762
console.error("Failed to check internal membership:", error);
5863
notifications.show({
5964
title: "Failed to get query membership list.",
@@ -112,7 +117,7 @@ export const ManageExternalMembershipPage = () => {
112117
return <FullScreenLoader />;
113118
}
114119
return (
115-
<Container fluid mr="xl" ml="xl">
120+
<Container fluid m="lg">
116121
<Grid>
117122
<Grid.Col span={{ base: 12, lg: 6 }}>
118123
<AuthGuard
@@ -122,7 +127,7 @@ export const ManageExternalMembershipPage = () => {
122127
}}
123128
>
124129
<Stack>
125-
<Title order={2}>Query ACM Paid Membership Lists</Title>
130+
<Title order={2}>Query ACM Paid Membership List</Title>
126131
<InternalMembershipQuery
127132
queryInternalMembership={queryInternalMembership}
128133
/>

0 commit comments

Comments
 (0)