Skip to content

Commit a804d84

Browse files
authored
Merge pull request #4078 from Northeastern-Electric-Racing/3972-maintenance---reimbursement-move-up-createedit-ordering-purchased-items
#3972 changed append method to prepend method in rrform.tsx and in al…
2 parents 75c4bf4 + 54c4a88 commit a804d84

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ interface ReimbursementRequestFormViewProps {
7171
reimbursementProducts: ReimbursementProductFormArgs[];
7272
receiptPrepend: (args: ReimbursementReceiptUploadArgs) => void;
7373
receiptRemove: (index: number) => void;
74-
reimbursementProductAppend: (args: ReimbursementProductFormArgs) => void;
74+
reimbursementProductPrepend: (args: ReimbursementProductFormArgs) => void;
7575
reimbursementProductRemove: (index: number) => void;
7676
onSubmit: (data: ReimbursementRequestFormInput) => void;
7777
handleSubmit: UseFormHandleSubmit<ReimbursementRequestFormInput>;
@@ -98,7 +98,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
9898
control,
9999
receiptPrepend,
100100
receiptRemove,
101-
reimbursementProductAppend,
101+
reimbursementProductPrepend,
102102
reimbursementProductRemove,
103103
onSubmit,
104104
handleSubmit,
@@ -900,7 +900,7 @@ const ReimbursementRequestFormView: React.FC<ReimbursementRequestFormViewProps>
900900
<ReimbursementProductTable
901901
errors={errors}
902902
reimbursementProducts={reimbursementProducts}
903-
appendProduct={reimbursementProductAppend}
903+
prependProduct={reimbursementProductPrepend}
904904
removeProduct={reimbursementProductRemove}
905905
projectAutocompleteOptions={projectAutocompleteOptions}
906906
watch={watch}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import CreateMaterialModal from '../../ProjectDetailPage/ProjectViewContainer/BO
4545
interface ReimbursementProductTableProps {
4646
reimbursementProducts: ReimbursementProductFormArgs[];
4747
removeProduct: (index: number) => void;
48-
appendProduct: (args: ReimbursementProductFormArgs) => void;
48+
prependProduct: (args: ReimbursementProductFormArgs) => void;
4949
projectAutocompleteOptions: {
5050
label: string;
5151
id: string;
@@ -145,7 +145,7 @@ const MaterialAutocomplete: React.FC<{
145145
const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
146146
reimbursementProducts,
147147
removeProduct,
148-
appendProduct,
148+
prependProduct,
149149
projectAutocompleteOptions,
150150
control,
151151
errors,
@@ -403,7 +403,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
403403
options={projectAutocompleteOptions}
404404
onChange={(_e, value) => {
405405
if (value) {
406-
appendProduct({
406+
prependProduct({
407407
reason: validateWBS(value.id),
408408
name: '',
409409
cost: 0,
@@ -428,7 +428,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
428428
getOptionLabel={(option) => formatReasonName(option.name)}
429429
onChange={(_e, value) => {
430430
if (value) {
431-
appendProduct({
431+
prependProduct({
432432
reason: value,
433433
name: '',
434434
cost: 0,
@@ -834,7 +834,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
834834
onClick={(e) => {
835835
const existingProducts = uniqueWbsElementsWithProducts.get(key);
836836
if (existingProducts && existingProducts.length > 0) {
837-
appendProduct({
837+
prependProduct({
838838
reason: existingProducts[0].reason,
839839
name: '',
840840
cost: 0,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ const ReimbursementRequestForm: React.FC<ReimbursementRequestFormProps> = ({
180180
});
181181
const {
182182
fields: reimbursementProducts,
183-
append: reimbursementProductAppend,
183+
prepend: reimbursementProductPrepend,
184184
remove: reimbursementProductRemove
185185
} = useFieldArray({
186186
control,
@@ -356,7 +356,7 @@ const ReimbursementRequestForm: React.FC<ReimbursementRequestFormProps> = ({
356356
reimbursementProducts={reimbursementProducts}
357357
receiptPrepend={receiptPrepend}
358358
receiptRemove={receiptRemove}
359-
reimbursementProductAppend={reimbursementProductAppend}
359+
reimbursementProductPrepend={reimbursementProductPrepend}
360360
reimbursementProductRemove={reimbursementProductRemove}
361361
onSubmit={onSubmitWrapper}
362362
handleSubmit={handleSubmit}

0 commit comments

Comments
 (0)