Skip to content
Snippets Groups Projects
Commit b3413b32 authored by Bogdan Cochior's avatar Bogdan Cochior
Browse files

feat(review): add conditional validation

parent 0ae0ac02
No related branches found
No related tags found
1 merge request!8Sprint #10
import React, { Fragment } from 'react' import React, { Fragment } from 'react'
import { isEmpty } from 'lodash'
import { connect } from 'react-redux' import { connect } from 'react-redux'
import { required } from 'xpub-validators' import { required } from 'xpub-validators'
import { withJournal } from 'xpub-journal' import { withJournal } from 'xpub-journal'
...@@ -115,7 +116,7 @@ const ReviewerReportForm = ({ ...@@ -115,7 +116,7 @@ const ReviewerReportForm = ({
/> />
)} )}
name="public" name="public"
validate={[]} validate={isEmpty(formValues.files) ? [required] : []}
/> />
</FullWidth> </FullWidth>
</Row> </Row>
...@@ -232,14 +233,10 @@ export default compose( ...@@ -232,14 +233,10 @@ export default compose(
changeField: ({ changeForm }) => (field, value) => { changeField: ({ changeForm }) => (field, value) => {
changeForm('reviewerReport', field, value) changeForm('reviewerReport', field, value)
}, },
addFile: ({ addFile: ({ formValues = {}, uploadFile, changeForm, version }) => file => {
formValues: { files = [] },
uploadFile,
changeForm,
version,
}) => file => {
uploadFile(file, 'review', version.id) uploadFile(file, 'review', version.id)
.then(file => { .then(file => {
const files = formValues.files || []
const newFiles = [...files, file] const newFiles = [...files, file]
setTimeout(() => { setTimeout(() => {
......
...@@ -140,7 +140,7 @@ const onChange = ( ...@@ -140,7 +140,7 @@ const onChange = (
const newValues = parseReviewRequest(values) const newValues = parseReviewRequest(values)
const prevValues = parseReviewRequest(previousValues) const prevValues = parseReviewRequest(previousValues)
if (!isEqual(newValues, prevValues) && !isEmpty(prevValues)) { if (!isEqual(newValues, prevValues)) {
dispatch(autosaveRequest()) dispatch(autosaveRequest())
if (newValues.id) { if (newValues.id) {
updateRecommendation(project.id, version.id, newValues) updateRecommendation(project.id, version.id, newValues)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment