Skip to content

#3888 Create New Material Button for RR Form #3976

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
chpy04 merged 5 commits into from
Feb 21, 2026
Merged

#3888 Create New Material Button for RR Form #3976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65255bd
#3888 added create material button for rr form
rbessin Feb 16, 2026
9442e50
#3888 fixed linting errors
rbessin Feb 16, 2026
cd25f2f
fixed type issues
rbessin Feb 18, 2026
5569e59
#3888 fixed variable naming
rbessin Feb 21, 2026
fb1e1bf
#3888 fixed prettier error
rbessin Feb 21, 2026
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
26 changes: 10 additions & 16 deletions src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementFormView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ import {
IndexCode,
isHead,
MAX_FILE_SIZE,
ProjectPreview,
ReimbursementProductFormArgs,
ReimbursementReceiptUploadArgs,
Vendor,
WbsNumber,
wbsPipe
Vendor
} from 'shared';
import { ClearIcon, DatePicker } from '@mui/x-date-pickers';
import ReimbursementProductTable from './ReimbursementProductTable';
Expand All @@ -50,7 +49,6 @@ import React, { useState, useEffect, useMemo, useRef } from 'react';
import { useToast } from '../../../hooks/toasts.hooks';
import { Link as RouterLink } from 'react-router-dom';
import { routes } from '../../../utils/routes';
import { wbsNumComparator } from 'shared';
import { codeAndRefundSourceName, accountCodePipe } from '../../../utils/pipes';
import { imagePreviewUrl } from '../../../utils/reimbursement-request.utils';
import { useCreateVendor } from '../../../hooks/finance.hooks';
Expand All @@ -64,9 +62,10 @@ interface ReimbursementRequestFormViewProps {
allVendors: Vendor[];
allAccountCodes: AccountCode[];
receiptFiles: ReimbursementReceiptUploadArgs[];
allWbsElements: {
wbsNum: WbsNumber;
wbsName: string;
allProjects: ProjectPreview[];
projectAutocompleteOptions: {
label: string;
id: string;
}[];
control: Control<ReimbursementRequestFormInput, any>;
reimbursementProducts: ReimbursementProductFormArgs[];
Expand All @@ -92,7 +91,8 @@ interface ReimbursementRequestFormViewProps {
const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps> = ({
allVendors,
allAccountCodes,
allWbsElements,
allProjects,
projectAutocompleteOptions,
receiptFiles,
reimbursementProducts,
control,
Expand Down Expand Up @@ -227,13 +227,6 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
.reduce((acc: number, product: ReimbursementProductFormArgs) => acc + Number(product.cost), 0)
.toFixed(2);

const wbsElementAutocompleteOptions = allWbsElements.map((wbsElement) => ({
label: wbsPipe(wbsElement.wbsNum) + ' - ' + wbsElement.wbsName,
id: wbsPipe(wbsElement.wbsNum)
}));

wbsElementAutocompleteOptions.sort((wbsNum1, wbsNum2) => wbsNumComparator(wbsNum1.id, wbsNum2.id));

const { isLoading, isError, error, data: financeDelegates } = useGetFinanceDelegates();

if (isLoading || !financeDelegates) {
Expand Down Expand Up @@ -850,7 +843,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
reimbursementProducts={reimbursementProducts}
appendProduct={reimbursementProductAppend}
removeProduct={reimbursementProductRemove}
wbsElementAutocompleteOptions={wbsElementAutocompleteOptions}
projectAutocompleteOptions={projectAutocompleteOptions}
watch={watch}
register={register}
setValue={setValue}
Expand All @@ -860,6 +853,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
secondRefundSourceIndexCode={secondRefundSourcePassed}
firstRefundSourceName={firstRefundSource.name}
secondRefundSourceName={secondRefundSource.name}
allProjects={allProjects}
/>
<FormHelperText error>{errors.reimbursementProducts?.message}</FormHelperText>
</FormControl>
Expand Down
Loading