@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2203 → 5.4.2-pre.2223

package/src/specialized-clinics/generic-nav-links/generic-dashboard.component.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { CardHeader, EmptyState, launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
+import { CardHeader, EmptyState } from '@openmrs/esm-patient-common-lib';
 import { useTranslation } from 'react-i18next';
 import capitalize from 'lodash/capitalize';
 import { ErrorState, launchWorkspace, showModal, showSnackbar, useConfig } from '@openmrs/esm-framework';
@@ -42,7 +42,7 @@ const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid }) => {
   const clinicalFormTitle = capitalize(clinic.replace('-', ' '));
 
   const handleWorkspaceForm = () => {
-    launchPatientWorkspace('patient-form-entry-workspace', {
+    launchWorkspace('patient-form-entry-workspace', {
       workspaceTitle: clinicalFormTitle.replace('clinic', 'form'),
       mutateForm: mutate,
       formInfo: {
@@ -53,7 +53,7 @@ const GenericDashboard: React.FC<GenericDashboardProps> = ({ patientUuid }) => {
     });
   };
   const handleWorkspaceEditForm = (encounterUuid: string = '') => {
-    launchPatientWorkspace('patient-form-entry-workspace', {
+    launchWorkspace('patient-form-entry-workspace', {
       workspaceTitle: clinicalFormTitle.replace('clinic', 'form'),
       mutateForm: mutate,
       formInfo: {

package/src/specialized-clinics/hiv-care-and-treatment-services/defaulter-tracing/defaulter-tracing.component.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { formatDate, parseDate, useConfig } from '@openmrs/esm-framework';
+import { formatDate, launchWorkspace, parseDate, useConfig } from '@openmrs/esm-framework';
 import {
   Contacted_UUID,
   MissedAppointmentDate_UUID,
@@ -9,7 +9,7 @@ import {
   TracingType_UUID,
 } from '../../../utils/constants';
 import { getObsFromEncounter } from '../../../ui/encounter-list/encounter-list-utils';
-import { CardHeader, EmptyState, ErrorState, launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
+import { CardHeader, EmptyState, ErrorState } from '@openmrs/esm-patient-common-lib';
 import {
   Button,
   DataTable,
@@ -42,7 +42,7 @@ const DefaulterTracing: React.FC<PatientTracingProps> = ({ patientUuid }) => {
     defaulterTracingEncounterUuid,
   );
   const handleOpenOrEditDefaulterTracingForm = (encounterUUID = '') => {
-    launchPatientWorkspace('patient-form-entry-workspace', {
+    launchWorkspace('patient-form-entry-workspace', {
       workspaceTitle: 'Defaulter Tracing',
       mutateForm: () => mutate(),
       formInfo: {
@@ -130,7 +130,7 @@ const DefaulterTracing: React.FC<PatientTracingProps> = ({ patientUuid }) => {
         rows={tableRows}
         headers={tableHeader}
         render={({ rows, headers, getHeaderProps, getRowProps, getTableProps, getTableContainerProps }) => (
-          <TableContainer size="sm" {...getTableContainerProps()}>
+          <TableContainer {...getTableContainerProps()}>
             <Table size="sm" {...getTableProps()} aria-label={t('defaulterTracing', 'Defaulter tracing')}>
               <TableHead>
                 <TableRow>
@@ -157,7 +157,7 @@ const DefaulterTracing: React.FC<PatientTracingProps> = ({ patientUuid }) => {
                       <TableCell key={cell.id}>{cell.value}</TableCell>
                     ))}
                     <TableCell className="cds--table-column-menu">
-                      <OverflowMenu aria-label="overflow-menu" flipped="false">
+                      <OverflowMenu aria-label="overflow-menu" flipped={false}>
                         <OverflowMenuItem
                           onClick={() => handleOpenOrEditDefaulterTracingForm(encounters[index]?.uuid)}
                           itemText={t('edit', 'Edit')}

package/src/specialized-clinics/hiv-care-and-treatment-services/defaulter-tracing/defaulter-tracing.test.tsx

@@ -2,23 +2,17 @@ import React from 'react';
 import { screen, render } from '@testing-library/react';
 import DefaulterTracing from './defaulter-tracing.component';
 import { usePatientTracing } from '../../../hooks/usePatientTracing';
-import { launchPatientWorkspace } from '@openmrs/esm-patient-common-lib';
 import useEvent from '@testing-library/user-event';
 import * as mock from '@openmrs/esm-framework/mock';
 
 const usePatientTracingMock = usePatientTracing as jest.MockedFunction<typeof usePatientTracing>;
-const launchPatientWorkspaceMock = launchPatientWorkspace as jest.MockedFunction<typeof launchPatientWorkspace>;
+const launchWorkspaceMock = mock.launchWorkspace as jest.MockedFunction<typeof mock.launchWorkspace>;
 
 jest.mock('../../../hooks/usePatientTracing', () => ({
   defaulterTracingEncounterUuid: 'some-uuid',
   usePatientTracing: jest.fn(),
 }));
 
-jest.mock('@openmrs/esm-patient-common-lib', () => ({
-  ...jest.requireActual('@openmrs/esm-patient-common-lib'),
-  launchPatientWorkspace: jest.fn(),
-}));
-
 jest.spyOn(mock, 'useConfig').mockReturnValue({
   formsList: {
     defaulterTracingFormUuid: 'defaulterTracingFormUuid',
@@ -38,7 +32,7 @@ describe('DefaulterTracing', () => {
     render(<DefaulterTracing patientUuid="patientUuid" />);
     const recordDefaulterTracing = screen.getByRole('button', { name: /Record Defaulter Tracing/i });
     await user.click(recordDefaulterTracing);
-    expect(launchPatientWorkspaceMock).toBeCalledWith('patient-form-entry-workspace', {
+    expect(launchWorkspaceMock).toBeCalledWith('patient-form-entry-workspace', {
       formInfo: {
         encounterUuid: '',
         formUuid: 'defaulterTracingFormUuid',

package/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/hiv-testing-component.scss

@@ -1,8 +1,9 @@
 @use '@carbon/styles/scss/spacing';
-@import '~@openmrs/esm-styleguide/src/vars';
+@use '~@openmrs/esm-styleguide/src/vars' as *;
+@use '@carbon/colors';
 
 .widgetContainer {
-  background-color: $ui-background;
+  background-color: colors.$white;
 }
 
 .widgetHeaderContainer {
@@ -52,7 +53,7 @@
 }
 
 .widgetCard {
-  background-color: $ui-background;
+  background-color: colors.$white;
   border: 1px solid $ui-03;
   position: relative;
 }

package/src/specialized-clinics/hiv-care-and-treatment-services/hiv-testing-services/views/hiv-testing/hiv-testing-services.component.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Tabs, Tab, TabList, TabPanels, TabPanel, ContentSwitcher, Switch, SwitcherItem } from '@carbon/react';
+import { ContentSwitcher, Switch, SwitchEventHandlersParams } from '@carbon/react';
 import styles from '../../hiv-testing-component.scss';
 import { useTranslation } from 'react-i18next';
 import HivScreeningEncounters from './tabs/hiv-screening.component';
@@ -10,20 +10,15 @@ interface OverviewListProps {
   patientUuid: string;
 }
 
-type SwitcherItem = {
-  index: number;
-  name?: string;
-  text?: string;
-};
 const HivTestingEncountersList: React.FC<OverviewListProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
-  const [switchItem, setSwitcherItem] = useState<SwitcherItem>({ index: 0 });
+  const [switchItem, setSwitcherItem] = useState<SwitchEventHandlersParams>({ index: 0 });
 
   return (
     <div className={styles.widgetCard}>
       <CardHeader title={t('htsClinicalView', 'HTS Clinical View')}>
         <div className={styles.contextSwitcherContainer}>
-          <ContentSwitcher selectedIndex={switchItem?.index} onChange={setSwitcherItem}>
+          <ContentSwitcher size="md" selectedIndex={switchItem?.index} onChange={setSwitcherItem}>
             <Switch name={'screening'} text="Screening" />
             <Switch name={'hivTesting'} text="Testing" />
           </ContentSwitcher>

package/src/ui/data-table/o-table.component.tsx

@@ -36,9 +36,9 @@ export const OTable: React.FC<TableProps> = ({ tableHeaders, tableRows, formConc
                     className={`${styles.productiveHeading01} ${styles.text02}`}
                     {...getHeaderProps({
                       header,
-                      isSortable: header.isSortable,
+                      isSortable: true,
                     })}>
-                    {header.header?.content ?? header.header}
+                    {header.header}
                   </TableHeader>
                 ))}
               </TableRow>

package/src/ui/data-table/o-table.scss

@@ -1 +1 @@
-@import '../../root.scss';
+@use '../../root.scss';

package/src/ui/encounter-list/encounter-list.scss

@@ -1,9 +1,11 @@
 @use '@carbon/styles/scss/spacing';
 @use '@carbon/styles/scss/type';
-@import '../../root.scss';
+@use '@carbon/colors';
+@use '@openmrs/esm-styleguide/src/vars' as *;
+@use '../../root.scss';
 
 .widgetContainer {
-  background-color: $ui-background;
+  background-color: colors.$white;
   margin-bottom: 1rem;
   padding: 1rem 0.625rem;
 }
@@ -29,7 +31,7 @@
 }
 
 .newServiceEnrolmentBtn > button {
-  background-color: $ui-background;
+  background-color: colors.$white;
 }
 
 .widgetContainer :global(.cds--data-table) thead th button span {

package/translations/en.json

@@ -89,6 +89,7 @@
   "feedingOrders": "Feeding Orders",
   "fetalHeartRate": "Fetal Heart Rate",
   "filterByForm": "Filter by form",
+  "filterByStatue": "Filter by status",
   "filterByStatus": "Filter by status",
   "finalDiagnosis": "Final Diagnosis",
   "finalDischargeDiagnosis": "Final Discharge Diagnosis",