From 34a041b5d6d8bd99d908bc28d3971722e65e55f1 Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Thu, 31 Oct 2024 14:00:08 -0400
Subject: [PATCH 1/2] MAT-7830: Remove ShiftTestCasesDates

---
 .../routes/qdm/TestCaseRoutes.test.tsx        |   1 -
 src/components/routes/qdm/TestCaseRoutes.tsx  |  12 +-
 .../routes/qiCore/TestCaseRoutes.tsx          |  17 +--
 .../common/TestCaseListSideBarNav.tsx         | 114 +++++++++---------
 .../TestCaseTable/TestCaseTable.test.tsx      |   2 -
 .../TestCaseTable/TestCaseTablePopover.tsx    |   2 +-
 .../testCaseLanding/qdm/TestCaseList.test.tsx |  12 +-
 src/types/madie-madie-util.d.ts               |   1 -
 8 files changed, 68 insertions(+), 93 deletions(-)

diff --git a/src/components/routes/qdm/TestCaseRoutes.test.tsx b/src/components/routes/qdm/TestCaseRoutes.test.tsx
index 4563ad5b5..5a0a3dcb5 100644
--- a/src/components/routes/qdm/TestCaseRoutes.test.tsx
+++ b/src/components/routes/qdm/TestCaseRoutes.test.tsx
@@ -83,7 +83,6 @@ jest.mock("@madie/madie-util", () => ({
   },
   useFeatureFlags: jest.fn().mockImplementation(() => ({
     applyDefaults: false,
-    ShiftTestCasesDates: true,
   })),
   useOktaTokens: () => ({
     getAccessToken: () => "test.jwt",
diff --git a/src/components/routes/qdm/TestCaseRoutes.tsx b/src/components/routes/qdm/TestCaseRoutes.tsx
index 132f888bf..80ec4d7b1 100644
--- a/src/components/routes/qdm/TestCaseRoutes.tsx
+++ b/src/components/routes/qdm/TestCaseRoutes.tsx
@@ -211,14 +211,10 @@ const TestCaseRoutes = () => {
             path="/measures/:measureId/edit/test-cases/list-page/expansion"
             element={<TestCaseLandingWrapper qdm children={<Expansion />} />}
           />
-          {featureFlags?.ShiftTestCasesDates && (
-            <Route
-              path="/measures/:measureId/edit/test-cases/list-page/test-case-data"
-              element={
-                <TestCaseLandingWrapper qdm children={<TestCaseData />} />
-              }
-            />
-          )}
+          <Route
+            path="/measures/:measureId/edit/test-cases/list-page/test-case-data"
+            element={<TestCaseLandingWrapper qdm children={<TestCaseData />} />}
+          />
           <Route
             index
             element={
diff --git a/src/components/routes/qiCore/TestCaseRoutes.tsx b/src/components/routes/qiCore/TestCaseRoutes.tsx
index 2302805ca..dcedfdf71 100644
--- a/src/components/routes/qiCore/TestCaseRoutes.tsx
+++ b/src/components/routes/qiCore/TestCaseRoutes.tsx
@@ -165,17 +165,12 @@ const TestCaseRoutes = () => {
               />
             }
           />
-          {featureFlags?.ShiftTestCasesDates && (
-            <Route
-              path="/measures/:measureId/edit/test-cases/list-page/test-case-data"
-              element={
-                <TestCaseLandingWrapper
-                  qdm={false}
-                  children={<TestCaseData />}
-                />
-              }
-            />
-          )}
+          <Route
+            path="/measures/:measureId/edit/test-cases/list-page/test-case-data"
+            element={
+              <TestCaseLandingWrapper qdm={false} children={<TestCaseData />} />
+            }
+          />
         </Route>
 
         <Route
diff --git a/src/components/testCaseLanding/common/TestCaseListSideBarNav.tsx b/src/components/testCaseLanding/common/TestCaseListSideBarNav.tsx
index faf81f89d..0c2fb9537 100644
--- a/src/components/testCaseLanding/common/TestCaseListSideBarNav.tsx
+++ b/src/components/testCaseLanding/common/TestCaseListSideBarNav.tsx
@@ -24,8 +24,7 @@ const TestCaseListSideBarNav = ({
   qdm,
 }: TestCaseListSideBarNavProps) => {
   const featureFlags = useFeatureFlags();
-  const showConfigurationSection =
-    (!qdm && featureFlags?.ShiftTestCasesDates) || qdm;
+
   let navigate = useNavigate();
   const { measureId, criteriaId } = useParams<{
     measureId: string;
@@ -96,68 +95,63 @@ const TestCaseListSideBarNav = ({
             )}
           </Tabs>
         )}
+        <>
+          <div className="nav-collapse-container">
+            <button
+              className="nav-collapser-title"
+              onClick={() => {
+                setShowConfigTabs(!showConfigTabs);
+              }}
+              data-testid="qdm-nav-collapser"
+              id="qdm-nav-collapser"
+              tw="px-2"
+            >
+              Configuration
+              <span className="tab-dropdown">
+                {showConfigTabs ? <ExpandLessIcon /> : <ExpandMoreIcon />}
+              </span>
+            </button>
+          </div>
 
-        {showConfigurationSection && (
-          <>
-            <div className="nav-collapse-container">
-              <button
-                className="nav-collapser-title"
-                onClick={() => {
-                  setShowConfigTabs(!showConfigTabs);
-                }}
-                data-testid="qdm-nav-collapser"
-                id="qdm-nav-collapser"
-                tw="px-2"
-              >
-                Configuration
-                <span className="tab-dropdown">
-                  {showConfigTabs ? <ExpandLessIcon /> : <ExpandMoreIcon />}
-                </span>
-              </button>
-            </div>
-
-            {showConfigTabs && (
-              <Tabs
+          {showConfigTabs && (
+            <Tabs
+              type="C"
+              size="standard"
+              orientation="vertical"
+              onChange={handleChange}
+              value={endRoute}
+            >
+              {qdm && (
+                <Tab
+                  label="SDE"
+                  value="sde"
+                  data-testid="nav-link-sde"
+                  type="C"
+                  orientation="vertical"
+                  onChange={handleChange}
+                />
+              )}
+              {qdm && (
+                <Tab
+                  label="Expansion"
+                  value="expansion"
+                  data-testid="nav-link-expansion"
+                  type="C"
+                  orientation="vertical"
+                  onChange={handleChange}
+                />
+              )}
+              <Tab
+                label="Test Case Data"
+                value="test-case-data"
+                data-testid="test-case-data"
                 type="C"
-                size="standard"
                 orientation="vertical"
                 onChange={handleChange}
-                value={endRoute}
-              >
-                {qdm && (
-                  <Tab
-                    label="SDE"
-                    value="sde"
-                    data-testid="nav-link-sde"
-                    type="C"
-                    orientation="vertical"
-                    onChange={handleChange}
-                  />
-                )}
-                {qdm && (
-                  <Tab
-                    label="Expansion"
-                    value="expansion"
-                    data-testid="nav-link-expansion"
-                    type="C"
-                    orientation="vertical"
-                    onChange={handleChange}
-                  />
-                )}
-                {featureFlags?.ShiftTestCasesDates && (
-                  <Tab
-                    label="Test Case Data"
-                    value="test-case-data"
-                    data-testid="test-case-data"
-                    type="C"
-                    orientation="vertical"
-                    onChange={handleChange}
-                  />
-                )}
-              </Tabs>
-            )}
-          </>
-        )}
+              />
+            </Tabs>
+          )}
+        </>
       </Nav>
     </OuterWrapper>
   );
diff --git a/src/components/testCaseLanding/common/TestCaseTable/TestCaseTable.test.tsx b/src/components/testCaseLanding/common/TestCaseTable/TestCaseTable.test.tsx
index b12266ea5..5430da969 100644
--- a/src/components/testCaseLanding/common/TestCaseTable/TestCaseTable.test.tsx
+++ b/src/components/testCaseLanding/common/TestCaseTable/TestCaseTable.test.tsx
@@ -82,7 +82,6 @@ let mockApplyDefaults = false;
 jest.mock("@madie/madie-util", () => ({
   useFeatureFlags: jest.fn().mockImplementation(() => ({
     applyDefaults: mockApplyDefaults,
-    ShiftTestCasesDates: true,
     TestCaseID: false,
   })),
 }));
@@ -345,7 +344,6 @@ describe("TestCase component", () => {
     const exportTestCase = jest.fn();
     const onCloneTestCase = jest.fn();
     (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({
-      ShiftTestCasesDates: true,
       TestCaseID: false,
     }));
 
diff --git a/src/components/testCaseLanding/common/TestCaseTable/TestCaseTablePopover.tsx b/src/components/testCaseLanding/common/TestCaseTable/TestCaseTablePopover.tsx
index 936e91f96..30d408084 100644
--- a/src/components/testCaseLanding/common/TestCaseTable/TestCaseTablePopover.tsx
+++ b/src/components/testCaseLanding/common/TestCaseTable/TestCaseTablePopover.tsx
@@ -204,7 +204,7 @@ const TestCaseTablePopover = (props: TestCaseTablePopoverProps) => {
             </>
           )}
 
-          {canEdit && featureFlags?.ShiftTestCasesDates && (
+          {canEdit && (
             <button
               id={`shift-dates-btn-${selectedTestCase?.id}`}
               aria-label={`shift-dates-${selectedTestCase?.title}`}
diff --git a/src/components/testCaseLanding/qdm/TestCaseList.test.tsx b/src/components/testCaseLanding/qdm/TestCaseList.test.tsx
index a9ce96359..2950d42c7 100644
--- a/src/components/testCaseLanding/qdm/TestCaseList.test.tsx
+++ b/src/components/testCaseLanding/qdm/TestCaseList.test.tsx
@@ -3280,9 +3280,7 @@ describe("TestCaseList component", () => {
   });
 
   it("should render shift test case dates dialogue on Test Case list page when shift test case dates button is clicked", async () => {
-    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({
-      ShiftTestCasesDates: true,
-    }));
+    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({}));
 
     const { getByTestId } = renderTestCaseListComponent();
     await waitFor(() => {
@@ -3301,9 +3299,7 @@ describe("TestCaseList component", () => {
 
   it("should shift test case dates successfully", async () => {
     testCases[0].title = "WhenAllGood";
-    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({
-      ShiftTestCasesDates: true,
-    }));
+    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({}));
     const responseDto: TestCase = {
       id: "1234",
       json: "date2",
@@ -3357,9 +3353,7 @@ describe("TestCaseList component", () => {
   });
 
   it("should handle shift test case dates failure", async () => {
-    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({
-      ShiftTestCasesDates: true,
-    }));
+    (useFeatureFlags as jest.Mock).mockClear().mockImplementation(() => ({}));
     const shiftTestCaseDatesApiMock = jest.fn().mockRejectedValueOnce(null);
     useTestCaseServiceMock.mockImplementationOnce(() => {
       return {
diff --git a/src/types/madie-madie-util.d.ts b/src/types/madie-madie-util.d.ts
index 6a65ce959..e3c8de2e2 100644
--- a/src/types/madie-madie-util.d.ts
+++ b/src/types/madie-madie-util.d.ts
@@ -14,7 +14,6 @@ declare module "@madie/madie-util" {
     qiCoreBonnieTestCases: boolean;
     qiCoreElementsTab: boolean;
     qdmHideJson: boolean;
-    ShiftTestCasesDates: boolean;
     TestCaseListSearch: boolean;
     TestCaseID: boolean;
   }

From de995304eb4bb0345659b2f16cb84eebd1fabf8c Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Sat, 2 Nov 2024 10:13:00 -0400
Subject: [PATCH 2/2] MAT-7830: Fixing failing test

---
 .../testCaseLanding/common/TestCaseListSideBarNav.test.tsx      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/testCaseLanding/common/TestCaseListSideBarNav.test.tsx b/src/components/testCaseLanding/common/TestCaseListSideBarNav.test.tsx
index ef1a1d01e..811e232d7 100644
--- a/src/components/testCaseLanding/common/TestCaseListSideBarNav.test.tsx
+++ b/src/components/testCaseLanding/common/TestCaseListSideBarNav.test.tsx
@@ -65,7 +65,7 @@ describe("TestCase component", () => {
     );
 
     expect(screen.getByRole("navigation")).toBeInTheDocument();
-    expect(screen.getAllByRole("tab").length).toEqual(2);
+    expect(screen.getAllByRole("tab").length).toEqual(3);
     const activeLink = screen.getByRole("tab", {
       name: "Population Criteria 2",
     });