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 5 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
36 changes: 2 additions & 34 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,45 +1,13 @@
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 { TabsComponent } from '@ohri/openmrs-esm-ohri-commons-lib';
import cacxConfigSchema from './cacx-config.json';

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

interface OverviewListProps {
patientUuid: string;
}

const CaCxCervicalCancerServices: React.FC<OverviewListProps> = ({ patientUuid }) => {
const config = useConfig();
const tabs = getMenuItemTabConfiguration(cacxConfigSchema, config);

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} configSchema={cacxConfigSchema} />;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The package config should also be passed at this point

};

export default CaCxCervicalCancerServices;
44 changes: 44 additions & 0 deletions ...ages/esm-commons-lib/src/components/encounter-list-tabs/encounter-list-tabs.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
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 styles from './encounter-list-tabs.scss';

interface TabsComponentProps {
patientUuid: string;
configSchema: any;
}

export const TabsComponent: React.FC<TabsComponentProps> = ({ patientUuid, configSchema }) => {
const config = useConfig();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will not work because at this point the config is for the commons lib, we need to pass the config at the package/app level since the configs are different across packages.

const tabsConfig = getMenuItemTabConfiguration(configSchema, config);

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;
2 changes: 1 addition & 1 deletion ...ancer-app/src/cervical-cancer/common.scss → ...ounter-list-tabs/encounter-list-tabs.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
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-list-tabs/encounter-list-tabs.component';
// Workspace registration moved to the index.ts and routes.json
const options = {
featureName: 'ohri-forms-workspace-item',
Expand Down
Loading