Fix vulnerabilities

.eslintignore

@@ -8,4 +8,5 @@ vite.config.ts
 vite-env.d.ts
 build/
 dist/
-.esbuild/
+.esbuild/
+old-ottehr/

.prettierignore

@@ -7,4 +7,5 @@
 !apps/**/*.js
 !apps/**/*.jsx
 !/vite.config.ts
-.esbuild/
+.esbuild/
+old-ottehr/

apps/ehr/src/components/PatientsSearch/PatientsSearchTable.tsx

@@ -240,6 +240,7 @@ export const PatientsSearchTable: React.FC<{
                 backIconButtonProps={{
                   disabled: !searchResult?.pagination.prev || arePatientsLoading,
                 }}
+                data-testid={dataTestIds.pagination.paginationContainer}
               />
             </TableRow>
           </TableFooter>

apps/ehr/src/components/ScheduleInformation.tsx

@@ -18,14 +18,15 @@ import { ReactElement, useEffect, useMemo, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { otherColors } from '../CustomThemeProvider';
 
+import { Add } from '@mui/icons-material';
 import Oystehr from '@oystehr/sdk';
 import { HealthcareService, Location, Practitioner, Resource } from 'fhir/r4b';
 import { DateTime } from 'luxon';
+import { dataTestIds } from '../constants/data-test-ids';
 import { OVERRIDE_DATE_FORMAT } from '../helpers/formatDateTime';
 import { useApiClients } from '../hooks/useAppClients';
 import { Closure, ClosureType, ScheduleExtension } from '../types/types';
 import Loading from './Loading';
-import { Add } from '@mui/icons-material';
 
 export type ScheduleType = 'office' | 'provider' | 'group';
 
@@ -301,6 +302,7 @@ export const ScheduleInformation = ({ scheduleType }: ScheduleInformationProps):
           page={pageNumber}
           onPageChange={handleChangePage}
           onRowsPerPageChange={handleChangeRowsPerPage}
+          data-testid={dataTestIds.pagination.paginationContainer}
         />
       </TableContainer>
     </Paper>

apps/ehr/src/constants/data-test-ids.ts

@@ -43,10 +43,7 @@ export const dataTestIds = {
     prefilledPatientEmail: 'prefilled-patient-email',
   },
   pagination: {
-    nextPage: 'KeyboardArrowRightIcon',
-    previousPage: 'KeyboardArrowLeftIcon',
     paginationContainer: 'pagination-container',
-    dropDownArrow: 'ArrowDropDownIcon',
   },
   patientHeader: {
     patientId: 'header-patient-id',
@@ -109,7 +106,8 @@ export const dataTestIds = {
     patientEmail: 'patient-email',
     patientPhoneNumber: 'patient-phone-number',
     patientAddress: 'patient-address',
-    searchResultRow: (patientId: string) => `search-result-row-${patientId}`,
+    searchResultsRowPrefix: 'search-result-row-',
+    searchResultRow: (patientId: string) => `${dataTestIds.patients.searchResultsRowPrefix}${patientId}`,
   },
   employeesPage: {
     table: 'employees-providers-content-table',

apps/ehr/src/pages/Employees.tsx

@@ -27,11 +27,11 @@ import { AllStates, EmployeeDetails, State } from 'utils';
 import { otherColors } from '../CustomThemeProvider';
 import { getEmployees } from '../api/api';
 import Loading from '../components/Loading';
+import { EMPLOYEE_ROWS_PER_PAGE, PROVIDER_ROWS_PER_PAGE } from '../constants';
+import { dataTestIds } from '../constants/data-test-ids';
 import { formatDateUsingSlashes } from '../helpers/formatDateTime';
 import { useApiClients } from '../hooks/useAppClients';
 import PageContainer from '../layout/PageContainer';
-import { EMPLOYEE_ROWS_PER_PAGE, PROVIDER_ROWS_PER_PAGE } from '../constants';
-import { dataTestIds } from '../constants/data-test-ids';
 
 enum PageTab {
   employees = 'employees',
@@ -414,6 +414,7 @@ function EmployeesTable({
             page={pageNumber}
             onPageChange={handleChangePage}
             onRowsPerPageChange={handleChangeRowsPerPage}
+            data-testid={dataTestIds.pagination.paginationContainer}
           />
         </TableContainer>
       </Paper>

apps/ehr/src/telemed/features/telemed-admin/Insurance.tsx

@@ -27,9 +27,10 @@ import React, { ReactElement } from 'react';
 import { Link } from 'react-router-dom';
 import { BooleanStateChip } from '../..';
 import { INSURANCES_URL } from '../../../App';
+import { INSURANCE_ROWS_PER_PAGE } from '../../../constants';
+import { dataTestIds } from '../../../constants/data-test-ids';
 import { otherColors } from '../../../CustomThemeProvider';
 import { useInsurancesQuery } from './telemed-admin.queries';
-import { INSURANCE_ROWS_PER_PAGE } from '../../../constants';
 
 enum IsActiveStatus {
   active,
@@ -206,6 +207,7 @@ export default function Insurances(): ReactElement {
           page={pageNumber}
           onPageChange={handleChangePage}
           onRowsPerPageChange={handleChangeRowsPerPage}
+          data-testid={dataTestIds.pagination.paginationContainer}
         />
       </TableContainer>
     </Paper>

apps/ehr/src/telemed/state/appointment/appointment.queries.ts

@@ -2,16 +2,16 @@ import { useAuth0 } from '@auth0/auth0-react';
 import {
   Appointment,
   Bundle,
+  Coding,
   DocumentReference,
   Encounter,
   FhirResource,
   InsurancePlan,
   Location,
+  Medication,
   Patient,
   QuestionnaireResponse,
   RelatedPerson,
-  Coding,
-  Medication,
 } from 'fhir/r4b';
 import { DateTime } from 'luxon';
 import { enqueueSnackbar } from 'notistack';
@@ -21,6 +21,7 @@ import {
   ChartDataRequestedFields,
   GetMedicationOrdersResponse,
   INVENTORY_MEDICATION_TYPE_CODE,
+  IcdSearchRequestParams,
   InstructionType,
   MEDICATION_IDENTIFIER_NAME_SYSTEM,
   MeetingData,
@@ -33,14 +34,13 @@ import {
   createSmsModel,
   filterResources,
   relatedPersonAndCommunicationMaps,
-  IcdSearchRequestParams,
 } from 'utils';
 import { APPOINTMENT_REFRESH_INTERVAL, CHAT_REFETCH_INTERVAL, QUERY_STALE_TIME } from '../../../constants';
 import { useApiClients } from '../../../hooks/useAppClients';
 import { useAuthToken } from '../../../hooks/useAuthToken';
 import useEvolveUser, { EvolveUser } from '../../../hooks/useEvolveUser';
 import { getSelectors } from '../../../shared/store/getSelectors';
-import { PromiseReturnType, OystehrTelemedAPIClient } from '../../data';
+import { OystehrTelemedAPIClient, PromiseReturnType } from '../../data';
 import { useGetAppointmentAccessibility } from '../../hooks';
 import { useZapEHRAPIClient } from '../../hooks/useOystehrAPIClient';
 import { createRefreshableAppointmentData, extractReviewAndSignAppointmentData } from '../../utils';

apps/ehr/test/e2e/page/AddPatientPage.ts

@@ -58,6 +58,7 @@ export class AddPatientPage {
     const locator = this.#page.locator('[placeholder="MM/DD/YYYY"]');
     await locator.click();
     await this.#page.waitForTimeout(2000);
+    // just because of date input for some reason not accepting wrong date
     await locator.pressSequentially(dateOfBirth);
   }
 

apps/ehr/test/e2e/page/PageWithTablePagination.ts

@@ -0,0 +1,70 @@
+import { Page, expect } from '@playwright/test';
+import { dataTestIds } from '../../../src/constants/data-test-ids';
+
+export class PageWithTablePagination {
+  #page: Page;
+
+  constructor(page: Page) {
+    this.#page = page;
+  }
+
+  async clickNextPage(): Promise<void> {
+    await this.#page.getByTestId(dataTestIds.pagination.paginationContainer).getByTitle('Go to next page').click();
+  }
+
+  async clickPreviousPage(): Promise<void> {
+    await this.#page.getByTestId(dataTestIds.pagination.paginationContainer).getByTitle('Go to previous page').click();
+  }
+
+  async verifyPaginationState(rows: string): Promise<void> {
+    await expect(
+      this.#page.getByTestId(dataTestIds.pagination.paginationContainer).locator('p:text("' + rows + '")')
+    ).toBeVisible();
+  }
+
+  async selectRowsPerPage(rowsPerPage: string): Promise<void> {
+    await this.#page.getByTestId(dataTestIds.pagination.paginationContainer).getByText('10', { exact: true }).click();
+    await this.#page.getByText(rowsPerPage).click();
+  }
+
+  async canGoNextPage(): Promise<boolean> {
+    return (
+      await this.#page.getByTestId(dataTestIds.pagination.paginationContainer).getByTitle('Go to next page')
+    ).isEnabled();
+  }
+
+  /**
+   * Iterates through paginated results and finds an expected value.
+   * @param callback - A function that returns `true` when the expected element is found.
+   * @param pageLoadedCallback - (Optional) A function to wait for the page to load after pagination.
+   * @returns `true` if the element is found, otherwise `false`.
+   */
+  async findInPages(callback: () => Promise<boolean>, pageLoadedCallback?: () => Promise<void>): Promise<boolean> {
+    if (pageLoadedCallback) {
+      await pageLoadedCallback(); // Wait for the page to load initially
+    }
+    do {
+      if (await callback()) {
+        return true; // Stop when the condition is met
+      }
+    } while (await this.goToNextPageIfPossible(pageLoadedCallback));
+
+    return false; // Element not found in any page
+  }
+
+  /**
+   * Moves to the next page and waits for it to load.
+   * @param pageLoadedCallback - (Optional) A function to wait for the page to fully load.
+   * @returns `true` if pagination moved to the next page, otherwise `false`.
+   */
+  private async goToNextPageIfPossible(pageLoadedCallback?: () => Promise<void>): Promise<boolean> {
+    if (await this.canGoNextPage()) {
+      await this.clickNextPage();
+      if (pageLoadedCallback) {
+        await pageLoadedCallback(); // Wait for the page to load dynamically
+      }
+      return true;
+    }
+    return false;
+  }
+}

apps/ehr/test/e2e/page/PatientsPage.ts

@@ -1,10 +1,12 @@
 import { expect, Page } from '@playwright/test';
 import { dataTestIds } from '../../../src/constants/data-test-ids';
+import { PageWithTablePagination } from './PageWithTablePagination';
 
-export class PatientsPage {
+export class PatientsPage extends PageWithTablePagination {
   #page: Page;
 
   constructor(page: Page) {
+    super(page);
     this.#page = page;
   }
 
@@ -16,7 +18,7 @@ export class PatientsPage {
     const locator = this.#page.getByTestId(dataTestIds.patients.searchByDateOfBirthField).locator('input');
     await locator.click();
     await this.#page.waitForTimeout(2000);
-    await locator.pressSequentially(dateOfBirth);
+    await locator.fill(dateOfBirth);
   }
 
   async searchByMobilePhone(phone: string): Promise<void> {
@@ -43,7 +45,6 @@ export class PatientsPage {
 
   async clickSearchButton(): Promise<void> {
     await this.#page.getByTestId(dataTestIds.patients.searchButton).click();
-    await this.#page.waitForTimeout(15000);
   }
 
   async clickResetFiltersButton(): Promise<void> {
@@ -67,19 +68,45 @@ export class PatientsPage {
     phoneNumber: string;
     address: string;
   }): Promise<void> {
-    const rowLocator = this.#page.getByTestId(dataTestIds.patients.searchResultRow(patientInfo.id));
-    const rowPatientId = await rowLocator.getByTestId(dataTestIds.patients.patientId).innerText();
-    const rowPatientName = await rowLocator.getByTestId(dataTestIds.patients.patientName).innerText();
-    const rowPatientDateOfBirth = await rowLocator.getByTestId(dataTestIds.patients.patientDateOfBirth).innerText();
-    const rowPatientEmail = await rowLocator.getByTestId(dataTestIds.patients.patientEmail).innerText();
-    const rowPatientPhoneNumber = await rowLocator.getByTestId(dataTestIds.patients.patientPhoneNumber).innerText();
-    const rowPatientAddress = await rowLocator.getByTestId(dataTestIds.patients.patientAddress).innerText();
-    expect(rowPatientId).toBe(patientInfo.id);
-    expect(rowPatientName).toBe(patientInfo.lastName + ' ' + patientInfo.firstName);
-    expect(rowPatientDateOfBirth).toBe(patientInfo.dateOfBirth);
-    expect(rowPatientEmail).toBe(patientInfo.email);
-    expect(rowPatientPhoneNumber).toBe(patientInfo.phoneNumber);
-    expect(rowPatientAddress).toBe(patientInfo.address);
+    const patientPresent = await this.findInPages(
+      async () => {
+        const rowLocator = this.#page.getByTestId(dataTestIds.patients.searchResultRow(patientInfo.id));
+        if (!(await rowLocator.isVisible())) return Promise.resolve(false);
+        const rowPatientId = await rowLocator.getByTestId(dataTestIds.patients.patientId).innerText();
+        const rowPatientName = await rowLocator.getByTestId(dataTestIds.patients.patientName).innerText();
+        const rowPatientDateOfBirth = await rowLocator.getByTestId(dataTestIds.patients.patientDateOfBirth).innerText();
+        const rowPatientEmail = await rowLocator.getByTestId(dataTestIds.patients.patientEmail).innerText();
+        const rowPatientPhoneNumber = await rowLocator.getByTestId(dataTestIds.patients.patientPhoneNumber).innerText();
+        const rowPatientAddress = await rowLocator.getByTestId(dataTestIds.patients.patientAddress).innerText();
+        return new Promise((resolve) => {
+          if (
+            rowPatientId === patientInfo.id &&
+            rowPatientName === patientInfo.lastName + ' ' + patientInfo.firstName &&
+            rowPatientDateOfBirth === patientInfo.dateOfBirth &&
+            rowPatientEmail === patientInfo.email &&
+            rowPatientPhoneNumber === patientInfo.phoneNumber &&
+            rowPatientAddress === patientInfo.address
+          ) {
+            resolve(true);
+          }
+          resolve(false);
+        });
+      },
+      async () => {
+        // Wait for the backend API call to complete
+        await this.#page.waitForResponse(
+          (response) => response.url().includes('/Patient?') && response.status() === 200
+        );
+
+        // Ensure search results update after response is received
+        await this.#page
+          .getByTestId(/search-result-row-/i)
+          .first()
+          .waitFor({ state: 'attached' });
+      }
+    );
+
+    expect(patientPresent).toBe(true);
   }
 }
 

apps/ehr/test/e2e/page/StatesPage.ts

@@ -1,27 +1,15 @@
 import { expect, Page } from '@playwright/test';
 import { dataTestIds } from '../../../src/constants/data-test-ids';
+import { PageWithTablePagination } from './PageWithTablePagination';
 
-export class StatesPage {
+export class StatesPage extends PageWithTablePagination {
   #page: Page;
 
   constructor(page: Page) {
+    super(page);
     this.#page = page;
   }
 
-  async clickNextPage(): Promise<void> {
-    await this.#page.getByTestId(dataTestIds.pagination.nextPage).click();
-  }
-
-  async clickPreviousPage(): Promise<void> {
-    await this.#page.getByTestId(dataTestIds.pagination.previousPage).click();
-  }
-
-  async verifyPaginationState(rows: string): Promise<void> {
-    await expect(
-      this.#page.getByTestId(dataTestIds.pagination.paginationContainer).locator('p:text("' + rows + '")')
-    ).toBeVisible();
-  }
-
   async verifyStatePresent(state: string): Promise<void> {
     await expect(this.#page.getByTestId(dataTestIds.statesPage.stateRow(state))).toBeVisible();
   }
@@ -32,11 +20,6 @@ export class StatesPage {
     );
   }
 
-  async selectRowsPerPage(rowsPerPage: string): Promise<void> {
-    await this.#page.getByTestId(dataTestIds.pagination.paginationContainer).getByText('10', { exact: true }).click();
-    await this.#page.getByText(rowsPerPage).click();
-  }
-
   async searchStates(text: string): Promise<void> {
     await this.#page.getByTestId(dataTestIds.statesPage.statesSearch).locator('input').fill(text);
   }