From e91ca0d45c5b9ef84de756dcef8de99400589675 Mon Sep 17 00:00:00 2001
From: adongare <ashok.dongare@semanticbits.com>
Date: Thu, 21 Nov 2024 16:41:17 -0500
Subject: [PATCH] iMAT-7936 MADiE: Issues around Measure Buttons: Automatic
 navigation and an Error

---
 src/components/testCaseLanding/qdm/TestCaseList.tsx    | 2 +-
 src/components/testCaseLanding/qiCore/TestCaseList.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/testCaseLanding/qdm/TestCaseList.tsx b/src/components/testCaseLanding/qdm/TestCaseList.tsx
index 8d3c85f33..7ddf9bd05 100644
--- a/src/components/testCaseLanding/qdm/TestCaseList.tsx
+++ b/src/components/testCaseLanding/qdm/TestCaseList.tsx
@@ -245,7 +245,7 @@ const TestCaseList = (props: TestCaseListProps) => {
 
   useEffect(() => {
     const validTestCases = testCases?.filter((tc) => tc.validResource);
-    if (validTestCases && calculationOutput) {
+    if (validTestCases && calculationOutput && selectedPopCriteria) {
       const executionResults: CqmExecutionResultsByPatient = calculationOutput;
       // calculation output only contains valid testcases already.
       const highlightingForAllGroups = buildHighlightingForAllGroups(
diff --git a/src/components/testCaseLanding/qiCore/TestCaseList.tsx b/src/components/testCaseLanding/qiCore/TestCaseList.tsx
index c3b0da466..dac288fe7 100644
--- a/src/components/testCaseLanding/qiCore/TestCaseList.tsx
+++ b/src/components/testCaseLanding/qiCore/TestCaseList.tsx
@@ -230,7 +230,7 @@ const TestCaseList = (props: TestCaseListProps) => {
 
   useEffect(() => {
     const validTestCases = testCases?.filter((tc) => tc.validResource);
-    if (validTestCases && calculationOutput?.results) {
+    if (validTestCases && calculationOutput?.results && selectedPopCriteria) {
       // Pull Clause Coverage from coverage HTML
       setCoveragePercentage(
         getCoverageValueFromHtml(