Merge branch 'master' into developer-staging

tieme-ndo · Sep 20, 2019 · 196db6d · 196db6d
2 parents 48bdd4a + 4ced9ec
commit 196db6d
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 8 deletions.
diff --git a/src/components/pages/AddStaff/AddStaff.js b/src/components/pages/AddStaff/AddStaff.js
@@ -10,6 +10,7 @@ function AddStaff() {
   const [state, updateState] = useState({
     username: '',
     password: '',
+    confirmPassword: '',
     isAdmin: false,
     createAccount: false,
     errors: {}
@@ -36,7 +37,8 @@ function AddStaff() {
 
     const credential = {
       username: state.username,
-      password: state.password
+      password: state.password,
+      confirmPassword: state.confirmPassword
     };
 
     const { errors, isValid } = await validateAddStaffForm(credential);
@@ -49,6 +51,16 @@ function AddStaff() {
       }));
     }
 
+    if (state.password !== state.confirmPassword) {
+      return updateState(prevState => ({
+        ...prevState,
+        createAccount: false,
+        password: '',
+        confirmPassword: '',
+        errors: [{ password: 'Passwords do not match' }]
+      }));
+    }
+
     const response = await registrationHandler({
       username: state.username,
       password: state.password,
@@ -69,7 +81,8 @@ function AddStaff() {
 
       return updateState(prevState => ({
         ...prevState,
-        createAccount: false
+        createAccount: false,
+        errors: {}
       }));
     } else if (response === 'New user created') {
       toast.success('New user created');
@@ -78,6 +91,7 @@ function AddStaff() {
         ...prevState,
         username: '',
         password: '',
+        confirmPassword: '',
         isAdmin: false,
         createAccount: false
       }));

diff --git a/src/components/pages/AddStaff/AddStaff.spec.js b/src/components/pages/AddStaff/AddStaff.spec.js
@@ -9,6 +9,8 @@ it('renders without crashing', () => {
   expect(usernameField).toBeInTheDocument();
   const passwordField = getByTestId('password-field');
   expect(passwordField).toBeInTheDocument();
+  const confirmPasswordField = getByTestId('confirm-password-field');
+  expect(confirmPasswordField).toBeInTheDocument();
   const adminCheckbox = getByTestId('admin-checkbox');
   expect(adminCheckbox).toBeInTheDocument();
 });
diff --git a/src/components/pages/AddStaff/AddStaffForm.js b/src/components/pages/AddStaff/AddStaffForm.js
@@ -67,6 +67,18 @@ const AddStaff = props => {
                     data-testid="password-field"
                   />
                 </Form.Field>
+                <Form.Field>
+                  <label htmlFor="confirmPassword">Confirm Password</label>
+                  <Form.Input
+                    fluid
+                    id="confirmPassword"
+                    name="confirmPassword"
+                    type="password"
+                    value={state.confirmPassword}
+                    onChange={handleChange}
+                    data-testid="confirm-password-field"
+                  />
+                </Form.Field>
                 <Form.Field>
                   <Checkbox
                     label="Check this box to make this user Admin"
@@ -88,8 +100,8 @@ const AddStaff = props => {
                     content="Loading..."
                   />
                 ) : (
-                  <Button color="teal" fluid content="Add Staff" />
-                )}
+                    <Button color="teal" fluid content="Add Staff" />
+                  )}
               </Segment>
             </Form>
           </Grid.Column>

diff --git a/src/components/pages/AddStaff/AddStaffValidation.js b/src/components/pages/AddStaff/AddStaffValidation.js
@@ -8,6 +8,12 @@ const addStaffSchema = yup.object().shape({
     .trim()
     .required(),
   password: yup
+    .string()
+    .min(6)
+    .max(40)
+    .required(),
+
+  confirmPassword: yup
     .string()
     .min(6)
     .max(40)

diff --git a/src/components/pages/EditCollection/EditCollection.js b/src/components/pages/EditCollection/EditCollection.js
@@ -6,12 +6,12 @@ import styled from 'styled-components';
 import uuid from 'uuid';
 import PropTypes from 'prop-types';
 import moment from 'moment';
-import { toast } from 'react-toastify';
 import {
   getChangeRequestById,
   approveChangeRequest,
   rejectChangeRequest
 } from '../../../utils/handlers/changeRequestHandler';
+import { toast } from 'react-toastify';
 
 const Div = styled.div`
   strike {
@@ -60,8 +60,14 @@ const EditCollection = ({ match, history, appStateShouldUpdate }) => {
           };
         });
       })
-      .catch(err => toast.error(err.message));
-  }, [match]);
+      .catch(() => {
+        toast.error(
+          'Network Error when retrieving change request. Redirecting to Dashboard'
+        );
+        // If no request is found with that ID
+        history.push('/');
+      });
+  }, [match, history]);
 
   const { data, cleanedData } = state;
 

diff --git a/src/utils/handlers/changeRequestHandler.js b/src/utils/handlers/changeRequestHandler.js
@@ -29,7 +29,7 @@ export const getChangeRequestById = requestId => {
       }
     })
     .catch(error => {
-      return new Error(error);
+      throw new Error(error.response.data.message);
     });
 };