fix: Delete study measurements instead of all measurements (#4882)

This commit is contained in:
Bill Wallace authored and GitHub committed 2025-03-25 09:32:29 -04:00
1 parent 165c9dc710
commit 8e47112d8e
16 files changed
+237 -232

No files matched your search

@@ -888,6 +888,9 @@ function commandsModule({
},
scroll: (options: ToolTypes.ScrollOptions) => {
const enabledElement = _getActiveViewportEnabledElement();
// Allow either or direction for consistency in scroll implementation
options.delta ??= options.direction || 1;
options.direction ??= options.delta;
if (!enabledElement) {
return;
@@ -1,11 +1,13 @@
import React from 'react';
import { useActiveViewportDisplaySets, useSystem } from '@ohif/core';
import { useActiveViewportDisplaySets, useSystem, utils } from '@ohif/core';
// import { AccordionContent, AccordionItem, AccordionTrigger } from '@ohif/ui-next';
import { AccordionGroup } from './AccordionGroup';
import MeasurementsOrAdditionalFindings from './MeasurementsOrAdditionalFindings';
import StudySummaryWithActions from './StudySummaryWithActions';
const { MeasurementFilters } = utils;
/**
* Groups measurements by study in order to allow display and saving by study
* @param {Object} servicesManager
@@ -26,6 +28,10 @@ export const groupByStudy = (items, grouping, childProps) => {
const studyUID = getItemStudyInstanceUID(item);
if (!groups.has(studyUID)) {
const items = [];
const filter = MeasurementFilters.filterAnd(
MeasurementFilters.filterMeasurementsByStudyUID(activeStudyUID),
grouping.filter
);
const group = {
...grouping,
items,
@@ -33,6 +39,8 @@ export const groupByStudy = (items, grouping, childProps) => {
key: studyUID,
isSelected: studyUID === activeStudyUID,
StudyInstanceUID: activeStudyUID,
filter,
measurementFilter: filter,
};
if (group.isSelected && !firstSelected) {
firstSelected = group;
@@ -58,12 +58,7 @@ import StudyMeasurements from '../components/StudyMeasurements';
*```
*/
export default function PanelMeasurement(props): React.ReactNode {
const {
measurementFilter,
emptyComponent: EmptyComponent,
key = 'PanelMeasurement',
children,
} = props;
const { measurementFilter, emptyComponent: EmptyComponent, children } = props;
const system = useSystem();
const displayMeasurements = useMeasurements(system.servicesManager, {
@@ -72,11 +67,7 @@ export default function PanelMeasurement(props): React.ReactNode {
if (!displayMeasurements.length) {
return EmptyComponent ? (
<EmptyComponent
key={key}
data-cy={key}
items={displayMeasurements}
/>
<EmptyComponent items={displayMeasurements} />
) : (
<span className="text-white">No Measurements</span>
);
@@ -87,17 +78,10 @@ export default function PanelMeasurement(props): React.ReactNode {
React.cloneElement(child, {
items: displayMeasurements,
filter: measurementFilter,
'data-cy': key,
})
);
return cloned;
}
// Need to merge defaults on the content props to ensure they get passed to children
return (
<StudyMeasurements
key={key}
data-cy={key}
items={displayMeasurements}
/>
);
return <StudyMeasurements items={displayMeasurements} />;
}