From 55b59ad9635e6db09d8613034a80f1115cc9e535 Mon Sep 17 00:00:00 2001 From: ibolton336 Date: Tue, 8 Aug 2023 14:40:02 -0400 Subject: [PATCH] Move the wizard reset methods into one function Signed-off-by: ibolton336 --- .../analysis-wizard/analysis-wizard.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx index 7d56f6f04d..21cbdf6b9f 100644 --- a/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx +++ b/client/src/app/pages/applications/analysis-wizard/analysis-wizard.tsx @@ -280,16 +280,18 @@ export const AnalysisWizard: React.FC = ({ }; const isModeValid = applications.every((app) => isModeSupported(app, mode)); + const resetWizard = () => { + setCurrentTaskgroup(null); + reset(); + onClose(); + }; const onSubmit = (fieldValues: AnalysisWizardFormValues) => { if (currentTaskgroup) { const taskgroup = setupTaskgroup(currentTaskgroup, fieldValues); - submitTaskgroup(taskgroup); } - setCurrentTaskgroup(null); - reset(); - onClose(); + resetWizard(); }; const onMove: WizardStepFunctionType = ( @@ -305,12 +307,10 @@ export const AnalysisWizard: React.FC = ({ }; const handleClose = () => { - reset(); if (currentTaskgroup && currentTaskgroup.id) { deleteTaskgroup(currentTaskgroup.id); - setCurrentTaskgroup(null); } - onClose(); + resetWizard(); }; const analyzableApplications = useAnalyzableApplications(applications, mode);