diff --git a/apps/ehr/src/components/AppointmentTableRow.tsx b/apps/ehr/src/components/AppointmentTableRow.tsx index 05c1be4984..9f6d074ba5 100644 --- a/apps/ehr/src/components/AppointmentTableRow.tsx +++ b/apps/ehr/src/components/AppointmentTableRow.tsx @@ -32,7 +32,6 @@ import { Link, useNavigate } from 'react-router-dom'; import { FEATURE_FLAGS } from 'src/constants/feature-flags'; import { ROUTER_PATH } from 'src/features/visits/in-person/routing/routesInPerson'; import { VitalsIconTooltip } from 'src/features/visits/shared/components/VitalsIconTooltip'; -import { TrackingBoardTableButton } from 'src/features/visits/telemed/components/tracking-board/TrackingBoardTableButton'; import { getTelemedQuickTexts } from 'src/features/visits/telemed/utils/appointments'; import { LocationWithWalkinSchedule } from 'src/pages/AddPatient'; import { otherColors } from 'src/themes/ottehr/colors'; @@ -43,7 +42,6 @@ import { getInPersonQuickTexts, getPatchBinary, getSupportPhoneFor, - getTelemedVisitStatus, getVisitTotalTime, GetVitalsResponseData, InPersonAppointmentInformation, @@ -586,10 +584,7 @@ export default function AppointmentTableRow({ }; const renderStartIntakeButton = (): ReactElement | undefined => { - if ( - !isVirtual(appointment) && - (appointment.status === 'arrived' || appointment.status === 'ready' || appointment.status === 'intake') - ) { + if (appointment.status === 'arrived' || appointment.status === 'ready' || appointment.status === 'intake') { return ( { - const location = appointment.location; - if (isVirtual(appointment) && location?.id) { - return ( - - ); - } - return undefined; - }; - const handleProgressNoteButton = async (): Promise => { setProgressNoteButtonLoading(true); try { @@ -1059,7 +1031,6 @@ export default function AppointmentTableRow({ {renderStartIntakeButton()} {renderProgressNoteButton()} {renderDischargeButton()} - {renderAssignMeButton()} {FEATURE_FLAGS.SUPERVISOR_APPROVAL_ENABLED && renderSupervisorApproval()} diff --git a/apps/ehr/tests/e2e/page/VisitsPage.ts b/apps/ehr/tests/e2e/page/VisitsPage.ts index 82092d5ad7..fd3c693006 100644 --- a/apps/ehr/tests/e2e/page/VisitsPage.ts +++ b/apps/ehr/tests/e2e/page/VisitsPage.ts @@ -58,16 +58,6 @@ export class VisitsPage { await arrivedButton.click(); } - async clickAssignButton(appointmentId: string): Promise { - const arrivedButton = this.#page - .getByTestId(dataTestIds.dashboard.tableRowWrapper(appointmentId)) - .getByTestId(dataTestIds.telemedEhrFlow.trackingBoardAssignButton); - // Wait for button to be visible and enabled before clicking - await arrivedButton.waitFor({ state: 'visible', timeout: 60000 }); - await expect(arrivedButton).toBeEnabled({ timeout: 5000 }); - await arrivedButton.click(); - } - async clickOnPatientName(appointmentId: string): Promise { await this.#page .getByTestId(dataTestIds.dashboard.tableRowWrapper(appointmentId)) diff --git a/apps/ehr/tests/e2e/specs/telemed/telemedChartDataAndStatuses.spec.ts b/apps/ehr/tests/e2e/specs/telemed/telemedChartDataAndStatuses.spec.ts index ac6ef3eb76..384d2b42f8 100644 --- a/apps/ehr/tests/e2e/specs/telemed/telemedChartDataAndStatuses.spec.ts +++ b/apps/ehr/tests/e2e/specs/telemed/telemedChartDataAndStatuses.spec.ts @@ -156,7 +156,6 @@ test.describe.skip('Telemed tracking board checks, buttons, chart data filling', await test.step('Find and assign my appointment', async () => { const visitsPage = await openVisitsPage(page); await visitsPage.selectLocation(myPatientsTabAppointmentResources.appointmentLocation?.name ?? 'Unknown'); - await visitsPage.clickAssignButton(myPatientsTabAppointmentResources.appointment.id!); await telemedDialogConfirm(page); }); diff --git a/apps/ehr/tests/e2e/specs/telemed/telemedMinimalHappyPath.spec.ts b/apps/ehr/tests/e2e/specs/telemed/telemedMinimalHappyPath.spec.ts index e7d9bab42e..8b9ca9821c 100644 --- a/apps/ehr/tests/e2e/specs/telemed/telemedMinimalHappyPath.spec.ts +++ b/apps/ehr/tests/e2e/specs/telemed/telemedMinimalHappyPath.spec.ts @@ -26,7 +26,9 @@ test.describe.configure({ mode: 'serial' }); test('Should assign visit to practitioner', async () => { const visitsPage = await openVisitsPage(page); await visitsPage.selectLocation(resourceHandler.appointmentLocation?.name ?? 'Unknown'); - await visitsPage.clickAssignButton(resourceHandler.appointment.id!); + await visitsPage.clickProgressNoteButton(resourceHandler.appointment.id!); + const assignMeButton = page.getByTestId(dataTestIds.telemedEhrFlow.footerButtonAssignMe); + await assignMeButton.click(); await telemedDialogConfirm(page); });