From 60cdb1cee3c1f2e991d6d3c195a68777e21c5624 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 6 Mar 2025 18:55:02 -0500 Subject: [PATCH] Fix navigating between steps on start from scratch flow --- .../src/steps/UploadFlow.tsx | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/inventory/src/lib/react-spreadsheet-import/src/steps/UploadFlow.tsx b/inventory/src/lib/react-spreadsheet-import/src/steps/UploadFlow.tsx index cc565fb..0f50a15 100644 --- a/inventory/src/lib/react-spreadsheet-import/src/steps/UploadFlow.tsx +++ b/inventory/src/lib/react-spreadsheet-import/src/steps/UploadFlow.tsx @@ -213,12 +213,16 @@ export const UploadFlow = ({ state, onNext, onBack }: Props) => { return ( { - if (onBack) { - // When going back, preserve the global selections - setPersistedGlobalSelections(state.globalSelections) - onBack() + // If we started from scratch, we need to go back to the upload step + if (state.isFromScratch) { + onNext({ + type: StepType.upload + }); + } else if (onBack) { + // Use the provided onBack function + onBack(); } }} onNext={(validatedData) => { @@ -226,7 +230,7 @@ export const UploadFlow = ({ state, onNext, onBack }: Props) => { onNext({ type: StepType.imageUpload, data: validatedData, - file: uploadedFile!, + file: uploadedFile || new File([], "empty.xlsx"), globalSelections: state.globalSelections }); }} @@ -238,21 +242,13 @@ export const UploadFlow = ({ state, onNext, onBack }: Props) => { { - if (onBack) { - onNext({ - type: StepType.validateData, - data: state.data, - globalSelections: state.globalSelections - }) - } - }} + onBack={onBack} onSubmit={(data, file) => { // Create a Result object from the array data const result = { - validData: data, - invalidData: [], - all: data + validData: data as Data[], + invalidData: [] as Data[], + all: data as Data[] }; onSubmit(result, file); }}