Skip to content

Update mui/styles #209

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

Merged
bbimber merged 1 commit into from
Jan 7, 2026
Merged

Update mui/styles #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
290 changes: 82 additions & 208 deletions mcc/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mcc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@emotion/styled": "^11.14.0",
"@labkey/api": "^1.39.0",
"@mui/material": "^5.0.0",
"@mui/styles": "^5.0.0",
"@mui/system": "^5.0.0",
"@mui/x-data-grid": "^6.0.0",
"chart.js": "^4.4.8",
"react": "^17.0.0",
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/client/AnimalRequest/saving-overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'

export default function SavingOverlay(props) {
export default function SavingOverlay(props: {display: boolean}) {
if(props.display === false) {
return (
<>
Expand Down
10 changes: 5 additions & 5 deletions mcc/src/client/RequestReview/components/FinalReviewForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActionURL, Filter, Query } from '@labkey/api';
import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
import { AnimalRequestModel } from '../../components/RequestUtils';
import SavingOverlay from '../../AnimalRequest/saving-overlay';
import { styled } from '@mui/styles';
import { styled } from '@mui/material/styles';

const StyledTableHead = styled(TableCell)(({ theme }) => ({
fontWeight: "bold",
Expand Down Expand Up @@ -158,18 +158,18 @@ export default function FinalReviewForm(props: {requestData: AnimalRequestModel}
<Table>
<TableBody>
<TableRow>
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant={'outlined'} value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant="outlined" value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
</TableRow>
<TableRow>
<TableCell width={800}><TextField key={"resourceAvailabilityAssessment"} name={"resourceAvailabilityAssessment"} label={"Resource Availability Assessment"} minRows={4} multiline={true} disabled={true} onChange={handleChange} variant={'outlined'} defaultValue={recordData.resourceAvailabilityAssessment || ''} fullWidth={true} /></TableCell>
</TableRow>
<TableRow>
<TableCell width={800}><TextField key={"comments"} name={"comments"} label={"NIH Comments"} minRows={4} multiline={true} onChange={handleChange} variant={'outlined'} defaultValue={recordData.comments || ''} fullWidth={true} /></TableCell>
<TableCell width={800}><TextField key={"comments"} name={"comments"} label={"NIH Comments"} minRows={4} multiline={true} onChange={handleChange} variant="outlined" defaultValue={recordData.comments || ''} fullWidth={true} /></TableCell>
</TableRow>
</TableBody>
</Table>
<Button key={"approveBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Approved")}>Approve Request</Button>
<Button key={"rejectBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Rejected")}>Reject Request</Button>
<Button key={"approveBtn"} variant="contained" style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Approved")}>Approve Request</Button>
<Button key={"rejectBtn"} variant="contained" style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Rejected")}>Reject Request</Button>
</Box>
</form>
<SavingOverlay display={displayOverlay} />
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/client/RequestReview/components/RabReviewForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export default function RabReviewForm(props: {requestId: string}) {
<TableCell>
<FormControl>
<InputLabel id={"review-input-label"}>Review</InputLabel>
<Select id={"review"} variant={"outlined"} name={"review"} aria-label="Review" label={"Review"} labelId={"review-input-label"} error={hasSubmitted && !recordData[0].review} onChange={handleChange} required={true} value={recordData[0].review ?? ''} fullWidth={true} displayEmpty={true}>
<Select id={"review"} variant="outlined" name={"review"} aria-label="Review" label={"Review"} labelId={"review-input-label"} error={hasSubmitted && !recordData[0].review} onChange={handleChange} required={true} value={recordData[0].review ?? ''} fullWidth={true} displayEmpty={true}>
<MenuItem value={""}>Not Decided</MenuItem>
<MenuItem value={"I recommend this proposal"}>I recommend this proposal</MenuItem>
<MenuItem value={"I recommend this proposal with conditions"}>I recommend this proposal with conditions</MenuItem>
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/client/RequestReview/components/ReadOnlyRequest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from '../../AnimalRequest/components/values';
import { Box, Button, Grid, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material';
import { ActionURL } from '@labkey/api';
import { styled } from '@mui/styles';
import { styled } from '@mui/material/styles';

function formatPIName(request: AnimalRequestProps) {
return(formatName(request.lastname, request.firstname, request.middleinitial))
Expand Down
8 changes: 4 additions & 4 deletions mcc/src/client/RequestReview/components/ResourceAssessmentForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ActionURL, Filter, Query } from '@labkey/api';
import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
import { AnimalRequestModel } from '../../components/RequestUtils';
import SavingOverlay from '../../AnimalRequest/saving-overlay';
import { styled } from '@mui/styles';
import { styled } from '@mui/material/styles';

const StyledTableHead = styled(TableCell)(({ theme }) => ({
fontWeight: "bold",
Expand Down Expand Up @@ -156,14 +156,14 @@ export default function ResourceAssessmentForm(props: {requestData: AnimalReques
<Table>
<TableBody>
<TableRow>
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant={'outlined'} value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant="outlined" value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
</TableRow>
<TableRow>
<TableCell width={800}><TextField key={"resourceAvailabilityAssessment"} name={"resourceAvailabilityAssessment"} label={"Resource Availability Assessment"} required={true} minRows={4} multiline={true} onChange={handleChange} variant={'outlined'} defaultValue={recordData.resourceAvailabilityAssessment || ''} fullWidth={true} /></TableCell>
<TableCell width={800}><TextField key={"resourceAvailabilityAssessment"} name={"resourceAvailabilityAssessment"} label={"Resource Availability Assessment"} required={true} minRows={4} multiline={true} onChange={handleChange} variant="outlined" defaultValue={recordData.resourceAvailabilityAssessment || ''} fullWidth={true} /></TableCell>
</TableRow>
</TableBody>
</Table>
<Button key={"approveBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'}>Submit</Button>
<Button key={"approveBtn"} variant="contained" style={{marginRight: 10}} type={'submit'}>Submit</Button>
</Box>
</form>
<SavingOverlay display={displayOverlay} />
Expand Down
2 changes: 1 addition & 1 deletion mcc/src/client/RequestReview/request-review.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Title from '../AnimalRequest/components/title';
import RabReviewForm from './components/RabReviewForm';
import InternalReviewForm from './components/InternalReviewForm';

import { ThemeProvider } from '@mui/styles';
import { ThemeProvider } from '@mui/material/styles';
import { createTheme } from '@mui/material/styles';
import '../labkeyOverrides.css';
import FinalReviewForm from './components/FinalReviewForm';
Expand Down