feat: add validation for project forms

Chia-Network · Feb 14, 2022 · 3cd19f0 · 3cd19f0
1 parent a573faf
commit 3cd19f0
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 36 deletions.
diff --git a/src/components/forms/CreateLocationsForm.js b/src/components/forms/CreateLocationsForm.js
@@ -94,7 +94,7 @@ const CreateLocationsForm = ({ value, onChange }) => {
             <StyledLabelContainer>
               <Body>
                 <LabelContainer>
-                  <FormattedMessage id="in-country-region" />
+                  *<FormattedMessage id="in-country-region" />
                 </LabelContainer>
                 <ToolTipContainer
                   tooltip={intl.formatMessage({

diff --git a/src/components/forms/CreateProjectForm.js b/src/components/forms/CreateProjectForm.js
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
 import { useDispatch, useSelector } from 'react-redux';
 import { withRouter } from 'react-router-dom';
@@ -31,7 +31,7 @@ import {
   locationsSchema,
   estimationsSchema,
   ratingsSchema,
-  // projectSchema,
+  projectSchema,
 } from '../../store/validations';
 
 const StyledFormContainer = styled('div')`
@@ -54,8 +54,6 @@ const CreateProjectForm = withRouter(
     const dispatch = useDispatch();
     const intl = useIntl();
     const { notification } = useSelector(state => state.app);
-    const labelRef = useRef();
-    const issuanceRef = useRef();
 
     const [newProject, setNewProject] = useState({
       registryOfOrigin: '',
@@ -146,7 +144,7 @@ const CreateProjectForm = withRouter(
       }
 
       if (!_.isEmpty(newIssuance)) {
-        dataToSend.issuance = newIssuance;
+        dataToSend.issuances = newIssuance;
       }
 
       if (!_.isEmpty(newCoBenefits)) {
@@ -169,14 +167,13 @@ const CreateProjectForm = withRouter(
         dataToSend.projectRatings = ratingsState;
       }
 
-      // const projectIsValid = await projectSchema.isValid(dataToSend);
+      const projectIsValid = await projectSchema.isValid(dataToSend);
 
-      // if (projectIsValid) {
-      // console.log('project is valid');
-      dispatch(postNewProject(dataToSend));
-      // } else {
-      // console.log('project is invalid');
-      // }
+      if (projectIsValid) {
+        dispatch(postNewProject(dataToSend));
+      } else {
+        console.log('project is invalid');
+      }
     };
 
     const projectWasSuccessfullyCreated =
@@ -243,14 +240,12 @@ const CreateProjectForm = withRouter(
                   <LabelsRepeater
                     labelsState={newLabels}
                     newLabelsState={setNewLabels}
-                    labelRef={labelRef}
                   />
                 </TabPanel>
                 <TabPanel value={tabValue} index={2}>
                   <IssuanceRepeater
                     issuanceState={newIssuance}
                     newIssuanceState={setNewIssuance}
-                    issuanceRef={issuanceRef}
                   />
                 </TabPanel>
                 <TabPanel value={tabValue} index={3}>

diff --git a/src/components/forms/CreateRelatedProjectsForm.js b/src/components/forms/CreateRelatedProjectsForm.js
@@ -48,7 +48,7 @@ const CreateRelatedProjectsForm = ({ value, onChange }) => {
             <StyledLabelContainer>
               <Body>
                 <LabelContainer>
-                  <FormattedMessage id="related-project-id" />
+                  *<FormattedMessage id="related-project-id" />
                 </LabelContainer>
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
@@ -82,7 +82,7 @@ const CreateRelatedProjectsForm = ({ value, onChange }) => {
             <StyledLabelContainer>
               <Body>
                 <LabelContainer>
-                  <FormattedMessage id="relationship-type" />
+                  *<FormattedMessage id="relationship-type" />
                 </LabelContainer>
                 <ToolTipContainer
                   tooltip={intl.formatMessage({
@@ -116,7 +116,7 @@ const CreateRelatedProjectsForm = ({ value, onChange }) => {
             <StyledLabelContainer>
               <Body>
                 <LabelContainer>
-                  <FormattedMessage id="registry" />
+                  *<FormattedMessage id="registry" />
                 </LabelContainer>
                 <ToolTipContainer
                   tooltip={intl.formatMessage({

diff --git a/src/store/validations/labels.validation.js b/src/store/validations/labels.validation.js
@@ -9,6 +9,7 @@ export const labelSchema = yup.object().shape({
     .required('Required Field'),
   creditingPeriodEndDate: yup
     .date()
+    .min(yup.ref('creditingPeriodStartDate'))
     .typeError('Invalid Date')
     .required('Required Field'),
   validityPeriodStartDate: yup
@@ -17,6 +18,7 @@ export const labelSchema = yup.object().shape({
     .required('Required Field'),
   validityPeriodEndDate: yup
     .date()
+    .min(yup.ref('validityPeriodStartDate'))
     .typeError('Invalid Date')
     .required('Required Field'),
   unitQuantity: yup

diff --git a/src/store/validations/locations.validations.js b/src/store/validations/locations.validations.js
@@ -3,7 +3,7 @@ import * as yup from 'yup';
 export const locationSchema = yup.object({
   id: yup.string().optional(),
   country: yup.string().required('Required Field'),
-  inCountryRegion: yup.string().optional(),
+  inCountryRegion: yup.string().required('Required Field'),
   geographicIdentifier: yup.string().required('Required Field'),
   updatedAt: yup.date().optional(),
   createdAt: yup.date().optional(),

diff --git a/src/store/validations/project.validations.js b/src/store/validations/project.validations.js
@@ -1,16 +1,11 @@
 import * as yup from 'yup';
-
-/*
-import {
-  labelSchema,
-  issuanceSchema,
-  coBenefitSchema,
-  locationSchema,
-  relatedProjectSchema,
-  estimationSchema,
-  ratingSchema,
-} from './';
-*/
+import { coBenefitSchema } from './co-benefits.validation';
+import { estimationSchema } from './estimations.validation';
+import { issuanceSchema } from './Issuances.validations';
+import { labelSchema } from './labels.validation';
+import { locationSchema } from './locations.validations';
+import { ratingSchema } from './ratings.validation';
+import { relatedProjectSchema } from './relatedProjects.validation';
 
 export const projectDetailsSchema = yup.object().shape({
   registryOfOrigin: yup.string().required('Required Field'),
@@ -37,7 +32,6 @@ export const projectDetailsSchema = yup.object().shape({
   validationDate: yup.date().optional(),
 });
 
-/*
 export const projectSchema = yup.object().shape({
   registryOfOrigin: yup.string().required('Required Field'),
   originProjectId: yup.string().required('Required Field'),
@@ -69,4 +63,3 @@ export const projectSchema = yup.object().shape({
   estimations: yup.array().of(estimationSchema).optional(),
   projectRatings: yup.array().of(ratingSchema).optional(),
 });
-*/
diff --git a/src/store/validations/relatedProjects.validation.js b/src/store/validations/relatedProjects.validation.js
@@ -2,9 +2,9 @@ import * as yup from 'yup';
 
 export const relatedProjectSchema = yup.object({
   id: yup.string().optional(),
-  relatedProjectId: yup.string().optional(),
-  relationshipType: yup.string().optional(),
-  registry: yup.string().optional(),
+  relatedProjectId: yup.string().required('Required Field'),
+  relationshipType: yup.string().required('Required Field'),
+  registry: yup.string().required('Required Field'),
   updatedAt: yup.date().optional(),
   createdAt: yup.date().optional(),
 });