feat(edit appointment): implement Edit Appointment #1845

MatthewDorner · 2020-02-21T23:04:02Z

Changes proposed in this pull request:

Implement Edit Appointment
Rename translation keys to be consistent across Patient and Appointment
Move createAppointment from appointments-slice to appointment-slice
Rename AppointmentsRepository to AppointmentRepository to be consistent with PatientRepository
Add createAppointmentSuccess action to set isLoading to false and be consistent with createPatient
Refactor AppointmentDetailsForm to use single Typeahead for patient instead of conditional typeahead / text field

1807

vercel · 2020-02-21T23:04:07Z

This pull request is being automatically deployed with ZEIT Now (learn more).
To see the status of your deployment, click below or on the icon next to each commit.

🔍 Inspect: https://zeit.co/hospitalrun/hospitalrun-frontend/fafryjun5
✅ Preview: https://hospitalrun-frontend-git-fork-matthewdorner-edit-appointment.hospitalrun.now.sh

MatthewDorner · 2020-02-22T01:42:48Z

src/scheduling/appointments/AppointmentDetailForm.tsx

+            <Label htmlFor="patientTypeahead" text={t('scheduling.appointment.patient')} />
+            <Typeahead
+              id="patientTypeahead"
+              disabled={!isEditable || patient !== undefined}


This line appears to be why the Travis build is failing, because it doesn't recognize disabled as a prop. I recently added disabled in HospitalRun/components#290. Is Travis running it with an older version of the components library?

Seems like it, since GitHub actions passed. @tehkapa can you check this out?

jackcmeyer

Awesome feature 🎉

One other bug:
The tool bar button on the /appointments route is showing the internationalized key rather than the value.

src/scheduling/appointments/AppointmentDetailForm.tsx

jackcmeyer · 2020-02-22T03:49:20Z

src/scheduling/appointments/appointment-slice.ts

+export const createAppointment = (appointment: Appointment, history: any): AppThunk => async (
+  dispatch,
+) => {
+  dispatch(createAppointmentStart())
+  await AppointmentRepository.save(appointment)
+  dispatch(createAppointmentSuccess())
+  history.push('/appointments')
+}
+
+export const updateAppointment = (appointment: Appointment, history: any): AppThunk => async (
+  dispatch,
+) => {
+  dispatch(updateAppointmentStart())
+  const updatedAppointment = await AppointmentRepository.saveOrUpdate(appointment)
+  dispatch(updateAppointmentSuccess(updatedAppointment))
+  history.push(`/appointments/${updatedAppointment.id}`)
+}


We should probably have success alerts for successful create/edit. I think we can open new issues to accomplish this, though.

Yeah, I wasn't sure if we wanted Toasts for everything or which ones we wanted them for.

src/scheduling/appointments/view/ViewAppointment.tsx

jackcmeyer · 2020-02-22T04:01:20Z

src/scheduling/appointments/edit/EditAppointment.tsx

+    let newErrorMessage = ''
+    if (isBefore(new Date(appointment.endDateTime), new Date(appointment.startDateTime))) {
+      newErrorMessage += ` ${t('scheduling.appointment.errors.startDateMustBeBeforeEndDate')}`
+    }
+
+    if (newErrorMessage) {
+      setErrorMessage(newErrorMessage.trim())
+      return
+    }


This code is duplicated with the New Appointment save logic.

It seems like we should be able to use the same logic in both places.

Yes, but I'm not sure where it should go. It's the same for New Patient / Edit Patient.

I'm not sure either, right now. Let's think on this and we can figure out the right abstraction later.

Once we have two complete modules with new/view/edit/delete, maybe we should make a point to look over the code in general with an eye for code that's duplicated as I'm sure there are a few more instances. Just now I can think of the Save/Cancel buttons, Appointment and Patient objects used in tests, getFriendlyId, form field change handlers...

I agree! We're getting close to that point, if not at that point when this PR gets merged.

src/scheduling/appointments/edit/EditAppointment.tsx

jackcmeyer · 2020-02-23T02:56:41Z

src/HospitalRun.tsx

+                  <PrivateRoute
+                    isAuthenticated={
+                      permissions.includes(Permissions.WriteAppointments) &&
+                      permissions.includes(Permissions.ReadAppointments)
+                    }
+                    exact
+                    path="/appointments/edit/:id"
+                    component={EditAppointment}


Could we add some tests around this in HospitalRun.test.tsx. Just looking for tests around the security and then making sure the component renders when the route is accessed.

Related to this, do you think it should require any Patient permissions for this route?

Probably since there is patient data that can be seen...

We probably need a ReadPatient and ReadPatients permission. New Appointments and Edit Appointments should require ReadPatients maybe?

I think that is outside the scope of this issue though.

Ok, added tests.

jackcmeyer · 2020-02-23T02:57:53Z

src/scheduling/appointments/edit/EditAppointment.tsx

+    let newErrorMessage = ''
+    if (isBefore(new Date(appointment.endDateTime), new Date(appointment.startDateTime))) {
+      newErrorMessage += ` ${t('scheduling.appointment.errors.startDateMustBeBeforeEndDate')}`
+    }
+
+    if (newErrorMessage) {
+      setErrorMessage(newErrorMessage.trim())
+      return
+    }


I'm not sure either, right now. Let's think on this and we can figure out the right abstraction later.

MatthewDorner · 2020-02-23T03:25:29Z

The tool bar button on the /appointments route is showing the internationalized key rather than the value.

This should also be fixed now.

matteovivona · 2020-02-23T14:02:49Z

@MatthewDorner I've accepted 2 PRs and there's been an "avalanche" of conflict. Sorry, dude!

MatthewDorner · 2020-02-24T00:22:40Z

@MatthewDorner I've accepted 2 PRs and there's been an "avalanche" of conflict. Sorry, dude!

Should be fixed now. Not sure what's going on with the tests now, but they're passing for me locally (Ubuntu).

feat(edit appointment): implement Edit Appointment functionality

f32c573

1807

vercel bot temporarily deployed to Preview February 21, 2020 23:04 Inactive

Merge branch 'master' into edit-appointment

d639700

vercel bot deployed to Preview February 21, 2020 23:06 View deployment

feat(edit appointment): fix lint errors and typo

c22d02b

vercel bot deployed to Preview February 21, 2020 23:27 View deployment

MatthewDorner commented Feb 22, 2020

View reviewed changes

jackcmeyer suggested changes Feb 22, 2020

View reviewed changes

jackcmeyer requested review from fox1t and matteovivona February 22, 2020 04:07

jackcmeyer added 🚀enhancement an issue/pull request that adds a feature to the application scheduling issue/pull request that interacts with scheduling module labels Feb 22, 2020

jackcmeyer added this to In progress in Version 2.0 via automation Feb 22, 2020

jackcmeyer added this to the v2.0.0 milestone Feb 22, 2020

matteovivona requested review from jackcmeyer and removed request for matteovivona February 22, 2020 08:46

feat(edit appointment): use button toolbar, address other PR issues

4744152

vercel bot deployed to Preview February 22, 2020 20:52 View deployment

jackcmeyer suggested changes Feb 23, 2020

View reviewed changes

feat(edit appointment): add tests for Edit Appointment route

58117b4

vercel bot deployed to Preview February 23, 2020 04:23 View deployment

jackcmeyer previously approved these changes Feb 23, 2020

View reviewed changes

Merge branch 'master' into edit-appointment

c67a283

vercel bot deployed to Preview February 23, 2020 05:49 View deployment

feat(edit appointment): resolve merge conflicts

63165ab

MatthewDorner dismissed jackcmeyer’s stale review via 63165ab February 24, 2020 00:11

vercel bot deployed to Preview February 24, 2020 00:11 View deployment

jackcmeyer approved these changes Feb 24, 2020

View reviewed changes

Merge branch 'master' into edit-appointment

84eed3a

vercel bot temporarily deployed to Preview February 24, 2020 08:55 Inactive

Merge branch 'master' into edit-appointment

581a0f3

vercel bot deployed to Preview February 24, 2020 08:55 View deployment

matteovivona merged commit 4366462 into HospitalRun:master Feb 24, 2020

Version 2.0 automation moved this from In progress to Done Feb 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(edit appointment): implement Edit Appointment #1845

feat(edit appointment): implement Edit Appointment #1845

MatthewDorner commented Feb 21, 2020 •

edited

vercel bot commented Feb 21, 2020 •

edited

MatthewDorner Feb 22, 2020

jackcmeyer Feb 22, 2020

jackcmeyer left a comment

jackcmeyer Feb 22, 2020

MatthewDorner Feb 22, 2020

jackcmeyer Feb 22, 2020

MatthewDorner Feb 22, 2020

jackcmeyer Feb 23, 2020

MatthewDorner Feb 24, 2020

jackcmeyer Feb 24, 2020

jackcmeyer Feb 23, 2020

MatthewDorner Feb 23, 2020

jackcmeyer Feb 23, 2020

MatthewDorner Feb 23, 2020

jackcmeyer Feb 23, 2020

MatthewDorner commented Feb 23, 2020

matteovivona commented Feb 23, 2020

MatthewDorner commented Feb 24, 2020

feat(edit appointment): implement Edit Appointment #1845

feat(edit appointment): implement Edit Appointment #1845

Conversation

MatthewDorner commented Feb 21, 2020 • edited

vercel bot commented Feb 21, 2020 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jackcmeyer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MatthewDorner commented Feb 23, 2020

matteovivona commented Feb 23, 2020

MatthewDorner commented Feb 24, 2020

MatthewDorner commented Feb 21, 2020 •

edited

vercel bot commented Feb 21, 2020 •

edited