fix(submission flow): fix radio groups, remove unused code, add margin to comma

packages/component-faraday-ui/src/AuthorTag.js

@@ -31,6 +31,7 @@ const Root = styled.div`
   height: calc(${th('gridUnit')} * 3);
 
   margin-left: calc(${th('gridUnit')} / 2);
+  margin-right: calc(${th('gridUnit')} / 4);
 
   ${Tag} {
     margin-left: calc(${th('gridUnit')} / 2);

packages/component-faraday-ui/src/AuthorTagList.js

@@ -108,32 +108,6 @@ export default compose(
       : authors,
     affiliationList:
       withAffiliations && get(parsedAffiliations, 'affiliations', []),
-    plm: authors.reduce(
-      (acc, curr) => {
-        if (acc.affiliations.includes(curr.affiliation)) {
-          acc.authors = [
-            ...acc.authors,
-            {
-              ...curr,
-              affiliationNumber:
-                acc.affiliations.findIndex(e => e === curr.affiliation) + 1,
-            },
-          ]
-        } else {
-          acc.affiliations = [...acc.affiliations, curr.affiliation]
-          acc.authors = [
-            ...acc.authors,
-            {
-              ...curr,
-              affiliationNumber:
-                acc.affiliations.findIndex(e => e === curr.affiliation) + 1,
-            },
-          ]
-        }
-        return acc
-      },
-      { affiliations: [], authors: [] },
-    ),
   })),
 )(AuthorTagList)
 

packages/component-wizard/src/components/StepTwo.js

@@ -106,7 +106,6 @@ const StepTwo = ({
       formValues={formValues}
       radioFieldName="conflicts.hasDataAvailability"
       radioLabel="Have you included a data availability statement in your manuscript?"
-      required
       tooltipContent={DataAvailabilityTooltip}
     />
     <RadioWithComments
@@ -116,7 +115,6 @@ const StepTwo = ({
       formValues={formValues}
       radioFieldName="conflicts.hasFunding"
       radioLabel="Have you provided a funding statement in your manuscript?"
-      required
       tooltipContent={FundingTooltip}
     />
   </Fragment>

packages/component-wizard/src/components/utils.js

@@ -22,8 +22,8 @@ export const setInitialValues = ({ version }) => ({
     metadata: get(version, 'metadata', {}),
     conflicts: get(version, 'conflicts', {
       hasConflicts: 'no',
-      hasDataAvailability: 'yes',
-      hasFunding: 'yes',
+      hasDataAvailability: '',
+      hasFunding: '',
     }),
     declarations: get(version, 'declarations', { agree: false }),
   },

packages/xpub-faraday/config/validations.js

@@ -37,9 +37,9 @@ module.exports = {
       conflicts: Joi.object({
         hasConflicts: Joi.any().valid(['yes', 'no']),
         message: Joi.string(),
-        hasDataAvailability: Joi.any().valid(['yes', 'no']),
+        hasDataAvailability: Joi.any().valid(['yes', 'no', '']),
         dataAvailabilityMessage: Joi.string(),
-        hasFunding: Joi.any().valid(['yes', 'no']),
+        hasFunding: Joi.any().valid(['yes', 'no', '']),
         fundingMessage: Joi.string(),
       }),
       commentsToReviewers: Joi.string(),