Claude review suggestions round 1

Author: Katelyn Grimes

src/components/Shared/UserTypeAccess/UserTypeAccess.test.tsx

@@ -4,14 +4,7 @@ import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 import { render } from '__tests__/util/testingLibraryReactMock';
 import { HcmQuery } from 'src/components/HrTools/Shared/HcmData/Hcm.generated';
-import { StaffAccountQuery } from 'src/components/Shared/StaffAccount/StaffAccount.generated';
-import { GetUserQuery } from 'src/components/User/GetUser.generated';
-import {
-  PeopleGroupSupportTypeEnum,
-  UsStaffGroupEnum,
-  UserPersonTypeEnum,
-  UserTypeEnum,
-} from 'src/graphql/types.generated';
+import { UsStaffGroupEnum, UserTypeEnum } from 'src/graphql/types.generated';
 import theme from 'src/theme';
 import { RequiredUserGroupEnum, UserTypeAccess } from './UserTypeAccess';
 
@@ -23,11 +16,6 @@ interface TestComponentProps {
   usStaffGroup?: UsStaffGroupEnum;
   staffAccountId?: string | null;
   requireUserGroups?: RequiredUserGroupEnum;
-  asrEligible?: boolean;
-  salaryRequestEligible?: boolean;
-  designationSupportCalculatorEligible?: boolean;
-  peopleGroupSupportType?: PeopleGroupSupportTypeEnum;
-  userPersonType?: UserPersonTypeEnum;
 }
 
 const TestComponent: React.FC<TestComponentProps> = ({
@@ -36,30 +24,13 @@ const TestComponent: React.FC<TestComponentProps> = ({
   usStaffGroup = UsStaffGroupEnum.PartTimeFieldStaff,
   staffAccountId = id,
   requireUserGroups,
-  asrEligible = true,
-  salaryRequestEligible = true,
-  designationSupportCalculatorEligible = true,
-  peopleGroupSupportType = PeopleGroupSupportTypeEnum.SupportedRmo,
-  userPersonType = UserPersonTypeEnum.EmployeeHourly,
 }) => (
   <ThemeProvider theme={theme}>
     <TestRouter>
       <GqlMockedProvider<{
-        StaffAccount: StaffAccountQuery;
-        GetUser: GetUserQuery;
         Hcm: HcmQuery;
       }>
         mocks={{
-          Hcm: {
-            hcm: [
-              {
-                asrEit: { asrEligibility: asrEligible },
-                salaryRequestEligible,
-                designationSupportCalculatorEligible,
-                staffInfo: { peopleGroupSupportType, userPersonType },
-              },
-            ],
-          },
           GetUser: { user: { userType, usStaffGroup, staffAccountId } },
         }}
       >
@@ -102,7 +73,7 @@ describe('UserTypeAccess', () => {
     const { findByRole, getByText } = render(
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.Asr}
-        asrEligible={false}
+        usStaffGroup={UsStaffGroupEnum.PartTimeFieldStaff}
       />,
     );
 
@@ -122,7 +93,7 @@ describe('UserTypeAccess', () => {
     const { findByRole, getByText } = render(
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.SalaryCalc}
-        salaryRequestEligible={false}
+        usStaffGroup={UsStaffGroupEnum.PartTimeFieldStaff}
       />,
     );
 
@@ -142,7 +113,7 @@ describe('UserTypeAccess', () => {
     const { findByRole } = render(
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.MpdGoalCalc}
-        salaryRequestEligible={false}
+        usStaffGroup={UsStaffGroupEnum.PartTimeFieldStaff}
       />,
     );
     expect(
@@ -156,7 +127,7 @@ describe('UserTypeAccess', () => {
     const { findByRole } = render(
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.PdsGoalCalc}
-        designationSupportCalculatorEligible={false}
+        usStaffGroup={UsStaffGroupEnum.PartTimeFieldStaff}
       />,
     );
     expect(
@@ -170,7 +141,6 @@ describe('UserTypeAccess', () => {
     const { findByText } = render(
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.PdsGoalCalc}
-        designationSupportCalculatorEligible={true}
         usStaffGroup={UsStaffGroupEnum.PaidWithDesignation}
       />,
     );

src/hooks/useIneligibleByGroup.test.tsx

@@ -7,7 +7,7 @@ import { UsStaffGroupEnum, UserTypeEnum } from 'src/graphql/types.generated';
 import { useIneligibleByGroup } from './useIneligibleByGroup';
 
 interface MockUser {
-  usStaffGroup?: UsStaffGroupEnum;
+  usStaffGroup?: UsStaffGroupEnum | null;
   userType?: UserTypeEnum;
   staffAccountId?: string | null;
 }
@@ -149,5 +149,18 @@ describe('useIneligibleByGroup', () => {
       expect(result.current.inMpdGoalCalcIneligibleGroup).toBe(true);
       expect(result.current.inPdsGoalCalcIneligibleGroup).toBe(true);
     });
+
+    it('no us staff group eligibility', async () => {
+      const { result } = renderUseIneligibleByGroup({
+        usStaffGroup: null,
+      });
+
+      await waitFor(() => expect(result.current.userLoading).toBe(false));
+      expect(result.current.inAsrIneligibleGroup).toBe(true);
+      expect(result.current.inSalaryCalcIneligibleGroup).toBe(true);
+      expect(result.current.inMhaIneligibleGroup).toBe(true);
+      expect(result.current.inMpdGoalCalcIneligibleGroup).toBe(true);
+      expect(result.current.inPdsGoalCalcIneligibleGroup).toBe(true);
+    });
   });
 });