ILOS (I Lose ollmy Sanity)

services/app-api/handlers/reports/create.ts

@@ -76,11 +76,14 @@ export const createReport = handler(async (event, _context) => {
   const isProgramPCCM =
     unvalidatedMetadata?.programIsPCCM?.[0]?.value === "Yes";
 
+  const ilosAvailable = unvalidatedMetadata?.ilosAvailable;
+
   try {
     ({ formTemplate, formTemplateVersion } = await getOrCreateFormTemplate(
       reportBucket,
       reportType,
-      isProgramPCCM
+      isProgramPCCM,
+      ilosAvailable
     ));
   } catch (err) {
     logger.error(err, "Error getting or creating template");

services/app-api/utils/formTemplates/formTemplates.test.ts

@@ -66,7 +66,8 @@ describe("Test getOrCreateFormTemplate MCPAR", () => {
     const result = await getOrCreateFormTemplate(
       "local-mcpar-reports",
       ReportType.MCPAR,
-      programIsNotPCCM
+      programIsNotPCCM,
+      true
     );
     expect(dynamoPutSpy).toHaveBeenCalled();
     expect(s3PutSpy).toHaveBeenCalled();
@@ -95,7 +96,8 @@ describe("Test getOrCreateFormTemplate MCPAR", () => {
     const result = await getOrCreateFormTemplate(
       "local-mcpar-reports",
       ReportType.MCPAR,
-      programIsPCCM
+      programIsPCCM,
+      true
     );
     expect(dynamoPutSpy).toHaveBeenCalled();
     expect(s3PutSpy).toHaveBeenCalled();
@@ -126,7 +128,8 @@ describe("Test getOrCreateFormTemplate MCPAR", () => {
     const result = await getOrCreateFormTemplate(
       "local-mcpar-reports",
       ReportType.MCPAR,
-      programIsNotPCCM
+      programIsNotPCCM,
+      true
     );
     expect(dynamoPutSpy).not.toHaveBeenCalled();
     expect(s3PutSpy).not.toHaveBeenCalled();
@@ -165,7 +168,8 @@ describe("Test getOrCreateFormTemplate MCPAR", () => {
     const result = await getOrCreateFormTemplate(
       "local-mcpar-reports",
       ReportType.MCPAR,
-      programIsNotPCCM
+      programIsNotPCCM,
+      true
     );
     expect(dynamoPutSpy).toHaveBeenCalled();
     expect(s3PutSpy).toHaveBeenCalled();

services/app-api/utils/formTemplates/formTemplates.ts

@@ -73,14 +73,18 @@ export const formTemplateForReportType = (reportType: ReportType) => {
 export async function getOrCreateFormTemplate(
   reportBucket: string,
   reportType: ReportType,
-  isProgramPCCM: boolean
+  isProgramPCCM: boolean,
+  ilosAvailable?: boolean
 ) {
   let currentFormTemplate = formTemplateForReportType(reportType);
+  // if ILOS is not enabled, remove the fields from form template
+  if (!ilosAvailable) {
+    currentFormTemplate = generateTemplateWithoutIlos(currentFormTemplate);
+  }
   if (isProgramPCCM) {
     currentFormTemplate = generatePCCMTemplate(currentFormTemplate);
   }
   const stringifiedTemplate = JSON.stringify(currentFormTemplate);
-
   const currentTemplateHash = createHash("md5")
     .update(stringifiedTemplate)
     .digest("hex");
@@ -323,3 +327,19 @@ const makePCCMTemplateModifications = (reportTemplate: ReportJson) => {
   }
   programTypeQuestion.props!.disabled = true;
 };
+
+const generateTemplateWithoutIlos = (originalReportTemplate: any) => {
+  const reportTemplate = structuredClone(originalReportTemplate);
+  // remove ILOS sections from template
+  for (let route of reportTemplate.routes) {
+    if (
+      route.path === "/mcpar/program-information" ||
+      route.path === "/mcpar/plan-level-indicators"
+    ) {
+      // These sections' last subsection is ILOS-specific; remove it.
+      route.children = route.children?.slice(0, -1);
+    }
+  }
+
+  return reportTemplate;
+};

services/app-api/utils/types/reports.ts

@@ -152,6 +152,7 @@ export interface MCPARReportMetadata extends ReportMetadata {
   dueDate: number;
   combinedData: boolean;
   programIsPCCM: Choice[];
+  ilosAvailable?: boolean;
 }
 
 export enum ReportType {

services/ui-src/src/components/menus/Sidebar.tsx

@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from "react";
 import { Link as RouterLink, useLocation } from "react-router-dom";
-import { useFlags } from "launchdarkly-react-client-sdk";
 // components
 import {
   Box,
@@ -90,19 +89,15 @@ const NavSection = ({ section, level }: NavSectionProps) => {
   const { pathname } = useLocation();
   const [isOpen, setIsOpen] = useState(false);
 
-  // LaunchDarkly
-  const ilos = useFlags()?.ilos;
-
   useEffect(() => {
     if (pathname.includes(section.path)) {
       setIsOpen(true);
     }
   }, [pathname]);
 
   const { name, path, children } = section;
-  const ilosRoute =
-    path.endsWith("add-in-lieu-of-services") || path.endsWith("ilos");
-  return ilosRoute && !ilos ? null : (
+
+  return (
     <React.Fragment key={path}>
       {children ? (
         <Box

services/ui-src/src/components/modals/AddEditReportModal.tsx

@@ -38,7 +38,10 @@ export const AddEditReportModal = ({
   const { copyEligibleReportsByState } = useStore();
 
   const [submitting, setSubmitting] = useState<boolean>(false);
+
+  // LaunchDarkly
   const yoyCopyFlag = useFlags()?.yoyCopy;
+  const ilosAvailable = useFlags()?.ilos;
 
   // get correct form
   const modalFormJsonMap: any = {
@@ -101,6 +104,7 @@ export const AddEditReportModal = ({
         lastAlteredBy: full_name,
         copyFieldDataSourceId: copyFieldDataSourceId?.value,
         programIsPCCM,
+        ilosAvailable,
         locked: false,
         submissionCount: 0,
         previousRevisions: [],

services/ui-src/src/components/reports/DrawerReportPage.tsx

@@ -19,6 +19,7 @@ import {
   entityWasUpdated,
   filterFormData,
   generateIlosFields,
+  isIlosCompleted,
   getEntriesToClear,
   parseCustomHtml,
   setClearedEntriesToDefaultValue,
@@ -127,25 +128,13 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
           .every((field: FormField) => field.id in entity);
       };
 
-      // if reporting on ILOS, verify that there its questions are completed
-      let isIlosCompleted = false;
-      if (
-        (reportingOnIlos && entity["plan_ilosOfferedByPlan"]) ||
-        entity["plan_ilosUtilizationByPlan"]
-      ) {
-        isIlosCompleted = entity["plan_ilosOfferedByPlan"][0].value.startsWith(
-          "Yes"
-        )
-          ? entity["plan_ilosUtilizationByPlan"].length > 0
-          : entity["plan_ilosOfferedByPlan"][0];
-      }
-
       /*
        * If the entity has the same fields from drawerForms fields, it was completed
        * at somepoint.
        */
       const isEntityCompleted = reportingOnIlos
-        ? calculateEntityCompletion() && isIlosCompleted
+        ? calculateEntityCompletion() &&
+          isIlosCompleted(reportingOnIlos, entity)
         : calculateEntityCompletion();
 
       return (

services/ui-src/src/components/reports/ReportPageWrapper.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useState } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import { useFlags } from "launchdarkly-react-client-sdk";
 // components
 import { Flex, Spinner } from "@chakra-ui/react";
 import {
@@ -31,9 +30,6 @@ export const ReportPageWrapper = () => {
   const { pathname } = useLocation();
   const locationState = useLocation().state as AnyObject;
 
-  // LaunchDarkly
-  const ilos = useFlags()?.ilos;
-
   // get state and id from context or storage
   const reportId = report?.id || localStorage.getItem("selectedReport");
   const reportState = state || localStorage.getItem("selectedState");
@@ -53,19 +49,15 @@ export const ReportPageWrapper = () => {
   };
 
   const renderPageSection = (route: ReportRoute) => {
-    const ilosRoute =
-      route.path.endsWith("add-in-lieu-of-services") ||
-      route.path.endsWith("ilos");
     switch (route.pageType) {
       case PageTypes.DRAWER:
         showSidebar();
-        return ilosRoute && !ilos ? null : (
+        return (
           <DrawerReportPage
             route={route as DrawerReportPageShape}
             validateOnRender={locationState?.validateOnRender}
           />
         );
-
       case PageTypes.MODAL_DRAWER:
         showSidebar();
         return (
@@ -87,7 +79,7 @@ export const ReportPageWrapper = () => {
         return <ReviewSubmitPage />;
       default:
         showSidebar();
-        return ilosRoute && !ilos ? null : (
+        return (
           <StandardReportPage
             route={route as StandardReportPageShape}
             validateOnRender={locationState?.validateOnRender}

services/ui-src/src/types/reportContext.ts

@@ -29,6 +29,7 @@ export interface ReportMetadataShape extends ReportKeys {
   fieldDataId: string;
   copyFieldDataSourceId?: string;
   programIsPCCM?: Choice[];
+  ilosAvailable?: boolean;
   previousRevisions: string[];
 }
 

services/ui-src/src/utils/forms/generateIlosFields.test.ts → services/ui-src/src/utils/forms/ilosFields.test.ts

@@ -1,5 +1,5 @@
-import { generateIlosFields } from "utils";
-import { FormJson, AnyObject } from "types";
+import { generateIlosFields, isIlosCompleted } from "utils";
+import { FormJson, AnyObject, EntityShape } from "types";
 
 const mockForm: FormJson = {
   id: "mock-id",
@@ -50,9 +50,28 @@ const mockIlos: AnyObject[] = [
   },
 ];
 
-const result = generateIlosFields(mockForm, mockIlos);
+const mockCompleteIlosEntity: EntityShape = {
+  id: "mock-complete-ilos",
+  plan_ilosOfferedByPlan: [
+    {
+      key: "mock-key",
+      value: "Yes",
+    },
+  ],
+  plan_ilosUtilizationByPlan: [
+    {
+      id: "mock-ilos",
+      name: "ilos",
+    },
+  ],
+};
+
+const mockIncompleteIlosEntity: EntityShape = {
+  id: "mock-incomplete-ilos",
+};
 
 describe("generateIlosFields", () => {
+  const result = generateIlosFields(mockForm, mockIlos);
   it("should generate checkboxes per each available ILOS", () => {
     expect(result.fields[0].props.choices.length).toBe(2);
   });
@@ -66,3 +85,14 @@ describe("generateIlosFields", () => {
     );
   });
 });
+
+describe("isIlosCompleted", () => {
+  it("should return TRUE if entity is complete", () => {
+    const result = isIlosCompleted(true, mockCompleteIlosEntity);
+    expect(result).toBe(true);
+  });
+  it("should return FALSE if entity is incomplete", () => {
+    const result = isIlosCompleted(true, mockIncompleteIlosEntity);
+    expect(result).toBe(false);
+  });
+});

services/ui-src/src/utils/forms/generateIlosFields.ts → services/ui-src/src/utils/forms/ilosFields.ts

@@ -1,4 +1,4 @@
-import { AnyObject, FormJson } from "types";
+import { AnyObject, EntityShape, FormJson } from "types";
 
 export const generateIlosFields = (form: FormJson, ilos: AnyObject[]) => {
   const fields = form.fields[0];
@@ -73,3 +73,22 @@ const updatedIlosChoiceList = (
   });
   return updatedChoiceList;
 };
+
+// if reporting on ILOS, verify that its questions are completed
+export const isIlosCompleted = (
+  reportingOnIlos: boolean,
+  entity: EntityShape
+) => {
+  let isIlosCompleted = false;
+  if (
+    (reportingOnIlos && entity["plan_ilosOfferedByPlan"]) ||
+    entity["plan_ilosUtilizationByPlan"]
+  ) {
+    isIlosCompleted = entity["plan_ilosOfferedByPlan"][0].value.startsWith(
+      "Yes"
+    )
+      ? entity["plan_ilosUtilizationByPlan"].length > 0
+      : entity["plan_ilosOfferedByPlan"][0];
+  }
+  return isIlosCompleted;
+};

services/ui-src/src/utils/index.ts

@@ -11,7 +11,7 @@ export * from "./auth/authLifecycle";
 export * from "./autosave/autosave";
 // forms
 export * from "./forms/forms";
-export * from "./forms/generateIlosFields";
+export * from "./forms/ilosFields";
 // reports
 export * from "./reports/entities";
 export * from "./reports/reports";

tests/cypress/e2e/mcpar/form.cy.js

@@ -114,13 +114,7 @@ function fillOutPartialMCPAR() {
 const traverseRoutes = (routes) => {
   //iterate over each route
   routes.forEach((route) => {
-    // skip over the ILOS routes as they are behind an LD flag
-    if (
-      !route.path.includes("add-in-lieu-of-services") ||
-      !route.path.includes("ilos")
-    ) {
-      traverseRoute(route);
-    }
+    traverseRoute(route);
   });
 };