Skip to content

Commit 80e5bde

Browse files
bbimberbbimber
authored
Merge pull request #209 from bimberlabinternal/25.11_fb_mcc
Update mui/styles
2 parents 004e1b7 + c7786c8 commit 80e5bde

8 files changed

Lines changed: 96 additions & 222 deletions

File tree

‎mcc/package-lock.json‎

Lines changed: 82 additions & 208 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mcc/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@emotion/styled": "^11.14.0",
1515
"@labkey/api": "^1.39.0",
1616
"@mui/material": "^5.0.0",
17-
"@mui/styles": "^5.0.0",
17+
"@mui/system": "^5.0.0",
1818
"@mui/x-data-grid": "^6.0.0",
1919
"chart.js": "^4.4.8",
2020
"react": "^17.0.0",

‎mcc/src/client/AnimalRequest/saving-overlay.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22

3-
export default function SavingOverlay(props) {
3+
export default function SavingOverlay(props: {display: boolean}) {
44
if(props.display === false) {
55
return (
66
<>

‎mcc/src/client/RequestReview/components/FinalReviewForm.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ActionURL, Filter, Query } from '@labkey/api';
33
import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
44
import { AnimalRequestModel } from '../../components/RequestUtils';
55
import SavingOverlay from '../../AnimalRequest/saving-overlay';
6-
import { styled } from '@mui/styles';
6+
import { styled } from '@mui/material/styles';
77

88
const StyledTableHead = styled(TableCell)(({ theme }) => ({
99
fontWeight: "bold",
@@ -158,18 +158,18 @@ export default function FinalReviewForm(props: {requestData: AnimalRequestModel}
158158
<Table>
159159
<TableBody>
160160
<TableRow>
161-
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant={'outlined'} value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
161+
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant="outlined" value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
162162
</TableRow>
163163
<TableRow>
164164
<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>
165165
</TableRow>
166166
<TableRow>
167-
<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>
167+
<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>
168168
</TableRow>
169169
</TableBody>
170170
</Table>
171-
<Button key={"approveBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Approved")}>Approve Request</Button>
172-
<Button key={"rejectBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Rejected")}>Reject Request</Button>
171+
<Button key={"approveBtn"} variant="contained" style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Approved")}>Approve Request</Button>
172+
<Button key={"rejectBtn"} variant="contained" style={{marginRight: 10}} type={'submit'} onClick={() => setPendingStatus("Rejected")}>Reject Request</Button>
173173
</Box>
174174
</form>
175175
<SavingOverlay display={displayOverlay} />

‎mcc/src/client/RequestReview/components/RabReviewForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ export default function RabReviewForm(props: {requestId: string}) {
125125
<TableCell>
126126
<FormControl>
127127
<InputLabel id={"review-input-label"}>Review</InputLabel>
128-
<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}>
128+
<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}>
129129
<MenuItem value={""}>Not Decided</MenuItem>
130130
<MenuItem value={"I recommend this proposal"}>I recommend this proposal</MenuItem>
131131
<MenuItem value={"I recommend this proposal with conditions"}>I recommend this proposal with conditions</MenuItem>

‎mcc/src/client/RequestReview/components/ReadOnlyRequest.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from '../../AnimalRequest/components/values';
99
import { Box, Button, Grid, Table, TableBody, TableCell, TableHead, TableRow, Typography } from '@mui/material';
1010
import { ActionURL } from '@labkey/api';
11-
import { styled } from '@mui/styles';
11+
import { styled } from '@mui/material/styles';
1212

1313
function formatPIName(request: AnimalRequestProps) {
1414
return(formatName(request.lastname, request.firstname, request.middleinitial))

‎mcc/src/client/RequestReview/components/ResourceAssessmentForm.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ActionURL, Filter, Query } from '@labkey/api';
33
import { Box, Button, Table, TableBody, TableCell, TableHead, TableRow, TextField } from '@mui/material';
44
import { AnimalRequestModel } from '../../components/RequestUtils';
55
import SavingOverlay from '../../AnimalRequest/saving-overlay';
6-
import { styled } from '@mui/styles';
6+
import { styled } from '@mui/material/styles';
77

88
const StyledTableHead = styled(TableCell)(({ theme }) => ({
99
fontWeight: "bold",
@@ -156,14 +156,14 @@ export default function ResourceAssessmentForm(props: {requestData: AnimalReques
156156
<Table>
157157
<TableBody>
158158
<TableRow>
159-
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant={'outlined'} value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
159+
<TableCell><TextField key={"preliminaryScore"} name={"preliminaryScore"} label={"Preliminary Score"} onChange={handleChange} variant="outlined" value={recordData.preliminaryScore || ''} disabled={true} fullWidth={true}/></TableCell>
160160
</TableRow>
161161
<TableRow>
162-
<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>
162+
<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>
163163
</TableRow>
164164
</TableBody>
165165
</Table>
166-
<Button key={"approveBtn"} variant={"contained"} style={{marginRight: 10}} type={'submit'}>Submit</Button>
166+
<Button key={"approveBtn"} variant="contained" style={{marginRight: 10}} type={'submit'}>Submit</Button>
167167
</Box>
168168
</form>
169169
<SavingOverlay display={displayOverlay} />

‎mcc/src/client/RequestReview/request-review.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Title from '../AnimalRequest/components/title';
55
import RabReviewForm from './components/RabReviewForm';
66
import InternalReviewForm from './components/InternalReviewForm';
77

8-
import { ThemeProvider } from '@mui/styles';
8+
import { ThemeProvider } from '@mui/material/styles';
99
import { createTheme } from '@mui/material/styles';
1010
import '../labkeyOverrides.css';
1111
import FinalReviewForm from './components/FinalReviewForm';

0 commit comments

Comments
 (0)