feat: Group findings table values with custom components/grouping functions (#4712)
This commit is contained in:
1 parent
0522d58d9b
commit
df8efba82c
48 files changed
+1256
-631
No files matched your search
@@ -0,0 +1,192 @@
|
||||
import React from 'react';
|
||||
import { useSystem } from '@ohif/core';
|
||||
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
|
||||
import { ChevronDownIcon } from '@radix-ui/react-icons';
|
||||
|
||||
export type AccordionGrouping = {
|
||||
[name: string]: unknown;
|
||||
};
|
||||
|
||||
export type AccordionGroupProps = {
|
||||
grouping: AccordionGrouping;
|
||||
};
|
||||
|
||||
/**
|
||||
* Searches for the required type from the provided allChildren list and
|
||||
* renders them.
|
||||
*/
|
||||
export const CloneChildren = props => {
|
||||
const { group, allChildren, children, childType, defaultTypes } = props;
|
||||
|
||||
const subType = group?.subType;
|
||||
|
||||
for (const child of allChildren) {
|
||||
if (subType && child.props?.subType !== subType) {
|
||||
continue;
|
||||
}
|
||||
if (childType && child.type === childType) {
|
||||
return React.cloneElement(child, { ...props, children: child.props.children });
|
||||
}
|
||||
if (defaultTypes?.indexOf(child.type) === -1) {
|
||||
return childType({ ...props, children: child });
|
||||
}
|
||||
}
|
||||
|
||||
if (!children) {
|
||||
throw new Error(`No children defined for ${props.name} CloneChildren in group ${group?.name}`);
|
||||
}
|
||||
return React.cloneElement(children, props);
|
||||
};
|
||||
|
||||
/** Used to exclude defaults */
|
||||
const DEFAULT_TYPES = [GroupAccordion, Content, Trigger];
|
||||
|
||||
/**
|
||||
* An AccordionGroup is a component that splits a set of items into different
|
||||
* groups according to a set of grouping rules. It then puts the groups
|
||||
* into a set of accordion folds selected from the body of the accordion group,
|
||||
* looking for matching trigger/content sections according to the type definition
|
||||
* in the group with first one found being used.
|
||||
*
|
||||
* This design allows for easy customization of the component by declaring grouping
|
||||
* functions with default grouping setups and then only overriding the specific
|
||||
* children needing to be changed. See the PanelMeasurement for some example
|
||||
* possibilities of how to modify the default grouping, or the test-extension
|
||||
* measurements panel for a practical, working example.
|
||||
*/
|
||||
export function AccordionGroup(props) {
|
||||
const { grouping, items, children, sourceChildren, type } = props;
|
||||
const childProps = useSystem();
|
||||
let defaultValue = props.defaultValue;
|
||||
const groups = grouping.groupingFunction(items, grouping, childProps);
|
||||
|
||||
if (!defaultValue) {
|
||||
const defaultGroup = groups.values().find(group => group.isSelected);
|
||||
defaultValue = defaultGroup?.key || defaultGroup?.title;
|
||||
}
|
||||
|
||||
const valueArr =
|
||||
(Array.isArray(defaultValue) && defaultValue) || (defaultValue && [defaultValue]) || [];
|
||||
const sourceChildrenArr = sourceChildren ? React.Children.toArray(sourceChildren) : [];
|
||||
const childrenArr = children ? React.Children.toArray(children) : [];
|
||||
const allChildren = sourceChildrenArr.concat(childrenArr);
|
||||
|
||||
return (
|
||||
<CloneChildren
|
||||
allChildren={allChildren}
|
||||
groups={groups}
|
||||
childType={GroupAccordion}
|
||||
grouping={grouping}
|
||||
defaultValue={valueArr}
|
||||
name={'grouping ' + grouping.name}
|
||||
>
|
||||
<DefaultAccordion name="DefaultAccordion" />
|
||||
</CloneChildren>
|
||||
);
|
||||
}
|
||||
|
||||
function DefaultAccordion(props) {
|
||||
const { groups, defaultValue, grouping, allChildren, asChild } = props;
|
||||
if (!allChildren || !groups) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (Boolean(asChild)) {
|
||||
return React.cloneElement(props.children, props);
|
||||
}
|
||||
|
||||
return (
|
||||
<Accordion
|
||||
type={grouping.type || 'multiple'}
|
||||
className="text-white"
|
||||
defaultValue={defaultValue}
|
||||
>
|
||||
{[...groups.entries()].map(([key, group]) => {
|
||||
return (
|
||||
<AccordionItem
|
||||
key={group.key + '-i'}
|
||||
value={group.key}
|
||||
>
|
||||
<CloneChildren
|
||||
allChildren={allChildren}
|
||||
group={group}
|
||||
childType={Trigger}
|
||||
name="AccordionGroup.Trigger"
|
||||
/>
|
||||
<CloneChildren
|
||||
allChildren={allChildren}
|
||||
group={group}
|
||||
childType={Content}
|
||||
defaultTypes={DEFAULT_TYPES}
|
||||
name="AccordionGroup.Content"
|
||||
/>
|
||||
</AccordionItem>
|
||||
);
|
||||
})}
|
||||
</Accordion>
|
||||
);
|
||||
}
|
||||
|
||||
function GroupAccordion(props) {
|
||||
const { groups, children } = props;
|
||||
if (!groups) {
|
||||
return null;
|
||||
}
|
||||
return [...groups.values()].map(group =>
|
||||
React.cloneElement(children, {
|
||||
...props,
|
||||
children: children.props.children,
|
||||
group,
|
||||
...group,
|
||||
key: group.title,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
function Content(props) {
|
||||
const { children, asChild, ...childProps } = props;
|
||||
const { group } = props;
|
||||
Object.assign(childProps, group);
|
||||
|
||||
if (!group) {
|
||||
return null;
|
||||
}
|
||||
if (asChild) {
|
||||
return React.cloneElement(children, { ...group, ...props, children: children.props.children });
|
||||
}
|
||||
return (
|
||||
<AccordionContent>
|
||||
{React.cloneElement(children, { ...group, ...props, children: children.props.children })}
|
||||
</AccordionContent>
|
||||
);
|
||||
}
|
||||
|
||||
function Trigger(props) {
|
||||
const { children, asChild, ...childProps } = props;
|
||||
const { group } = props;
|
||||
Object.assign(childProps, group);
|
||||
|
||||
if (!group) {
|
||||
return null;
|
||||
}
|
||||
if (asChild) {
|
||||
return React.cloneElement(children, childProps);
|
||||
}
|
||||
return (
|
||||
<AccordionTrigger
|
||||
value={group.value}
|
||||
asChild={true}
|
||||
>
|
||||
<div>
|
||||
{React.cloneElement(children, childProps)}
|
||||
<ChevronDownIcon key="chevronDown" className="text-primary h-4 w-4 shrink-0 transition-transform duration-200" />
|
||||
</div>
|
||||
</AccordionTrigger>
|
||||
);
|
||||
}
|
||||
|
||||
AccordionGroup.Content = Content;
|
||||
AccordionGroup.Trigger = Trigger;
|
||||
AccordionGroup.Accordion = GroupAccordion;
|
||||
|
||||
export default AccordionGroup;
|
||||
@@ -0,0 +1,4 @@
|
||||
export * from './AccordionGroup';
|
||||
import AccordionGroup from './AccordionGroup';
|
||||
|
||||
export default AccordionGroup;
|
||||
@@ -0,0 +1,70 @@
|
||||
import React from 'react';
|
||||
import { Accordion, AccordionContent, AccordionItem } from '@ohif/ui-next';
|
||||
|
||||
import PanelAccordionTrigger from './PanelAccordionTrigger';
|
||||
import MeasurementsMenu from './MeasurementsMenu';
|
||||
import { useSystem } from '@ohif/core';
|
||||
|
||||
export function MeasurementItem(props) {
|
||||
const { index, item } = props;
|
||||
return (
|
||||
<PanelAccordionTrigger
|
||||
count={index + 1}
|
||||
text={item.toolName || item.label || item.title}
|
||||
colorHex="#f00"
|
||||
isActive={item.isSelected}
|
||||
menu={MeasurementsMenu}
|
||||
group={{ items: [item], onClick: props.onClick }}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export default function MeasurementAccordion(props) {
|
||||
const { items } = props;
|
||||
const system = useSystem();
|
||||
|
||||
const onClick = (e, group) => {
|
||||
const { items } = group;
|
||||
// Just jump to the first measurement in the set, and mark that one as active
|
||||
// with the set of items.
|
||||
system.commandsManager.run('jumpToMeasurement', {
|
||||
uid: items[0].uid,
|
||||
displayMeasurements: items,
|
||||
group,
|
||||
});
|
||||
};
|
||||
|
||||
return (
|
||||
<Accordion
|
||||
type="multiple"
|
||||
className="flex-shrink-0 overflow-hidden"
|
||||
>
|
||||
{items.map((item, index) => {
|
||||
const { displayText: details = {} } = item;
|
||||
return (
|
||||
<AccordionItem
|
||||
key={`measurementAccordion:${item.uid}`}
|
||||
value={item.uid}
|
||||
>
|
||||
<MeasurementItem
|
||||
item={item}
|
||||
key={`measurementItem:${item.uid}`}
|
||||
index={index}
|
||||
onClick={onClick}
|
||||
/>
|
||||
<AccordionContent key={`measurementContent:${item.uid}`}>
|
||||
<div className="ml-7 px-2 py-2">
|
||||
<div className="text-secondary-foreground flex items-center gap-1 text-base leading-normal">
|
||||
{details.primary?.length > 0 &&
|
||||
details.primary.map((detail, index) => (
|
||||
<span key={`details:${item.uid}:${index}`}>{detail}</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</AccordionContent>
|
||||
</AccordionItem>
|
||||
);
|
||||
})}
|
||||
</Accordion>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import React from 'react';
|
||||
import { MeasurementTable } from '@ohif/ui-next';
|
||||
import { useSystem } from '@ohif/core';
|
||||
|
||||
/**
|
||||
* This is a measurement table that is designed to be nested inside
|
||||
* the accordion groups.
|
||||
*/
|
||||
export default function MeasurementTableNested(props) {
|
||||
const { title, items, group, customHeader } = props;
|
||||
const { commandsManager } = useSystem();
|
||||
const onAction = (e, command, uid) => {
|
||||
commandsManager.run(command, { uid, annotationUID: uid, displayMeasurements: items });
|
||||
};
|
||||
|
||||
return (
|
||||
<MeasurementTable
|
||||
title={title ? title : `Measurements`}
|
||||
data={items}
|
||||
onAction={onAction}
|
||||
{...group}
|
||||
key={group.key}
|
||||
>
|
||||
<MeasurementTable.Header key="measurementTableHeader">
|
||||
{customHeader && group.isFirst && customHeader({ ...props, items: props.allItems })}
|
||||
</MeasurementTable.Header>
|
||||
<MeasurementTable.Body key="measurementTableBody" />
|
||||
</MeasurementTable>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
import React, { useState } from 'react';
|
||||
import { useSystem } from '@ohif/core';
|
||||
import {
|
||||
Button,
|
||||
DropdownMenu,
|
||||
DropdownMenuTrigger,
|
||||
DropdownMenuContent,
|
||||
DropdownMenuItem,
|
||||
Icons,
|
||||
} from '@ohif/ui-next';
|
||||
|
||||
export function MeasumentsMenu(props) {
|
||||
const { group, classNames } = props;
|
||||
if (!group.items?.length) {
|
||||
console.log('No items to iterate', group.items);
|
||||
return null;
|
||||
}
|
||||
const { items } = group;
|
||||
const [item] = items;
|
||||
const { isSelected, isVisible } = item;
|
||||
|
||||
const system = useSystem();
|
||||
|
||||
const onAction = (event, command, args?) => {
|
||||
const uid = items.map(item => item.uid);
|
||||
// Some commands use displayMeasurements and some use items
|
||||
system.commandsManager.run(command, {
|
||||
...args,
|
||||
uid,
|
||||
displayMeasurements: items,
|
||||
items,
|
||||
event,
|
||||
});
|
||||
};
|
||||
|
||||
const [isDropdownOpen, setIsDropdownOpen] = useState(false);
|
||||
|
||||
return (
|
||||
<div className={`relative ml-2 inline-flex items-center space-x-1 ${classNames}`}>
|
||||
{/* Visibility Toggle Icon */}
|
||||
<Button
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
className={`h-6 w-6 transition-opacity ${
|
||||
isSelected || !isVisible ? 'opacity-100' : 'opacity-50 group-hover:opacity-100'
|
||||
}`}
|
||||
aria-label={isVisible ? 'Hide' : 'Show'}
|
||||
onClick={e => {
|
||||
e.stopPropagation();
|
||||
onAction(e, ['jumpToMeasurement', 'toggleVisibilityMeasurement']);
|
||||
}}
|
||||
>
|
||||
{isVisible ? <Icons.Hide className="h-6 w-6" /> : <Icons.Show className="h-6 w-6" />}
|
||||
</Button>
|
||||
{/* Actions Dropdown Menu */}
|
||||
<DropdownMenu onOpenChange={open => setIsDropdownOpen(open)}>
|
||||
<DropdownMenuTrigger asChild>
|
||||
<Button
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
className={`h-6 w-6 transition-opacity ${
|
||||
isSelected || isDropdownOpen ? 'opacity-100' : 'opacity-50 group-hover:opacity-100'
|
||||
}`}
|
||||
aria-label="Actions"
|
||||
onClick={e => e.stopPropagation()} // Prevent row selection on button click
|
||||
>
|
||||
<Icons.More className="h-6 w-6" />
|
||||
</Button>
|
||||
</DropdownMenuTrigger>
|
||||
<DropdownMenuContent align="end">
|
||||
<DropdownMenuItem onClick={e => onAction(e, 'removeMeasurement')}>
|
||||
<Icons.Delete className="text-foreground" />
|
||||
<span className="pl-2">Delete</span>
|
||||
</DropdownMenuItem>
|
||||
</DropdownMenuContent>
|
||||
</DropdownMenu>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default MeasumentsMenu;
|
||||
@@ -0,0 +1,81 @@
|
||||
import React from 'react';
|
||||
import AccordionGroup from './AccordionGroup';
|
||||
import { utils } from '@ohif/core';
|
||||
import MeasurementTableNested from './MeasurementTableNested';
|
||||
|
||||
const { filterNot, filterAdditionalFindings } = utils.MeasurementFilters;
|
||||
|
||||
export const MeasurementOrAdditionalFindingSets = [
|
||||
{
|
||||
title: 'Measurements',
|
||||
filter: filterNot(filterAdditionalFindings),
|
||||
},
|
||||
{
|
||||
title: 'Additional Findings',
|
||||
filter: filterAdditionalFindings,
|
||||
},
|
||||
];
|
||||
|
||||
/**
|
||||
* Groups measurements by study in order to allow display and saving by study
|
||||
* @param {Object} servicesManager
|
||||
*/
|
||||
export const groupByNamedSets = (items, grouping) => {
|
||||
const groups = new Map();
|
||||
const { namedSets } = grouping;
|
||||
|
||||
for (const namedSet of namedSets) {
|
||||
const name = namedSet.id || namedSet.title;
|
||||
groups.set(name, {
|
||||
...grouping,
|
||||
...namedSet,
|
||||
items: [],
|
||||
isFirst: groups.size === 0,
|
||||
title: name,
|
||||
key: name,
|
||||
});
|
||||
}
|
||||
items.forEach(item => {
|
||||
for (const namedSet of namedSets) {
|
||||
if (namedSet.filter(item)) {
|
||||
const name = namedSet.id || namedSet.title;
|
||||
groups.get(name).items.push(item);
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
for (const namedSet of namedSets) {
|
||||
const name = namedSet.id || namedSet.title;
|
||||
if (!groups.get(name).items.length) {
|
||||
groups.delete(name);
|
||||
}
|
||||
}
|
||||
return groups;
|
||||
};
|
||||
|
||||
export function MeasurementsOrAdditionalFindings(props): React.ReactNode {
|
||||
const { items, children, grouping = {}, customHeader, group } = props;
|
||||
|
||||
return (
|
||||
<AccordionGroup
|
||||
grouping={{
|
||||
groupingFunction: groupByNamedSets,
|
||||
name: 'measurementsOrAdditional',
|
||||
namedSets: MeasurementOrAdditionalFindingSets,
|
||||
StudyInstanceUID: group?.StudyInstanceUID,
|
||||
...grouping,
|
||||
}}
|
||||
items={items}
|
||||
sourceChildren={children}
|
||||
>
|
||||
<AccordionGroup.Accordion noWrapper="true">
|
||||
<MeasurementTableNested
|
||||
customHeader={customHeader}
|
||||
allItems={items}
|
||||
/>
|
||||
</AccordionGroup.Accordion>
|
||||
</AccordionGroup>
|
||||
);
|
||||
}
|
||||
|
||||
export default MeasurementsOrAdditionalFindings;
|
||||
@@ -0,0 +1,48 @@
|
||||
import React from 'react';
|
||||
import { AccordionTrigger, ColorCircle } from '@ohif/ui-next';
|
||||
import { ChevronDownIcon } from '@radix-ui/react-icons';
|
||||
|
||||
function onClickDefault(e) {
|
||||
const { group, onClick = group?.onClick } = this;
|
||||
if (!onClick) {
|
||||
console.log('No onClick function', group);
|
||||
return;
|
||||
}
|
||||
console.log('onClickDefault');
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
|
||||
onClick(e, group);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
export default function PanelAccordionTrigger(props) {
|
||||
const { marginLeft = 8, isActive = false, colorHex, count, text, menu: Menu = null } = props;
|
||||
|
||||
return (
|
||||
<AccordionTrigger
|
||||
style={{ marginLeft: `${marginLeft}px`, padding: 0 }}
|
||||
asChild={true}
|
||||
>
|
||||
<div className={`inline-flex text-base ${isActive ? 'bg-popover' : 'bg-muted'} flex-grow`}>
|
||||
<button onClick={onClickDefault.bind(props)}>
|
||||
<span
|
||||
className={`inline-flex rounded-l border-r border-black ${isActive ? 'bg-highlight' : 'bg-muted'}`}
|
||||
>
|
||||
{count !== undefined ? <span className="px-2">{count}</span> : null}
|
||||
{colorHex && <ColorCircle colorHex={colorHex} />}
|
||||
</span>
|
||||
<span>{text}</span>
|
||||
</button>
|
||||
{Menu && (
|
||||
<Menu
|
||||
{...props}
|
||||
classNames="justify-end flex-grow"
|
||||
/>
|
||||
)}
|
||||
<ChevronDownIcon className="text-primary h-4 w-4 shrink-0 transition-transform duration-200" />
|
||||
</div>
|
||||
</AccordionTrigger>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
import React from 'react';
|
||||
import { useActiveViewportDisplaySets, useSystem } from '@ohif/core';
|
||||
|
||||
import AccordionGroup from './AccordionGroup';
|
||||
import PanelAccordionTrigger from './PanelAccordionTrigger';
|
||||
import MeasurementItems from './MeasurementItems';
|
||||
import MeasurementsMenu from './MeasurementsMenu';
|
||||
|
||||
/**
|
||||
* Groups measurements by study in order to allow display and saving by study
|
||||
* @param {Object} servicesManager
|
||||
*/
|
||||
export const groupByDisplaySet = (items, grouping, childProps) => {
|
||||
const groups = new Map();
|
||||
const { displaySetService } = childProps.servicesManager.services;
|
||||
const { activeDisplaySetInstanceUID } = grouping;
|
||||
|
||||
items.forEach(item => {
|
||||
const { displaySetInstanceUID } = item;
|
||||
|
||||
if (!groups.has(displaySetInstanceUID)) {
|
||||
const displaySet = displaySetService.getDisplaySetByUID(displaySetInstanceUID);
|
||||
groups.set(displaySetInstanceUID, {
|
||||
header: null,
|
||||
isSelected: displaySetInstanceUID == activeDisplaySetInstanceUID,
|
||||
...grouping,
|
||||
items: [],
|
||||
key: displaySetInstanceUID,
|
||||
title: 'Series Measurements',
|
||||
displaySet,
|
||||
});
|
||||
}
|
||||
groups.get(displaySetInstanceUID).items.push(item);
|
||||
});
|
||||
|
||||
return groups;
|
||||
};
|
||||
|
||||
export function SeriesMeasurementTrigger(props) {
|
||||
const { group, isSelected, displaySet, menu } = props;
|
||||
const { SeriesNumber = 1, SeriesDescription } = displaySet;
|
||||
|
||||
return (
|
||||
<PanelAccordionTrigger
|
||||
text={`Series #${SeriesNumber} ${SeriesDescription}`}
|
||||
count={group.items.length}
|
||||
isActive={isSelected}
|
||||
group={group}
|
||||
menu={menu}
|
||||
marginLeft="0"
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export function SeriesMeasurements(props): React.ReactNode {
|
||||
const { items, grouping = {}, children } = props;
|
||||
const system = useSystem();
|
||||
const activeDisplaySets = useActiveViewportDisplaySets(system);
|
||||
const activeDisplaySetInstanceUID = activeDisplaySets?.[0]?.displaySetInstanceUID;
|
||||
const onClick = (_e, group) => {
|
||||
const { items } = group;
|
||||
system.commandsManager.run('jumpToMeasurement', {
|
||||
uid: items[0].uid,
|
||||
displayMeasurements: items,
|
||||
group,
|
||||
});
|
||||
};
|
||||
|
||||
// The content of the accordion group will default to the children of the
|
||||
// parent declaration if present, otherwise to MeasurementItems
|
||||
return (
|
||||
<AccordionGroup
|
||||
grouping={{
|
||||
groupingFunction: groupByDisplaySet,
|
||||
activeDisplaySetInstanceUID,
|
||||
...grouping,
|
||||
onClick,
|
||||
}}
|
||||
items={items}
|
||||
sourceChildren={children}
|
||||
>
|
||||
<AccordionGroup.Trigger asChild={true}>
|
||||
<SeriesMeasurementTrigger menu={MeasurementsMenu} />
|
||||
</AccordionGroup.Trigger>
|
||||
<MeasurementItems />
|
||||
</AccordionGroup>
|
||||
);
|
||||
}
|
||||
|
||||
export default SeriesMeasurements;
|
||||
@@ -0,0 +1,21 @@
|
||||
import React from 'react';
|
||||
import { utils } from '@ohif/core';
|
||||
|
||||
const { formatDate } = utils;
|
||||
|
||||
export function SeriesSummaryFromDisplaySet({ displaySet }) {
|
||||
if (!displaySet) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const { SeriesDate, SeriesDescription, SeriesNumber = 1 } = displaySet;
|
||||
|
||||
return (
|
||||
<div className="mx-2 my-0">
|
||||
<div className="text-foreground pb-1 text-sm">
|
||||
Series #{SeriesNumber} {SeriesDescription}
|
||||
</div>
|
||||
<div className="text-muted-foreground text-sm">{formatDate(SeriesDate)}</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
import React from 'react';
|
||||
import { useActiveViewportDisplaySets, useSystem } from '@ohif/core';
|
||||
// import { AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
|
||||
|
||||
import { AccordionGroup } from './AccordionGroup';
|
||||
import MeasurementsOrAdditionalFindings from './MeasurementsOrAdditionalFindings';
|
||||
import StudySummaryWithActions from './StudySummaryWithActions';
|
||||
|
||||
/**
|
||||
* Groups measurements by study in order to allow display and saving by study
|
||||
* @param {Object} servicesManager
|
||||
*/
|
||||
export const groupByStudy = (items, grouping, childProps) => {
|
||||
const groups = new Map();
|
||||
const { activeStudyUID } = grouping;
|
||||
const { displaySetService } = childProps.servicesManager.services;
|
||||
|
||||
const getItemStudyInstanceUID = item => {
|
||||
const displaySet = displaySetService.getDisplaySetByUID(item.displaySetInstanceUID);
|
||||
return displaySet.instances[0].StudyInstanceUID;
|
||||
};
|
||||
|
||||
let firstSelected, firstGroup;
|
||||
|
||||
items.forEach(item => {
|
||||
const studyUID = getItemStudyInstanceUID(item);
|
||||
if (!groups.has(studyUID)) {
|
||||
const items = [];
|
||||
const group = {
|
||||
...grouping,
|
||||
items,
|
||||
displayMeasurements: items,
|
||||
key: studyUID,
|
||||
isSelected: studyUID === activeStudyUID,
|
||||
StudyInstanceUID: activeStudyUID,
|
||||
};
|
||||
if (group.isSelected && !firstSelected) {
|
||||
firstSelected = group;
|
||||
}
|
||||
firstGroup ||= group;
|
||||
groups.set(studyUID, group);
|
||||
}
|
||||
if (!firstSelected && firstGroup) {
|
||||
firstGroup.isSelected = true;
|
||||
}
|
||||
const group = groups.get(studyUID);
|
||||
group.items.push(item);
|
||||
});
|
||||
|
||||
return groups;
|
||||
};
|
||||
|
||||
export function StudyMeasurements(props): React.ReactNode {
|
||||
const { items, grouping = {}, children } = props;
|
||||
|
||||
const system = useSystem();
|
||||
const activeDisplaySets = useActiveViewportDisplaySets(system);
|
||||
const activeStudyUID = activeDisplaySets?.[0]?.StudyInstanceUID;
|
||||
|
||||
return (
|
||||
<AccordionGroup
|
||||
grouping={{
|
||||
name: 'groupByStudy',
|
||||
groupingFunction: groupByStudy,
|
||||
activeStudyUID,
|
||||
...grouping,
|
||||
}}
|
||||
items={items}
|
||||
value={[activeStudyUID]}
|
||||
sourceChildren={children}
|
||||
>
|
||||
<AccordionGroup.Trigger>
|
||||
<StudySummaryWithActions />
|
||||
</AccordionGroup.Trigger>
|
||||
<MeasurementsOrAdditionalFindings activeStudyUID={activeStudyUID} />
|
||||
</AccordionGroup>
|
||||
);
|
||||
}
|
||||
|
||||
export default StudyMeasurements;
|
||||
@@ -0,0 +1,69 @@
|
||||
import React from 'react';
|
||||
import { Button, Icons } from '@ohif/ui-next';
|
||||
import { useSystem } from '@ohif/core';
|
||||
|
||||
export function StudyMeasurementsActions({ items, StudyInstanceUID, measurementFilter, actions }) {
|
||||
const { commandsManager } = useSystem();
|
||||
const disabled = !items?.length;
|
||||
|
||||
if (disabled) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="bg-background flex h-9 w-full items-center rounded pr-0.5">
|
||||
<div className="flex space-x-1">
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
className="pl-1.5"
|
||||
onClick={() => {
|
||||
commandsManager.runCommand('downloadCSVMeasurementsReport', {
|
||||
StudyInstanceUID,
|
||||
measurementFilter,
|
||||
});
|
||||
}}
|
||||
>
|
||||
<Icons.Download className="h-5 w-5" />
|
||||
<span className="pl-1">CSV</span>
|
||||
</Button>
|
||||
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
className="pl-0.5"
|
||||
onClick={e => {
|
||||
e.stopPropagation();
|
||||
if (actions?.createSR) {
|
||||
actions.createSR({ StudyInstanceUID, measurementFilter });
|
||||
return;
|
||||
}
|
||||
commandsManager.run('promptSaveReport', {
|
||||
StudyInstanceUID,
|
||||
measurementFilter,
|
||||
});
|
||||
}}
|
||||
>
|
||||
<Icons.Add />
|
||||
Create SR
|
||||
</Button>
|
||||
<Button
|
||||
size="sm"
|
||||
variant="ghost"
|
||||
className="pl-0.5"
|
||||
onClick={e => {
|
||||
e.stopPropagation();
|
||||
commandsManager.runCommand('clearMeasurements', {
|
||||
measurementFilter,
|
||||
});
|
||||
}}
|
||||
>
|
||||
<Icons.Delete />
|
||||
Delete
|
||||
</Button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default StudyMeasurementsActions;
|
||||
@@ -4,7 +4,8 @@ import { StudySummary } from '@ohif/ui-next';
|
||||
|
||||
const { formatDate } = utils;
|
||||
|
||||
export function StudySummaryFromMetadata({ StudyInstanceUID }) {
|
||||
export function StudySummaryFromMetadata(props) {
|
||||
const { StudyInstanceUID } = props;
|
||||
if (!StudyInstanceUID) {
|
||||
return null;
|
||||
}
|
||||
@@ -20,6 +21,6 @@ export function StudySummaryFromMetadata({ StudyInstanceUID }) {
|
||||
<StudySummary
|
||||
date={formatDate(StudyDate)}
|
||||
description={StudyDescription}
|
||||
></StudySummary>
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
import React from 'react';
|
||||
import { StudySummaryFromMetadata } from './StudySummaryFromMetadata';
|
||||
import StudyMeasurementsActions from './StudyMeasurementsActions';
|
||||
|
||||
export function StudySummaryWithActions(props) {
|
||||
return (
|
||||
<div>
|
||||
<StudySummaryFromMetadata {...props} />
|
||||
<StudyMeasurementsActions {...props} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default StudySummaryWithActions;
|
||||
@@ -0,0 +1,10 @@
|
||||
export * from './AccordionGroup';
|
||||
export * from './MeasurementTableNested';
|
||||
export * from './StudyMeasurements';
|
||||
export * from './MeasurementsMenu';
|
||||
export * from './SeriesMeasurements';
|
||||
export * from './StudyMeasurementsActions';
|
||||
export * from './MeasurementsOrAdditionalFindings';
|
||||
import DicomUpload from './DicomUpload/DicomUpload';
|
||||
|
||||
export { DicomUpload };
|
||||
Reference in new issue
Block a user