@openmrs/esm-ward-app 9.2.1-pre.7455 → 9.2.1-pre.7460

package/src/ward-workspace/ward-patient-notes/history/note.component.tsx

@@ -1,8 +1,27 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import dayjs from 'dayjs';
 import { useTranslation } from 'react-i18next';
-import { SkeletonText, Tile } from '@carbon/react';
+import {
+  SkeletonText,
+  Tile,
+  OverflowMenu,
+  OverflowMenuItem,
+  Stack,
+  TextArea,
+  Button,
+  Layer,
+  InlineLoading,
+} from '@carbon/react';
+import {
+  getCoreTranslation,
+  isDesktop,
+  showModal,
+  showSnackbar,
+  useEmrConfiguration,
+  useLayoutType,
+} from '@openmrs/esm-framework';
 import { type PatientNote } from '../types';
+import { editPatientNote } from '../notes.resource';
 import styles from './styles.scss';
 
 export const InPatientNoteSkeleton: React.FC = () => {
@@ -20,27 +39,133 @@ export const InPatientNoteSkeleton: React.FC = () => {
 };
 
 interface InPatientNoteProps {
+  mutatePatientNotes(): void;
   note: PatientNote;
+  promptBeforeClosing(hasUnsavedChanges: boolean): void;
 }
 
-const InPatientNote: React.FC<InPatientNoteProps> = ({ note }) => {
+/**
+ * This component shows a note (obs) created with concept as either:
+ * - `consultFreeTextCommentsConcept` from emrapi configuration
+ * - one of the concepts defined in additionalInpatientNotesConceptUuids.
+ *
+ * Note that only notes with encounter type emrConfiguration.inpatientNoteEncounterType are creatable,
+ * editable and deletable from the ward app.
+ *
+ */
+const InPatientNote: React.FC<InPatientNoteProps> = ({ note, mutatePatientNotes, promptBeforeClosing }) => {
   const { t } = useTranslation();
   const formattedDate = note.encounterNoteRecordedAt
     ? dayjs(note.encounterNoteRecordedAt).format('dddd, D MMM YYYY')
     : '';
   const formattedTime = note.encounterNoteRecordedAt ? dayjs(note.encounterNoteRecordedAt).format('HH:mm') : '';
+  const [editMode, setEditMode] = useState(false);
+  const [editedNote, setEditedNote] = useState(note.encounterNote);
+  const isTablet = !isDesktop(useLayoutType());
+  const [isSaving, setIsSaving] = useState(false);
+  const { emrConfiguration } = useEmrConfiguration();
+  const isInpatientNoteEncounter = note.encounterTypeUuid === emrConfiguration?.inpatientNoteEncounterType?.uuid;
+
+  useEffect(() => {
+    promptBeforeClosing(editMode);
+  }, [editMode, promptBeforeClosing]);
+
+  const onSave = async () => {
+    try {
+      setIsSaving(true);
+      await editPatientNote(note.obsUuid, editedNote);
+      setEditMode(false);
+      showSnackbar({
+        isLowContrast: true,
+        kind: 'success',
+        subtitle: t('patientNoteNowVisible', 'It should be now visible in the notes history'),
+        title: t('visitNoteSaved', 'Patient note saved'),
+      });
+      mutatePatientNotes();
+    } catch (e) {
+      showSnackbar({
+        isLowContrast: true,
+        kind: 'error',
+        subtitle: e?.responseBody?.error?.translatedMessage ?? e?.responseBody?.error?.message,
+        title: t('errorSavingPatientNote', 'Error saving patient note'),
+      });
+    } finally {
+      setIsSaving(false);
+    }
+  };
 
   return (
-    <Tile className={styles.noteTile}>
-      <div className={styles.noteHeader}>
-        <span className={styles.noteProviderRole}>{t('note', 'Note')}</span>
-        <span className={styles.noteDateAndTime}>
-          {formattedDate}, {formattedTime}
-        </span>
-      </div>
-      <div className={styles.noteBody}>{note.encounterNote}</div>
-      <div className={styles.noteProviderName}>{note.encounterProvider}</div>
-    </Tile>
+    <div className={styles.noteTile}>
+      <Stack gap={4}>
+        <div className={styles.noteHeader}>
+          <span className={styles.noteDateAndTime}>
+            {formattedDate}, {formattedTime}
+          </span>
+          {isInpatientNoteEncounter && (
+            <OverflowMenu className={styles.overflowMenu} flipped>
+              {!editMode && note.obsUuid && (
+                <OverflowMenuItem
+                  aria-label={getCoreTranslation('edit')}
+                  id={'edit note-' + note.encounterUuid}
+                  className={styles.menuItem}
+                  hasDivider
+                  itemText={getCoreTranslation('edit')}
+                  onClick={() => {
+                    setEditMode(true);
+                  }}
+                />
+              )}
+              <OverflowMenuItem
+                aria-label={getCoreTranslation('delete')}
+                id={'delete-note-' + note.encounterUuid}
+                isDelete
+                className={styles.menuItem}
+                itemText={getCoreTranslation('delete')}
+                onClick={() => {
+                  const dispose = showModal('delete-note-modal', {
+                    close: () => dispose(),
+                    encounterUuid: note.encounterUuid,
+                    onDelete: () => mutatePatientNotes(),
+                  });
+                }}
+              />
+            </OverflowMenu>
+          )}
+        </div>
+        {editMode ? (
+          <Layer>
+            <Stack gap={3}>
+              <TextArea
+                className={styles.textArea}
+                rows={6}
+                value={editedNote}
+                onChange={(e) => setEditedNote(e.target.value)}
+                labelText={t('editNote', 'Edit note')}
+              />
+              <div className={styles.editButtons}>
+                <Button
+                  onClick={() => {
+                    setEditMode(false);
+                    setEditedNote(note.encounterNote); // Reset to original note on cancel
+                  }}
+                  kind={'secondary'}
+                  size={isTablet ? 'lg' : 'sm'}>
+                  {t('cancel', 'Cancel')}
+                </Button>
+                <Button onClick={onSave} kind={'primary'} size={isTablet ? 'lg' : 'sm'}>
+                  {isSaving ? <InlineLoading description={t('saving', 'Saving...')} /> : t('save', 'Save')}
+                </Button>
+              </div>
+            </Stack>
+          </Layer>
+        ) : (
+          <>
+            <div className={styles.noteBody}>{note.encounterNote}</div>
+            <div className={styles.noteProviderName}>{note.encounterProvider}</div>
+          </>
+        )}
+      </Stack>
+    </div>
   );
 };
 

package/src/ward-workspace/ward-patient-notes/history/notes-container.component.tsx

@@ -1,27 +1,28 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { type PatientUuid, useConfig } from '@openmrs/esm-framework';
+import { useConfig, useEmrConfiguration, type PatientUuid } from '@openmrs/esm-framework';
 import { usePatientNotes } from '../notes.resource';
 import InPatientNote, { InPatientNoteSkeleton } from './note.component';
 import styles from './styles.scss';
 import { InlineNotification } from '@carbon/react';
-import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
 import { type WardConfigObject } from '../../../config-schema';
 
 interface PatientNotesHistoryProps {
   patientUuid: PatientUuid;
   visitUuid: string;
+  promptBeforeClosing(hasUnsavedChanges: boolean): void;
 }
 
-const PatientNotesHistory: React.FC<PatientNotesHistoryProps> = ({ patientUuid, visitUuid }) => {
+const PatientNotesHistory: React.FC<PatientNotesHistoryProps> = ({ patientUuid, visitUuid, promptBeforeClosing }) => {
   const { t } = useTranslation();
   const { emrConfiguration, isLoadingEmrConfiguration } = useEmrConfiguration();
   const config = useConfig<WardConfigObject>();
 
-  const { patientNotes, isLoadingPatientNotes, errorFetchingPatientNotes } = usePatientNotes(patientUuid, visitUuid, [
-    emrConfiguration?.consultFreeTextCommentsConcept.uuid,
-    ...config.additionalInpatientNotesConceptUuids,
-  ]);
+  const { patientNotes, mutatePatientNotes, isLoadingPatientNotes, errorFetchingPatientNotes } = usePatientNotes(
+    patientUuid,
+    visitUuid,
+    [emrConfiguration?.consultFreeTextCommentsConcept.uuid, ...config.additionalInpatientNotesConceptUuids],
+  );
 
   const isLoading = isLoadingPatientNotes || isLoadingEmrConfiguration;
 
@@ -34,7 +35,12 @@ const PatientNotesHistory: React.FC<PatientNotesHistoryProps> = ({ patientUuid,
       </div>
       {isLoading ? [1, 2, 3, 4].map((item, index) => <InPatientNoteSkeleton key={index} />) : null}
       {patientNotes.map((patientNote) => (
-        <InPatientNote key={patientNote.id} note={patientNote} />
+        <InPatientNote
+          key={patientNote.encounterUuid}
+          note={patientNote}
+          mutatePatientNotes={mutatePatientNotes}
+          promptBeforeClosing={promptBeforeClosing}
+        />
       ))}
       {errorFetchingPatientNotes && (
         <InlineNotification

package/src/ward-workspace/ward-patient-notes/history/notes-container.test.tsx

@@ -2,16 +2,15 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import PatientNotesHistory from './notes-container.component';
 import { usePatientNotes } from '../notes.resource';
-import useEmrConfiguration from '../../../hooks/useEmrConfiguration';
 import { emrConfigurationMock } from '__mocks__';
-import { getDefaultsFromConfigSchema, useConfig } from '@openmrs/esm-framework';
+import { getDefaultsFromConfigSchema, useConfig, useEmrConfiguration } from '@openmrs/esm-framework';
 import { configSchema, type WardConfigObject } from '../../../config-schema';
+import { type PatientNote } from '../types';
 
 const mockUseConfig = jest.mocked(useConfig<WardConfigObject>);
 
 const mockedUseEmrConfiguration = jest.mocked(useEmrConfiguration);
-
-jest.mock('../../../hooks/useEmrConfiguration', () => jest.fn());
+const mockedUsePatientNotes = jest.mocked(usePatientNotes);
 
 jest.mock('../notes.resource', () => ({
   usePatientNotes: jest.fn(),
@@ -19,20 +18,24 @@ jest.mock('../notes.resource', () => ({
 
 const mockPatientUuid = 'sample-patient-uuid';
 
-const mockPatientNotes = [
+const mockPatientNotes: PatientNote[] = [
   {
-    id: 'note-1',
-    diagnoses: '',
+    encounterUuid: 'note-1',
     encounterNote: 'Patient shows improvement with current medication.',
     encounterNoteRecordedAt: '2024-08-01T12:34:56Z',
     encounterProvider: 'Dr. John Doe',
+    obsUuid: 'obsUuid1',
+    conceptUuid: 'concept1',
+    encounterTypeUuid: 'inpatientNoteEncounterTypeUuid',
   },
   {
-    id: 'note-2',
-    diagnoses: '',
+    encounterUuid: 'note-2',
     encounterNote: 'Blood pressure is slightly elevated. Consider adjusting medication.',
     encounterNoteRecordedAt: '2024-08-02T14:22:00Z',
     encounterProvider: 'Dr. Jane Smith',
+    obsUuid: 'obsUuid2',
+    conceptUuid: 'concept1',
+    encounterTypeUuid: 'inpatientNoteEncounterTypeUuid',
   },
 ];
 
@@ -50,12 +53,14 @@ describe('PatientNotesHistory', () => {
       errorFetchingEmrConfiguration: null,
     });
 
-    usePatientNotes.mockReturnValue({
+    mockedUsePatientNotes.mockReturnValue({
       patientNotes: [],
       isLoadingPatientNotes: true,
+      errorFetchingPatientNotes: undefined,
+      mutatePatientNotes: jest.fn(),
     });
 
-    render(<PatientNotesHistory patientUuid={mockPatientUuid} />);
+    render(<PatientNotesHistory patientUuid={mockPatientUuid} promptBeforeClosing={jest.fn()} visitUuid={''} />);
 
     expect(screen.getAllByTestId('in-patient-note-skeleton')).toHaveLength(4);
   });
@@ -68,12 +73,14 @@ describe('PatientNotesHistory', () => {
       errorFetchingEmrConfiguration: null,
     });
 
-    usePatientNotes.mockReturnValue({
+    mockedUsePatientNotes.mockReturnValue({
       patientNotes: mockPatientNotes,
       isLoadingPatientNotes: false,
+      errorFetchingPatientNotes: undefined,
+      mutatePatientNotes: jest.fn(),
     });
 
-    render(<PatientNotesHistory patientUuid={mockPatientUuid} />);
+    render(<PatientNotesHistory patientUuid={mockPatientUuid} promptBeforeClosing={jest.fn()} visitUuid={''} />);
 
     expect(screen.getByText('History')).toBeInTheDocument();
 

package/src/ward-workspace/ward-patient-notes/history/styles.scss

@@ -24,13 +24,13 @@
 .noteTile {
   padding: layout.$spacing-04;
   margin-bottom: layout.$spacing-04;
+  background-color: $ui-01;
 }
 
 .noteHeader {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: layout.$spacing-04;
 }
 
 .noteProviderRole {
@@ -41,8 +41,9 @@
 }
 
 .noteBody {
-  font-size: 0.875rem;
+  font-size: 1rem;
   color: $text-02;
+  white-space: pre-wrap;
 }
 
 .noteDateAndTime {
@@ -51,7 +52,7 @@
 }
 
 .noteProviderName {
-  font-size: layout.$spacing-04;
+  font-size: 0.75rem;
   margin-top: layout.$spacing-04;
   color: $text-02;
 }
@@ -59,3 +60,15 @@
 .noteSkeletonContainer {
   height: layout.$spacing-13;
 }
+
+.editFields {
+  display: flex;
+  flex-direction: column;
+  gap: layout.$spacing-03;
+}
+
+.editButtons {
+  display: flex;
+  gap: layout.$spacing-02;
+  justify-content: flex-end;
+}

package/src/ward-workspace/ward-patient-notes/notes.resource.ts

@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import { type EncounterPayload } from '../../types';
 import { type PatientNote, type RESTPatientNote, type UsePatientNotes } from './types';
 
-export function savePatientNote(payload: EncounterPayload, abortController: AbortController = new AbortController()) {
+export function createPatientNote(payload: EncounterPayload, abortController: AbortController = new AbortController()) {
   return openmrsFetch(`${restBaseUrl}/encounter`, {
     headers: {
       'Content-Type': 'application/json',
@@ -14,9 +14,19 @@ export function savePatientNote(payload: EncounterPayload, abortController: Abor
   });
 }
 
+export function editPatientNote(obsUuid: string, note: string) {
+  return openmrsFetch(`${restBaseUrl}/obs/${obsUuid}`, {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    method: 'POST',
+    body: { value: note },
+  });
+}
+
 export function usePatientNotes(patientUuid: string, visitUuid: string, conceptUuids: Array<string>): UsePatientNotes {
   const customRepresentation =
-    'custom:(uuid,patient:(uuid),obs:(uuid,concept:(uuid),obsDatetime,value:(uuid)),' +
+    'custom:(uuid,patient:(uuid),obs:(uuid,concept:(uuid),obsDatetime,value:(uuid)),encounterType,' +
     'encounterProviders:(uuid,provider:(uuid,person:(uuid,display)))';
   const encountersApiUrl = `${restBaseUrl}/encounter?patient=${patientUuid}&visit=${visitUuid}&v=${customRepresentation}`;
 
@@ -32,14 +42,17 @@ export function usePatientNotes(patientUuid: string, visitUuid: string, conceptU
               return encounter.obs?.reduce((acc, obs) => {
                 if (conceptUuids.includes(obs.concept.uuid)) {
                   acc.push({
-                    id: encounter.uuid,
+                    encounterUuid: encounter.uuid,
+                    obsUuid: obs.uuid,
                     encounterNote: obs ? obs.value : '',
                     encounterNoteRecordedAt: obs ? obs.obsDatetime : '',
                     encounterProvider: encounter.encounterProviders.map((ep) => ep.provider.person.display).join(', '),
+                    conceptUuid: obs.concept.uuid,
+                    encounterTypeUuid: encounter.encounterType.uuid,
                   });
                 }
                 return acc;
-              }, []);
+              }, [] as Array<PatientNote>);
             })
             .sort(
               (a, b) => new Date(b.encounterNoteRecordedAt).getTime() - new Date(a.encounterNoteRecordedAt).getTime(),

package/src/ward-workspace/ward-patient-notes/notes.scss

@@ -21,8 +21,12 @@
   color: colors.$gray-70;
 }
 
+.saveButtonContainer {
+  display: flex;
+  justify-content: flex-end;
+}
+
 .saveButton {
-  margin-left: layout.$spacing-04;
   display: flex;
   align-content: flex-start;
   align-items: baseline;

package/src/ward-workspace/ward-patient-notes/notes.test.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen } from '@testing-library/react';
 import { getDefaultsFromConfigSchema, showSnackbar, useConfig } from '@openmrs/esm-framework';
-import { savePatientNote, usePatientNotes } from './notes.resource';
+import { createPatientNote, usePatientNotes } from './notes.resource';
 import WardPatientNotesWorkspace from './notes.workspace';
 import { emrConfigurationMock, mockInpatientRequestAlice, mockPatientAlice } from '__mocks__';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
@@ -30,11 +30,11 @@ const testProps: WardPatientWorkspaceDefinition = {
   isRootWorkspace: false,
 };
 
-const mockSavePatientNote = savePatientNote as jest.Mock;
+const mockCreatePatientNote = createPatientNote as jest.Mock;
 const mockedShowSnackbar = jest.mocked(showSnackbar);
 
 jest.mock('./notes.resource', () => ({
-  savePatientNote: jest.fn(),
+  createPatientNote: jest.fn(),
   usePatientNotes: jest.fn(),
 }));
 
@@ -86,7 +86,7 @@ describe('<WardPatientNotesWorkspace>', () => {
       patient: mockPatientAlice.uuid,
     };
 
-    mockSavePatientNote.mockResolvedValue({ status: 201, body: 'Condition created' });
+    mockCreatePatientNote.mockResolvedValue({ status: 201, body: 'Condition created' });
 
     renderWardPatientNotesForm();
 
@@ -98,8 +98,8 @@ describe('<WardPatientNotesWorkspace>', () => {
     const submitButton = screen.getByRole('button', { name: /Save/i });
     await userEvent.click(submitButton);
 
-    expect(mockSavePatientNote).toHaveBeenCalledTimes(1);
-    expect(mockSavePatientNote).toHaveBeenCalledWith(expect.objectContaining(successPayload), new AbortController());
+    expect(mockCreatePatientNote).toHaveBeenCalledTimes(1);
+    expect(mockCreatePatientNote).toHaveBeenCalledWith(expect.objectContaining(successPayload), new AbortController());
   });
 
   test('renders an error snackbar if there was a problem recording a visit note', async () => {
@@ -111,7 +111,7 @@ describe('<WardPatientNotesWorkspace>', () => {
       },
     };
 
-    mockSavePatientNote.mockRejectedValueOnce(error);
+    mockCreatePatientNote.mockRejectedValueOnce(error);
     renderWardPatientNotesForm();
 
     const note = screen.getByRole('textbox', { name: /Write your notes/i });

package/src/ward-workspace/ward-patient-notes/notes.workspace.tsx

@@ -6,6 +6,7 @@ import { Controller, useForm } from 'react-hook-form';
 import { Button, Column, Form, InlineLoading, InlineNotification, Row, Stack, TextArea } from '@carbon/react';
 import {
   closeWorkspaceGroup2,
+  getCoreTranslation,
   ResponsiveWrapper,
   showSnackbar,
   translateFrom,
@@ -13,7 +14,7 @@ import {
   Workspace2,
 } from '@openmrs/esm-framework';
 import { moduleName } from '../../constant';
-import { savePatientNote } from './notes.resource';
+import { createPatientNote } from './notes.resource';
 import useEmrConfiguration from '../../hooks/useEmrConfiguration';
 import styles from './notes.scss';
 import { type WardPatientWorkspaceDefinition, type EncounterPayload } from '../../types';
@@ -39,7 +40,7 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
   const session = useSession();
 
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [rows, setRows] = useState(0);
+  const [hasEditChanges, setHasEditChanges] = useState(false);
 
   const {
     control,
@@ -83,7 +84,7 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
 
       const abortController = new AbortController();
 
-      savePatientNote(notePayload, abortController)
+      createPatientNote(notePayload, abortController)
         .then(async () => {
           showSnackbar({
             isLowContrast: true,
@@ -119,7 +120,9 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
   const onError = (errors) => console.error(errors);
 
   return (
-    <Workspace2 hasUnsavedChanges={isDirty} title={t('inpatientNotesWorkspaceTitle', 'In-patient notes')}>
+    <Workspace2
+      hasUnsavedChanges={isDirty || hasEditChanges}
+      title={t('inpatientNotesWorkspaceTitle', 'In-patient notes')}>
       <WardPatientWorkspaceBanner {...{ wardPatient }} />
       <Form className={styles.form} onSubmit={handleSubmit(onSubmit, onError)}>
         {errorFetchingEmrConfiguration && (
@@ -136,7 +139,7 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
             />
           </div>
         )}
-        <Stack className={styles.formContainer} gap={2}>
+        <Stack className={styles.formContainer} gap={4}>
           <Row className={styles.row}>
             <Column sm={1}>
               <span className={styles.columnLabel}>{t('note', 'Note')}</span>
@@ -155,12 +158,9 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
                       onBlur={onBlur}
                       onChange={(event) => {
                         onChange(event);
-                        const textAreaLineHeight = 24; // This is the default line height for Carbon's TextArea component
-                        const newRows = Math.ceil(event.target.scrollHeight / textAreaLineHeight);
-                        setRows(newRows);
                       }}
                       placeholder={t('wardClinicalNotePlaceholder', 'Write any notes here')}
-                      rows={rows}
+                      rows={6}
                       value={value}
                     />
                   </ResponsiveWrapper>
@@ -168,17 +168,26 @@ const WardPatientNotesWorkspace: React.FC<WardPatientWorkspaceDefinition> = ({
               />
             </Column>
           </Row>
+
+          <Button
+            className={styles.saveButton}
+            disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
+            kind="primary"
+            type="submit">
+            {isSubmitting ? (
+              <InlineLoading description={t('saving', 'Saving...')} />
+            ) : (
+              <span>{getCoreTranslation('save')}</span>
+            )}
+          </Button>
         </Stack>
-        <Button
-          className={styles.saveButton}
-          disabled={isSubmitting || isLoadingEmrConfiguration || errorFetchingEmrConfiguration}
-          kind="primary"
-          type="submit">
-          {isSubmitting ? <InlineLoading description={t('saving', 'Saving...')} /> : <span>{t('save', 'Save')}</span>}
-        </Button>
       </Form>
 
-      <PatientNotesHistory patientUuid={patientUuid} visitUuid={wardPatient?.visit?.uuid} />
+      <PatientNotesHistory
+        patientUuid={patientUuid}
+        visitUuid={wardPatient?.visit?.uuid}
+        promptBeforeClosing={setHasEditChanges}
+      />
     </Workspace2>
   );
 };

package/src/ward-workspace/ward-patient-notes/types.ts

@@ -12,10 +12,13 @@ export interface RESTPatientNote extends OpenmrsResource {
 }
 
 export interface PatientNote {
-  id: string;
+  encounterUuid: string;
+  obsUuid: string;
   encounterNote: string;
   encounterNoteRecordedAt: string;
   encounterProvider: string;
+  conceptUuid: string;
+  encounterTypeUuid: string;
 }
 
 export interface UsePatientNotes {
@@ -27,6 +30,7 @@ export interface UsePatientNotes {
 }
 
 export interface ObsData {
+  uuid: string;
   concept: Concept;
   value?: string | any;
   groupMembers?: Array<{

package/src/ward.resource.ts

@@ -40,6 +40,12 @@ export function useCreateEncounter() {
   return { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration };
 }
 
+export function deleteEncounter(encounterUuid: string) {
+  return openmrsFetch(`${restBaseUrl}/encounter/${encounterUuid}`, {
+    method: 'DELETE',
+  });
+}
+
 export function useAdmitPatient() {
   const { createEncounter, emrConfiguration, isLoadingEmrConfiguration, errorFetchingEmrConfiguration } =
     useCreateEncounter();

package/translations/en.json

@@ -25,7 +25,10 @@
   "countItems_other": "{{count}} {{item}}",
   "days_one": "{{count}} day",
   "days_other": "{{count}} days",
+  "deleteNote": "Delete Note",
+  "deleteNoteConfirmationText": "Are you sure you want to delete this note? This action can't be undone.",
   "discharge": "Discharge",
+  "editNote": "Edit note",
   "emptyBed": "Empty bed",
   "emptyStateIllustration": "Empty state illustration",
   "emptyText": "Empty",
@@ -36,6 +39,7 @@
   "errorConfiguringPatientCardMessage": "Unable to find configuration for {{elementType}}, id: {{id}}",
   "errorCreatingEncounter": "Failed to admit patient",
   "errorCreatingTransferRequest": "Error creating transfer request",
+  "errorDeletingNote": "Error deleting note",
   "errorDischargingPatient": "Error discharging patient",
   "errorLoadingBedDetails": "Error loading bed details",
   "errorLoadingChildren": "Error loading children info",
@@ -44,6 +48,7 @@
   "errorLoadingPatientInfo": "Error loading patient info",
   "errorLoadingPatients": "Error loading admitted patients",
   "errorLoadingWardLocation": "Error loading ward location",
+  "errorSavingPatientNote": "Error saving patient note",
   "female": "Female",
   "fetchingEmrConfigurationFailed": "Fetching EMR configuration failed. Try refreshing the page or contact your system administrator.",
   "fetchingPatientNotesFailed": "Fetching patient notes failed. Try refreshing the page or contact your system administrator.",
@@ -70,6 +75,7 @@
   "noLocationsFound": "No locations found",
   "noPendingAdmissionRequests": "No pending admission requests",
   "note": "Note",
+  "noteDeletedSuccessfully": "Note deleted successfully",
   "notes": "Notes",
   "notesRequiredForCancellingRequest": "Notes required for cancelling admission or transfer request",
   "orderBasket": "Order basket",