O3-2476 - Remove unnecessary conversion from date to string back to date

openmrs · Oct 10, 2023 · 863ca3c · 863ca3c
1 parent 95f655c
commit 863ca3c
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 20 deletions.
diff --git a/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx b/packages/esm-active-visits-app/src/visits-summary/visit-detail.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { render, screen, act } from '@testing-library/react';
 import VisitDetailComponent from './visit-detail.component';
 import { useVisit } from './visit.resource';
+import { formatDate } from '@openmrs/esm-framework';
 
 jest.mock('./visit.resource');
 
@@ -23,11 +24,12 @@ describe('VisitDetailComponent', () => {
   });
 
   it('should render visit details and switches when data is available', () => {
+    let visitDate = new Date();
     mockedUseVisit.mockReturnValueOnce({
       visit: {
         uuid: visitUuid,
         visitType: { display: 'Some Visit Type' },
-        startDatetime: '2023-07-29T12:34:56Z',
+        startDatetime: visitDate,
         encounters: [],
       },
       isLoading: false,
@@ -36,7 +38,7 @@ describe('VisitDetailComponent', () => {
     render(<VisitDetailComponent visitUuid={visitUuid} patientUuid={patientUuid} />);
 
     expect(screen.getByText(/Some Visit Type/)).toBeInTheDocument();
-    expect(screen.getByText(/29-Jul-2023, 12:34 PM/)).toBeInTheDocument();
+    expect(screen.getByText(formatDate(visitDate))).toBeInTheDocument();
 
     expect(screen.getByText('All Encounters')).toBeInTheDocument();
     expect(screen.getByText('Visit Summary')).toBeInTheDocument();

diff --git a/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx b/packages/esm-appointments-app/src/appointments/details/appointment-details.component.tsx
@@ -63,7 +63,7 @@ const AppointmentDetails: React.FC<AppointmentDetailsProps> = ({ appointment })
               <span className={styles.historyGridCount}>{appointmentsCount.cancelledAppointments}</span>
             </div>
             <div>
-              <p className={styles.historyGridLabel}>{t('upcomming', 'Upcoming')}</p>
+              <p className={styles.historyGridLabel}>{t('upcoming', 'Upcoming')}</p>
               <span className={styles.historyGridCount}>{appointmentsCount.upcomingAppointments}</span>
             </div>
           </div>

diff --git a/packages/esm-appointments-app/src/patient-queue/visit-form/queue.resource.ts b/packages/esm-appointments-app/src/patient-queue/visit-form/queue.resource.ts
@@ -36,7 +36,7 @@ export async function saveQueueEntry(
         patient: {
           uuid: patientUuid,
         },
-        startedAt: toDateObjectStrict(toOmrsIsoString(new Date())),
+        startedAt: new Date(),
         sortWeight: sortWeight,
       },
     },

diff --git a/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx b/packages/esm-appointments-app/src/patient-queue/visit-form/visit-form.component.tsx
@@ -98,10 +98,12 @@ const VisitForm: React.FC<VisitFormProps> = ({ patientUuid, appointment }) => {
 
       const payload: NewVisitPayload = {
         patient: patientUuid,
-        startDatetime: toDateObjectStrict(
-          toOmrsIsoString(
-            new Date(dayjs(visitDate).year(), dayjs(visitDate).month(), dayjs(visitDate).date(), hours, minutes),
-          ),
+        startDatetime: new Date(
+          dayjs(visitDate).year(),
+          dayjs(visitDate).month(),
+          dayjs(visitDate).date(),
+          hours,
+          minutes,
         ),
         visitType: visitType,
         location: selectedLocation,

diff --git a/packages/esm-appointments-app/translations/am.json b/packages/esm-appointments-app/translations/am.json
@@ -137,7 +137,7 @@
   "unscheduled": "Unscheduled",
   "unscheduledAppointments": "Unscheduled appointments",
   "unscheduledAppointments_lower": "unscheduled appointments",
-  "upcomming": "Upcoming",
+  "upcoming": "Upcoming",
   "view": "View",
   "viewCalendar": "View Calendar",
   "visitLocation": "Visit Location",

diff --git a/packages/esm-appointments-app/translations/en.json b/packages/esm-appointments-app/translations/en.json
@@ -137,7 +137,7 @@
   "unscheduled": "Unscheduled",
   "unscheduledAppointments": "Unscheduled appointments",
   "unscheduledAppointments_lower": "unscheduled appointments",
-  "upcomming": "Upcoming",
+  "upcoming": "Upcoming",
   "view": "View",
   "viewCalendar": "View Calendar",
   "visitLocation": "Visit Location",

diff --git a/packages/esm-appointments-app/translations/fr.json b/packages/esm-appointments-app/translations/fr.json
@@ -137,7 +137,7 @@
   "unscheduled": "Unscheduled",
   "unscheduledAppointments": "Unscheduled appointments",
   "unscheduledAppointments_lower": "unscheduled appointments",
-  "upcomming": "Upcoming",
+  "upcoming": "Upcoming",
   "view": "View",
   "viewCalendar": "View Calendar",
   "visitLocation": "Visit Location",

diff --git a/packages/esm-appointments-app/translations/he.json b/packages/esm-appointments-app/translations/he.json
@@ -137,7 +137,7 @@
   "unscheduled": "Unscheduled",
   "unscheduledAppointments": "Unscheduled appointments",
   "unscheduledAppointments_lower": "unscheduled appointments",
-  "upcomming": "Upcoming",
+  "upcoming": "Upcoming",
   "view": "הצג",
   "viewCalendar": "הצג לוח שנה",
   "visitLocation": "מיקום הביקור",

diff --git a/packages/esm-appointments-app/translations/km.json b/packages/esm-appointments-app/translations/km.json
@@ -137,7 +137,7 @@
   "unscheduled": "មិនបានគ្រោងទុក",
   "unscheduledAppointments": "ការណាត់ជួបដែលមិនបានគ្រោងទុក",
   "unscheduledAppointments_lower": "unscheduled appointments",
-  "upcomming": "Upcoming",
+  "upcoming": "Upcoming",
   "view": "ពិនិត្យមើល",
   "viewCalendar": "ពិនិត្យមើលប្រតិទិន",
   "visitLocation": "ទីតាំងមកពិនិត្យ",

diff --git a/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts b/packages/esm-service-queues-app/src/active-visits/active-visits-table.resource.ts
@@ -311,7 +311,7 @@ export async function updateQueueEntry(
         patient: {
           uuid: patientUuid,
         },
-        startedAt: toDateObjectStrict(toOmrsIsoString(new Date())),
+        startedAt: new Date(),
         sortWeight: sortWeight,
         queueComingFrom: previousQueueUuid,
       },
@@ -396,7 +396,7 @@ export async function addQueueEntry(
         patient: {
           uuid: patientUuid,
         },
-        startedAt: toDateObjectStrict(toOmrsIsoString(new Date())),
+        startedAt: new Date(),
         sortWeight: sortWeight,
       },
     },

diff --git a/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx b/packages/esm-service-queues-app/src/active-visits/change-status-dialog.component.tsx
@@ -62,7 +62,7 @@ const ChangeStatus: React.FC<ChangeStatusDialogProps> = ({ queueEntry, closeModa
       const queuePriority = priority === '' ? defaultPriority : priority;
       const emergencyPriorityConceptUuid = config.concepts.emergencyPriorityConceptUuid;
       const sortWeight = priority === emergencyPriorityConceptUuid ? 1.0 : 0.0;
-      const endDate = toDateObjectStrict(toOmrsIsoString(new Date()));
+      const endDate = new Date();
       updateQueueEntry(
         queueEntry?.visitUuid,
         queueEntry?.queueUuid,

diff --git a/...service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx b/...service-queues-app/src/clear-queue-entries-dialog/clear-queue-entries-dialog.resource.tsx
@@ -11,7 +11,7 @@ export async function batchClearQueueEntries(queueEntries: Array<MappedVisitQueu
   while (curReq < queueEntries.length) {
     const end = queueEntries.length < curReq + batchSize ? queueEntries.length : curReq + batchSize;
     const concurrentReq = new Array(batchSize);
-    const endedAt = toDateObjectStrict(toOmrsIsoString(new Date()));
+    const endedAt = new Date();
     for (let index = curReq; index < end; index++) {
       await Promise.all([
         endPatientStatus(queueEntries[index]?.queueUuid, queueEntries[index]?.queueEntryUuid, endedAt),

diff --git a/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts b/packages/esm-service-queues-app/src/patient-search/visit-form/queue.resource.ts
@@ -41,7 +41,7 @@ export async function addQueueEntry(
         patient: {
           uuid: patientUuid,
         },
-        startedAt: toDateObjectStrict(toOmrsIsoString(new Date())),
+        startedAt: new Date(),
       },
     },
   });

diff --git a/...ges/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx b/...ges/esm-service-queues-app/src/remove-queue-entry-dialog/remove-queue-entry.component.tsx
@@ -36,7 +36,7 @@ const RemoveQueueEntryDialog: React.FC<RemoveQueueEntryDialogProps> = ({ queueEn
       stopDatetime: new Date(),
     };
 
-    const endedAt = toDateObjectStrict(toOmrsIsoString(new Date()));
+    const endedAt = new Date();
 
     voidQueueEntry(
       queueEntry.queueUuid,

diff --git a/...service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx b/...service-queues-app/src/transition-queue-entry/transition-queue-entry-dialog.component.tsx
@@ -53,7 +53,7 @@ const TransitionQueueEntryModal: React.FC<TransitionQueueEntryModalProps> = ({ q
   const { mutate } = useVisitQueueEntries('', '');
 
   const launchEditPriorityModal = useCallback(() => {
-    const endedAt = toDateObjectStrict(toOmrsIsoString(new Date()));
+    const endedAt = new Date();
     updateQueueEntry(
       queueEntry?.visitUuid,
       queueEntry?.queueUuid,