Skip to content

Commit c13d37a

Browse files
RChandler234RChandler234
committed
#1638 - clean up code
1 parent d958002 commit c13d37a

2 files changed

Lines changed: 52 additions & 89 deletions

File tree

‎src/frontend/src/layouts/PageTitle/PageTitle.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ const PageTitle: React.FC<PageTitleProps> = ({ title, previousPages, headerRight
3434
</Typography>
3535
</Grid>
3636
<Grid item xs={0} md={4} sx={{ display: { xs: 'none', md: 'block' } }}>
37-
{tabs && <Box>{tabs}</Box>}
37+
{tabs}
3838
</Grid>
3939
<Grid item xs={6} md={4} textAlign={['left', 'right']}>
4040
{headerRight}
4141
</Grid>
4242
<Grid item xs={12} md={0} justifyContent={'center'} sx={{ display: { xs: 'flex', md: 'none' } }}>
43-
{tabs && <Box>{tabs}</Box>}
43+
{tabs}
4444
</Grid>
4545
</Grid>
4646
</Box>

‎src/frontend/src/pages/ChangeRequestsPage/ChangeRequestsTable.tsx‎

Lines changed: 50 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -67,61 +67,58 @@ const ChangeRequestsTable: React.FC = () => {
6767

6868
if (isError) return <ErrorPage message={error?.message} />;
6969

70-
const smallColumns: GridColDef[] = [
71-
{
72-
...baseColDef,
73-
field: 'crId',
74-
type: 'number',
75-
headerName: 'ID',
76-
maxWidth: 75
77-
},
78-
{
79-
...baseColDef,
80-
field: 'dateReviewed',
81-
headerName: 'Date Reviewed',
82-
type: 'date',
83-
valueFormatter: (params) => (params.value ? datePipe(params.value) : ''),
84-
maxWidth: 200
85-
},
86-
{
87-
...baseColDef,
88-
field: 'wbs',
89-
headerName: 'WBS',
90-
filterable: true,
91-
sortable: true,
92-
maxWidth: 300,
93-
valueGetter: (params) => `${wbsPipe(params.value.wbsNum)} - ${params.value.name}`,
94-
sortComparator: (_v1, _v2, param1, param2) => {
95-
const wbs1: WbsNumber = validateWBS((param1.value as string).split(' ')[0]);
96-
const wbs2: WbsNumber = validateWBS((param2.value as string).split(' ')[0]);
70+
const idColumn: GridColDef = {
71+
...baseColDef,
72+
field: 'crId',
73+
type: 'number',
74+
headerName: 'ID',
75+
maxWidth: 75
76+
};
9777

98-
if (wbs1.carNumber !== wbs2.carNumber) {
99-
return wbs1.carNumber - wbs2.carNumber;
100-
} else if (wbs1.projectNumber !== wbs2.projectNumber) {
101-
return wbs1.projectNumber - wbs2.projectNumber;
102-
} else if (wbs1.workPackageNumber !== wbs2.workPackageNumber) {
103-
return wbs1.workPackageNumber - wbs2.workPackageNumber;
104-
} else {
105-
return 0;
106-
}
78+
const dateReviewedColumn: GridColDef = {
79+
...baseColDef,
80+
field: 'dateReviewed',
81+
headerName: 'Date Reviewed',
82+
type: 'date',
83+
valueFormatter: (params) => (params.value ? datePipe(params.value) : ''),
84+
maxWidth: 200
85+
};
86+
87+
const wbsColumn: GridColDef = {
88+
...baseColDef,
89+
field: 'wbs',
90+
headerName: 'WBS',
91+
filterable: true,
92+
sortable: true,
93+
maxWidth: 300,
94+
valueGetter: (params) => `${wbsPipe(params.value.wbsNum)} - ${params.value.name}`,
95+
sortComparator: (_v1, _v2, param1, param2) => {
96+
const wbs1: WbsNumber = validateWBS((param1.value as string).split(' ')[0]);
97+
const wbs2: WbsNumber = validateWBS((param2.value as string).split(' ')[0]);
98+
99+
if (wbs1.carNumber !== wbs2.carNumber) {
100+
return wbs1.carNumber - wbs2.carNumber;
101+
} else if (wbs1.projectNumber !== wbs2.projectNumber) {
102+
return wbs1.projectNumber - wbs2.projectNumber;
103+
} else if (wbs1.workPackageNumber !== wbs2.workPackageNumber) {
104+
return wbs1.workPackageNumber - wbs2.workPackageNumber;
105+
} else {
106+
return 0;
107107
}
108-
},
109-
{
110-
...baseColDef,
111-
field: 'submitter',
112-
headerName: 'Submitter',
113-
maxWidth: 200
114108
}
115-
];
109+
};
110+
111+
const submitterColumn: GridColDef = {
112+
...baseColDef,
113+
field: 'submitter',
114+
headerName: 'Submitter',
115+
maxWidth: 200
116+
};
117+
118+
const smallColumns: GridColDef[] = [idColumn, dateReviewedColumn, wbsColumn, submitterColumn];
116119

117120
const columns: GridColDef[] = [
118-
{
119-
...baseColDef,
120-
field: 'crId',
121-
type: 'number',
122-
headerName: 'ID',
123-
maxWidth: 75
124-
},
121+
idColumn,
125122
{
126123
...baseColDef,
127124
field: 'type',
@@ -131,29 +128,7 @@ const ChangeRequestsTable: React.FC = () => {
131128
maxWidth: 150
132129
},
133130
{ ...baseColDef, field: 'carNumber', headerName: 'Car #', type: 'number', maxWidth: 50 },
134-
{
135-
...baseColDef,
136-
field: 'wbs',
137-
headerName: 'WBS',
138-
filterable: true,
139-
sortable: true,
140-
maxWidth: 300,
141-
valueGetter: (params) => `${wbsPipe(params.value.wbsNum)} - ${params.value.name}`,
142-
sortComparator: (_v1, _v2, param1, param2) => {
143-
const wbs1: WbsNumber = validateWBS((param1.value as string).split(' ')[0]);
144-
const wbs2: WbsNumber = validateWBS((param2.value as string).split(' ')[0]);
145-
146-
if (wbs1.carNumber !== wbs2.carNumber) {
147-
return wbs1.carNumber - wbs2.carNumber;
148-
} else if (wbs1.projectNumber !== wbs2.projectNumber) {
149-
return wbs1.projectNumber - wbs2.projectNumber;
150-
} else if (wbs1.workPackageNumber !== wbs2.workPackageNumber) {
151-
return wbs1.workPackageNumber - wbs2.workPackageNumber;
152-
} else {
153-
return 0;
154-
}
155-
}
156-
},
131+
wbsColumn,
157132
{
158133
...baseColDef,
159134
field: 'dateSubmitted',
@@ -162,20 +137,8 @@ const ChangeRequestsTable: React.FC = () => {
162137
valueFormatter: (params) => datePipe(params.value),
163138
maxWidth: 200
164139
},
165-
{
166-
...baseColDef,
167-
field: 'submitter',
168-
headerName: 'Submitter',
169-
maxWidth: 200
170-
},
171-
{
172-
...baseColDef,
173-
field: 'dateReviewed',
174-
headerName: 'Date Reviewed',
175-
type: 'date',
176-
valueFormatter: (params) => (params.value ? datePipe(params.value) : ''),
177-
maxWidth: 200
178-
},
140+
submitterColumn,
141+
dateReviewedColumn,
179142
{
180143
...baseColDef,
181144
field: 'reviewer',

0 commit comments

Comments
 (0)