Merge pull request #749 from MeasureAuthoringTool/MAT-7844_ResetExecu…

…tionResultsAfterChange Mat 7844 reset execution results after change
MeasureAuthoringTool · Oct 30, 2024 · 382daa7 · 382daa7
2 parents 0e52951 + b278727
commit 382daa7
Show file tree

Hide file tree

Showing 21 changed files with 118 additions and 50 deletions.
diff --git a/src/api/CalculationService.ts b/src/api/CalculationService.ts
@@ -434,7 +434,7 @@ export class CalculationService {
                   strata.strataCode === strataResult.strataCode) ||
                 (strata.strataId && strata.strataId === strataResult.strataId)
             );
-            return population.result && stratification.result;
+            return population?.result && stratification?.result;
           }
         );
         // adjust the episode count for strata & associated population

diff --git a/src/components/createTestCase/RightPanel/ExpectedActual/ExpectedActual.tsx b/src/components/createTestCase/RightPanel/ExpectedActual/ExpectedActual.tsx
@@ -7,7 +7,8 @@ const ExpectedActual = ({
   onChange,
   onStratificationChange,
   errors,
-  executionRun = false,
+  isTestCaseExecuted = false,
+  clearTestResults,
   groupsStratificationAssociationMap,
 }) => {
   return (
@@ -22,7 +23,8 @@ const ExpectedActual = ({
         onChange={onChange}
         onStratificationChange={onStratificationChange}
         errors={errors}
-        executionRun={executionRun}
+        isTestCaseExecuted={isTestCaseExecuted}
+        setIsTestCaseExecuted={clearTestResults}
       />
     </div>
   );

diff --git a/src/components/editTestCase/qdm/EditTestCase.tsx b/src/components/editTestCase/qdm/EditTestCase.tsx
@@ -322,6 +322,7 @@ const EditTestCase = () => {
                   canEdit={canEdit}
                   testCaseGroups={formik?.values?.groupPopulations}
                   isTestCaseExecuted={isTestCaseExecuted}
+                  setIsTestCaseExecuted={setIsTestCaseExecuted}
                   errors={formik.errors.groupPopulations}
                   groupCoverageResult={groupCoverageResult}
                   testCaseResults={testCaseResults}

diff --git a/src/components/editTestCase/qdm/RightPanel/RightPanel.tsx b/src/components/editTestCase/qdm/RightPanel/RightPanel.tsx
@@ -12,6 +12,7 @@ const RightPanel = ({
   testCaseGroups,
   testCaseResults,
   isTestCaseExecuted,
+  setIsTestCaseExecuted,
   errors,
   groupCoverageResult,
   calculationErrors,
@@ -56,6 +57,7 @@ const RightPanel = ({
             onChange={onChange}
             errors={errors}
             isTestCaseExecuted={isTestCaseExecuted}
+            setIsTestCaseExecuted={setIsTestCaseExecuted}
           />
         )}
         {activeTab === "details" && (

diff --git a/src/components/editTestCase/qdm/populations/GroupPopulations.test.tsx b/src/components/editTestCase/qdm/populations/GroupPopulations.test.tsx
@@ -217,6 +217,7 @@ describe("Group Populations", () => {
   it("should handle checkbox changes", () => {
     testCaseGroups[0].scoring = MeasureScoring.CONTINUOUS_VARIABLE;
     const handleChange = jest.fn();
+    const setIsTestCaseExecuted = jest.fn();
     const updatedTestCaseGroups = [
       {
         groupId: "Group1_ID",
@@ -246,6 +247,7 @@ describe("Group Populations", () => {
         isTestCaseExecuted={true}
         testCaseResults={testCaseGroups}
         groupPopulations={testCaseGroups}
+        setIsTestCaseExecuted={setIsTestCaseExecuted}
         onChange={handleChange}
         errors={errors}
       />

diff --git a/src/components/editTestCase/qdm/populations/GroupPopulations.tsx b/src/components/editTestCase/qdm/populations/GroupPopulations.tsx
@@ -17,6 +17,7 @@ interface GroupPopulationsProps {
   disableExpected: boolean;
   testCaseResults: GroupPopulation[];
   isTestCaseExecuted: boolean;
+  setIsTestCaseExecuted?: (isTestCaseExecuted: boolean) => void;
   groupPopulations: GroupPopulation[];
   onChange?: (
     groupPopulations: GroupPopulation[],
@@ -30,6 +31,7 @@ interface GroupPopulationsProps {
 const GroupPopulations = ({
   disableExpected = false,
   isTestCaseExecuted = false,
+  setIsTestCaseExecuted,
   testCaseResults,
   groupPopulations = [],
   onChange,
@@ -56,6 +58,7 @@ const GroupPopulations = ({
                 errors={errors?.[groupIndex]}
                 disableExpected={disableExpected}
                 isTestCaseExecuted={isTestCaseExecuted}
+                setIsTestCaseExecuted={setIsTestCaseExecuted}
                 populations={gp.populationValues}
                 populationResults={
                   testCaseResults
@@ -96,6 +99,7 @@ const GroupPopulations = ({
                         scoring={gp.scoring}
                         disableExpected={disableExpected}
                         isTestCaseExecuted={isTestCaseExecuted}
+                        setIsTestCaseExecuted={setIsTestCaseExecuted}
                         populations={strat.populationValues}
                         populationResults={
                           testCaseResults

diff --git a/src/components/editTestCase/qdm/populations/TestCasePopulation.tsx b/src/components/editTestCase/qdm/populations/TestCasePopulation.tsx
@@ -17,6 +17,7 @@ export interface TestCasePopulationProps {
   i?: number;
   strat?: boolean;
   isTestCaseExecuted?: boolean;
+  setIsTestCaseExecuted?: (isTestCaseExecuted: boolean) => void;
 }
 
 const TestCasePopulation = ({
@@ -31,6 +32,7 @@ const TestCasePopulation = ({
   strat,
   i,
   isTestCaseExecuted,
+  setIsTestCaseExecuted,
 }: TestCasePopulationProps) => {
   const populationNameTemplate = (prop) => {
     if (prop === PopulationType.INITIAL_POPULATION) {
@@ -80,9 +82,10 @@ const TestCasePopulation = ({
             aria-labelledby={`${population.name}-expected`}
             name={population.name}
             expectedValue={population.expected}
-            onChange={(expectedValue) =>
-              onChange({ ...population, expected: expectedValue })
-            }
+            onChange={(expectedValue) => {
+              setIsTestCaseExecuted(false);
+              return onChange({ ...population, expected: expectedValue });
+            }}
             populationBasis={populationBasis}
             disabled={disableExpected}
             data-testid={

diff --git a/src/components/editTestCase/qdm/populations/TestCasePopulationList.test.tsx b/src/components/editTestCase/qdm/populations/TestCasePopulationList.test.tsx
@@ -4,6 +4,7 @@ import { MemoryRouter } from "react-router-dom";
 import TestCasePopulationList from "./TestCasePopulationList";
 import { MeasureScoring, PopulationType } from "@madie/madie-models";
 import userEvent from "@testing-library/user-event";
+import { act } from "react-dom/test-utils";
 
 describe("TestCasePopulationList component", () => {
   afterEach(() => {
@@ -77,13 +78,17 @@ describe("TestCasePopulationList component", () => {
         actual: true,
       },
     ];
-    const handleChange = jest.fn();
+    const handle1Change = jest.fn((arg1, arg2) => {});
+
+    const setIsTestCaseExecuted = jest.fn();
+
     render(
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
           populationResults={testCasePopulations}
-          onChange={handleChange}
+          onChange={handle1Change}
+          setIsTestCaseExecuted={setIsTestCaseExecuted}
           disableExpected={false}
           populationBasis="true"
           content="population"
@@ -103,10 +108,11 @@ describe("TestCasePopulationList component", () => {
       "test-population-initialPopulation-expected"
     );
     expect(ippCb).toBeInTheDocument();
-    userEvent.click(ippCb);
-    await waitFor(() => {
-      expect(handleChange).toHaveBeenCalled();
+
+    await act(async () => {
+      userEvent.click(ippCb);
     });
+    await waitFor(() => expect(handle1Change).toHaveBeenCalled());
   });
 
   it("should handle stratification changes for the test case population", async () => {
@@ -126,6 +132,7 @@ describe("TestCasePopulationList component", () => {
     };
     const handleChange = jest.fn();
     const handleStratificationChange = jest.fn();
+    const setIsTestCaseExecuted = jest.fn();
 
     render(
       <MemoryRouter>
@@ -141,6 +148,7 @@ describe("TestCasePopulationList component", () => {
           content="population"
           groupIndex={0}
           scoring="Proportion"
+          setIsTestCaseExecuted={setIsTestCaseExecuted}
         />
       </MemoryRouter>
     );
@@ -177,6 +185,7 @@ describe("TestCasePopulationList component", () => {
     };
     const handleChange = jest.fn();
     const handleStratificationChange = jest.fn();
+    const setIsTestCaseExecuted = jest.fn();
 
     render(
       <MemoryRouter>
@@ -193,6 +202,7 @@ describe("TestCasePopulationList component", () => {
           groupIndex={0}
           scoring="Proportion"
           isTestCaseExecuted={true}
+          setIsTestCaseExecuted={setIsTestCaseExecuted}
         />
       </MemoryRouter>
     );

diff --git a/src/components/editTestCase/qdm/populations/TestCasePopulationList.tsx b/src/components/editTestCase/qdm/populations/TestCasePopulationList.tsx
@@ -33,6 +33,7 @@ export interface TestCasePopulationListProps {
   populationBasis: string;
   disableExpected?: boolean;
   isTestCaseExecuted?: boolean;
+  setIsTestCaseExecuted?: (isTestCaseExecuted: boolean) => void;
   onChange?: (
     populations: DisplayPopulationValue[],
     changedPopulation: DisplayPopulationValue
@@ -57,6 +58,7 @@ const TestCasePopulationList = ({
   populationBasis,
   disableExpected = true,
   isTestCaseExecuted = false,
+  setIsTestCaseExecuted,
   onChange,
   onStratificationChange,
   errors,
@@ -236,6 +238,7 @@ const TestCasePopulationList = ({
               index={groupIndex}
               QDM={true}
               isTestCaseExecuted={isTestCaseExecuted}
+              setIsTestCaseExecuted={setIsTestCaseExecuted}
               strataCode={stratification?.name}
               stratification={stratification}
               stratResult={stratResult}
@@ -251,6 +254,7 @@ const TestCasePopulationList = ({
             <TestCasePopulation
               i={j}
               isTestCaseExecuted={isTestCaseExecuted}
+              setIsTestCaseExecuted={setIsTestCaseExecuted}
               strat={!_.isEmpty(stratification)}
               population={population}
               populationResult={populationResults ? populationResults[j] : null}

diff --git a/src/components/editTestCase/qdm/populations/TestCasePopulationListUtil.ts b/src/components/editTestCase/qdm/populations/TestCasePopulationListUtil.ts
@@ -16,7 +16,9 @@ export const determineGroupResult = (
   }
   for (let i = 0; i < populations?.length; i++) {
     const population = populations[i];
-    const { actual } = populationResult[i];
+    //const { actual } = populationResult[i];
+    const actual =
+      populationResult[i] === undefined ? "" : populationResult[i].actual;
     const { expected } = population;
     if (populationBasis === "boolean" && expected != actual) {
       return "fail";

diff --git a/src/components/editTestCase/qdm/stratifications/TestCaseStratification.test.tsx b/src/components/editTestCase/qdm/stratifications/TestCaseStratification.test.tsx
@@ -10,6 +10,7 @@ import userEvent from "@testing-library/user-event";
 import TestCaseStratification from "./TestCaseStratification";
 
 describe("Test Case Stratification Component", () => {
+  const setIsTestCaseExecuted = jest.fn();
   const { findByTestId, findByText, getByTestId } = screen;
   const renderStrats = (
     strataCode,
@@ -24,7 +25,8 @@ describe("Test Case Stratification Component", () => {
     render(
       <TestCaseStratification
         strataCode={strataCode}
-        executionRun={executionRun}
+        isTestCaseExecuted={executionRun}
+        setIsTestCaseExecuted={setIsTestCaseExecuted}
         stratification={stratification}
         stratResult={stratification}
         populationBasis={populationBasis}

diff --git a/src/components/editTestCase/qdm/stratifications/TestCaseStratification.tsx b/src/components/editTestCase/qdm/stratifications/TestCaseStratification.tsx
@@ -14,6 +14,7 @@ export interface TestCaseStratificationProps {
   QDM?: boolean;
   index?: number;
   isTestCaseExecuted?: boolean;
+  setIsTestCaseExecuted?: (isTestCaseExecuted: boolean) => void;
 }
 
 const TestCaseStratification = ({
@@ -23,6 +24,7 @@ const TestCaseStratification = ({
   populationBasis,
   disableExpected = false,
   onStratificationChange,
+  setIsTestCaseExecuted,
   index,
   QDM = false,
   isTestCaseExecuted = false,
@@ -41,12 +43,13 @@ const TestCaseStratification = ({
           <ExpectActualInput
             id={`${stratification.name}-expected-cb`}
             expectedValue={stratification.expected}
-            onChange={(expectedValue) =>
+            onChange={(expectedValue) => {
+              setIsTestCaseExecuted(false);
               onStratificationChange({
                 ...stratification,
                 expected: expectedValue,
-              })
-            }
+              });
+            }}
             populationBasis={populationBasis}
             disabled={disableExpected}
             data-testid={

diff --git a/src/components/editTestCase/qiCore/EditTestCase.tsx b/src/components/editTestCase/qiCore/EditTestCase.tsx
@@ -984,7 +984,10 @@ const EditTestCase = (props: EditTestCaseProps) => {
                   <ExpectedActual
                     canEdit={canEdit}
                     groupPopulations={groupPopulations}
-                    executionRun={!_.isNil(populationGroupResults)}
+                    isTestCaseExecuted={!_.isNil(populationGroupResults)}
+                    clearTestResults={() => {
+                      setPopulationGroupResults(undefined);
+                    }}
                     errors={formik.errors.groupPopulations}
                     groupsStratificationAssociationMap={stratificationsMap}
                     onChange={(

diff --git a/src/components/populations/GroupPopulations.test.tsx b/src/components/populations/GroupPopulations.test.tsx
@@ -82,7 +82,7 @@ describe("Group Populations", () => {
     const handleChange = jest.fn();
     render(
       <GroupPopulations
-        executionRun
+        isTestCaseExecuted={true}
         groupPopulations={groupPopulations}
         onChange={handleChange}
       />
@@ -139,11 +139,13 @@ describe("Group Populations", () => {
   });
 
   it("should handle null groupPopulation input", () => {
+    const mockExecute = jest.fn();
     render(
       <GroupPopulations
         groupPopulations={null}
         onChange={jest.fn()}
-        executionRun
+        isTestCaseExecuted
+        setIsTestCaseExecuted={mockExecute}
       />
     );
     expect(
@@ -188,7 +190,7 @@ describe("Group Populations", () => {
     render(
       <GroupPopulations
         disableExpected={true}
-        executionRun
+        isTestCaseExecuted={true}
         groupPopulations={testCaseGroups}
         onChange={handleChange}
         groupsStratificationAssociationMap={groupStratificationsMap}
@@ -206,10 +208,12 @@ describe("Group Populations", () => {
   it("should handle checkbox changes", () => {
     testCaseGroups[0].scoring = MeasureScoring.CONTINUOUS_VARIABLE;
     const handleChange = jest.fn();
+    const setIsTestCaseExecuted = jest.fn();
     const handleStratificationChange = jest.fn();
     render(
       <GroupPopulations
-        executionRun
+        isTestCaseExecuted={true}
+        setIsTestCaseExecuted={setIsTestCaseExecuted}
         groupPopulations={testCaseGroups}
         onChange={handleChange}
         onStratificationChange={handleStratificationChange}

diff --git a/src/components/populations/GroupPopulations.tsx b/src/components/populations/GroupPopulations.tsx
@@ -13,7 +13,8 @@ import * as _ from "lodash";
 export interface PopulationsProps {
   disableExpected?: boolean;
   // we dont need disable actual as it's always disabled.
-  executionRun?: boolean;
+  isTestCaseExecuted?: boolean;
+  setIsTestCaseExecuted?: (isTestCaseExecuted) => void;
   groupPopulations: DisplayGroupPopulation[];
   onChange?: (
     groupPopulations: GroupPopulation[],
@@ -33,7 +34,8 @@ const GroupPopulations = ({
   disableExpected = false,
   groupsStratificationAssociationMap,
   // Execution run determines weather we display one of 3 views.
-  executionRun = false,
+  isTestCaseExecuted = false,
+  setIsTestCaseExecuted,
   groupPopulations = [],
   onChange,
   onStratificationChange,
@@ -50,7 +52,8 @@ const GroupPopulations = ({
               scoring={gp.scoring}
               errors={errors?.[i]}
               disableExpected={disableExpected}
-              executionRun={executionRun}
+              isTestCaseExecuted={isTestCaseExecuted}
+              setIsTestCaseExecuted={setIsTestCaseExecuted}
               populations={gp.populationValues}
               populationBasis={gp?.populationBasis}
               onChange={(populations, type, changedPopulation) => {
@@ -81,7 +84,8 @@ const GroupPopulations = ({
                 }
                 scoring={gp.scoring}
                 disableExpected={disableExpected}
-                executionRun={executionRun}
+                isTestCaseExecuted={isTestCaseExecuted}
+                setIsTestCaseExecuted={setIsTestCaseExecuted}
                 populations={null}
                 populationBasis={gp.populationBasis}
                 onStratificationChange={(