Initial commit to integrate MHA eligibility: add HCM EIT checks and modify tests

Author: zweatshirt

src/components/Reports/MinisterHousingAllowance/MainPages/IneligibleDisplay.test.tsx

@@ -1,55 +1,61 @@
 import React from 'react';
 import { ThemeProvider } from '@mui/material/styles';
-import { LocalizationProvider } from '@mui/x-date-pickers';
-import { AdapterLuxon } from '@mui/x-date-pickers/AdapterLuxon';
 import { render } from '@testing-library/react';
+import TestRouter from '__tests__/util/TestRouter';
+import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 import theme from 'src/theme';
+import { HcmDataQuery } from '../../Shared/HcmData/HCMData.generated';
 import {
-  ContextType,
-  HcmData,
-  MinisterHousingAllowanceContext,
-} from '../Shared/Context/MinisterHousingAllowanceContext';
+  marriedSpouseIneligible,
+  singleNoMhaNoException,
+} from '../../Shared/HcmData/mockData';
+import { MinistryHousingAllowanceRequestsQuery } from '../MinisterHousingAllowance.generated';
+import { MinisterHousingAllowanceProvider } from '../Shared/Context/MinisterHousingAllowanceContext';
 import { IneligibleDisplay } from './IneligibleDisplay';
 
 interface TestComponentProps {
-  contextValue: Partial<ContextType>;
+  hcmMock: HcmDataQuery['hcm'];
 }
 
-const TestComponent: React.FC<TestComponentProps> = ({ contextValue }) => {
+const TestComponent: React.FC<TestComponentProps> = ({ hcmMock }) => {
   return (
     <ThemeProvider theme={theme}>
-      <LocalizationProvider dateAdapter={AdapterLuxon}>
-        <MinisterHousingAllowanceContext.Provider
-          value={contextValue as ContextType}
+      <TestRouter>
+        <GqlMockedProvider<{
+          HcmData: HcmDataQuery;
+          MinistryHousingAllowanceRequests: MinistryHousingAllowanceRequestsQuery;
+        }>
+          mocks={{
+            HcmData: {
+              hcm: hcmMock,
+            },
+            MinistryHousingAllowanceRequests: {
+              ministryHousingAllowanceRequests: {
+                nodes: [],
+              },
+            },
+          }}
         >
-          <IneligibleDisplay />
-        </MinisterHousingAllowanceContext.Provider>
-      </LocalizationProvider>
+          <MinisterHousingAllowanceProvider>
+            <IneligibleDisplay />
+          </MinisterHousingAllowanceProvider>
+        </GqlMockedProvider>
+      </TestRouter>
     </ThemeProvider>
   );
 };
 
 describe('IneligibleDisplay', () => {
-  it('should render page with single staff', () => {
-    const { getByText, queryByText } = render(
-      <TestComponent
-        contextValue={{
-          isMarried: false,
-          preferredName: 'John',
-          spousePreferredName: '',
-          userHcmData: {
-            staffInfo: {
-              personNumber: '000123456',
-            },
-          } as unknown as HcmData,
-          spouseHcmData: null,
-        }}
-      />,
+  it('should render page with single staff', async () => {
+    const { findByRole, findByText, queryByText } = render(
+      <TestComponent hcmMock={singleNoMhaNoException} />,
     );
 
-    expect(getByText('Your MHA')).toBeInTheDocument();
     expect(
-      getByText(
+      await findByRole('heading', { name: 'Your MHA' }),
+    ).toBeInTheDocument();
+    expect(
+      await findByText(
         /our records indicate that you have not applied for minister's housing allowance/i,
       ),
     ).toBeInTheDocument();
@@ -58,29 +64,16 @@ describe('IneligibleDisplay', () => {
     ).not.toBeInTheDocument();
   });
 
-  it('should render page with married staff', () => {
-    const { getByText } = render(
-      <TestComponent
-        contextValue={{
-          isMarried: true,
-          preferredName: 'John',
-          spousePreferredName: 'Jane',
-          userHcmData: {
-            staffInfo: {
-              personNumber: '000123456',
-            },
-          } as unknown as HcmData,
-          spouseHcmData: {
-            staffInfo: {
-              personNumber: '100123456',
-            },
-          } as unknown as HcmData,
-        }}
-      />,
+  it('should render page with married staff and ineligible spouse', async () => {
+    const { findByRole, findByText } = render(
+      <TestComponent hcmMock={marriedSpouseIneligible} />,
     );
 
     expect(
-      getByText(/Jane has not completed the required ibs courses/i),
+      await findByRole('heading', { name: 'Your MHA' }),
+    ).toBeInTheDocument();
+    expect(
+      await findByText(/Jane has not completed the required ibs courses/i),
     ).toBeInTheDocument();
   });
 });

src/components/Reports/MinisterHousingAllowance/MainPages/IneligibleDisplay.tsx

@@ -4,13 +4,9 @@ import { useMinisterHousingAllowance } from '../Shared/Context/MinisterHousingAl
 
 export const IneligibleDisplay: React.FC = () => {
   const { t } = useTranslation();
-  const { isMarried, preferredName, spousePreferredName } =
+  const { isMarried, preferredName, spousePreferredName, spouseEligibleForMHA } =
     useMinisterHousingAllowance();
 
-  // TODO - Add spouse to API and check eligibility
-  // We will get this from HCM data in the future
-  const spouseEligibleForMHA = false;
-
   return (
     <>
       <Box mb={2}>

src/components/Reports/MinisterHousingAllowance/MinisterHousingAllowance.test.tsx

@@ -9,7 +9,7 @@ import theme from 'src/theme';
 import { HcmDataQuery } from '../Shared/HcmData/HCMData.generated';
 import {
   marriedMhaAndNoException,
-  marriedNoMhaNoException,
+  marriedSpouseIneligible,
   singleMhaNoException,
   singleNoMhaNoException,
 } from '../Shared/HcmData/mockData';
@@ -66,9 +66,9 @@ describe('MinisterHousingAllowanceReport', () => {
     expect(await findByText('John Doe')).toBeInTheDocument();
   });
 
-  it('renders married, no pending, no approved correctly', async () => {
+  it('renders married with ineligible spouse, no approved requests', async () => {
     const { findByText } = render(
-      <TestComponent hcmMock={marriedNoMhaNoException} mhaRequestsMock={[]} />,
+      <TestComponent hcmMock={marriedSpouseIneligible} mhaRequestsMock={[]} />,
     );
 
     expect(

src/components/Reports/MinisterHousingAllowance/MinisterHousingAllowance.tsx

@@ -31,6 +31,7 @@ export const MinisterHousingAllowanceReport = () => {
     spousePreferredName,
     userHcmData,
     spouseHcmData,
+    canAccessMHA,
     requestsData,
     requestsError,
   } = useMinisterHousingAllowance();
@@ -118,21 +119,22 @@ export const MinisterHousingAllowanceReport = () => {
           ) : (
             <>
               <Stack direction="column" width={mainContentWidth}>
-                {hasNoRequests ? (
+                {hasNoRequests || !canAccessMHA ? (
                   <IneligibleDisplay />
                 ) : (
                   <EligibleDisplay isPending={isCurrentRequestPending} />
                 )}
                 <NameDisplay names={names} personNumbers={personNumbers} />
 
-                {currentRequest &&
+                {canAccessMHA &&
+                  currentRequest &&
                   (isCurrentRequestPending ? (
                     <CurrentRequest request={currentRequest} />
                   ) : (
                     <CurrentBoardApproved request={currentRequest} />
                   ))}
               </Stack>
-              {(!isCurrentRequestPending || hasNoRequests) && (
+              {canAccessMHA && (!isCurrentRequestPending || hasNoRequests) && (
                 <Button
                   variant="contained"
                   color="primary"
@@ -145,7 +147,7 @@ export const MinisterHousingAllowanceReport = () => {
             </>
           )}
 
-          {previousApprovedRequest && (
+          {canAccessMHA && previousApprovedRequest && (
             <Stack direction="column" width={mainContentWidth} mt={4}>
               <CurrentBoardApproved request={previousApprovedRequest} />
             </Stack>

src/components/Reports/MinisterHousingAllowance/Shared/Context/MinisterHousingAllowanceContext.tsx

@@ -53,6 +53,8 @@ export type ContextType = {
   spouseHcmData?: HcmData | null;
   preferredName: string;
   spousePreferredName: string;
+  spouseEligibleForMHA: boolean;
+  canAccessMHA: boolean;
 
   requestData?:
     | MinistryHousingAllowanceRequestQuery['ministryHousingAllowanceRequest']
@@ -97,8 +99,7 @@ export const MinisterHousingAllowanceProvider: React.FC<Props> = ({
   const { data: requestsData, error: requestsError } =
     useMinistryHousingAllowanceRequestsQuery();
 
-  //const requestId = requestsData?.ministryHousingAllowanceRequests.nodes[0]?.id;
-  const requestId = 'c1a68821-5fb6-4e5e-b308-9263539af9d8';
+  const requestId = requestsData?.ministryHousingAllowanceRequests.nodes[0]?.id;
 
   const { data: requestData, error: requestError } =
     useMinistryHousingAllowanceRequestQuery({
@@ -169,6 +170,14 @@ export const MinisterHousingAllowanceProvider: React.FC<Props> = ({
     [spouseHcmData],
   );
 
+  const { canAccessMHA, spouseEligibleForMHA } = useMemo(() => {
+    const userEligible = userHcmData?.mhaEit?.mhaEligibility ?? false;
+    const spouseEligible = spouseHcmData?.mhaEit?.mhaEligibility ?? false;
+    // Allow access if at least one person is eligible (user OR spouse if married)
+    const canAccess = userEligible || (isMarried && spouseEligible);
+    return { canAccessMHA: canAccess, spouseEligibleForMHA: spouseEligible };
+  }, [userHcmData, spouseHcmData, isMarried]);
+
   const [isDrawerOpen, setIsDrawerOpen] = useState(true);
   const toggleDrawer = useCallback(() => {
     setIsDrawerOpen((prev) => !prev);
@@ -212,6 +221,8 @@ export const MinisterHousingAllowanceProvider: React.FC<Props> = ({
       spouseHcmData,
       preferredName,
       spousePreferredName,
+      spouseEligibleForMHA,
+      canAccessMHA,
       isPrint,
       setIsPrint,
       setIsComplete,
@@ -241,6 +252,8 @@ export const MinisterHousingAllowanceProvider: React.FC<Props> = ({
       spouseHcmData,
       preferredName,
       spousePreferredName,
+      spouseEligibleForMHA,
+      canAccessMHA,
       isPrint,
       setIsPrint,
       setIsComplete,

src/components/Reports/Shared/HcmData/HCMData.graphql

@@ -29,6 +29,9 @@ query HcmData($maritalStatus: MaritalStatusEnum!) {
       lastUpdatedDate
       currentApprovedAmountForStaff
     }
+    mhaEit {
+      mhaEligibility
+    }
     exceptionSalaryCap {
       amount
       effectiveDate

src/components/Reports/Shared/HcmData/mockData.ts

@@ -46,6 +46,9 @@ const noMhaAndNoException: HcmDataQuery['hcm'][0] = {
     lastUpdatedDate: null,
     currentApprovedAmountForStaff: null,
   },
+  mhaEit: {
+    mhaEligibility: true,
+  },
   exceptionSalaryCap: {
     amount: null,
     effectiveDate: null,
@@ -106,3 +109,13 @@ export const marriedNoMhaNoException: HcmDataQuery['hcm'] = [
     staffInfo: janeDoe,
   },
 ];
+export const marriedSpouseIneligible: HcmDataQuery['hcm'] = [
+  noMhaAndNoException,
+  {
+    ...noMhaAndNoException,
+    staffInfo: janeDoe,
+    mhaEit: {
+      mhaEligibility: false,
+    },
+  },
+];