Merge pull request #2544 from riiniii/fix/2540

fix(ImagingRequest): imaging table requestedBy show current usr

package.json

@@ -160,4 +160,4 @@
  "git add ."
  ]
  }
-}
+}

src/__tests__/imagings/hooks/useRequestImaging.test.tsx

@@ -5,6 +5,7 @@ import { ImagingRequestError } from '../../../imagings/util/validate-imaging-req
 import * as imagingRequestValidator from '../../../imagings/util/validate-imaging-request'
 import ImagingRepository from '../../../shared/db/ImagingRepository'
 import Imaging from '../../../shared/model/Imaging'
+import { UserState, LoginError } from '../../../user/user-slice'
 import executeMutation from '../../test-utils/use-mutation.util'
 
 describe('useReportIncident', () => {
@@ -13,6 +14,13 @@ describe('useReportIncident', () => {
  console.error = jest.fn()
  })
 
+ const user = {
+ fullName: 'test',
+ id: 'test-hospitalrun',
+ permissions: [],
+ loginError: {} as LoginError,
+ } as UserState
+
  it('should save the imaging request with correct data', async () => {
  const expectedDate = new Date(Date.now())
  Date.now = jest.fn().mockReturnValue(expectedDate)
@@ -28,11 +36,12 @@ describe('useReportIncident', () => {
  const expectedImagingRequest = {
  ...givenImagingRequest,
  requestedOn: expectedDate.toISOString(),
- requestedBy: 'test',
+ requestedBy: 'test-hospitalrun',
+ requestedByFullName: 'test',
  } as Imaging
  jest.spyOn(ImagingRepository, 'save').mockResolvedValue(expectedImagingRequest)
 
- await executeMutation(() => useRequestImaging(), givenImagingRequest)
+ await executeMutation(() => useRequestImaging(user), givenImagingRequest)
  expect(ImagingRepository.save).toHaveBeenCalledTimes(1)
  expect(ImagingRepository.save).toBeCalledWith(expectedImagingRequest)
  })
@@ -46,7 +55,7 @@ describe('useReportIncident', () => {
  jest.spyOn(ImagingRepository, 'save').mockResolvedValue({} as Imaging)
 
  try {
- await executeMutation(() => useRequestImaging(), {})
+ await executeMutation(() => useRequestImaging(user), {})
  } catch (e) {
  expect(e).toEqual(expectedImagingRequestError)
  expect(ImagingRepository.save).not.toHaveBeenCalled()

src/__tests__/imagings/requests/NewImagingRequest.test.tsx

@@ -19,6 +19,7 @@ import ImagingRepository from '../../../shared/db/ImagingRepository'
 import Imaging from '../../../shared/model/Imaging'
 import Patient from '../../../shared/model/Patient'
 import { RootState } from '../../../shared/store'
+import { UserState, LoginError } from '../../../user/user-slice'
 
 const mockStore = createMockStore<RootState, any>([thunk])
 
@@ -35,7 +36,13 @@ describe('New Imaging Request', () => {
 
  history = createMemoryHistory()
  history.push(`/imaging/new`)
- const store = mockStore({} as any)
+ const store = mockStore({
+ user: {
+ fullName: 'test',
+ permissions: [],
+ loginError: {} as LoginError,
+ } as UserState,
+ } as any)
 
  let wrapper: any
  await act(async () => {

src/imagings/hooks/useRequestImaging.tsx

@@ -14,22 +14,25 @@ export interface ImagingRequest {
  type: string
 }
 
-async function requestImaging(request: ImagingRequest): Promise<void> {
- const error = validateImagingRequest(request)
+function requestImagingWrapper(user: any) {
+ return async function requestImaging(request: ImagingRequest): Promise<void> {
+ const error = validateImagingRequest(request)
 
- if (!isEmpty(error)) {
- throw error
- }
+  if (!isEmpty(error)) {
+  throw error
+  }
 
- await ImagingRepository.save({
- ...request,
- requestedBy: 'test',
- requestedOn: new Date(Date.now()).toISOString(),
- } as Imaging)
+ await ImagingRepository.save({
+ ...request,
+ requestedBy: user?.id || '',
+ requestedByFullName: user?.fullName || '',
+ requestedOn: new Date(Date.now()).toISOString(),
+ } as Imaging)
+ }
 }
 
-export default function useRequestImaging() {
- return useMutation(requestImaging, {
+export default function useRequestImaging(user: any) {
+ return useMutation(requestImagingWrapper(user), {
  onSuccess: async () => {
  await queryCache.invalidateQueries('imagings')
  },

src/imagings/requests/NewImagingRequest.tsx

@@ -1,6 +1,7 @@
 import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'
 import format from 'date-fns/format'
 import React, { useState, useEffect } from 'react'
+import { useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
 
 import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'
@@ -13,17 +14,20 @@ import TextInputWithLabelFormGroup from '../../shared/components/input/TextInput
 import PatientRepository from '../../shared/db/PatientRepository'
 import useTranslator from '../../shared/hooks/useTranslator'
 import Patient from '../../shared/model/Patient'
+import { RootState } from '../../shared/store'
 import useRequestImaging, { ImagingRequest } from '../hooks/useRequestImaging'
 import { ImagingRequestError } from '../util/validate-imaging-request'
 
 const NewImagingRequest = () => {
  const { t } = useTranslator()
  const history = useHistory()
+ const { user } = useSelector((state: RootState) => state.user)
+
  const updateTitle = useUpdateTitle()
  useEffect(() => {
  updateTitle(t('imagings.requests.new'))
  })
- const [mutate] = useRequestImaging()
+ const [mutate] = useRequestImaging(user)
  const [error, setError] = useState<ImagingRequestError>()
  const [visitOption, setVisitOption] = useState([] as Option[])
 

src/imagings/search/ImagingRequestTable.tsx

@@ -37,7 +37,7 @@ const ImagingRequestTable = (props: Props) => {
  {
  label: t('imagings.imaging.requestedBy'),
  key: 'requestedBy',
- formatter: (row) => extractUsername(row.requestedBy),
+ formatter: (row) => extractUsername(row.requestedByFullName || ''),
  },
  { label: t('imagings.imaging.status'), key: 'status' },
  ]}

src/shared/model/Imaging.ts

@@ -9,6 +9,7 @@ export default interface Imaging extends AbstractDBModel {
  visitId: string
  requestedOn: string
  requestedBy: string // will be the currently logged in user's id
+ requestedByFullName?: string
  completedOn?: string
  canceledOn?: string
  notes?: string

src/user/user-slice.ts

@@ -6,13 +6,13 @@ import Permissions from '../shared/model/Permissions'
 import User from '../shared/model/User'
 import { AppThunk } from '../shared/store'
 
-interface LoginError {
+export interface LoginError {
  message?: string
  username?: string
  password?: string
 }
 
-interface UserState {
+export interface UserState {
  permissions: (Permissions | null)[]
  user?: User
  loginError?: LoginError