Merge pull request #1139 from chaotixkilla/feat-dont-allow-same-name-custom-reqs

Error out on same name custom info requests creation

new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/CustomInfoRequests.js

@@ -276,6 +276,7 @@ const CustomInfoRequests = ({
             }}
             toBeEdited={toBeEdited}
             onSave={(...args) => handleSave(...args)}
+            existingRequirements={customRequests}
           />
         )}
 

new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Forms/NameOfRequirement.js

@@ -1,4 +1,5 @@
 import { Field } from 'formik'
+import * as R from 'ramda'
 import React from 'react'
 import * as Yup from 'yup'
 
@@ -25,8 +26,19 @@ const NameOfRequirement = () => {
   )
 }
 
-const validationSchema = Yup.object().shape({
-  requirementName: Yup.string().required()
+const validationSchema = existingRequirements =>
+  Yup.object().shape({
+    requirementName: Yup.string()
+      .required('A requirement name is required')
+      .test(
+        'unique-name',
+        'A custom information requirement with that name already exists',
+        (value, _context) =>
+          !R.includes(
+            value,
+            R.map(it => it.customRequest.name, existingRequirements)
+          )
+      )
   })
 
 const defaultValues = {

new-lamassu-admin/src/pages/Triggers/CustomInfoRequests/Wizard.js

@@ -53,11 +53,11 @@ const styles = {
 
 const useStyles = makeStyles(styles)
 
-const getStep = step => {
+const getStep = (step, existingRequirements) => {
   switch (step) {
     case 1:
       return {
-        schema: nameOfReqSchema,
+        schema: nameOfReqSchema(existingRequirements),
         Component: NameOfRequirement
       }
     case 2:
@@ -162,11 +162,18 @@ const chooseNotNull = (a, b) => {
   return a
 }
 
-const Wizard = ({ onClose, error = false, toBeEdited, onSave, hasError }) => {
+const Wizard = ({
+  onClose,
+  error = false,
+  toBeEdited,
+  onSave,
+  hasError,
+  existingRequirements
+}) => {
   const classes = useStyles()
   const isEditing = !R.isNil(toBeEdited)
   const [step, setStep] = useState(isEditing ? 1 : 0)
-  const stepOptions = getStep(step)
+  const stepOptions = getStep(step, existingRequirements)
   const isLastStep = step === LAST_STEP
 
   const onContinue = (values, actions) => {
@@ -226,15 +233,21 @@ const Wizard = ({ onClose, error = false, toBeEdited, onSave, hasError }) => {
             editingValues
           )}
           validationSchema={stepOptions.schema}>
+          {({ errors }) => (
             <Form className={classes.form} id={'custom-requirement-form'}>
               <stepOptions.Component />
               <div className={classes.submit}>
-              {hasError && <ErrorMessage>Failed to save</ErrorMessage>}
+                {(hasError || !R.isEmpty(errors)) && (
+                  <ErrorMessage>
+                    {R.head(R.values(errors)) ?? `Failed to save`}
+                  </ErrorMessage>
+                )}
                 <Button className={classes.button} type="submit">
                   {isLastStep ? 'Save' : 'Next'}
                 </Button>
               </div>
             </Form>
+          )}
         </Formik>
       )}
     </Modal>