Modify stepper to be linear

frontend/src/components/Stepper.js

@@ -2,127 +2,77 @@ import * as React from 'react';
 import Box from '@mui/material/Box';
 import Stepper from '@mui/material/Stepper';
 import Step from '@mui/material/Step';
-import StepButton from '@mui/material/StepButton';
+import StepLabel from '@mui/material/StepLabel';
 import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
 
 import LocationStep from './steps/Location'
 import SoilStep from './steps/Soil'
 import ResultsStep from './steps/Results'
 
-export default function StepperWizard(props) {
+const steps = [
-  const [activeStep, setActiveStep] = React.useState(0);
-  const [completed, setCompleted] = React.useState({});
-
-  const steps = [
     {'label': 'Select location', 'component': LocationStep },
     {'label': 'Choose soil', 'component': SoilStep },
     {'label': 'Choose habitat', 'component': SoilStep },
     {'label': 'Select zone', 'component': SoilStep },
     {'label': 'Project specifics', 'component': SoilStep },
     {'label': 'Summary', 'component': SoilStep }
-  ];
+];
 
-  const totalSteps = () => {
+export default function StepperWizard(props) {
-    return steps.length;
+  const [activeStep, setActiveStep] = React.useState(0);
-  };
-
-  const completedSteps = () => {
-    return Object.keys(completed).length;
-  };
-
-  const isLastStep = () => {
-    return activeStep === totalSteps() - 1;
-  };
-
-  const allStepsCompleted = () => {
-    return completedSteps() === totalSteps();
-  };
 
   const handleNext = () => {
-    const newActiveStep =
+    setActiveStep((prevActiveStep) => prevActiveStep + 1);
-      isLastStep() && !allStepsCompleted()
-        ? // It's the last step, but not all steps have been completed,
-          // find the first step that has been completed
-          steps.findIndex((step, i) => !(i in completed))
-        : activeStep + 1;
-    setActiveStep(newActiveStep);
   };
 
   const handleBack = () => {
     setActiveStep((prevActiveStep) => prevActiveStep - 1);
   };
 
-  const handleStep = (step) => () => {
-    setActiveStep(step);
-  };
-
-  const handleComplete = () => {
-    const newCompleted = completed;
-    newCompleted[activeStep] = true;
-    setCompleted(newCompleted);
-    handleNext();
-  };
-
   const handleReset = () => {
     setActiveStep(0);
-    setCompleted({});
   };
 
-  let CurrentStep = activeStep > totalSteps() ? steps[activeStep].component : steps[totalSteps()-1].component;
+  let CurrentStep = activeStep >= steps.length ? steps[steps.length-1].component : steps[activeStep].component;
 
   return (
     <Box sx={{ width: '100%' }}>
-      <Stepper nonLinear activeStep={activeStep}>
+      <Stepper activeStep={activeStep}>
-        {steps.map((step, index) => (
+        {steps.map((step, index) => {
-          <Step key={step.label} completed={completed[index]}>
+          return (
-            <StepButton color="inherit" onClick={handleStep(index)}>
+            <Step key={step.label}>
-              {step.label}
+              <StepLabel>{step.label}</StepLabel>
-            </StepButton>
+            </Step>
-          </Step>
+          );
-        ))}
+        })}
       </Stepper>
-      <div>
+      {activeStep === steps.length ? (
-        {allStepsCompleted() ? (
+        <React.Fragment>
-          <React.Fragment>
+          <ResultsStep {...props} />
-            <ResultsStep {...props} />
+          <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2 }}>
-            <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2 }}>
+            <Box sx={{ flex: '1 1 auto' }} />
-              <Box sx={{ flex: '1 1 auto' }} />
+            <Button onClick={handleReset}>Reset</Button>
-              <Button onClick={handleReset}>Reset</Button>
+          </Box>
-            </Box>
+        </React.Fragment>
-          </React.Fragment>
+      ) : (
-        ) : (
+        <React.Fragment>
-          <React.Fragment>
+          <CurrentStep {...props} />
-            <CurrentStep {...props} />
+          <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2 }}>
-            <Box sx={{ display: 'flex', flexDirection: 'row', pt: 2 }}>
+            <Button
-              <Button
+              color="inherit"
-                color="inherit"
+              disabled={activeStep === 0}
-                disabled={activeStep === 0}
+              onClick={handleBack}
-                onClick={handleBack}
+              sx={{ mr: 1 }}
-                sx={{ mr: 1 }}
+            >
-              >
+              Back
-                Back
+            </Button>
-              </Button>
+            <Box sx={{ flex: '1 1 auto' }} />
-              <Box sx={{ flex: '1 1 auto' }} />
+            <Button onClick={handleNext}>
-              <Button onClick={handleNext} sx={{ mr: 1 }}>
+              {activeStep === steps.length - 1 ? 'Finish' : 'Next'}
-                Next
+            </Button>
-              </Button>
+          </Box>
-              {activeStep !== steps.length &&
+        </React.Fragment>
-                (completed[activeStep] ? (
+      )}
-                  <Typography variant="caption" sx={{ display: 'inline-block' }}>
-                    Step {activeStep + 1} already completed
-                  </Typography>
-                ) : (
-                  <Button onClick={handleComplete}>
-                    {completedSteps() === totalSteps() - 1
-                      ? 'Finish'
-                      : 'Complete Step'}
-                  </Button>
-                ))}
-            </Box>
-          </React.Fragment>
-        )}
-      </div>
     </Box>
   );
 }