Merge branch 'feat-HospitalRun#1969' of https://github.com/akshay-ap/…

…hospitalrun-frontend into feat-HospitalRun#1969

package.json

@@ -9,11 +9,11 @@
     "@reduxjs/toolkit": "~1.3.0",
     "@types/escape-string-regexp": "~2.0.1",
     "@types/pouchdb-find": "~6.3.4",
-    "bootstrap": "~4.4.1",
+    "bootstrap": "~4.5.0",
     "date-fns": "~2.13.0",
     "escape-string-regexp": "~4.0.0",
     "i18next": "~19.4.0",
-    "i18next-browser-languagedetector": "~4.1.0",
+    "i18next-browser-languagedetector": "~4.2.0",
     "i18next-xhr-backend": "~3.2.2",
     "lodash": "^4.17.15",
     "node-sass": "~4.14.0",
@@ -71,7 +71,7 @@
     "@types/react-router-dom": "~5.1.0",
     "@types/redux-mock-store": "~1.0.1",
     "@types/shortid": "^0.0.29",
-    "@types/uuid": "^7.0.0",
+    "@types/uuid": "^8.0.0",
     "@types/validator": "~13.0.0",
     "@typescript-eslint/eslint-plugin": "~2.33.0",
     "@typescript-eslint/parser": "~2.33.0",

src/__tests__/incidents/incidents-slice.test.ts

@@ -3,10 +3,11 @@ import createMockStore from 'redux-mock-store'
 import thunk from 'redux-thunk'
 
 import IncidentRepository from '../../clients/db/IncidentRepository'
+import IncidentFilter from '../../incidents/IncidentFilter'
 import incidents, {
-  fetchIncidents,
   fetchIncidentsStart,
   fetchIncidentsSuccess,
+  searchIncidents,
 } from '../../incidents/incidents-slice'
 import Incident from '../../model/Incident'
 import { RootState } from '../../store'
@@ -39,12 +40,24 @@ describe('Incidents Slice', () => {
         jest.spyOn(IncidentRepository, 'findAll').mockResolvedValue(expectedIncidents)
         const store = mockStore()
 
-        await store.dispatch(fetchIncidents())
+        await store.dispatch(searchIncidents(IncidentFilter.all))
 
         expect(store.getActions()[0]).toEqual(fetchIncidentsStart())
         expect(IncidentRepository.findAll).toHaveBeenCalledTimes(1)
         expect(store.getActions()[1]).toEqual(fetchIncidentsSuccess(expectedIncidents))
       })
+
+      it('should fetch incidents filtering by status', async () => {
+        const expectedIncidents = [{ id: '123' }] as Incident[]
+        jest.spyOn(IncidentRepository, 'search').mockResolvedValue(expectedIncidents)
+        const store = mockStore()
+
+        await store.dispatch(searchIncidents(IncidentFilter.reported))
+
+        expect(store.getActions()[0]).toEqual(fetchIncidentsStart())
+        expect(IncidentRepository.search).toHaveBeenCalledTimes(1)
+        expect(store.getActions()[1]).toEqual(fetchIncidentsSuccess(expectedIncidents))
+      })
     })
   })
 })

src/__tests__/incidents/list/ViewIncidents.test.tsx

@@ -11,6 +11,7 @@ import thunk from 'redux-thunk'
 
 import * as breadcrumbUtil from '../../../breadcrumbs/useAddBreadcrumbs'
 import IncidentRepository from '../../../clients/db/IncidentRepository'
+import IncidentFilter from '../../../incidents/IncidentFilter'
 import ViewIncidents from '../../../incidents/list/ViewIncidents'
 import Incident from '../../../model/Incident'
 import Permissions from '../../../model/Permissions'
@@ -42,6 +43,7 @@ describe('View Incidents', () => {
     jest.spyOn(titleUtil, 'default')
     jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)
     jest.spyOn(IncidentRepository, 'findAll').mockResolvedValue(expectedIncidents)
+    jest.spyOn(IncidentRepository, 'search').mockResolvedValue(expectedIncidents)
 
     history = createMemoryHistory()
     history.push(`/incidents`)
@@ -72,7 +74,27 @@ describe('View Incidents', () => {
     wrapper.update()
     return wrapper
   }
+  it('should filter incidents by status=reported on first load ', async () => {
+    const wrapper = await setup([Permissions.ViewIncidents])
+    const filterSelect = wrapper.find('select')
+    expect(filterSelect.props().value).toBe(IncidentFilter.reported)
 
+    expect(IncidentRepository.search).toHaveBeenCalled()
+    expect(IncidentRepository.search).toHaveBeenCalledWith({ status: IncidentFilter.reported })
+  })
+  it('should call IncidentRepository after changing filter', async () => {
+    const wrapper = await setup([Permissions.ViewIncidents])
+    const filterSelect = wrapper.find('select')
+
+    expect(IncidentRepository.findAll).not.toHaveBeenCalled()
+
+    filterSelect.simulate('change', { target: { value: IncidentFilter.all } })
+    expect(IncidentRepository.findAll).toHaveBeenCalled()
+    filterSelect.simulate('change', { target: { value: IncidentFilter.reported } })
+
+    expect(IncidentRepository.search).toHaveBeenCalledTimes(2)
+    expect(IncidentRepository.search).toHaveBeenLastCalledWith({ status: IncidentFilter.reported })
+  })
   describe('layout', () => {
     it('should set the title', async () => {
       await setup([Permissions.ViewIncidents])

src/clients/db/IncidentRepository.ts

@@ -1,11 +1,29 @@
 import { incidents } from '../../config/pouchdb'
+import IncidentFilter from '../../incidents/IncidentFilter'
 import Incident from '../../model/Incident'
 import Repository from './Repository'
 
+interface SearchOptions {
+  status: IncidentFilter
+}
 class IncidentRepository extends Repository<Incident> {
   constructor() {
     super(incidents)
   }
+
+  async search(options: SearchOptions): Promise<Incident[]> {
+    return super.search(IncidentRepository.getSearchCriteria(options))
+  }
+
+  private static getSearchCriteria(options: SearchOptions): any {
+    const statusFilter = options.status !== IncidentFilter.all ? [{ status: options.status }] : []
+    const selector = {
+      $and: statusFilter,
+    }
+    return {
+      selector,
+    }
+  }
 }
 
 export default new IncidentRepository()

src/incidents/IncidentFilter.ts

@@ -0,0 +1,6 @@
+enum IncidentFilter {
+  reported = 'reported',
+  all = 'all',
+}
+
+export default IncidentFilter

src/incidents/incidents-slice.ts

@@ -3,6 +3,7 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import IncidentRepository from '../clients/db/IncidentRepository'
 import Incident from '../model/Incident'
 import { AppThunk } from '../store'
+import IncidentFilter from './IncidentFilter'
 
 interface IncidentsState {
   incidents: Incident[]
@@ -34,10 +35,16 @@ const incidentSlice = createSlice({
 
 export const { fetchIncidentsStart, fetchIncidentsSuccess } = incidentSlice.actions
 
-export const fetchIncidents = (): AppThunk => async (dispatch) => {
+export const searchIncidents = (status: IncidentFilter): AppThunk => async (dispatch) => {
   dispatch(fetchIncidentsStart())
-
-  const incidents = await IncidentRepository.findAll()
+  let incidents
+  if (status === IncidentFilter.all) {
+    incidents = await IncidentRepository.findAll()
+  } else {
+    incidents = await IncidentRepository.search({
+      status,
+    })
+  }
 
   dispatch(fetchIncidentsSuccess(incidents))
 }

src/incidents/list/ViewIncidents.tsx

@@ -1,53 +1,80 @@
 import format from 'date-fns/format'
-import React, { useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
 
+import SelectWithLabelFormGroup from '../../components/input/SelectWithLableFormGroup'
 import Incident from '../../model/Incident'
 import useTitle from '../../page-header/useTitle'
 import { RootState } from '../../store'
-import { fetchIncidents } from '../incidents-slice'
+import IncidentFilter from '../IncidentFilter'
+import { searchIncidents } from '../incidents-slice'
 
 const ViewIncidents = () => {
   const { t } = useTranslation()
   const history = useHistory()
   const dispatch = useDispatch()
   useTitle(t('incidents.reports.label'))
-
+  const [searchFilter, setSearchFilter] = useState(IncidentFilter.reported)
   const { incidents } = useSelector((state: RootState) => state.incidents)
 
   useEffect(() => {
-    dispatch(fetchIncidents())
-  }, [dispatch])
+    dispatch(searchIncidents(searchFilter))
+  }, [dispatch, searchFilter])
 
   const onTableRowClick = (incident: Incident) => {
     history.push(`incidents/${incident.id}`)
   }
 
+  const onFilterChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+    setSearchFilter(event.target.value as IncidentFilter)
+  }
+
+  const filterOptions = Object.values(IncidentFilter).map((filter) => ({
+    label: t(`incidents.status.${filter}`),
+    value: `${filter}`,
+  }))
+
   return (
-    <table className="table table-hover">
-      <thead className="thead-light">
-        <tr>
-          <th>{t('incidents.reports.code')}</th>
-          <th>{t('incidents.reports.dateOfIncident')}</th>
-          <th>{t('incidents.reports.reportedBy')}</th>
-          <th>{t('incidents.reports.reportedOn')}</th>
-          <th>{t('incidents.reports.status')}</th>
-        </tr>
-      </thead>
-      <tbody>
-        {incidents.map((incident: Incident) => (
-          <tr onClick={() => onTableRowClick(incident)} key={incident.id}>
-            <td>{incident.code}</td>
-            <td>{format(new Date(incident.date), 'yyyy-MM-dd hh:mm a')}</td>
-            <td>{incident.reportedBy}</td>
-            <td>{format(new Date(incident.reportedOn), 'yyyy-MM-dd hh:mm a')}</td>
-            <td>{incident.status}</td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
+    <>
+      <div className="row">
+        <div className="col-md-3 col-lg-2">
+          <SelectWithLabelFormGroup
+            name="type"
+            value={searchFilter}
+            label={t('incidents.filterTitle')}
+            isEditable
+            options={filterOptions}
+            onChange={onFilterChange}
+          />
+        </div>
+      </div>
+      <div className="row">
+        <table className="table table-hover">
+          <thead className="thead-light">
+            <tr>
+              <th>{t('incidents.reports.code')}</th>
+              <th>{t('incidents.reports.dateOfIncident')}</th>
+              <th>{t('incidents.reports.reportedBy')}</th>
+              <th>{t('incidents.reports.reportedOn')}</th>
+              <th>{t('incidents.reports.status')}</th>
+            </tr>
+          </thead>
+          <tbody>
+            {incidents.map((incident: Incident) => (
+              <tr onClick={() => onTableRowClick(incident)} key={incident.id}>
+                <td>{incident.code}</td>
+                <td>{format(new Date(incident.date), 'yyyy-MM-dd hh:mm a')}</td>
+                <td>{incident.reportedBy}</td>
+                <td>{format(new Date(incident.reportedOn), 'yyyy-MM-dd hh:mm a')}</td>
+                <td>{incident.status}</td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+    </>
   )
 }