From 6154c8494b189f7b07dda381acecde8adefdaacc Mon Sep 17 00:00:00 2001 From: lucille Date: Tue, 2 Jul 2024 14:59:39 +0300 Subject: [PATCH] Move the tabs implementation in the commons-lib -cacx --- .../cacx-visits-services.component.tsx | 33 ++------------- .../components/encounter-tabs}/common.scss | 0 .../encounter-tabs.component.tsx | 40 +++++++++++++++++++ 3 files changed, 43 insertions(+), 30 deletions(-) rename packages/{esm-cervical-cancer-app/src/cervical-cancer => esm-commons-lib/src/components/encounter-tabs}/common.scss (100%) create mode 100644 packages/esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component.tsx diff --git a/packages/esm-cervical-cancer-app/src/cervical-cancer/cacx-visits/cacx-visits-services.component.tsx b/packages/esm-cervical-cancer-app/src/cervical-cancer/cacx-visits/cacx-visits-services.component.tsx index 29039051a..3fe18f03b 100644 --- a/packages/esm-cervical-cancer-app/src/cervical-cancer/cacx-visits/cacx-visits-services.component.tsx +++ b/packages/esm-cervical-cancer-app/src/cervical-cancer/cacx-visits/cacx-visits-services.component.tsx @@ -1,11 +1,9 @@ import React from 'react'; -import { Tabs, Tab, TabList, TabPanels, TabPanel } from '@carbon/react'; import { useConfig } from '@openmrs/esm-framework'; -import { EncounterList, getMenuItemTabConfiguration } from '@ohri/openmrs-esm-ohri-commons-lib'; +import { getMenuItemTabConfiguration, TabsComponent } from '@ohri/openmrs-esm-ohri-commons-lib'; +// import TabsComponent from '../../../../esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component'; import cacxConfigSchema from './cacx-config.json'; -import styles from '../common.scss'; - interface OverviewListProps { patientUuid: string; } @@ -14,32 +12,7 @@ const CaCxCervicalCancerServices: React.FC = ({ patientUuid } const config = useConfig(); const tabs = getMenuItemTabConfiguration(cacxConfigSchema, config); - return ( -
- - - {tabs.map((tab) => ( - {tab.name} - ))} - - - {tabs.map((tab) => ( - - - - ))} - - -
- ); + return ; }; export default CaCxCervicalCancerServices; diff --git a/packages/esm-cervical-cancer-app/src/cervical-cancer/common.scss b/packages/esm-commons-lib/src/components/encounter-tabs/common.scss similarity index 100% rename from packages/esm-cervical-cancer-app/src/cervical-cancer/common.scss rename to packages/esm-commons-lib/src/components/encounter-tabs/common.scss diff --git a/packages/esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component.tsx b/packages/esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component.tsx new file mode 100644 index 000000000..91a37f189 --- /dev/null +++ b/packages/esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component.tsx @@ -0,0 +1,40 @@ +import React from 'react'; +import { Tabs, Tab, TabList, TabPanels, TabPanel } from '@carbon/react'; +import { EncounterList } from '@ohri/openmrs-esm-ohri-commons-lib'; +import styles from '../common.scss'; + +interface OverviewListProps { + patientUuid: string; + tabsConfig: any[]; +} + +const TabsComponent = ({ patientUuid, tabsConfig }: OverviewListProps) => { + return ( +
+ + + {tabsConfig.map((tab) => ( + {tab.name} + ))} + + + {tabsConfig.map((tab) => ( + + + + ))} + + +
+ ); +}; + +export default TabsComponent;