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

Jump to bottom

(Fix): chart review component optimized #1762

Closed
wants to merge 2 commits into from
Closed

(Fix): chart review component optimized #1762

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
912586b
"added usememo + Errorhandling"
Madhu-mac Mar 27, 2024
38cd979
Merge branch 'main' into chart-review-optimization
Madhu-mac May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 22 additions & 13 deletions packages/esm-patient-chart-app/src/patient-chart/chart-review/chart-review.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,44 @@ const ChartReview: React.FC<ChartReviewProps> = ({ patientUuid, patient, view, s
const extensionStore = useExtensionStore();
const { navGroups } = useNavGroups();

const ungroupedDashboards = extensionStore.slots['patient-chart-dashboard-slot'].assignedExtensions.map((e) =>
getDashboardDefinition(e.meta, e.config),
const ungroupedDashboards = useMemo(
() =>
extensionStore.slots['patient-chart-dashboard-slot']?.assignedExtensions?.map((e) =>
getDashboardDefinition(e.meta, e.config),
) ?? [],
[extensionStore.slots['patient-chart-dashboard-slot']],
);
const groupedDashboards = navGroups
.map((slotName) =>
extensionStore.slots[slotName].assignedExtensions.map((e) => getDashboardDefinition(e.meta, e.config)),
)
.flat();

const groupedDashboards = useMemo(
() =>
navGroups.flatMap(
(slotName) =>
extensionStore.slots[slotName]?.assignedExtensions?.map((e) => getDashboardDefinition(e.meta, e.config)) ??
[],
),
[extensionStore.slots, navGroups],
);

const dashboards = ungroupedDashboards.concat(groupedDashboards) as Array<DashboardConfig>;

const defaultDashboard = dashboards.filter((dashboard) => dashboard.path)[0];
const defaultDashboard = useMemo(() => dashboards.find((dashboard) => dashboard.path), [dashboards]);

const dashboard = useMemo(() => {
return dashboards.find((dashboard) => dashboard.path === view);
}, [dashboards, view]);

useEffect(() => {
const activeDashboard = dashboard ?? defaultDashboard;
if (setDashboardLayoutMode) {
setDashboardLayoutMode(activeDashboard.layoutMode ?? 'contained');
setDashboardLayoutMode(activeDashboard?.layoutMode ?? 'contained');
}
}, [dashboard, defaultDashboard, setDashboardLayoutMode]);

if (!('patient-chart-dashboard-slot' in extensionStore.slots)) {
if (!extensionStore.slots['patient-chart-dashboard-slot'] || !defaultDashboard) {
return null;
}

if (!defaultDashboard) {
return null;
} else if (!dashboard) {
if (!dashboard) {
return (
<Navigate
to={makePath(defaultDashboard, {
Expand Down