Skip to content

Commit 5569e59

Browse files
committed
#3888 fixed variable naming
1 parent cd25f2f commit 5569e59

3 files changed

Lines changed: 19 additions & 20 deletions

File tree

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementFormView.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ interface ReimbursementRequestFormViewProps {
6262
allVendors: Vendor[];
6363
allAccountCodes: AccountCode[];
6464
receiptFiles: ReimbursementReceiptUploadArgs[];
65-
allWbsElements: ProjectPreview[];
66-
wbsElementAutocompleteOptions: {
65+
allProjects: ProjectPreview[];
66+
projectAutocompleteOptions: {
6767
label: string;
6868
id: string;
6969
}[];
@@ -91,8 +91,8 @@ interface ReimbursementRequestFormViewProps {
9191
const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps> = ({
9292
allVendors,
9393
allAccountCodes,
94-
allWbsElements,
95-
wbsElementAutocompleteOptions,
94+
allProjects,
95+
projectAutocompleteOptions,
9696
receiptFiles,
9797
reimbursementProducts,
9898
control,
@@ -843,7 +843,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
843843
reimbursementProducts={reimbursementProducts}
844844
appendProduct={reimbursementProductAppend}
845845
removeProduct={reimbursementProductRemove}
846-
wbsElementAutocompleteOptions={wbsElementAutocompleteOptions}
846+
projectAutocompleteOptions={projectAutocompleteOptions}
847847
watch={watch}
848848
register={register}
849849
setValue={setValue}
@@ -853,7 +853,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
853853
secondRefundSourceIndexCode={secondRefundSourcePassed}
854854
firstRefundSourceName={firstRefundSource.name}
855855
secondRefundSourceName={secondRefundSource.name}
856-
allWbsElements={allWbsElements}
856+
allProjects={allProjects}
857857
/>
858858
<FormHelperText error>{errors.reimbursementProducts?.message}</FormHelperText>
859859
</FormControl>

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementProductTable.tsx

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ interface ReimbursementProductTableProps {
4545
reimbursementProducts: ReimbursementProductFormArgs[];
4646
removeProduct: (index: number) => void;
4747
appendProduct: (args: ReimbursementProductFormArgs) => void;
48-
wbsElementAutocompleteOptions: {
48+
projectAutocompleteOptions: {
4949
label: string;
5050
id: string;
5151
}[];
@@ -59,7 +59,7 @@ interface ReimbursementProductTableProps {
5959
secondRefundSourceIndexCode?: IndexCode;
6060
firstRefundSourceName?: string;
6161
secondRefundSourceName?: string;
62-
allWbsElements: ProjectPreview[];
62+
allProjects: ProjectPreview[];
6363
}
6464

6565
const ListItem = styled('li')(({ theme }) => ({
@@ -70,7 +70,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
7070
reimbursementProducts,
7171
removeProduct,
7272
appendProduct,
73-
wbsElementAutocompleteOptions,
73+
projectAutocompleteOptions,
7474
control,
7575
errors,
7676
setValue,
@@ -80,7 +80,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
8080
firstRefundSourceName,
8181
secondRefundSourceName,
8282
watch,
83-
allWbsElements
83+
allProjects
8484
}) => {
8585
const uniqueWbsElementsWithProducts = new Map<
8686
string,
@@ -158,12 +158,11 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
158158
}
159159
};
160160

161-
const handleOpenCreateMaterial = (productIndex: number, wbsNumber: WbsNumber) => {
162-
const project = allWbsElements.find(
161+
const handleOpenCreateMaterial = (productIndex: number, projectWbsNum: WbsNumber) => {
162+
const project = allProjects.find(
163163
(proj) =>
164-
proj.wbsNum.carNumber === wbsNumber.carNumber &&
165-
proj.wbsNum.projectNumber === wbsNumber.projectNumber &&
166-
proj.wbsNum.workPackageNumber === wbsNumber.workPackageNumber
164+
proj.wbsNum.carNumber === projectWbsNum.carNumber &&
165+
proj.wbsNum.projectNumber === projectWbsNum.projectNumber
167166
);
168167

169168
if (project) {
@@ -333,7 +332,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
333332
>
334333
<Autocomplete
335334
sx={{ flex: 1 }}
336-
options={wbsElementAutocompleteOptions}
335+
options={projectAutocompleteOptions}
337336
onChange={(_e, value) => {
338337
if (value) {
339338
appendProduct({
@@ -403,7 +402,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
403402
}}
404403
>
405404
{
406-
wbsElementAutocompleteOptions
405+
projectAutocompleteOptions
407406
.concat(
408407
(otherReasons || []).map((reason) => ({
409408
id: reason.name,

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementRequestForm.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ const ReimbursementRequestForm: React.FC<ReimbursementRequestFormProps> = ({
283283
}
284284
};
285285

286-
const wbsElementAutocompleteOptions = allProjects.map((proj) => ({
286+
const projectAutocompleteOptions = allProjects.map((proj) => ({
287287
label: wbsPipe(proj.wbsNum) + ' - ' + proj.name,
288288
id: wbsPipe(proj.wbsNum)
289289
}));
@@ -355,8 +355,8 @@ const ReimbursementRequestForm: React.FC<ReimbursementRequestFormProps> = ({
355355
reimbursementProductRemove={reimbursementProductRemove}
356356
onSubmit={onSubmitWrapper}
357357
handleSubmit={handleSubmit}
358-
allWbsElements={allProjects}
359-
wbsElementAutocompleteOptions={wbsElementAutocompleteOptions}
358+
allProjects={allProjects}
359+
projectAutocompleteOptions={projectAutocompleteOptions}
360360
submitText={submitText}
361361
setValue={setValue}
362362
hasSecureSettingsSet={hasSecureSettingsSet}

0 commit comments

Comments
 (0)