Merge branch 'develop' into MAT-7685_PositiveInt

src/components/editTestCase/qdm/EditTestCase.tsx

@@ -41,6 +41,7 @@ import {
   GroupCoverageResult,
 } from "../../../util/cqlCoverageBuilder/CqlCoverageBuilder";
 import checkSpecialCharacters from "../../../util/checkSpecialCharacters";
+import { GroupPopulation } from "@madie/madie-models/dist/TestCase";
 
 const EditTestCase = () => {
   useDocumentTitle("MADiE Edit Measure Edit Test Case");
@@ -106,7 +107,7 @@ const EditTestCase = () => {
   const [selectedDataElement, setSelectedDataElement] = useState<DataElement>();
   const [groupCoverageResult, setGroupCoverageResult] =
     useState<GroupCoverageResult>();
-  const [testCaseResults, setTestCaseResults] = useState<any>();
+  const [testCaseResults, setTestCaseResults] = useState<GroupPopulation[]>();
   dayjs.extend(utc);
   dayjs.utc().format(); // utc format
 

src/components/editTestCase/qdm/populations/GroupPopulations.test.tsx

@@ -30,7 +30,7 @@ describe("Group Populations", () => {
             id: "123",
             name: PopulationType.INITIAL_POPULATION,
             expected: true,
-            actual: true,
+            actual: false,
           },
         ],
         stratificationValues: [
@@ -144,7 +144,8 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={true}
-        groupPopulations={null}
+        testCaseResults={[]}
+        groupPopulations={[]}
         onChange={jest.fn()}
         errors={errors}
       />
@@ -161,6 +162,7 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={true}
+        testCaseResults={[]}
         groupPopulations={undefined}
         onChange={jest.fn()}
         errors={errors}
@@ -178,6 +180,7 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={true}
+        testCaseResults={[]}
         groupPopulations={[]}
         onChange={jest.fn()}
         errors={errors}
@@ -203,25 +206,45 @@ describe("Group Populations", () => {
       />
     );
 
-    const ippRows = screen.getAllByRole("row", {
-      name: "Initial Population",
-    });
-    const ippRow = ippRows[0];
+    const ippRow = screen.getByRole("row", { name: "Initial Population" });
     const ippCbs = within(ippRow).getAllByRole("checkbox");
     expect(ippCbs[0]).toBeDisabled();
     expect(ippCbs[0]).toBeChecked();
     expect(ippCbs[1]).toBeDisabled();
-    expect(ippCbs[1]).toBeChecked();
+    expect(ippCbs[1]).not.toBeChecked();
   });
 
-  it.skip("should handle checkbox changes", () => {
+  it("should handle checkbox changes", () => {
     testCaseGroups[0].scoring = MeasureScoring.CONTINUOUS_VARIABLE;
     const handleChange = jest.fn();
-    const handleStratificationChange = jest.fn();
+    const updatedTestCaseGroups = [
+      {
+        groupId: "Group1_ID",
+        scoring: MeasureScoring.CONTINUOUS_VARIABLE,
+        populationBasis: "true",
+        populationValues: [
+          {
+            id: "123",
+            name: PopulationType.INITIAL_POPULATION,
+            expected: false,
+            actual: false,
+          },
+        ],
+        stratificationValues: [
+          {
+            id: "321",
+            name: "strata-1 Initial Population",
+            expected: true,
+            actual: false,
+          },
+        ],
+      },
+    ];
     render(
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={true}
+        testCaseResults={testCaseGroups}
         groupPopulations={testCaseGroups}
         onChange={handleChange}
         errors={errors}
@@ -233,32 +256,15 @@ describe("Group Populations", () => {
     expect(ippCbs[0]).not.toBeDisabled();
     expect(ippCbs[0]).toBeChecked();
     expect(ippCbs[1]).toBeDisabled();
-    expect(ippCbs[1]).toBeChecked();
+    expect(ippCbs[1]).not.toBeChecked();
 
     userEvent.click(ippCbs[0]);
     expect(handleChange).toHaveBeenNthCalledWith(
       1,
-      testCaseGroups,
+      updatedTestCaseGroups,
       "Group1_ID",
-      { actual: true, expected: false, id: "123", name: "initialPopulation" }
+      { actual: false, expected: false, id: "123", name: "initialPopulation" }
     );
-
-    userEvent.click(ippCbs[0]);
-    expect(handleChange).toHaveBeenNthCalledWith(
-      2,
-      testCaseGroups,
-      "Group1_ID",
-      { actual: true, expected: false, id: "123", name: "initialPopulation" }
-    );
-
-    const stratRow = screen.getByRole("row", {
-      name: "strata-1 Initial Population",
-    });
-    const stratCbs = within(stratRow).getAllByRole("checkbox");
-    expect(stratCbs[0]).not.toBeDisabled();
-    expect(stratCbs[0]).toBeChecked();
-    userEvent.click(stratCbs[0]);
-    expect(handleStratificationChange).toHaveBeenCalledTimes(1);
   });
 
   it("should display empty on non run", () => {
@@ -267,6 +273,7 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={false}
+        testCaseResults={testCaseGroups}
         groupPopulations={testCaseGroups}
         onChange={handleChange}
         errors={errors}
@@ -301,6 +308,7 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={false}
+        testCaseResults={[]}
         groupPopulations={groupPopulations}
         onChange={handleChange}
         errors={errors}
@@ -317,6 +325,7 @@ describe("Group Populations", () => {
       <GroupPopulations
         disableExpected={false}
         isTestCaseExecuted={false}
+        testCaseResults={testCaseGroups}
         groupPopulations={testCaseGroups}
         onChange={handleChange}
         errors={errors}

src/components/editTestCase/qdm/populations/GroupPopulations.tsx

@@ -15,7 +15,7 @@ import { GroupPopulation } from "@madie/madie-models/dist/TestCase";
 
 interface GroupPopulationsProps {
   disableExpected: boolean;
-  testCaseResults: any;
+  testCaseResults: GroupPopulation[];
   isTestCaseExecuted: boolean;
   groupPopulations: GroupPopulation[];
   onChange?: (
@@ -101,7 +101,8 @@ const GroupPopulations = ({
                           testCaseResults
                             ? testCaseResults.find(
                                 (pop) => pop.groupId === gp.groupId
-                              )?.populationValues
+                              )?.stratificationValues[stratIndex]
+                                ?.populationValues
                             : []
                         }
                         stratification={strat}

src/components/editTestCase/qdm/populations/TestCasePopulationList.test.tsx

@@ -28,11 +28,12 @@ describe("TestCasePopulationList component", () => {
     render(
       <MemoryRouter>
         <TestCasePopulationList
-          populationBasis="boolean"
+          content="Measure Group 1"
+          scoring="Proportion"
           populations={testCasePopulations}
-          content="population"
+          populationResults={testCasePopulations}
+          populationBasis="boolean"
           groupIndex={0}
-          scoring="Proportion"
         />
       </MemoryRouter>
     );
@@ -81,6 +82,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           onChange={handleChange}
           disableExpected={false}
           populationBasis="true"
@@ -129,6 +131,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           stratification={testCaseStratification}
           stratResult={testCaseStratification}
           onChange={handleChange}
@@ -179,6 +182,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           stratification={testCaseStratification}
           stratResult={testCaseStratification}
           onChange={handleChange}
@@ -258,6 +262,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           onChange={handleChange}
           disableExpected={false}
           populationBasis="boolean"
@@ -334,6 +339,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           onChange={handleChange}
           disableExpected={false}
           populationBasis="boolean"
@@ -388,6 +394,7 @@ describe("TestCasePopulationList component", () => {
       <MemoryRouter>
         <TestCasePopulationList
           populations={testCasePopulations}
+          populationResults={testCasePopulations}
           onChange={handleChange}
           disableExpected={false}
           populationBasis="boolean"

src/components/editTestCase/qdm/populations/TestCasePopulationList.tsx

@@ -9,6 +9,7 @@ import {
   DisplayStratificationValue,
   StratificationExpectedValue,
   PopulationType,
+  PopulationExpectedValue,
 } from "@madie/madie-models";
 import classNames from "classnames";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -26,7 +27,7 @@ export interface TestCasePopulationListProps {
   groupIndex?: number;
   scoring: string;
   populations: DisplayPopulationValue[];
-  populationResults: any;
+  populationResults: PopulationExpectedValue[];
   stratification?: StratificationExpectedValue;
   stratResult?: any;
   populationBasis: string;
@@ -150,21 +151,20 @@ const TestCasePopulationList = ({
   };
 
   // Determines the result of each PopulationCriteria
-  // If stratification fails, then we skip verifying populations as the PC is failed
-  // if stratification pass, then we determine its populations result
-  // If the PC is not stratified, then we determine the PC results only based on its populations.
+  // If the PC is stratified then we determine the result based on stratResult and its populationValues (stratResult.populationValues)
+  // If the PC is not stratified, then we determine the PC results only based on its populationResults.
   const [view, setView] = useState<string>();
   useEffect(() => {
-    let localView = view;
     if (stratification) {
-      localView = determineGroupResultStratification(
-        populationBasis,
-        stratification,
-        stratResult,
-        isTestCaseExecuted
+      setView(
+        determineGroupResultStratification(
+          populationBasis,
+          stratification,
+          stratResult,
+          isTestCaseExecuted
+        )
       );
-    }
-    if (populationResults?.length > 0) {
+    } else if (populationResults?.length > 0) {
       setView(
         determineGroupResult(
           populationBasis,
@@ -173,8 +173,6 @@ const TestCasePopulationList = ({
           isTestCaseExecuted
         )
       );
-    } else {
-      setView(localView);
     }
   }, [
     isTestCaseExecuted,

src/components/editTestCase/qdm/populations/TestCasePopulationListUtil.ts

@@ -39,6 +39,7 @@ export const determineGroupResult = (
 };
 
 // Determines if stratification expected and actual value matches along with all its populations
+// If Stratification didn't fail, then we proceed to check the groupResults
 export const determineGroupResultStratification = (
   populationBasis: string,
   stratification: StratificationExpectedValue,
@@ -65,5 +66,10 @@ export const determineGroupResultStratification = (
       return "fail";
     }
   }
-  return "pass";
+  return determineGroupResult(
+    populationBasis,
+    stratification.populationValues,
+    stratificationResult?.populationValues,
+    isTestCaseExecuted
+  );
 };