update create challenge form's next button functionality

maproulette · Feb 15, 2024 · af0baf6 · af0baf6
1 parent 97d6a4a
commit af0baf6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/components/AdminPane/Manage/ManageChallenges/EditChallenge/EditChallenge.js b/src/components/AdminPane/Manage/ManageChallenges/EditChallenge/EditChallenge.js
@@ -289,13 +289,13 @@ export class EditChallenge extends Component {
     (this.validationPromise || Promise.resolve())
       .then(() => {
         this.isFinishing ? this.finish() : nextStep();
-        window.scrollTo(0, 0);
+      window.scrollTo(0, 0);
         return false;
       })
       .catch((err) => {
-        console.log(err);
+      console.log(err);
       }); // Stay on current step if validation fails
-      
+
     return false;
   };
 
@@ -758,6 +758,10 @@ export class EditChallenge extends Component {
                         this.isFinishing = false;
                         prevStep(stepName);
                       }}
+                      nextStep={() => {
+                        this.isFinishing = false;
+                        nextStep();
+                      }}
                       finish={() => {
                         this.isFinishing = true;
                         this.handleSubmit();
@@ -967,13 +971,16 @@ export class EditChallenge extends Component {
                         </div>
                       )}
 
-                    {/* Note: Next button submits the form, so nextStep isn't used here */}
                     <StepNavigation
                       activeStep={activeStep}
                       prevStep={(stepName) => {
                         this.isFinishing = false;
                         prevStep(stepName);
                       }}
+                      nextStep={() => {
+                        this.isFinishing = false;
+                        nextStep();
+                      }}
                       finish={() => {
                         this.isFinishing = true;
                         this.handleSubmit();

diff --git a/src/components/AdminPane/Manage/StepNavigation/StepNavigation.js b/src/components/AdminPane/Manage/StepNavigation/StepNavigation.js
@@ -37,8 +37,8 @@ export default class StepNavigation extends Component {
 
           {_isString(this.props.activeStep.next) &&
            <button
-             type="submit"
              className="mr-button mr-button--green-lighter mr-button--with-icon mr-mr-4"
+             onClick={() => this.props.nextStep()}
            >
              <FormattedMessage {...messages.next} />
              <SvgSymbol