Remove extra HCM call

Author: Katelyn Grimes

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

@@ -8,6 +8,7 @@ import { StaffAccountQuery } from 'src/components/Shared/StaffAccount/StaffAccou
 import { GetUserQuery } from 'src/components/User/GetUser.generated';
 import {
   PeopleGroupSupportTypeEnum,
+  UsStaffGroupEnum,
   UserPersonTypeEnum,
   UserTypeEnum,
 } from 'src/graphql/types.generated';
@@ -19,6 +20,7 @@ const id = 'staff-1';
 interface TestComponentProps {
   requireStaffAccount?: boolean;
   userType?: UserTypeEnum;
+  usStaffGroup?: UsStaffGroupEnum;
   staffAccountId?: string | null;
   requireUserGroups?: RequiredUserGroupEnum;
   asrEligible?: boolean;
@@ -31,6 +33,7 @@ interface TestComponentProps {
 const TestComponent: React.FC<TestComponentProps> = ({
   requireStaffAccount,
   userType = UserTypeEnum.UsStaff,
+  usStaffGroup = UsStaffGroupEnum.PartTimeFieldStaff,
   staffAccountId = id,
   requireUserGroups,
   asrEligible = true,
@@ -57,7 +60,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
               },
             ],
           },
-          GetUser: { user: { userType } },
+          GetUser: { user: { userType, usStaffGroup } },
           StaffAccount: {
             staffAccount: staffAccountId
               ? { id: staffAccountId, name: 'Test Account' }
@@ -173,6 +176,7 @@ describe('UserTypeAccess', () => {
       <TestComponent
         requireUserGroups={RequiredUserGroupEnum.PdsGoalCalc}
         designationSupportCalculatorEligible={true}
+        usStaffGroup={UsStaffGroupEnum.PaidWithDesignation}
       />,
     );
     expect(await findByText('Test Content')).toBeInTheDocument();

src/components/Shared/UserTypeAccess/UserTypeAccess.tsx

@@ -1,9 +1,9 @@
 import Loading from 'src/components/Loading';
 import { useGetUserQuery } from 'src/components/User/GetUser.generated';
-import { UserTypeEnum } from 'src/graphql/types.generated';
-import { useUsStaffGroups } from 'src/hooks/useUsStaffGroups';
+import { UsStaffGroupEnum, UserTypeEnum } from 'src/graphql/types.generated';
 import { LimitedAccess } from '../LimitedAccess/LimitedAccess';
 import { useStaffAccountQuery } from '../StaffAccount/StaffAccount.generated';
+import { getIneligibleByGroup } from './getIneligibleByGroup';
 
 export enum RequiredUserGroupEnum {
   Asr = 'asr',
@@ -37,16 +37,14 @@ export const UserTypeAccess: React.FC<UserTypeAccessProps> = ({
     skip: !requireStaffAccount,
   });
 
-  // Only run HCM query if we are using an HCM report
-  const skip = !requireUserGroups;
+  const usStaffGroup = data?.user.usStaffGroup;
   const {
     inAsrIneligibleGroup,
     inSalaryCalcIneligibleGroup,
     inMhaIneligibleGroup,
     inMpdGoalCalcIneligibleGroup,
     inPdsGoalCalcIneligibleGroup,
-    loading: hcmLoading,
-  } = useUsStaffGroups(skip);
+  } = getIneligibleByGroup(usStaffGroup as UsStaffGroupEnum);
 
   const ineligibleByGroup: Record<RequiredUserGroupEnum, boolean> = {
     [RequiredUserGroupEnum.Asr]: inAsrIneligibleGroup,
@@ -71,7 +69,7 @@ export const UserTypeAccess: React.FC<UserTypeAccessProps> = ({
     return <LimitedAccess userGroupError />;
   }
 
-  if ((userLoading && !userType) || hcmLoading) {
+  if (userLoading && !userType) {
     return <Loading loading />;
   }
 

src/components/Shared/UserTypeAccess/getIneligibleByGroup.ts

@@ -0,0 +1,24 @@
+import { UsStaffGroupEnum } from 'src/graphql/types.generated';
+
+export const getIneligibleByGroup = (usStaffGroup: UsStaffGroupEnum) => {
+  const isSeniorStaff = usStaffGroup === UsStaffGroupEnum.SeniorStaff;
+  const isNationalExpat = usStaffGroup === UsStaffGroupEnum.NationalExpat;
+
+  const inAsrIneligibleGroup =
+    !isSeniorStaff &&
+    usStaffGroup !== UsStaffGroupEnum.NewStaff &&
+    !isNationalExpat;
+  const inSalaryCalcIneligibleGroup = !isSeniorStaff && !isNationalExpat;
+  const inMhaIneligibleGroup = !isSeniorStaff && !isNationalExpat;
+  const inMpdGoalCalcIneligibleGroup = !isSeniorStaff;
+  const inPdsGoalCalcIneligibleGroup =
+    usStaffGroup !== UsStaffGroupEnum.PaidWithDesignation;
+
+  return {
+    inAsrIneligibleGroup,
+    inSalaryCalcIneligibleGroup,
+    inMhaIneligibleGroup,
+    inMpdGoalCalcIneligibleGroup,
+    inPdsGoalCalcIneligibleGroup,
+  };
+};

src/hooks/useHrToolsNavItems.ts

@@ -1,26 +1,32 @@
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { UsStaffGroupEnum } from 'pages/api/graphql-rest.page.generated';
+import { useStaffAccountQuery } from 'src/components/Shared/StaffAccount/StaffAccount.generated';
+import { getIneligibleByGroup } from 'src/components/Shared/UserTypeAccess/getIneligibleByGroup';
+import { useGetUserQuery } from 'src/components/User/GetUser.generated';
 import { NavItems } from './useReportNavItems';
-import { useUsStaffGroups } from './useUsStaffGroups';
 
 export function useHrToolsNavItems(): {
   items: NavItems[];
   loading: boolean;
 } {
   const { t } = useTranslation();
+  const { data, loading } = useGetUserQuery();
+  const { data: staffAccountData, loading: staffAccountLoading } =
+    useStaffAccountQuery();
+  const hasNoStaffAccount = !staffAccountData?.staffAccount?.id;
 
+  const usStaffGroup = data?.user.usStaffGroup;
   const {
     inAsrIneligibleGroup,
     inSalaryCalcIneligibleGroup,
     inMhaIneligibleGroup,
     inMpdGoalCalcIneligibleGroup,
     inPdsGoalCalcIneligibleGroup,
-    hasNoHcmData,
-    loading: hcmLoading,
-  } = useUsStaffGroups();
+  } = getIneligibleByGroup(usStaffGroup as UsStaffGroupEnum);
 
   const items = useMemo(() => {
-    if (hcmLoading) {
+    if (loading || staffAccountLoading) {
       return [];
     }
 
@@ -33,7 +39,7 @@ export function useHrToolsNavItems(): {
       {
         id: 'staffSavingFund',
         title: t('Savings Fund Transfer'),
-        hideItem: hasNoHcmData,
+        hideItem: hasNoStaffAccount,
       },
       {
         id: 'goalCalculator',
@@ -58,7 +64,7 @@ export function useHrToolsNavItems(): {
       {
         id: 'partnerReminders',
         title: t('Ministry Partner Reminders'),
-        hideItem: hasNoHcmData,
+        hideItem: hasNoStaffAccount,
       },
     ].filter((item) => !item.hideItem);
   }, [
@@ -68,9 +74,10 @@ export function useHrToolsNavItems(): {
     inMhaIneligibleGroup,
     inMpdGoalCalcIneligibleGroup,
     inPdsGoalCalcIneligibleGroup,
-    hasNoHcmData,
-    hcmLoading,
+    loading,
+    staffAccountLoading,
+    hasNoStaffAccount,
   ]);
 
-  return { items, loading: hcmLoading };
+  return { items, loading: loading || staffAccountLoading };
 }

src/hooks/useNavPages.tsx

@@ -122,7 +122,8 @@ export function useNavPages(coachingAccountCount: boolean, isSearch = false) {
               showInNav: true,
               hideTab:
                 (!!data && !showTab) ||
-                (!hrToolsLoading && hrToolsItems.length === 0),
+                hrToolsLoading ||
+                hrToolsItems.length === 0,
             },
           ]),
       {