Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the tabs implementation in the commons-lib -cacx #1894

Merged
merged 7 commits into from
Jul 4, 2024
Merged

Move the tabs implementation in the commons-lib -cacx #1894

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6154c84
Move the tabs implementation in the commons-lib -cacx
lucyjemutai Jul 2, 2024
d43deae
remove unused code
lucyjemutai Jul 2, 2024
1d53dcb
update the imported TabsComponent
lucyjemutai Jul 3, 2024
0c48fab
Merge branch 'UCSF-IGHS:dev' into cacx-tabs
lucyjemutai Jul 3, 2024
ea169b5
address comments on the PR
lucyjemutai Jul 3, 2024
8873b45
Merge branch 'UCSF-IGHS:dev' into cacx-tabs
lucyjemutai Jul 4, 2024
ee940b0
pass the config at the package
lucyjemutai Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 2 additions & 30 deletions ...sm-cervical-cancer-app/src/cervical-cancer/cacx-visits/cacx-visits-services.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
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 cacxConfigSchema from './cacx-config.json';

import styles from '../common.scss';

interface OverviewListProps {
patientUuid: string;
}
Expand All @@ -14,32 +11,7 @@ const CaCxCervicalCancerServices: React.FC<OverviewListProps> = ({ patientUuid }
const config = useConfig();
const tabs = getMenuItemTabConfiguration(cacxConfigSchema, config);
lucyjemutai marked this conversation as resolved.
Show resolved Hide resolved

return (
<div className={styles.tabContainer}>
<Tabs>
<TabList contained>
{tabs.map((tab) => (
<Tab key={tab.name}>{tab.name}</Tab>
))}
</TabList>
<TabPanels>
{tabs.map((tab) => (
<TabPanel>
<EncounterList
patientUuid={patientUuid}
formList={tab.formList}
columns={tab.columns}
encounterType={tab.encounterType}
launchOptions={tab.launchOptions}
headerTitle={tab.headerTitle}
description={tab.description}
/>
</TabPanel>
))}
</TabPanels>
</Tabs>
</div>
);
return <TabsComponent patientUuid={patientUuid} tabsConfig={tabs} />;
lucyjemutai marked this conversation as resolved.
Show resolved Hide resolved
};

export default CaCxCervicalCancerServices;
2 changes: 1 addition & 1 deletion ...ancer-app/src/cervical-cancer/common.scss → ...src/components/encounter-tabs/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '@carbon/styles/scss/spacing';
@import '../root.scss';
@import '../../root.scss';

.tabContainer div[role='tabpanel'] {
padding: 0 !important;
Expand Down
40 changes: 40 additions & 0 deletions packages/esm-commons-lib/src/components/encounter-tabs/encounter-tabs.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[];
}

export const TabsComponent: React.FC<OverviewListProps> = ({ patientUuid, tabsConfig }) => {
return (
<div className={styles.tabContainer}>
<Tabs>
<TabList contained>
{tabsConfig.map((tab) => (
<Tab key={tab.name}>{tab.name}</Tab>
))}
</TabList>
<TabPanels>
{tabsConfig.map((tab) => (
<TabPanel key={tab.name}>
<EncounterList
patientUuid={patientUuid}
formList={tab.formList}
columns={tab.columns}
encounterType={tab.encounterType}
launchOptions={tab.launchOptions}
headerTitle={tab.headerTitle}
description={tab.description}
/>
</TabPanel>
))}
</TabPanels>
</Tabs>
</div>
);
};

export default TabsComponent;
1 change: 1 addition & 0 deletions packages/esm-commons-lib/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export * from './utils/summary-card-config-builder';
export * from './utils/encounter-tile-config-builder';
export * from './utils/cohort-list-config-builder';
export * from './utils/patient-list-tabs-config-builder';
export * from './components/encounter-tabs/encounter-tabs.component';
// Workspace registration moved to the index.ts and routes.json
const options = {
featureName: 'ohri-forms-workspace-item',
Expand Down
Loading