Skip to content

Commit

Permalink
fix the duplicating issue
Browse files Browse the repository at this point in the history
  • Loading branch information
hadijahkyampeire committed May 30, 2024
1 parent 9dcc30d commit a029805
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 181 deletions.
2 changes: 0 additions & 2 deletions __mocks__/encounter-tile.mock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { getObsFromEncounter } from '@ohri/openmrs-esm-ohri-commons-lib';

export const headerTitle = 'HIV Monitoring';

export const patientUuid = 'b280078a-c0ce-443b-9997-3c66c63ec2f8';
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-hiv-care-treatment-app/src/dashboard.meta.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Home, Pills } from '@carbon/react/icons';
import { Home } from '@carbon/react/icons';

// Patient Chart Dashboards
export const hivCareAndTreatmentDashboardDMeta = {
Expand Down
12 changes: 7 additions & 5 deletions packages/esm-hiv-care-treatment-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ export function startupApp() {

export const patientHIVStatusTag = getSyncLifecycle(PatientStatusBannerTag, options);

export const htsServiceSummaryList = getSyncLifecycle(ServiceSummaryOverviewList, {
featureName: 'hts-service-summary-list',
moduleName,
});

export const hivCareAndTreatmentFolderLink = getSyncLifecycle(
createOHRIDashboardLink(hivCareAndTreatmentFolderDashboardMeta),
options,
Expand All @@ -57,6 +52,13 @@ export const hivCareAndTreatmentDashboardLink = getSyncLifecycle(
);
export const hivCareAndTreatmentDashboard = getSyncLifecycle(careAndTreatmentRootComponent, options);

// Patient chart

export const hivServiceSummaryList = getSyncLifecycle(ServiceSummaryOverviewList, {
featureName: 'hiv-service-summary-list',
moduleName,
});

export const patientChartHIVCareAndTreatmentDashboard = getSyncLifecycle(
createDashboardGroup(hivCareAndTreatmentDashboardDMeta),
options,
Expand Down
4 changes: 2 additions & 2 deletions packages/esm-hiv-care-treatment-app/src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
}
},
{
"name": "hts-service-summary-list-ext",
"name": "hiv-service-summary-list-ext",
"slot": "hiv-patient-summary-dashboard-slot",
"component": "htsServiceSummaryList"
"component": "hivServiceSummaryList"
},
{
"name": "program-management-summary",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React, { useEffect, useState, useCallback } from 'react';
import styles from './patient-list.scss';
import { useTranslation } from 'react-i18next';
import {
EmptyState,
Expand All @@ -14,6 +13,8 @@ import { capitalize } from 'lodash-es';
import { Link, BrowserRouter as Router } from 'react-router-dom';
import { LabresultsFormViewer } from '../lab-results-form-viewer';

import styles from './patient-list.scss';

interface CD4ResultsListProps {
patientUuid: string;
}
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion packages/esm-hiv-prevention-app/src/dashboard.meta.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Home, Pills } from '@carbon/react/icons';
import { Pills } from '@carbon/react/icons';

// Patient Chart Dashboards
export const hivPreventionDashboardMeta = {
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-hiv-prevention-app/src/hts-root.component.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { SWRConfig } from 'swr';
import { BrowserRouter, Route, Routes } from 'react-router-dom';
import Home from './hiv-testing-services-home.component';
import Home from './hts-home.component';

const swrConfiguration = {
// Maximum number of retries when the backend returns an error
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tabs, Tab, TabList, TabPanels, TabPanel } from '@carbon/react';
import styles from './ohri-patient-tabs.scss';
import { CohortPatientList } from '@ohri/openmrs-esm-ohri-commons-lib';
import { useTranslation } from 'react-i18next';
import { moduleName } from '../../../../../esm-hiv-care-treatment-app/src/index';
import { moduleName } from '../../../index';
import { useConfig } from '@openmrs/esm-framework';

function OHRIPatientTabs() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, Row } from '@carbon/react';
import { Row } from '@carbon/react';
import React, { useEffect, useState } from 'react';
import {
OHRISummaryTile,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import { capitalize } from 'lodash-es';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import {
fetchPatientsFromObservationCodeConcept,
fetchTodayClients,
TableEmptyState,
filterFHIRPatientsByName,
} from '@ohri/openmrs-esm-ohri-commons-lib';
import { basePath } from '../../../../../esm-hiv-care-treatment-app/src/constants';
import { basePath } from '../../../constants';

export const columns = [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { age, attach, detach, ExtensionSlot, useConfig } from '@openmrs/esm-framework';
import { capitalize } from 'lodash-es';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { basePath } from '../../../../../esm-hiv-care-treatment-app/src/constants';
import { basePath } from '../../../constants';
import {
fetchPatientsFromObservationCodeConcept,
fetchTodayClients,
TableEmptyState,
filterFHIRPatientsByName,
} from '@ohri/openmrs-esm-ohri-commons-lib';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { age, attach, detach, ExtensionSlot } from '@openmrs/esm-framework';
import { capitalize } from 'lodash-es';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { TableEmptyState, fetchTodayClients, filterFHIRPatientsByName } from '@ohri/openmrs-esm-ohri-commons-lib';
import { basePath } from '../../../../../esm-hiv-care-treatment-app/src/constants';
import { basePath } from '../../../constants';

export const columns = [
{
Expand Down

0 comments on commit a029805

Please sign in to comment.