Merge pull request #157 from bcgov/quantity-below-zero-fix

Quantity gives error message if it is below zero
bcgov · Aug 17, 2022 · 93083dc · 93083dc
2 parents 3b73dac + de31c4c
commit 93083dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/components/formik/FormikContainer.jsx b/src/components/formik/FormikContainer.jsx
@@ -187,7 +187,13 @@ export const FormikContainer = (props) => {
           );
         }}
       </Formik>
-      {errorMessage ? (
+      {errorMessage && formFields[1].name === 'title' ? (
+        <Alert severity="error">
+          <AlertTitle>Error</AlertTitle>
+          Software Title already in use.
+        </Alert>
+      ) : null}
+      {errorMessage && formFields[2].name === 'email' ? (
         <Alert severity="error">
           <AlertTitle>Error</AlertTitle>
           Email already in use.

diff --git a/src/hooks/useSoftware/softwareFields.js b/src/hooks/useSoftware/softwareFields.js
@@ -1,3 +1,4 @@
+import * as Yup from 'yup';
 import { DateCell } from '../../components/common/DateCell';
 import { LogoAvatar } from '../../components/common/LogoAvatar';
 import { QuantityAssigned } from '../../components/common/QuantityAssigned';
@@ -26,6 +27,7 @@ export const softwareFields = [
     form: {
       control: 'text',
       fullWidth: true,
+      validation: Yup.string().required('Required'),
       show: true,
       sortOrder: 0,
       column: 0,
@@ -83,6 +85,7 @@ export const softwareFields = [
     form: {
       control: 'number',
       show: true,
+      validation: Yup.number().min(0, 'Quantity cannot be below zero.'),
       sortOrder: 0,
       column: 0,
     },