MAT-6194 resolved conversations

MeasureAuthoringTool · Nov 20, 2023 · f40ef6d · f40ef6d
1 parent a15f281
commit f40ef6d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/src/components/editTestCase/groupCoverage/QdmGroupCoverage.tsx b/src/components/editTestCase/groupCoverage/QdmGroupCoverage.tsx
@@ -16,8 +16,8 @@ import parse from "html-react-parser";
 import { Group, GroupPopulation } from "@madie/madie-models";
 
 interface Props {
-  groupPopulations: GroupPopulation[];
-  mappedCql: MappedCql;
+  testCaseGroups: GroupPopulation[];
+  cqlPopulationDefinitions: MappedCql;
   measureGroups: Group[];
 }
 
@@ -26,12 +26,12 @@ type PopulationResult = Record<string, SelectedPopulationResult>;
 const populationCriteriaLabel = "Population Criteria";
 
 const QdmGroupCoverage = ({
-  groupPopulations,
-  mappedCql,
+  testCaseGroups,
+  cqlPopulationDefinitions,
   measureGroups,
 }: Props) => {
   const [selectedHighlightingTab, setSelectedHighlightingTab] =
-    useState<Population>(getFirstPopulation(groupPopulations[0]));
+    useState<Population>(getFirstPopulation(testCaseGroups[0]));
   const [selectedCriteria, setSelectedCriteria] = useState<string>("");
   const [populationResults, setPopulationResults] = useState<
     PopulationResult | {}
@@ -42,23 +42,23 @@ const QdmGroupCoverage = ({
   ] = useState<SelectedPopulationResult>();
 
   useEffect(() => {
-    if (!isEmpty(groupPopulations)) {
-      changeCriteria(groupPopulations[0].groupId);
+    if (!isEmpty(testCaseGroups)) {
+      changeCriteria(testCaseGroups[0].groupId);
     }
-  }, [groupPopulations]);
+  }, [testCaseGroups]);
 
   useEffect(() => {
     changePopulation(selectedHighlightingTab);
   }, [populationResults]);
 
   const getCriteriaLabel = (index) => {
-    return groupPopulations.length > 1
+    return testCaseGroups.length > 1
       ? `${populationCriteriaLabel} ${index + 1}`
       : populationCriteriaLabel;
   };
 
   const populationCriteriaOptions = [
-    ...groupPopulations?.map((gp, index) => {
+    ...testCaseGroups?.map((gp, index) => {
       return (
         <MenuItem
           key={gp.groupId}
@@ -96,8 +96,8 @@ const QdmGroupCoverage = ({
   };
 
   const getPopulationResults = (groupId: string) => {
-    if (mappedCql) {
-      const selectedGroupParsedResults = mappedCql[groupId];
+    if (cqlPopulationDefinitions) {
+      const selectedGroupParsedResults = cqlPopulationDefinitions[groupId];
       if (selectedGroupParsedResults) {
         const relevantPopulations =
           selectedGroupParsedResults.populationDefinitions;
@@ -111,12 +111,12 @@ const QdmGroupCoverage = ({
     setSelectedCriteria(criteriaId);
     const populationResults = getPopulationResults(criteriaId);
     setPopulationResults(populationResults);
-    const group = groupPopulations.find((gp) => gp.groupId === criteriaId);
+    const group = testCaseGroups.find((gp) => gp.groupId === criteriaId);
     setSelectedHighlightingTab(getFirstPopulation(group));
   };
 
   const getRelevantPopulations = () => {
-    const selectedGroup = groupPopulations.find(
+    const selectedGroup = testCaseGroups.find(
       (gp) => gp.groupId === selectedCriteria
     );
     return selectedGroup?.populationValues
@@ -186,7 +186,7 @@ const QdmGroupCoverage = ({
           defaultOptions={selectedCriteria}
           value={selectedCriteria}
           renderValue={(value) => {
-            const index = groupPopulations.findIndex(
+            const index = testCaseGroups.findIndex(
               (gp) => gp.groupId === value
             );
             return getCriteriaLabel(index);
@@ -211,7 +211,9 @@ const QdmGroupCoverage = ({
           data-testid={`${selectedHighlightingTab.abbreviation}-highlighting`}
         >
           {selectedPopulationDefinitionResults
-            ? parse(`<pre>${selectedPopulationDefinitionResults?.text}</pre>`)
+            ? parse(
+                `<pre><code>${selectedPopulationDefinitionResults?.text}</code></pre>`
+              )
             : "No results available"}
         </div>
       </div>

diff --git a/src/components/editTestCase/qdm/EditTestCase.tsx b/src/components/editTestCase/qdm/EditTestCase.tsx
@@ -337,7 +337,7 @@ const EditTestCase = () => {
               <Allotment.Pane>
                 <RightPanel
                   canEdit={canEdit}
-                  groupPopulations={currentTestCase?.groupPopulations}
+                  testCaseGroups={currentTestCase?.groupPopulations}
                   executionRun={executionRun}
                   errors={formik.errors.groupPopulations}
                   calculationResults={calculationResults}

diff --git a/src/components/editTestCase/qdm/RightPanel/RightPanel.tsx b/src/components/editTestCase/qdm/RightPanel/RightPanel.tsx
@@ -9,7 +9,7 @@ import { useFeatureFlags } from "@madie/madie-util";
 
 const RightPanel = ({
   canEdit,
-  groupPopulations,
+  testCaseGroups,
   executionRun,
   errors,
   calculationResults,
@@ -40,7 +40,7 @@ const RightPanel = ({
         {featureFlags.qdmHighlightingTabs && activeTab === "highlighting" && (
           <CalculationResults
             calculationResults={calculationResults}
-            groupPopulations={groupPopulations}
+            testCaseGroups={testCaseGroups}
             measureCql={measureCql}
             measureGroups={measureGroups}
             calculationErrors={calculationErrors}
@@ -49,7 +49,7 @@ const RightPanel = ({
         {activeTab === "expectoractual" && (
           <GroupPopulations
             disableExpected={!canEdit}
-            groupPopulations={groupPopulations}
+            groupPopulations={testCaseGroups}
             onChange={onChange}
             errors={errors}
             executionRun={executionRun}

diff --git a/src/components/editTestCase/qdm/RightPanel/calculationResults/CalculationResults.test.tsx b/src/components/editTestCase/qdm/RightPanel/calculationResults/CalculationResults.test.tsx
@@ -157,7 +157,7 @@ const renderCoverageComponent = (
   render(
     <CalculationResults
       calculationResults={calculationResults}
-      groupPopulations={groups}
+      testCaseGroups={groups}
       measureCql={measureCql}
       measureGroups={measureGroups}
       calculationErrors={calculationErrors}
@@ -184,7 +184,7 @@ describe("CalculationResults with new tabbed highlighting layout on", () => {
     render(
       <CalculationResults
         calculationResults={null}
-        groupPopulations={groups}
+        testCaseGroups={groups}
         measureCql={""}
         measureGroups={measureGroups}
         calculationErrors={null}

diff --git a/src/components/editTestCase/qdm/RightPanel/calculationResults/CalculationResults.tsx b/src/components/editTestCase/qdm/RightPanel/calculationResults/CalculationResults.tsx
@@ -8,12 +8,11 @@ import "styled-components/macro";
 
 const CalculationResults = ({
   calculationResults,
-  groupPopulations,
+  testCaseGroups,
   measureCql,
   measureGroups,
   calculationErrors,
 }) => {
-  console.log(calculationResults)
   return (
     <div tw="p-5" style={{ paddingRight: ".25rem" }}>
       {!calculationResults && isEmpty(calculationErrors) && (
@@ -26,10 +25,10 @@ const CalculationResults = ({
           }}
         />
       )}
-      {!isEmpty(groupPopulations) && (
+      {!isEmpty(testCaseGroups) && (
         <QdmGroupCoverage
-          groupPopulations={groupPopulations}
-          mappedCql={mapCql(measureCql, groupPopulations)}
+          testCaseGroups={testCaseGroups}
+          cqlPopulationDefinitions={mapCql(measureCql, testCaseGroups)}
           measureGroups={measureGroups}
         />
       )}

diff --git a/src/util/GroupCoverageHelpers.ts b/src/util/GroupCoverageHelpers.ts
@@ -63,7 +63,6 @@ export const mapCql = (
   if (measureCql && groupPopulations) {
     const definitions = new CqlAntlr(measureCql).parse().expressionDefinitions;
 
-    console.log(definitions)
     return groupPopulations.reduce((output, { groupId, populationValues }) => {
       output[groupId] = {
         populationDefinitions: populationValues?.reduce(