Add option to remove resources not relevant to measure

README.md

@@ -82,7 +82,7 @@ Test patients can be created in the app by clicking on the "Create" button in th
 
 #### Importing a Patient Bundle
 
-Test cases can be imported by clicking the "Import" button in the left panel, which will open a file dropzone that accepts JSON files of FHIR Patient Bundles and `.zip` files composed of FHIR Patient Bundles. Patient Bundles may contain additional FHIR resources. These FHIR resources are also loaded into the app and will belong to the patient contained in the Patient Bundle.
+Test cases can be imported by clicking the "Import" button in the left panel, which will open a file dropzone that accepts JSON files of FHIR Patient Bundles and `.zip` files composed of FHIR Patient Bundles. Patient Bundles may contain additional FHIR resources. These FHIR resources are also loaded into the app and will belong to the patient contained in the Patient Bundle. When importing a Patient Bundle or Bundles, there is a switch to remove resources not relevant to the Measure. When set, the resources that are not included in the provided Measure's data requirements will be removed from the Patient Bundle.
 
 #### Selecting Desired Measure Populations
 

__tests__/components/modals/ImportModal.test.tsx

@@ -1,6 +1,7 @@
 import '@testing-library/jest-dom';
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import ImportModal, { ImportModalProps } from '../../../components/modals/ImportModal';
+import { mantineRecoilWrap } from '../../helpers/testHelpers';
 
 describe('ImportModal', () => {
   it('should render a modal when set to open', () => {
@@ -9,7 +10,7 @@ describe('ImportModal', () => {
       onClose: jest.fn(),
       onImportSubmit: jest.fn()
     };
-    render(<ImportModal {...testImportModalProps} />);
+    render(mantineRecoilWrap(<ImportModal {...testImportModalProps} />));
 
     const modal = screen.getByRole('dialog');
     expect(modal).toBeInTheDocument();
@@ -21,7 +22,7 @@ describe('ImportModal', () => {
       onClose: jest.fn(),
       onImportSubmit: jest.fn()
     };
-    render(<ImportModal {...testImportModalProps} />);
+    render(mantineRecoilWrap(<ImportModal {...testImportModalProps} />));
 
     const modal = screen.queryByRole('dialog');
     expect(modal).not.toBeInTheDocument();
@@ -34,7 +35,7 @@ describe('ImportModal', () => {
       onImportSubmit: jest.fn()
     };
 
-    render(<ImportModal {...testImportModalProps} />);
+    render(mantineRecoilWrap(<ImportModal {...testImportModalProps} />));
 
     const submitButton = screen.getByRole('button', { name: 'Import' });
     expect(submitButton).toBeInTheDocument();
@@ -72,7 +73,7 @@ describe('ImportModal', () => {
       onImportSubmit: jest.fn()
     };
 
-    render(<ImportModal {...testImportModalProps} />);
+    render(mantineRecoilWrap(<ImportModal {...testImportModalProps} />));
 
     const cancelButton = screen.getByRole('button', { name: 'Cancel' });
     expect(cancelButton).toBeInTheDocument();

components/modals/ImportModal.tsx

@@ -1,9 +1,25 @@
-import { Modal, Button, Center, Group, Grid, Text, Collapse, ScrollArea } from '@mantine/core';
+import {
+  Modal,
+  Button,
+  Center,
+  Group,
+  Grid,
+  Text,
+  Collapse,
+  ScrollArea,
+  Switch,
+  Popover,
+  ActionIcon,
+  Anchor
+} from '@mantine/core';
 import { showNotification } from '@mantine/notifications';
 import { Dropzone } from '@mantine/dropzone';
 import { IconAlertCircle, IconCaretDown, IconCaretRight, IconFileCheck, IconFileImport } from '@tabler/icons';
 import { useState } from 'react';
 import JSZip from 'jszip';
+import { useRecoilState } from 'recoil';
+import { resourceSwitchOn } from '../../state/atoms/resourceSwitch';
+import { InfoCircle } from 'tabler-icons-react';
 
 export interface ImportModalProps {
   open: boolean;
@@ -16,6 +32,8 @@ export default function ImportModal({ open, onClose, onImportSubmit }: ImportMod
   const [fileDisplay, setFileDisplay] = useState<string | string[] | null>(null);
   const [showZipFileExpansion, setShowZipFileExpansion] = useState(false);
   const [isZipInfoExpanded, setIsZipInfoExpanded] = useState(false);
+  const [switchOn, setSwitchOn] = useRecoilState(resourceSwitchOn);
+  const [minimizeResourcesPopoverOpened, setMinimizeResourcesPopoverOpened] = useState(false);
 
   const closeAndReset = () => {
     setFiles([]);
@@ -139,6 +157,33 @@ export default function ImportModal({ open, onClose, onImportSubmit }: ImportMod
           )}
           <Center>
             <Group pt={12}>
+              <Switch
+                label="Remove resources not relevant to the Measure"
+                onLabel="ON"
+                offLabel="OFF"
+                checked={switchOn}
+                onChange={event => setSwitchOn(event.currentTarget.checked)}
+              />
+              <Popover
+                opened={minimizeResourcesPopoverOpened}
+                onClose={() => setMinimizeResourcesPopoverOpened(false)}
+                width={500}
+              >
+                <Popover.Target>
+                  <ActionIcon
+                    aria-label={'More Information'}
+                    onClick={() => setMinimizeResourcesPopoverOpened(o => !o)}
+                  >
+                    <InfoCircle size={20} />
+                  </ActionIcon>
+                </Popover.Target>
+                <Popover.Dropdown>
+                  If set to minimize the resources on the Test Case, only resources relevant to the measure will be
+                  included. Resources relevant to the measure are defined as resources included in the data requirements
+                  of the measure.
+                  <Anchor href="https://github.com/projecttacoma/fqm-testify#importing-a-patient-bundle">here</Anchor>.
+                </Popover.Dropdown>
+              </Popover>
               <Button
                 onClick={() => {
                   onImportSubmit(files);

components/patient-creation/PatientCreationPanel.tsx

@@ -32,6 +32,9 @@ import { detailedResultLookupState } from '../../state/atoms/detailedResultLooku
 import { calculateDetailedResult } from '../../util/MeasureCalculation';
 import { trustMetaProfileState } from '../../state/atoms/trustMetaProfile';
 import { dataRequirementsState } from '../../state/selectors/dataRequirements';
+import { minimizeTestCaseResources } from '../../util/ValueSetHelper';
+import { resourceSwitchOn } from '../../state/atoms/resourceSwitch';
+import { dataRequirementsLookupByType } from '../../state/selectors/dataRequirementsByType';
 
 function PatientCreationPanel() {
   const [isPatientModalOpen, setIsPatientModalOpen] = useState(false);
@@ -52,6 +55,8 @@ function PatientCreationPanel() {
   }, [measureBundle]);
   const trustMetaProfile = useRecoilValue(trustMetaProfileState);
   const dataRequirements = useRecoilValue(dataRequirementsState);
+  const drLookupByType = useRecoilValue(dataRequirementsLookupByType);
+  const switchOn = useRecoilValue(resourceSwitchOn);
 
   const openPatientModal = (patientId?: string, copy = false) => {
     if (patientId && Object.keys(currentPatients).includes(patientId)) {
@@ -336,6 +341,9 @@ function PatientCreationPanel() {
               );
               return;
             }
+            if (switchOn) {
+              testCase.resources = minimizeTestCaseResources(testCase, measureBundle.content, drLookupByType);
+            }
 
             draftState[testCase.patient.id] = testCase;
             successCount += 1;

state/atoms/resourceSwitch.ts

@@ -0,0 +1,10 @@
+import { atom } from 'recoil';
+
+/**
+ * Atom indicating if resources on a patient bundle are to be minimized using the
+ * data requirements of the provided measure bundle
+ */
+export const resourceSwitchOn = atom<boolean>({
+  key: 'resourceSwitchOn',
+  default: false
+});

state/selectors/dataRequirements.ts

@@ -2,7 +2,6 @@ import { selector } from 'recoil';
 import { measureBundleState } from '../atoms/measureBundle';
 import { Calculator } from 'fqm-execution';
 import { valueSetMapState } from './valueSetsMap';
-
 import { measurementPeriodState } from '../atoms/measurementPeriod';
 import { getDataRequirementFiltersString } from '../../util/fhir/codes';
 

state/selectors/dataRequirementsByType.ts

@@ -0,0 +1,50 @@
+import { selector } from 'recoil';
+import { dataRequirementsState } from './dataRequirements';
+
+export interface DataRequirementsLookupByTypeProps {
+  keepAll: boolean;
+  valueSets: string[];
+  directCodes: fhir4.Coding[];
+}
+
+export const dataRequirementsLookupByType = selector<Record<string, DataRequirementsLookupByTypeProps>>({
+  key: 'dataRequirementsLookupByType',
+  get: async ({ get }) => {
+    const dataRequirements = get(dataRequirementsState);
+    const result: Record<string, DataRequirementsLookupByTypeProps> = {};
+
+    if (dataRequirements !== null) {
+      dataRequirements.forEach((dr, i) => {
+        if (result[dr.type]) {
+          if (result[dr.type].keepAll === false) {
+            if (dr.codeFilter === undefined) {
+              result[dr.type].keepAll = true;
+            } else {
+              dr.codeFilter.forEach(cf => {
+                if (cf.valueSet) {
+                  result[dr.type].valueSets = result[dr.type].valueSets.concat(cf.valueSet);
+                } else if (cf.code) {
+                  result[dr.type].directCodes = result[dr.type].directCodes.concat(cf.code);
+                }
+              });
+            }
+          }
+        } else {
+          if (dr.codeFilter === undefined) {
+            result[dr.type] = { keepAll: true, valueSets: [], directCodes: [] };
+          } else {
+            dr.codeFilter.forEach(cf => {
+              if (cf.valueSet) {
+                result[dr.type] = { keepAll: false, valueSets: [cf.valueSet], directCodes: [] };
+              } else if (cf.code) {
+                result[dr.type] = { keepAll: false, valueSets: [], directCodes: cf.code };
+              }
+            });
+          }
+        }
+      });
+    }
+
+    return result;
+  }
+});