@openmrs/esm-patient-list-management-app 9.2.1-pre.7129 → 9.2.1-pre.7136

package/src/api/hooks.ts

@@ -2,7 +2,12 @@ import { useEffect } from 'react';
 import useSWR from 'swr';
 import useSWRInfinite from 'swr/infinite';
 import { openmrsFetch, type FetchResponse, useConfig, useSession } from '@openmrs/esm-framework';
-import { cohortUrl, getAllPatientLists, getPatientListIdsForPatient, getPatientListMembers } from './api-remote';
+import {
+  cohortUrl,
+  getAllPatientLists,
+  getPatientListIdsForPatient,
+  getPatientListMembers,
+} from './patient-list.resource';
 import { type PatientListManagementConfig } from '../config-schema';
 import {
   type CohortResponse,

package/src/api/{api-remote.ts → patient-list.resource.ts}

@@ -58,7 +58,7 @@ async function postData(url: string, data = {}, ac = new AbortController()) {
   return response.data;
 }
 
-export function extractErrorMessagesFromResponse(errorObject: ErrorObject) {
+export function extractErrorMessagesFromResponse(errorObject: ErrorObject, t?: TFunction) {
   const {
     error: { fieldErrors, globalErrors, message, code },
   } = errorObject ?? {};
@@ -75,7 +75,7 @@ export function extractErrorMessagesFromResponse(errorObject: ErrorObject) {
       .join('\n');
   }
 
-  return message ?? code ?? this.translateService.instant('unknownError');
+  return message ?? code ?? t('unknownError', 'An unknown error occurred');
 }
 
 async function deleteData(url: string, data = {}, ac = new AbortController()) {

package/src/dashboard.meta.ts

@@ -1,6 +1,6 @@
 export const dashboardMeta = {
   path: 'patient-lists',
   slot: 'patient-lists-dashboard-slot',
-  title: 'Patient lists',
+  title: 'patientLists',
   basePath: `${window.spaBase}/home`,
 } as const;

package/src/list-details/list-details.component.tsx

@@ -13,7 +13,7 @@ import {
   launchWorkspace,
   showModal,
 } from '@openmrs/esm-framework';
-import { deletePatientList } from '../api/api-remote';
+import { deletePatientList } from '../api/patient-list.resource';
 import { usePatientListDetails, usePatientListMembers } from '../api/hooks';
 import ListDetailsTable from '../list-details-table/list-details-table.component';
 import styles from './list-details.scss';

package/src/list-details/list-details.test.tsx

@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event';
 import type { OpenmrsCohortMember, OpenmrsCohort } from '../api/types';
 import { showModal } from '@openmrs/esm-framework';
 import { useCohortTypes, usePatientListDetails, usePatientListMembers } from '../api/hooks';
-import { deletePatientList } from '../api/api-remote';
+import { deletePatientList } from '../api/patient-list.resource';
 import { getByTextWithMarkup } from 'tools';
 import ListDetails from './list-details.component';
 
@@ -20,7 +20,7 @@ jest.mock('../api/hooks', () => ({
   useCohortTypes: jest.fn(),
 }));
 
-jest.mock('../api/api-remote');
+jest.mock('../api/patient-list.resource');
 
 const mockPatientListDetails = {
   name: 'Test Patient List',

package/src/list-details-table/list-details-table.component.tsx

@@ -32,7 +32,7 @@ import {
   useDebounce,
   useLayoutType,
 } from '@openmrs/esm-framework';
-import { addPatientToList, removePatientFromList } from '../api/api-remote';
+import { addPatientToList, removePatientFromList } from '../api/patient-list.resource';
 import { EmptyDataIllustration } from '../empty-state/empty-data-illustration.component';
 import styles from './list-details-table.scss';
 

package/src/list-details-table/list-details-table.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 { ExtensionSlot, isDesktop, showSnackbar, useLayoutType } from '@openmrs/esm-framework';
-import { addPatientToList } from '../api/api-remote';
+import { addPatientToList } from '../api/patient-list.resource';
 import ListDetailsTable from './list-details-table.component';
 
 const mockShowSnackbar = jest.mocked(showSnackbar);
@@ -19,7 +19,7 @@ beforeEach(() => {
   ));
 });
 
-jest.mock('../api/api-remote', () => ({
+jest.mock('../api/patient-list.resource', () => ({
   addPatientToList: jest.fn(() => Promise.resolve()),
   removePatientFromList: jest.fn(),
 }));

package/src/lists-table/lists-table.component.tsx

@@ -31,7 +31,7 @@ import {
 } from '@openmrs/esm-framework';
 import type { PatientListManagementConfig } from '../config-schema';
 import type { PatientList } from '../api/types';
-import { starPatientList } from '../api/api-remote';
+import { starPatientList } from '../api/patient-list.resource';
 import { CustomPagination } from './custom-pagination.component';
 import { ErrorState } from '../error-state/error-state.component';
 import EmptyState from '../empty-state/empty-state.component';

package/src/patient-list-form/patient-list-form.workspace.tsx

@@ -17,7 +17,7 @@ import {
   editPatientList,
   extractErrorMessagesFromResponse,
   type ErrorObject,
-} from '../api/api-remote';
+} from '../api/patient-list.resource';
 import { useCohortTypes } from '../api/hooks';
 import styles from './patient-list-form.scss';
 
@@ -105,7 +105,7 @@ const PatientListFormWorkspace: React.FC<PatientListFormWorkspaceProps> = ({
         OpenmrsFetchError && error instanceof OpenmrsFetchError
           ? typeof error.responseBody === 'string'
             ? error.responseBody
-            : extractErrorMessagesFromResponse(error.responseBody as ErrorObject)
+            : extractErrorMessagesFromResponse(error.responseBody as ErrorObject, t)
           : (error as any)?.message;
 
       showSnackbar({

package/translations/en.json

@@ -58,6 +58,7 @@
   "noMatchingPatients": "No matching patients to display",
   "noOfPatients": "No. of patients",
   "noPatientsInList": "There are no patients in this list",
+  "offlinePatients": "Offline patients",
   "openPatientList": "Add to list",
   "patientAddedToList": "Patient added to list",
   "patientAlreadyInList": "This patient is already in the list",
@@ -88,6 +89,7 @@
   "systemDefined": "system-defined",
   "systemLists": "System lists",
   "trySearchingForADifferentList": "Try searching for a different list",
+  "unknownError": "An unknown error occurred",
   "unstarList": "Unstar list",
   "updated": "Updated",
   "userDefined": "user-defined"