From f138a323a44d9d065c36a1d3a92aa8b5003eb86e Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 6 Sep 2018 11:48:14 +0300
Subject: [PATCH] fix(submission-flow): add initial values for the two new
radio groups
---
packages/component-wizard/src/components/StepTwo.js | 1 -
.../component-wizard/src/components/SubmissionWizard.js | 3 +--
packages/component-wizard/src/components/utils.js | 6 +++++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/packages/component-wizard/src/components/StepTwo.js b/packages/component-wizard/src/components/StepTwo.js
index 519712e13..96e4e033e 100644
--- a/packages/component-wizard/src/components/StepTwo.js
+++ b/packages/component-wizard/src/components/StepTwo.js
@@ -22,7 +22,6 @@ const StepTwo = ({
addAuthor,
changeForm,
formValues,
- hasConflicts,
authorsError,
manuscriptTypes,
...rest
diff --git a/packages/component-wizard/src/components/SubmissionWizard.js b/packages/component-wizard/src/components/SubmissionWizard.js
index a2379d079..d3b6de029 100644
--- a/packages/component-wizard/src/components/SubmissionWizard.js
+++ b/packages/component-wizard/src/components/SubmissionWizard.js
@@ -130,7 +130,7 @@ export default compose(
},
),
withStateHandlers(
- { step: 1 },
+ { step: 0 },
{
nextStep: ({ step }) => () => ({
step: Math.min(wizardSteps.length - 1, step + 1),
@@ -155,7 +155,6 @@ export default compose(
authorsError:
(submitFailed && get(formSyncErrors, 'authors', '')) ||
reduxAuthorError,
- hasConflicts: get(formValues, 'conflicts.hasConflicts', 'no') === 'yes',
}),
),
withHandlers({
diff --git a/packages/component-wizard/src/components/utils.js b/packages/component-wizard/src/components/utils.js
index 86d2812f6..8a222fc6e 100644
--- a/packages/component-wizard/src/components/utils.js
+++ b/packages/component-wizard/src/components/utils.js
@@ -20,7 +20,11 @@ export const setInitialValues = ({ version }) => ({
files: get(version, 'files', {}),
authors: get(version, 'authors', []),
metadata: get(version, 'metadata', {}),
- conflicts: get(version, 'conflicts', { hasConflicts: 'no' }),
+ conflicts: get(version, 'conflicts', {
+ hasConflicts: 'no',
+ hasDataAvailability: 'yes',
+ hasFunding: 'yes',
+ }),
declarations: get(version, 'declarations', { agree: false }),
},
})
--
GitLab