Skip to content

Commit 0a34049

Browse files
committed
#2137 converted modal to pageblock
1 parent 834c29a commit 0a34049

3 files changed

Lines changed: 7 additions & 30 deletions

File tree

src/frontend/src/pages/AdminToolsPage/AdminToolsAttendeeDesignReviewModal.tsx renamed to src/frontend/src/pages/AdminToolsPage/AdminToolsAttendeeDesignReviewInfo.tsx

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { useState } from 'react';
2+
import PageBlock from '../../layouts/PageBlock';
23
import {
34
TextField,
45
FormControl,
@@ -12,14 +13,8 @@ import {
1213
TableHead,
1314
TableRow
1415
} from '@mui/material';
15-
import NERModal from '../../components/NERModal';
1616

17-
interface AttendeeDesignReviewModalProps {
18-
open: boolean;
19-
onClose: () => void;
20-
}
21-
22-
const AttendeeDesignReviewModal: React.FC<AttendeeDesignReviewModalProps> = ({ open, onClose }) => {
17+
const AdminToolsAttendeeDesignReviewInfo: React.FC = () => {
2318
const [selectedTeam, setSelectedTeam] = useState('');
2419
const [searchQuery, setSearchQuery] = useState('');
2520
const tableHeaderCellStyle = {
@@ -57,13 +52,7 @@ const AttendeeDesignReviewModal: React.FC<AttendeeDesignReviewModalProps> = ({ o
5752
};
5853

5954
return (
60-
<NERModal
61-
open={open}
62-
onHide={onClose}
63-
title="Attendee Design Review Information"
64-
showCloseButton={true}
65-
hideFormButtons={true}
66-
>
55+
<PageBlock title="Attendee Design Review Information">
6756
<FormControl fullWidth sx={{ marginBottom: 2 }}>
6857
<FormLabel htmlFor="search-by-name">Search by team member name</FormLabel>
6958
<TextField id="search-by-name" variant="outlined" value={searchQuery} onChange={handleSearchChange} fullWidth />
@@ -104,8 +93,8 @@ const AttendeeDesignReviewModal: React.FC<AttendeeDesignReviewModalProps> = ({ o
10493
))}
10594
</TableBody>
10695
</Table>
107-
</NERModal>
96+
</PageBlock>
10897
);
10998
};
11099

111-
export default AttendeeDesignReviewModal;
100+
export default AdminToolsAttendeeDesignReviewInfo;

src/frontend/src/pages/AdminToolsPage/AdminToolsPage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import AdminToolsUserManagement from './AdminToolsUserManagement';
77
import AdminToolsSlackUpcomingDeadlines from './AdminToolsSlackUpcomingDeadlines';
8+
import AdminToolsAttendeeDesignReviewInfo from './AdminToolsAttendeeDesignReviewInfo';
89
import { useCurrentUser } from '../../hooks/users.hooks';
910
import { isAdmin, isHead } from 'shared';
1011
import PageLayout from '../../components/PageLayout';
@@ -20,6 +21,7 @@ const AdminToolsPage: React.FC = () => {
2021
<PageLayout title="Admin Tools">
2122
{isHead(currentUser.role) && <AdminToolsUserManagement />}
2223
{isAdmin(currentUser.role) && <AdminToolsSlackUpcomingDeadlines />}
24+
{isAdmin(currentUser.role) && <AdminToolsAttendeeDesignReviewInfo />}
2325
{(isAdmin(currentUser.role) || currentUser.isAtLeastFinanceLead) && <AdminToolsFinanceConfig />}
2426
{isAdmin(currentUser.role) && <TeamsTools />}
2527
{isAdmin(currentUser.role) && <AdminToolsBOMConfig />}

src/frontend/src/pages/AdminToolsPage/AdminToolsSlackUpcomingDeadlines.tsx

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,13 @@ import { useCurrentUser } from '../../hooks/users.hooks';
1313
import { isAdmin } from 'shared';
1414
import { useToast } from '../../hooks/toasts.hooks';
1515
import HelpIcon from '@mui/icons-material/Help';
16-
import AttendeeDesignReviewModal from './AdminToolsAttendeeDesignReviewModal';
1716

1817
const AdminToolsSlackUpcomingDeadlines: React.FC = () => {
1918
const user = useCurrentUser();
2019
const toast = useToast();
2120
const [deadline, setDeadline] = useState<Date>(new Date());
2221
const [disableButton, setDisableButton] = useState(false);
2322
const { mutateAsync, isLoading } = useSlackUpcomingDeadlines();
24-
const [isModalOpen, setIsModalOpen] = useState(false);
25-
const handleOpenModal = () => setIsModalOpen(true);
26-
const handleCloseModal = () => setIsModalOpen(false);
2723

2824
const datePickerOnChange = (value: Date | null) => {
2925
if (value) setDeadline(value);
@@ -70,17 +66,7 @@ const AdminToolsSlackUpcomingDeadlines: React.FC = () => {
7066
Send
7167
</NERButton>
7268
</Grid>
73-
<Grid item>
74-
<NERButton
75-
variant="contained"
76-
disabled={!isAdmin(user.role) || disableButton || isLoading}
77-
onClick={handleOpenModal} // Opens the modal
78-
>
79-
Attendee Design Review Information
80-
</NERButton>
81-
</Grid>
8269
</Grid>
83-
<AttendeeDesignReviewModal open={isModalOpen} onClose={handleCloseModal} />
8470
</PageBlock>
8571
);
8672
};

0 commit comments

Comments
 (0)