Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup participant selector and dark mode #29

Merged
merged 3 commits into from
Sep 13, 2023
Merged

Cleanup participant selector and dark mode #29

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd8494f
Cleanup participant selector and dark mode
ChrisJamesC Sep 13, 2023
59f090a
Merge branch 'main' into cleanup-participant-selector
ChrisJamesC Sep 13, 2023
6df5c6a
Cleanup code according to Michael's suggestions
ChrisJamesC Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reports/src/ThemeContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const CustomThemeProvider = ({
backgroundColor:
theme.palette.mode === "light"
? theme.palette.grey[100]
: theme.palette.grey[900],
: theme.palette.grey[800],
},
};
};
Expand Down
18 changes: 6 additions & 12 deletions reports/src/capability/CapabilityTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import {
Box,
Breadcrumbs,
Link,
List,
ListItem,
ListItemButton,
ListItemText,
Paper,
Typography,
} from "@mui/material";
import { Capability } from "./capabilityTypes";
import { useMatches, useNavigate } from "react-router-dom";
import { Link as RouterLink, useMatches } from "react-router-dom";
import { ReactNode } from "react";
import { Report } from "./capabilityTypes";
import { CapabilityTableHeader } from "./CapabilityTableHeader";
Expand Down Expand Up @@ -46,7 +45,6 @@ export const CapabilityTable = ({
report,
participantMissing,
}: CapabilityTableProps) => {
const navigate = useNavigate();
if (!capability) {
return <span>Capability not found</span>;
}
Expand All @@ -57,26 +55,22 @@ export const CapabilityTable = ({
<Box
component="main"
sx={{
backgroundColor: (theme) =>
theme.palette.mode === "light"
? theme.palette.grey[100]
: theme.palette.grey[900],
padding: 8,
paddingTop: 10,
}}
>
{participantMissing ? (
<>
<Typography variant="h3" gutterBottom>
<Typography variant="h4" gutterBottom>
{report.participants?.length ? "Participants" : "Participant"}
</Typography>
<Paper>
<List>
{report.participants?.map((p, i) => (
<ListItem key={i}>
<ListItemButton onClick={() => navigate(`/${i}`)}>
<ListItemText primary={p} />
</ListItemButton>
<Link component={RouterLink} to={`/${i}`}>
{p}
</Link>
</ListItem>
))}
</List>
Expand Down
14 changes: 7 additions & 7 deletions reports/src/capability/ParticipantSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,27 @@ export const ParticipantSelector = ({
}) => {
const location = useLocation();
const navigate = useNavigate();
const ussp = parseInt(location.pathname.split("/")[1]);
const ussId = parseInt(location.pathname.split("/")[1]);
ChrisJamesC marked this conversation as resolved.
Show resolved Hide resolved

const handleUsspSelect = (event: SelectChangeEvent<number>) => {
const id = event.target.value;
navigate(`/${id}`);
};
if (hideIfNoParticipant && Number.isNaN(ussp)) {
if (hideIfNoParticipant && Number.isNaN(ussId)) {
ChrisJamesC marked this conversation as resolved.
Show resolved Hide resolved
return null;
}
return (
<FormControl size="small">
<InputLabel id="ussp-select-label">USSP</InputLabel>
<InputLabel id="ussp-select-label">Participant</InputLabel>
<Select
displayEmpty={true}
label="USSP"
value={ussp}
label="Participant"
value={ussId}
ChrisJamesC marked this conversation as resolved.
Show resolved Hide resolved
onChange={handleUsspSelect}
labelId="ussp-select-label"
sx={{ minWidth: 90 }}
>
{report.participants?.map((p, i) => (
<MenuItem value={i} key={i}>
<MenuItem value={i} key={i} sx={{ minWidth: 30 }}>
{p}
</MenuItem>
))}
Expand Down
Loading