From 66a504c0176139a38d7333cca5bed62b52601a00 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Thu, 13 Feb 2025 17:11:58 -0500
Subject: [PATCH 01/13] adjusting the substitute modal

---
 services/app-api/forms/defaultMeasures.ts     | 17 +++++--
 services/app-api/forms/pomMeasures.ts         |  2 +-
 services/app-api/types/reports.ts             |  2 +-
 services/app-api/utils/reportValidation.ts    |  2 +-
 services/app-api/utils/tests/mockReport.ts    |  4 +-
 .../report/MeasureReplacementModal.tsx        | 46 ++++++++++++-------
 .../src/components/report/MeasureTable.tsx    |  6 ++-
 services/ui-src/src/types/report.ts           |  2 +-
 .../ui-src/src/utils/testing/setupJest.tsx    |  2 +-
 9 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/services/app-api/forms/defaultMeasures.ts b/services/app-api/forms/defaultMeasures.ts
index e76110cb..ea2a6521 100644
--- a/services/app-api/forms/defaultMeasures.ts
+++ b/services/app-api/forms/defaultMeasures.ts
@@ -104,7 +104,7 @@ export const defaultMeasureTemplates = {
     id: "LTSS-1",
     title: "LTSS-1: Comprehensive Assessment and Update",
     type: PageType.Measure,
-    substitutable: true,
+    substitutable: MeasureTemplateName["FASI-1"],
     sidebar: false,
     elements: [
       {
@@ -206,7 +206,6 @@ export const defaultMeasureTemplates = {
     id: "FFS",
     title: "LTSS-1: FFS LTSS Measure Results",
     type: PageType.MeasureResults,
-    substitutable: true,
     sidebar: false,
     elements: [
       {
@@ -218,6 +217,16 @@ export const defaultMeasureTemplates = {
         type: ElementType.Header,
         text: "Fee-For-Service Measure Results",
       },
+      {
+        type: ElementType.Accordion,
+        label: "Instructions",
+        value:
+          "[Optional instructional content that could support the user in completing this page]",
+      },
+      {
+        type: ElementType.SubHeader,
+        text: "FSS LTSS Measure Details",
+      },
       {
         type: ElementType.TextAreaField,
         label: "Which Medicaid HCBS programs are being reported? (optional)",
@@ -236,7 +245,7 @@ export const defaultMeasureTemplates = {
     title: "LTSS-2: Comprehensive Person-Centered Plan and Update",
     type: PageType.Measure,
     sidebar: false,
-    substitutable: true,
+    substitutable: MeasureTemplateName["FASI-2"],
     elements: [
       {
         type: ElementType.ButtonLink,
@@ -1126,7 +1135,7 @@ export const defaultMeasureTemplates = {
   [MeasureTemplateName["MLTSS"]]: {
     id: "MLTSS",
     title: "MLTSS: Plan All-Cause Readmission",
-    type: PageType.Measure,
+    type: PageType.MeasureResults,
     sidebar: false,
     elements: [
       {
diff --git a/services/app-api/forms/pomMeasures.ts b/services/app-api/forms/pomMeasures.ts
index 754fc1bd..17c890e7 100644
--- a/services/app-api/forms/pomMeasures.ts
+++ b/services/app-api/forms/pomMeasures.ts
@@ -20,7 +20,7 @@ export const pomMeasures: MeasureOptions[] = [
     uid: "1822-2",
     required: true,
     stratified: false,
-    measureTemplate: MeasureTemplateName["POM-2"],
+    measureTemplate: [MeasureTemplateName["POM-2"]],
   },
 ];
 
diff --git a/services/app-api/types/reports.ts b/services/app-api/types/reports.ts
index 1e9e17f4..0eb9eac3 100644
--- a/services/app-api/types/reports.ts
+++ b/services/app-api/types/reports.ts
@@ -85,7 +85,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
-  substitutable?: boolean;
+  substitutable?: MeasureTemplateName;
 }
 
 export interface SectionTemplate {
diff --git a/services/app-api/utils/reportValidation.ts b/services/app-api/utils/reportValidation.ts
index c4fc12eb..d560d3db 100644
--- a/services/app-api/utils/reportValidation.ts
+++ b/services/app-api/utils/reportValidation.ts
@@ -178,7 +178,7 @@ const measurePageTemplateSchema = formPageTemplateSchema.shape({
   required: boolean().notRequired(),
   stratified: boolean().notRequired(),
   optional: boolean().notRequired(),
-  substitutable: boolean().notRequired(),
+  substitutable: string().notRequired(),
 });
 
 const measureOptionsArraySchema = array().of(
diff --git a/services/app-api/utils/tests/mockReport.ts b/services/app-api/utils/tests/mockReport.ts
index 1ec08d18..d1d07d10 100644
--- a/services/app-api/utils/tests/mockReport.ts
+++ b/services/app-api/utils/tests/mockReport.ts
@@ -45,7 +45,7 @@ export const invalidMeasureTemplatesReport = {
       id: "LTSS-1",
       title: "LTSS-1: Comprehensive Assessment and Update",
       //   type: PageType.Measure,
-      substitutable: true,
+      substitutable: MeasureTemplateName["FASI-1"],
       sidebar: false,
       elements: [
         {
@@ -141,7 +141,7 @@ export const invalidRadioCheckedChildrenReport = {
       id: "LTSS-1",
       title: "LTSS-1: Comprehensive Assessment and Update",
       type: PageType.Measure,
-      substitutable: true,
+      substitutable: MeasureTemplateName["FASI-2"],
       sidebar: false,
       elements: [
         {
diff --git a/services/ui-src/src/components/report/MeasureReplacementModal.tsx b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
index d4acdd58..4c3739d6 100644
--- a/services/ui-src/src/components/report/MeasureReplacementModal.tsx
+++ b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
@@ -1,29 +1,43 @@
-import {
-  ModalBody,
-  ModalFooter,
-  Button,
-  Stack,
-  Radio,
-  RadioGroup,
-} from "@chakra-ui/react";
+import { ModalBody, ModalFooter, Button } from "@chakra-ui/react";
 import React from "react";
+import { ChoiceList } from "@cmsgov/design-system";
+
+const choices = [
+  {
+    label: "Yes",
+    value: "yes",
+  },
+  {
+    label: "No",
+    value: "no",
+  },
+];
 
 export const MeasureReplacementModal = (
   cmit: number | undefined,
   onClose: Function,
   onSubmit: Function
 ): React.ReactFragment => {
+  const onChangeHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const { name, value } = event.target;
+    console.log(name, value);
+  };
+
+  const measureCurr = "FASI-1";
+  const measureSub = "LTSS-1";
+  const label = `Do you want to substitute ${measureCurr} for ${measureSub}`
+
   return (
     <React.Fragment>
       <ModalBody>
-        Select alternate measure type for CMIT {cmit}
-        {/* @ts-ignore TODO */}
-        <RadioGroup onChange={() => {}} value={1}>
-          <Stack direction="column">
-            <Radio value="1">Measure Type One</Radio>
-            <Radio value="2">Measure Type Two</Radio>
-          </Stack>
-        </RadioGroup>
+        [hint text explaining what happens when substituting a measure]
+        <ChoiceList
+          name={"subsitute"}
+          type={"radio"}
+          label={label}
+          choices={choices}
+          onChange={onChangeHandler}
+        />
       </ModalBody>
       <ModalFooter gap="4">
         <Button colorScheme="blue" mr={3} onClick={() => onSubmit(false)}>
diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 227e45f7..7cff66c9 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -35,11 +35,15 @@ export const MeasureTableElement = (props: PageElementProps) => {
       page.type === PageType.Measure
   );
 
+  const onSubstitute = (measure: string) => {
+    console.log("selection", measure);
+  };
+
   const buildModal = (cmit: number | undefined) => {
     const modal = MeasureReplacementModal(
       cmit,
       () => setModalOpen(false), // Close Action
-      () => setModalOpen(false) // Submit
+      onSubstitute // Submit
     ); // This will need the whole measure eventually
     setModalComponent(modal);
   };
diff --git a/services/ui-src/src/types/report.ts b/services/ui-src/src/types/report.ts
index 0e7d5c64..3d2ed0ab 100644
--- a/services/ui-src/src/types/report.ts
+++ b/services/ui-src/src/types/report.ts
@@ -82,7 +82,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
-  substitutable?: boolean;
+  substitutable?: MeasureTemplateName;
 }
 
 export interface StatusPageTemplate extends FormPageTemplate {
diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index ad03f7b9..a9e27adb 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -193,7 +193,7 @@ const mockMeasureTemplate: MeasurePageTemplate = {
   title: "mock-title",
   type: PageType.Measure,
   required: true,
-  substitutable: true,
+  substitutable: MeasureTemplateName["LTSS-2"],
   elements: [],
 };
 

From 5046342bf512478a8aa3c48af0d7b7aff58e914f Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Fri, 14 Feb 2025 12:59:00 -0500
Subject: [PATCH 02/13] adding saving to the measure swap

---
 .../report/MeasureReplacementModal.tsx        | 41 ++++++++++---------
 .../src/components/report/MeasureTable.tsx    | 29 +++++++++----
 2 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/services/ui-src/src/components/report/MeasureReplacementModal.tsx b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
index 4c3739d6..11c60cbd 100644
--- a/services/ui-src/src/components/report/MeasureReplacementModal.tsx
+++ b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
@@ -1,31 +1,21 @@
 import { ModalBody, ModalFooter, Button } from "@chakra-ui/react";
 import React from "react";
 import { ChoiceList } from "@cmsgov/design-system";
-
-const choices = [
-  {
-    label: "Yes",
-    value: "yes",
-  },
-  {
-    label: "No",
-    value: "no",
-  },
-];
+import { MeasurePageTemplate } from "types";
 
 export const MeasureReplacementModal = (
-  cmit: number | undefined,
+  measure: MeasurePageTemplate,
   onClose: Function,
   onSubmit: Function
 ): React.ReactFragment => {
+  let selectMeasure: MeasurePageTemplate | undefined;
+
   const onChangeHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = event.target;
-    console.log(name, value);
+    selectMeasure = event.target.value === "0" ? measure : undefined;
   };
 
-  const measureCurr = "FASI-1";
-  const measureSub = "LTSS-1";
-  const label = `Do you want to substitute ${measureCurr} for ${measureSub}`
+  const name = measure.title.split(":")[0];
+  const label = `Do you want to substitute ${name} for ${measure.substitutable}`;
 
   return (
     <React.Fragment>
@@ -35,12 +25,25 @@ export const MeasureReplacementModal = (
           name={"subsitute"}
           type={"radio"}
           label={label}
-          choices={choices}
+          choices={[
+            {
+              label: "Yes",
+              value: 0,
+            },
+            {
+              label: "No",
+              value: 1,
+            },
+          ]}
           onChange={onChangeHandler}
         />
       </ModalBody>
       <ModalFooter gap="4">
-        <Button colorScheme="blue" mr={3} onClick={() => onSubmit(false)}>
+        <Button
+          colorScheme="blue"
+          mr={3}
+          onClick={() => onSubmit(selectMeasure)}
+        >
           Substitute Measure
         </Button>
         <Button variant="link" onClick={() => onClose(false)}>
diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 7cff66c9..b4f8ffa7 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -17,7 +17,7 @@ import {
   MeasureTableTemplate,
   PageType,
 } from "types";
-import { useStore } from "utils";
+import { putReport, useStore } from "utils";
 import { PageElementProps } from "./Elements";
 
 export const MeasureTableElement = (props: PageElementProps) => {
@@ -35,13 +35,28 @@ export const MeasureTableElement = (props: PageElementProps) => {
       page.type === PageType.Measure
   );
 
-  const onSubstitute = (measure: string) => {
-    console.log("selection", measure);
+  const onSubstitute = async (selectMeasure: MeasurePageTemplate) => {
+    if (selectMeasure) {
+      const substitute = selectMeasure.substitutable?.toString();
+      const measure = measures.find((measure) =>
+        measure.title.includes(substitute!)
+      );
+      if (report && measure) {
+        measure.required = true;
+
+        selectMeasure.required = false;
+        selectMeasure.substitutable = undefined;
+
+        await putReport(report);
+      }
+    }
+
+    setModalOpen(false);
   };
 
-  const buildModal = (cmit: number | undefined) => {
+  const buildModal = (measure: MeasurePageTemplate) => {
     const modal = MeasureReplacementModal(
-      cmit,
+      measure,
       () => setModalOpen(false), // Close Action
       onSubstitute // Submit
     ); // This will need the whole measure eventually
@@ -70,9 +85,7 @@ export const MeasureTableElement = (props: PageElementProps) => {
         </Td>
         <Td>
           {measure.substitutable ? (
-            <Link onClick={() => buildModal(measure.cmit)}>
-              Substitute measure
-            </Link>
+            <Link onClick={() => buildModal(measure)}>Substitute measure</Link>
           ) : null}
         </Td>
 

From 917a5da2a0c39aa1302347355fee49d22744bdd5 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Fri, 14 Feb 2025 14:29:02 -0500
Subject: [PATCH 03/13] working prototype

needs more thought on structure
---
 services/app-api/types/reports.ts                      | 2 +-
 services/ui-src/src/components/report/MeasureTable.tsx | 2 ++
 services/ui-src/src/types/report.ts                    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/app-api/types/reports.ts b/services/app-api/types/reports.ts
index 0eb9eac3..464d0606 100644
--- a/services/app-api/types/reports.ts
+++ b/services/app-api/types/reports.ts
@@ -85,7 +85,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
-  substitutable?: MeasureTemplateName;
+  substitutable?: string;
 }
 
 export interface SectionTemplate {
diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index b4f8ffa7..9cb68d9c 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -15,6 +15,7 @@ import {
   isMeasureTemplate,
   MeasurePageTemplate,
   MeasureTableTemplate,
+  MeasureTemplateName,
   PageType,
 } from "types";
 import { putReport, useStore } from "utils";
@@ -43,6 +44,7 @@ export const MeasureTableElement = (props: PageElementProps) => {
       );
       if (report && measure) {
         measure.required = true;
+        measure.substitutable = selectMeasure.title.split(":")[0];
 
         selectMeasure.required = false;
         selectMeasure.substitutable = undefined;
diff --git a/services/ui-src/src/types/report.ts b/services/ui-src/src/types/report.ts
index 3d2ed0ab..afa2f9af 100644
--- a/services/ui-src/src/types/report.ts
+++ b/services/ui-src/src/types/report.ts
@@ -82,7 +82,7 @@ export interface MeasurePageTemplate extends FormPageTemplate {
   required?: boolean;
   stratified?: boolean;
   optional?: boolean;
-  substitutable?: MeasureTemplateName;
+  substitutable?: string;
 }
 
 export interface StatusPageTemplate extends FormPageTemplate {

From c540a6fb8009313957498fc05f4bd8c7ae6340a1 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Fri, 14 Feb 2025 14:42:47 -0500
Subject: [PATCH 04/13] Update MeasureTable.tsx

---
 services/ui-src/src/components/report/MeasureTable.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 9cb68d9c..9207ba86 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -15,7 +15,6 @@ import {
   isMeasureTemplate,
   MeasurePageTemplate,
   MeasureTableTemplate,
-  MeasureTemplateName,
   PageType,
 } from "types";
 import { putReport, useStore } from "utils";

From cd1a81e398edb6ed906e33dce2ffb9d22341f2b0 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Tue, 18 Feb 2025 09:37:45 -0500
Subject: [PATCH 05/13] Update setupJest.tsx

---
 services/ui-src/src/utils/testing/setupJest.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index a9e27adb..2b538aa8 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -193,7 +193,7 @@ const mockMeasureTemplate: MeasurePageTemplate = {
   title: "mock-title",
   type: PageType.Measure,
   required: true,
-  substitutable: MeasureTemplateName["LTSS-2"],
+  substitutable: "LTSS-2",
   elements: [],
 };
 

From 3b93c629cc6d812ee423745539e894ded48b82d6 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 13:12:12 -0500
Subject: [PATCH 06/13] better design for substitution

---
 services/app-api/forms/defaultMeasures.ts             |  7 ++++---
 services/app-api/handlers/reports/buildReport.ts      |  1 -
 services/app-api/types/reports.ts                     |  2 +-
 .../src/components/report/MeasureReplacementModal.tsx |  3 +--
 .../ui-src/src/components/report/MeasureTable.tsx     |  5 +----
 .../components/report/QualityMeasureTable.test.tsx    |  2 +-
 .../src/components/report/QualityMeasureTable.tsx     | 11 +++++++++--
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/services/app-api/forms/defaultMeasures.ts b/services/app-api/forms/defaultMeasures.ts
index ea2a6521..4ac7c586 100644
--- a/services/app-api/forms/defaultMeasures.ts
+++ b/services/app-api/forms/defaultMeasures.ts
@@ -16,7 +16,7 @@ export const defaultMeasures: MeasureOptions[] = [
     stratified: false,
     measureTemplate: [
       MeasureTemplateName["LTSS-1"],
-      MeasureTemplateName["FFS960"],
+      MeasureTemplateName["FFS-1"],
       MeasureTemplateName["MLTSS"],
     ],
   },
@@ -202,8 +202,8 @@ export const defaultMeasureTemplates = {
       },
     ],
   },
-  [MeasureTemplateName["FFS960"]]: {
-    id: "FFS",
+  [MeasureTemplateName["FFS-1"]]: {
+    id: "FFS-1",
     title: "LTSS-1: FFS LTSS Measure Results",
     type: PageType.MeasureResults,
     sidebar: false,
@@ -630,6 +630,7 @@ export const defaultMeasureTemplates = {
   [MeasureTemplateName["FASI-1"]]: {
     id: "FASI-1",
     title: "FASI-1: Identification of Person-Centered Priorities",
+    substitutable: MeasureTemplateName["LTSS-1"],
     type: PageType.Measure,
     sidebar: false,
     elements: [
diff --git a/services/app-api/handlers/reports/buildReport.ts b/services/app-api/handlers/reports/buildReport.ts
index 81c71234..de750b79 100644
--- a/services/app-api/handlers/reports/buildReport.ts
+++ b/services/app-api/handlers/reports/buildReport.ts
@@ -61,7 +61,6 @@ export const buildReport = async (
       return pages.map((page) => {
         // TODO: make reusable. This will be used on the optional page when adding a measure.
         page.cmit = measure.cmit;
-        page.id += measure.cmit; // TODO this will need some logic if a measure is substituted
         page.stratified = measure.stratified;
         page.required = measure.required;
         page.elements = [
diff --git a/services/app-api/types/reports.ts b/services/app-api/types/reports.ts
index d35e8a25..413b9ecc 100644
--- a/services/app-api/types/reports.ts
+++ b/services/app-api/types/reports.ts
@@ -46,7 +46,7 @@ export interface MeasureOptions {
 export enum MeasureTemplateName {
   // required measures
   "LTSS-1" = "LTSS-1",
-  "FFS960" = "FFS960",
+  "FFS-1" = "FFS-1",
   "LTSS-2" = "LTSS-2",
   "LTSS-6" = "LTSS-6",
   "LTSS-7" = "LTSS-7",
diff --git a/services/ui-src/src/components/report/MeasureReplacementModal.tsx b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
index 11c60cbd..74171510 100644
--- a/services/ui-src/src/components/report/MeasureReplacementModal.tsx
+++ b/services/ui-src/src/components/report/MeasureReplacementModal.tsx
@@ -14,8 +14,7 @@ export const MeasureReplacementModal = (
     selectMeasure = event.target.value === "0" ? measure : undefined;
   };
 
-  const name = measure.title.split(":")[0];
-  const label = `Do you want to substitute ${name} for ${measure.substitutable}`;
+  const label = `Do you want to substitute ${measure.id} for ${measure.substitutable}`;
 
   return (
     <React.Fragment>
diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 9207ba86..ca591bc5 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -43,11 +43,8 @@ export const MeasureTableElement = (props: PageElementProps) => {
       );
       if (report && measure) {
         measure.required = true;
-        measure.substitutable = selectMeasure.title.split(":")[0];
-
         selectMeasure.required = false;
-        selectMeasure.substitutable = undefined;
-
+        
         await putReport(report);
       }
     }
diff --git a/services/ui-src/src/components/report/QualityMeasureTable.test.tsx b/services/ui-src/src/components/report/QualityMeasureTable.test.tsx
index 7d0bea32..2910b31a 100644
--- a/services/ui-src/src/components/report/QualityMeasureTable.test.tsx
+++ b/services/ui-src/src/components/report/QualityMeasureTable.test.tsx
@@ -33,7 +33,7 @@ describe("Quality Measure Table", () => {
     expect(ffsButton).toBeEnabled();
 
     await userEvent.click(ffsButton!);
-    const ffsRoute = "/report/QMS/CO/mock-id/FFS960";
+    const ffsRoute = "/report/QMS/CO/mock-id/FFS-1";
     expect(mockUseNavigate).toHaveBeenCalledWith(ffsRoute);
 
     const mltssRow = screen.getByRole("row", { name: /MLTSS CMIT# 960/ });
diff --git a/services/ui-src/src/components/report/QualityMeasureTable.tsx b/services/ui-src/src/components/report/QualityMeasureTable.tsx
index faf8bdc5..b89c1846 100644
--- a/services/ui-src/src/components/report/QualityMeasureTable.tsx
+++ b/services/ui-src/src/components/report/QualityMeasureTable.tsx
@@ -16,15 +16,22 @@ import { useParams, useNavigate } from "react-router-dom";
 import { CMIT } from "types";
 
 export const QualityMeasureTableElement = () => {
-  const { cmit } = useStore();
+  const { cmit, report } = useStore();
   const cmitInfo = CMIT_LIST.find((item) => item.cmit === cmit);
   const deliveryMethods = useWatch({ name: "delivery-method-radio" });
+  const { defaultMeasures } = report?.measureLookup!;
 
   const { reportType, state, reportId } = useParams();
   const navigate = useNavigate();
 
   const handleEditClick = (deliverySystem: string, cmitInfo: CMIT) => {
-    const path = `/report/${reportType}/${state}/${reportId}/${deliverySystem}${cmitInfo.cmit}`;
+    const measure = defaultMeasures.find(
+      (measure) => measure.cmit === cmitInfo.cmit
+    );
+    const deliveryId = measure?.measureTemplate.find((item) =>
+      item.toString().includes(deliverySystem)
+    );
+    const path = `/report/${reportType}/${state}/${reportId}/${deliveryId}`;
     navigate(path);
   };
 

From 767f85ca3216c36b224c57ac95977dc7b25d246b Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 13:48:10 -0500
Subject: [PATCH 07/13] smarter return link

---
 services/app-api/forms/defaultMeasures.ts       |  7 ++-----
 services/app-api/types/reports.ts               |  2 +-
 services/app-api/utils/reportValidation.ts      |  2 +-
 .../ui-src/src/components/report/Elements.tsx   | 17 +++++++++++++++--
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/services/app-api/forms/defaultMeasures.ts b/services/app-api/forms/defaultMeasures.ts
index 4ac7c586..6f281d6a 100644
--- a/services/app-api/forms/defaultMeasures.ts
+++ b/services/app-api/forms/defaultMeasures.ts
@@ -110,7 +110,6 @@ export const defaultMeasureTemplates = {
       {
         type: ElementType.ButtonLink,
         label: "Return to Required Measures Dashboard",
-        to: "req-measure-result",
       },
       {
         type: ElementType.Header,
@@ -211,7 +210,7 @@ export const defaultMeasureTemplates = {
       {
         type: ElementType.ButtonLink,
         label: "Return to Required Measures Dashboard",
-        to: "LTSS-1960",
+        to: "LTSS-1",
       },
       {
         type: ElementType.Header,
@@ -250,7 +249,6 @@ export const defaultMeasureTemplates = {
       {
         type: ElementType.ButtonLink,
         label: "Return to Required Measures Dashboard",
-        to: "req-measure-result",
       },
       {
         type: ElementType.Header,
@@ -637,7 +635,6 @@ export const defaultMeasureTemplates = {
       {
         type: ElementType.ButtonLink,
         label: "Return to Optional Measures Dashboard",
-        to: "optional-measure-result",
       },
       {
         type: ElementType.Header,
@@ -718,12 +715,12 @@ export const defaultMeasureTemplates = {
     id: "FASI-2",
     title: "FASI-2: Documentation of a Person-Centered Service Plan",
     type: PageType.Measure,
+    substitutable: MeasureTemplateName["LTSS-2"],
     sidebar: false,
     elements: [
       {
         type: ElementType.ButtonLink,
         label: "Return to Optional Measures Dashboard",
-        to: "optional-measure-result",
       },
       {
         type: ElementType.Header,
diff --git a/services/app-api/types/reports.ts b/services/app-api/types/reports.ts
index 413b9ecc..0a80e638 100644
--- a/services/app-api/types/reports.ts
+++ b/services/app-api/types/reports.ts
@@ -278,7 +278,7 @@ export type RadioTemplate = {
 export type ButtonLinkTemplate = {
   type: ElementType.ButtonLink;
   label: string;
-  to: PageId;
+  to?: PageId;
 };
 
 export type MeasureFooterTemplate = {
diff --git a/services/app-api/utils/reportValidation.ts b/services/app-api/utils/reportValidation.ts
index d560d3db..0e4dff9c 100644
--- a/services/app-api/utils/reportValidation.ts
+++ b/services/app-api/utils/reportValidation.ts
@@ -128,7 +128,7 @@ const radioTemplateSchema = object().shape({
 const buttonLinkTemplateSchema = object().shape({
   type: string().required(ElementType.ButtonLink),
   label: string().required(),
-  to: string().required(),
+  to: string().optional(),
 });
 
 const measureTableTemplateSchema = object().shape({
diff --git a/services/ui-src/src/components/report/Elements.tsx b/services/ui-src/src/components/report/Elements.tsx
index 389d4a90..f2bf9011 100644
--- a/services/ui-src/src/components/report/Elements.tsx
+++ b/services/ui-src/src/components/report/Elements.tsx
@@ -14,10 +14,12 @@ import {
   AccordionTemplate,
   ButtonLinkTemplate,
   PageElement,
+  MeasurePageTemplate,
 } from "types";
 import { AccordionItem } from "components";
 import arrowLeftIcon from "assets/icons/arrows/icon_arrow_left_blue.png";
 import { parseCustomHtml } from "utils";
+import { useStore } from "utils";
 
 export interface PageElementProps {
   element: PageElement;
@@ -69,11 +71,22 @@ export const accordionElement = (props: PageElementProps) => {
 };
 
 export const buttonLinkElement = (props: PageElementProps) => {
-  const { reportType, state, reportId } = useParams();
+  const { reportType, state, reportId, pageId } = useParams();
+  const { report } = useStore();
+
   const navigate = useNavigate();
   const button = props.element as ButtonLinkTemplate;
+
+  const findPrevPage = () => {
+    const measure = report?.pages.find(
+      (measure) => measure.id === pageId
+    ) as MeasurePageTemplate;
+    return measure?.required ? "req-measure-result" : "optional-measure-result";
+  };
+
+  const page = button.to ?? findPrevPage();
   const nav = () =>
-    navigate(`/report/${reportType}/${state}/${reportId}/${button.to}`);
+    navigate(`/report/${reportType}/${state}/${reportId}/${page}`);
 
   return (
     <Button variant="return" onClick={() => nav()}>

From 54cc3f22d51856b1e6249ece77c9882d81e563c4 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 14:33:53 -0500
Subject: [PATCH 08/13] fix broken unit test

---
 services/ui-src/src/types/report.ts           | 25 ++++++++++---------
 .../ui-src/src/utils/testing/setupJest.tsx    | 11 +++++++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/services/ui-src/src/types/report.ts b/services/ui-src/src/types/report.ts
index 9a3e2d85..a4b57b05 100644
--- a/services/ui-src/src/types/report.ts
+++ b/services/ui-src/src/types/report.ts
@@ -285,18 +285,19 @@ export interface MeasureOptions {
 }
 
 export enum MeasureTemplateName {
-  "LTSS-1",
-  "LTSS-2",
-  "LTSS-6",
-  "LTSS-7",
-  "LTSS-8",
-  "POM-1",
-  "POM-2",
-  "POM-3",
-  "POM-4",
-  "POM-5",
-  "POM-6",
-  "POM-7",
+  "LTSS-1" = "LTSS-1",
+  "LTSS-2" = "LTSS-2",
+  "LTSS-6" = "LTSS-6",
+  "LTSS-7" = "LTSS-7",
+  "LTSS-8" = "LTSS-8",
+  "FFS-1" = "FFS-1",
+  "POM-1" = "POM-1",
+  "POM-2" = "POM-2",
+  "POM-3" = "POM-3",
+  "POM-4" = "POM-4",
+  "POM-5" = "POM-5",
+  "POM-6" = "POM-6",
+  "POM-7" = "POM-7",
 }
 
 export interface FormComponent {
diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index e8be4ec6..0a5d27c4 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -210,7 +210,15 @@ export const mockReportStore: HcbsReportState = {
     state: "PR",
     pages: [{ ...mockMeasureTemplate, cmit: 960 }],
     measureLookup: {
-      defaultMeasures: [],
+      defaultMeasures: [
+        {
+          cmit: 960,
+          measureTemplate: [MeasureTemplateName["FFS-1"]],
+          required: true,
+          uid: "960",
+          stratified: false,
+        },
+      ],
       optionGroups: {},
     },
     measureTemplates: {
@@ -228,6 +236,7 @@ export const mockReportStore: HcbsReportState = {
       },
       [MeasureTemplateName["LTSS-7"]]: mockMeasureTemplate,
       [MeasureTemplateName["LTSS-8"]]: mockMeasureTemplate,
+      [MeasureTemplateName["FFS-1"]]: mockMeasureTemplate,
       [MeasureTemplateName["POM-1"]]: mockMeasureTemplate,
       [MeasureTemplateName["POM-2"]]: mockMeasureTemplate,
       [MeasureTemplateName["POM-3"]]: mockMeasureTemplate,

From 84b6b8a05330ec147ffc9e2b262a85f1cc59760a Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 14:40:47 -0500
Subject: [PATCH 09/13] prettier fix

---
 .../ui-src/src/components/report/Elements.tsx |  3 +--
 .../components/report/QualityMeasureTable.tsx | 20 ++++++++++---------
 .../report/ReportPageWrapper.test.tsx         |  6 ++++++
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/services/ui-src/src/components/report/Elements.tsx b/services/ui-src/src/components/report/Elements.tsx
index f2bf9011..f8d6236c 100644
--- a/services/ui-src/src/components/report/Elements.tsx
+++ b/services/ui-src/src/components/report/Elements.tsx
@@ -18,8 +18,7 @@ import {
 } from "types";
 import { AccordionItem } from "components";
 import arrowLeftIcon from "assets/icons/arrows/icon_arrow_left_blue.png";
-import { parseCustomHtml } from "utils";
-import { useStore } from "utils";
+import { parseCustomHtml, useStore } from "utils";
 
 export interface PageElementProps {
   element: PageElement;
diff --git a/services/ui-src/src/components/report/QualityMeasureTable.tsx b/services/ui-src/src/components/report/QualityMeasureTable.tsx
index b89c1846..3dddbe17 100644
--- a/services/ui-src/src/components/report/QualityMeasureTable.tsx
+++ b/services/ui-src/src/components/report/QualityMeasureTable.tsx
@@ -19,20 +19,22 @@ export const QualityMeasureTableElement = () => {
   const { cmit, report } = useStore();
   const cmitInfo = CMIT_LIST.find((item) => item.cmit === cmit);
   const deliveryMethods = useWatch({ name: "delivery-method-radio" });
-  const { defaultMeasures } = report?.measureLookup!;
 
   const { reportType, state, reportId } = useParams();
   const navigate = useNavigate();
 
   const handleEditClick = (deliverySystem: string, cmitInfo: CMIT) => {
-    const measure = defaultMeasures.find(
-      (measure) => measure.cmit === cmitInfo.cmit
-    );
-    const deliveryId = measure?.measureTemplate.find((item) =>
-      item.toString().includes(deliverySystem)
-    );
-    const path = `/report/${reportType}/${state}/${reportId}/${deliveryId}`;
-    navigate(path);
+    if (report?.measureLookup) {
+      const { defaultMeasures } = report?.measureLookup;
+      const measure = defaultMeasures.find(
+        (measure) => measure.cmit === cmitInfo.cmit
+      );
+      const deliveryId = measure?.measureTemplate.find((item) =>
+        item.toString().includes(deliverySystem)
+      );
+      const path = `/report/${reportType}/${state}/${reportId}/${deliveryId}`;
+      navigate(path);
+    }
   };
 
   // Build Rows
diff --git a/services/ui-src/src/components/report/ReportPageWrapper.test.tsx b/services/ui-src/src/components/report/ReportPageWrapper.test.tsx
index 94547c1f..9fc07c36 100644
--- a/services/ui-src/src/components/report/ReportPageWrapper.test.tsx
+++ b/services/ui-src/src/components/report/ReportPageWrapper.test.tsx
@@ -97,6 +97,12 @@ const testReport: Report = {
       type: PageType.Measure,
       elements: [],
     },
+    [MeasureTemplateName["FFS-1"]]: {
+      id: "",
+      title: "",
+      type: PageType.Measure,
+      elements: [],
+    },
     [MeasureTemplateName["POM-1"]]: {
       id: "",
       title: "",

From 8a4f5a6f040d695891ac4b403f77be56d0b82e2a Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 14:44:16 -0500
Subject: [PATCH 10/13] why are you mad at me prettier

---
 services/ui-src/src/components/report/MeasureTable.tsx       | 2 +-
 .../ui-src/src/components/report/QualityMeasureTable.tsx     | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index ca591bc5..3e3ee0e2 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -44,7 +44,7 @@ export const MeasureTableElement = (props: PageElementProps) => {
       if (report && measure) {
         measure.required = true;
         selectMeasure.required = false;
-        
+
         await putReport(report);
       }
     }
diff --git a/services/ui-src/src/components/report/QualityMeasureTable.tsx b/services/ui-src/src/components/report/QualityMeasureTable.tsx
index 3dddbe17..13a89446 100644
--- a/services/ui-src/src/components/report/QualityMeasureTable.tsx
+++ b/services/ui-src/src/components/report/QualityMeasureTable.tsx
@@ -24,9 +24,8 @@ export const QualityMeasureTableElement = () => {
   const navigate = useNavigate();
 
   const handleEditClick = (deliverySystem: string, cmitInfo: CMIT) => {
-    if (report?.measureLookup) {
-      const { defaultMeasures } = report?.measureLookup;
-      const measure = defaultMeasures.find(
+    if (report && report.measureLookup) {
+      const measure = report?.measureLookup.defaultMeasures.find(
         (measure) => measure.cmit === cmitInfo.cmit
       );
       const deliveryId = measure?.measureTemplate.find((item) =>

From 3ad3fcb6fbecf09edcaf2a5c78fcda9d5c87ee08 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 15:16:01 -0500
Subject: [PATCH 11/13] increase code coverage

---
 .../report/MeasureReplacementModal.test.tsx   | 39 +++++++++++++++++++
 .../state/management/reportState.test.ts      |  6 +++
 .../ui-src/src/utils/testing/setupJest.tsx    |  2 +-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 services/ui-src/src/components/report/MeasureReplacementModal.test.tsx

diff --git a/services/ui-src/src/components/report/MeasureReplacementModal.test.tsx b/services/ui-src/src/components/report/MeasureReplacementModal.test.tsx
new file mode 100644
index 00000000..decaf93c
--- /dev/null
+++ b/services/ui-src/src/components/report/MeasureReplacementModal.test.tsx
@@ -0,0 +1,39 @@
+import { render, screen } from "@testing-library/react";
+import { mockMeasureTemplate } from "utils/testing/setupJest";
+import { MeasureReplacementModal } from "./MeasureReplacementModal";
+import { Modal } from "@chakra-ui/react";
+import userEvent from "@testing-library/user-event";
+
+const mockClose = jest.fn();
+const mockSubmit = jest.fn();
+
+describe("Test MeasureReplacementModal", () => {
+  it("Test MeasureReplacementModal Render", async () => {
+    const modal = MeasureReplacementModal(
+      mockMeasureTemplate,
+      mockClose,
+      mockSubmit
+    );
+    render(
+      <Modal isOpen={true} onClose={mockClose}>
+        {modal}
+      </Modal>
+    );
+
+    const radioYes = screen.getByLabelText("Yes");
+    await userEvent.click(radioYes);
+    expect(radioYes).toBeChecked();
+
+    const radioNo = screen.getByLabelText("Yes");
+    await userEvent.click(radioNo);
+    expect(radioNo).toBeChecked();
+
+    const cancelBtn = screen.getByText("Cancel");
+    await userEvent.click(cancelBtn);
+    expect(mockClose).toHaveBeenCalled();
+
+    const submit = screen.getByText("Substitute Measure");
+    await userEvent.click(submit);
+    expect(mockSubmit).toHaveBeenCalled();
+  });
+});
diff --git a/services/ui-src/src/utils/state/management/reportState.test.ts b/services/ui-src/src/utils/state/management/reportState.test.ts
index 48c472bc..a4d776be 100644
--- a/services/ui-src/src/utils/state/management/reportState.test.ts
+++ b/services/ui-src/src/utils/state/management/reportState.test.ts
@@ -101,6 +101,12 @@ const testReport: Report = {
       type: PageType.Measure,
       elements: [],
     },
+    [MeasureTemplateName["FFS-1"]]: {
+      id: "",
+      title: "",
+      type: PageType.Measure,
+      elements: [],
+    },
     [MeasureTemplateName["POM-1"]]: {
       id: "",
       title: "",
diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index 0a5d27c4..70a3f8fe 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -188,7 +188,7 @@ export const mockAdminUserStore: HcbsUserState = {
   setShowLocalLogins: () => {},
 };
 
-const mockMeasureTemplate: MeasurePageTemplate = {
+export const mockMeasureTemplate: MeasurePageTemplate = {
   id: "mock-template-id",
   title: "mock-title",
   type: PageType.Measure,

From 3011e75dc9037b9135c13707ebbef3506778c8cf Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 16:27:20 -0500
Subject: [PATCH 12/13] better unit test

---
 .../components/report/MeasureTable.test.tsx   | 22 ++++++++++++++++---
 .../src/components/report/MeasureTable.tsx    |  2 +-
 .../ui-src/src/utils/testing/setupJest.tsx    | 12 ++++++++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/services/ui-src/src/components/report/MeasureTable.test.tsx b/services/ui-src/src/components/report/MeasureTable.test.tsx
index ff603e5e..4388b250 100644
--- a/services/ui-src/src/components/report/MeasureTable.test.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.test.tsx
@@ -1,20 +1,35 @@
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { MeasureTableElement } from "./MeasureTable";
-import { mockUseStore } from "utils/testing/setupJest";
+import { mockMeasureTemplate, mockUseStore } from "utils/testing/setupJest";
 import { useStore } from "utils/state/useStore";
-import { ElementType, PageElement } from "types";
+import { ElementType, MeasurePageTemplate, PageElement } from "types";
 import { MemoryRouter } from "react-router-dom";
 
 jest.mock("utils/state/useStore");
 const mockedUseStore = useStore as jest.MockedFunction<typeof useStore>;
 mockedUseStore.mockReturnValue(mockUseStore);
 
+const mockPut = jest.fn();
+jest.mock("utils/api/requestMethods/report", () => ({
+  putReport: () => mockPut(),
+}));
+
 const mockedMeasureTableElement = {
   type: ElementType.MeasureTable,
   measureDisplay: "required",
 };
 
+jest.mock("./MeasureReplacementModal", () => ({
+  MeasureReplacementModal: (
+    _measure: MeasurePageTemplate,
+    _onClose: Function,
+    onSubmit: Function
+  ) => {
+    onSubmit(mockMeasureTemplate);
+  },
+}));
+
 const MeasureTableComponent = (
   <MemoryRouter>
     <MeasureTableElement
@@ -35,9 +50,10 @@ describe("Test MeasureTable", () => {
   it("Test Sustitute button", async () => {
     const substituteBtn = screen.getByText("Substitute measure");
     await userEvent.click(substituteBtn);
+    expect(mockPut).toHaveBeenCalled();
   });
   it("Test Edit button", async () => {
-    const editBtn = screen.getByText("Edit");
+    const editBtn = screen.getAllByText("Edit")[0];
     await userEvent.click(editBtn);
   });
 });
diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 3e3ee0e2..9bd70633 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -39,7 +39,7 @@ export const MeasureTableElement = (props: PageElementProps) => {
     if (selectMeasure) {
       const substitute = selectMeasure.substitutable?.toString();
       const measure = measures.find((measure) =>
-        measure.title.includes(substitute!)
+        measure.id.includes(substitute!)
       );
       if (report && measure) {
         measure.required = true;
diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index 70a3f8fe..058b552d 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -189,7 +189,7 @@ export const mockAdminUserStore: HcbsUserState = {
 };
 
 export const mockMeasureTemplate: MeasurePageTemplate = {
-  id: "mock-template-id",
+  id: "LTSS-1",
   title: "mock-title",
   type: PageType.Measure,
   required: true,
@@ -197,6 +197,14 @@ export const mockMeasureTemplate: MeasurePageTemplate = {
   elements: [],
 };
 
+export const mock2MeasureTemplate: MeasurePageTemplate = {
+  id: "LTSS-2",
+  title: "mock-title-2",
+  type: PageType.Measure,
+  required: true,
+  elements: [],
+};
+
 export const mockReportStore: HcbsReportState = {
   modalOpen: false,
   cmit: 960,
@@ -208,7 +216,7 @@ export const mockReportStore: HcbsReportState = {
     year: 2026,
     options: {},
     state: "PR",
-    pages: [{ ...mockMeasureTemplate, cmit: 960 }],
+    pages: [{ ...mockMeasureTemplate, cmit: 960 }, {...mock2MeasureTemplate, cmit: 961}],
     measureLookup: {
       defaultMeasures: [
         {

From ca37348623df46f41c951d1b2387209344015c26 Mon Sep 17 00:00:00 2001
From: ailZhou <aileen.zhou@coforma.io>
Date: Wed, 19 Feb 2025 16:33:43 -0500
Subject: [PATCH 13/13] lock substitution to only required measures

---
 services/ui-src/src/components/report/MeasureTable.tsx | 2 +-
 services/ui-src/src/utils/testing/setupJest.tsx        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/ui-src/src/components/report/MeasureTable.tsx b/services/ui-src/src/components/report/MeasureTable.tsx
index 9bd70633..2e0a3e52 100644
--- a/services/ui-src/src/components/report/MeasureTable.tsx
+++ b/services/ui-src/src/components/report/MeasureTable.tsx
@@ -82,7 +82,7 @@ export const MeasureTableElement = (props: PageElementProps) => {
           <Text>CMIT# {measure.cmit}</Text>
         </Td>
         <Td>
-          {measure.substitutable ? (
+          {measure.substitutable && measure.required ? (
             <Link onClick={() => buildModal(measure)}>Substitute measure</Link>
           ) : null}
         </Td>
diff --git a/services/ui-src/src/utils/testing/setupJest.tsx b/services/ui-src/src/utils/testing/setupJest.tsx
index 058b552d..e9cf4e26 100644
--- a/services/ui-src/src/utils/testing/setupJest.tsx
+++ b/services/ui-src/src/utils/testing/setupJest.tsx
@@ -216,7 +216,10 @@ export const mockReportStore: HcbsReportState = {
     year: 2026,
     options: {},
     state: "PR",
-    pages: [{ ...mockMeasureTemplate, cmit: 960 }, {...mock2MeasureTemplate, cmit: 961}],
+    pages: [
+      { ...mockMeasureTemplate, cmit: 960 },
+      { ...mock2MeasureTemplate, cmit: 961 },
+    ],
     measureLookup: {
       defaultMeasures: [
         {