From aa8e2ed5f1c49d37fff0e6e8f928814e23cd359d Mon Sep 17 00:00:00 2001
From: Tomas Nygren <tomasnygren.854@gmail.com>
Date: Wed, 5 Aug 2020 12:16:06 +1000
Subject: [PATCH] fix: reset lab state when navigation from lab form (#2268)

---
 src/labs/lab-slice.ts               | 6 ++++++
 src/labs/requests/NewLabRequest.tsx | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/labs/lab-slice.ts b/src/labs/lab-slice.ts
index c57ea7b165..b0dbbe808c 100644
--- a/src/labs/lab-slice.ts
+++ b/src/labs/lab-slice.ts
@@ -126,6 +126,12 @@ export const requestLab = (newLab: Lab, onSuccess?: (lab: Lab) => void): AppThun
   }
 }
 
+export const resetLab = (): AppThunk => async (dispatch) => {
+  const labRequestError: Error = {}
+  dispatch(requestLabError(labRequestError))
+  dispatch(fetchLabStart())
+}
+
 export const cancelLab = (labToCancel: Lab, onSuccess?: (lab: Lab) => void): AppThunk => async (
   dispatch,
 ) => {
diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx
index 833fa8a71e..775911ed13 100644
--- a/src/labs/requests/NewLabRequest.tsx
+++ b/src/labs/requests/NewLabRequest.tsx
@@ -1,5 +1,5 @@
 import { Typeahead, Label, Button, Alert } from '@hospitalrun/components'
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
 
@@ -12,7 +12,7 @@ import useTranslator from '../../shared/hooks/useTranslator'
 import Lab from '../../shared/model/Lab'
 import Patient from '../../shared/model/Patient'
 import { RootState } from '../../shared/store'
-import { requestLab } from '../lab-slice'
+import { requestLab, resetLab } from '../lab-slice'
 
 const NewLabRequest = () => {
   const { t } = useTranslator()
@@ -28,6 +28,10 @@ const NewLabRequest = () => {
     status: 'requested',
   })
 
+  useEffect(() => {
+    dispatch(resetLab())
+  }, [dispatch])
+
   const breadcrumbs = [
     {
       i18nKey: 'labs.requests.new',