[MPDX-10001] - Show the MPD Goal admin table and NSO questionnaire only to those who need them

pages/accountLists/[accountListId]/hrTools/mpdGoalAdmin/index.page.tsx

@@ -62,7 +62,9 @@ export const MpdGoalAdminPage: React.FC = () => {
         )}`}</title>
       </Head>
       {accountListId ? (
-        <UserTypeAccess requireUserGroups={RequiredUserGroupEnum.MpdGoalCalc}>
+        <UserTypeAccess
+          requireUserGroups={RequiredUserGroupEnum.NewStaffCohorts}
+        >
           <ReportPageWrapper>
             <MpdGoalAdminProvider>
               <MpdGoalAdminContent />

pages/accountLists/[accountListId]/hrTools/mpdGoalAdmin/scenario/[scenarioGoalId]/index.page.test.tsx

@@ -11,7 +11,6 @@ import { NewStaffGoalCalculationQuery } from 'src/components/HrTools/NsGoalCalcu
 import { GetUserQuery } from 'src/components/User/GetUser.generated';
 import {
   NewStaffQuestionnaireMaritalStatusEnum,
-  UsStaffGroupEnum,
   UserTypeEnum,
 } from 'src/graphql/types.generated';
 import { GoalCalculatorConstantsQuery } from 'src/hooks/goalCalculatorConstants.generated';
@@ -28,12 +27,12 @@ const mockBlockImpersonatingNonDevelopers =
   >;
 
 interface TestComponentProps {
-  /** Senior Staff is the group the MPD goal tools are open to. */
-  usStaffGroup?: UsStaffGroupEnum;
+  /** The MPD Goals team and MPD coordinators are the only ones let in. */
+  canViewNewStaffCohorts?: boolean;
 }
 
 const TestComponent: React.FC<TestComponentProps> = ({
-  usStaffGroup = UsStaffGroupEnum.SeniorStaff,
+  canViewNewStaffCohorts = true,
 }) => (
   <TestRouter
     router={{
@@ -54,7 +53,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
             GetUser: {
               user: {
                 userType: UserTypeEnum.UsStaff,
-                usStaffGroup,
+                canViewNewStaffCohorts,
                 staffAccountId: 'staff-account-1',
               },
             },
@@ -91,9 +90,9 @@ describe('Scenario NsGoalCalculator page', () => {
     ).toBeInTheDocument();
   });
 
-  it("denies a user outside the admin table's group", async () => {
+  it('denies a user without goals-team or coordinator access', async () => {
     const { findByRole } = render(
-      <TestComponent usStaffGroup={UsStaffGroupEnum.NewStaff} />,
+      <TestComponent canViewNewStaffCohorts={false} />,
     );
 
     expect(

pages/accountLists/[accountListId]/hrTools/mpdGoalAdmin/scenario/[scenarioGoalId]/index.page.tsx

@@ -32,7 +32,9 @@ export const NsScenarioGoalPage: React.FC = () => {
         <title>{`${appName} | ${t('New Staff Goal Calculator')}`}</title>
       </Head>
       {scenarioGoalId ? (
-        <UserTypeAccess requireUserGroups={RequiredUserGroupEnum.MpdGoalCalc}>
+        <UserTypeAccess
+          requireUserGroups={RequiredUserGroupEnum.NewStaffCohorts}
+        >
           <GoalSettingsView
             scenarioGoalId={scenarioGoalId}
             returnUrl={mpdGoalAdminUrl(

pages/accountLists/[accountListId]/hrTools/mpdGoalAdmin/staff/[staffAccountListId]/index.page.test.tsx

@@ -12,7 +12,6 @@ import { NewStaffGoalCalculationQuery } from 'src/components/HrTools/NsGoalCalcu
 import { GetUserQuery } from 'src/components/User/GetUser.generated';
 import {
   NewStaffQuestionnaireMaritalStatusEnum,
-  UsStaffGroupEnum,
   UserTypeEnum,
 } from 'src/graphql/types.generated';
 import { GoalCalculatorConstantsQuery } from 'src/hooks/goalCalculatorConstants.generated';
@@ -32,14 +31,14 @@ const push = jest.fn();
 const mutationSpy = jest.fn();
 
 interface TestComponentProps {
-  /** Senior Staff is the group the MPD goal tools are open to. */
-  usStaffGroup?: UsStaffGroupEnum;
+  /** The MPD Goals team and MPD coordinators are the only ones let in. */
+  canViewNewStaffCohorts?: boolean;
   /** Empty stands in for a router that has not resolved the path yet. */
   staffAccountListId?: string;
 }
 
 const TestComponent: React.FC<TestComponentProps> = ({
-  usStaffGroup = UsStaffGroupEnum.SeniorStaff,
+  canViewNewStaffCohorts = true,
   staffAccountListId = 'staff-account-list-1',
 }) => (
   <TestRouter
@@ -62,7 +61,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
             GetUser: {
               user: {
                 userType: UserTypeEnum.UsStaff,
-                usStaffGroup,
+                canViewNewStaffCohorts,
                 staffAccountId: 'staff-account-1',
               },
             },
@@ -140,9 +139,9 @@ describe('Staff Details page', () => {
     expect(queryByRole('navigation')).not.toBeInTheDocument();
   });
 
-  it("denies a user outside the admin table's group", async () => {
+  it('denies a user without goals-team or coordinator access', async () => {
     const { findByRole } = render(
-      <TestComponent usStaffGroup={UsStaffGroupEnum.NewStaff} />,
+      <TestComponent canViewNewStaffCohorts={false} />,
     );
 
     expect(

pages/accountLists/[accountListId]/hrTools/mpdGoalAdmin/staff/[staffAccountListId]/index.page.tsx

@@ -39,7 +39,9 @@ export const NsStaffDetailsPage: React.FC = () => {
         )}`}</title>
       </Head>
       {staffAccountListId ? (
-        <UserTypeAccess requireUserGroups={RequiredUserGroupEnum.MpdGoalCalc}>
+        <UserTypeAccess
+          requireUserGroups={RequiredUserGroupEnum.NewStaffCohorts}
+        >
           <GoalSettingsView
             accountListId={staffAccountListId}
             returnUrl={mpdGoalAdminUrl(

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

@@ -19,6 +19,7 @@ interface TestComponentProps {
   spouseUsStaffGroup?: UsStaffGroupEnum;
   staffAccountId?: string | null;
   supervisesStaff?: boolean;
+  canViewNewStaffCohorts?: boolean;
   requireUserGroups?: RequiredUserGroupEnum;
 }
 
@@ -30,6 +31,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
   spouseUsStaffGroup = UsStaffGroupEnum.PartTimeFieldStaff,
   staffAccountId = id,
   supervisesStaff = true,
+  canViewNewStaffCohorts = true,
   requireUserGroups,
 }) => (
   <ThemeProvider theme={theme}>
@@ -45,6 +47,7 @@ const TestComponent: React.FC<TestComponentProps> = ({
               spouseUsStaffGroup,
               staffAccountId,
               supervisesStaff,
+              canViewNewStaffCohorts,
             },
           },
         }}
@@ -218,6 +221,32 @@ describe('UserTypeAccess', () => {
     expect(await findByText('Test Content')).toBeInTheDocument();
   });
 
+  it('should render LimitedAccess when the user may not open the admin table', async () => {
+    const { findByRole } = render(
+      <TestComponent
+        requireUserGroups={RequiredUserGroupEnum.NewStaffCohorts}
+        canViewNewStaffCohorts={false}
+      />,
+    );
+
+    expect(
+      await findByRole('heading', {
+        name: 'Access to this feature is limited.',
+      }),
+    ).toBeInTheDocument();
+  });
+
+  it('should render child component for the goals team and coordinators, whatever their group', async () => {
+    const { findByText } = render(
+      <TestComponent
+        requireUserGroups={RequiredUserGroupEnum.NewStaffCohorts}
+        canViewNewStaffCohorts
+        usStaffGroup={UsStaffGroupEnum.NewStaff}
+      />,
+    );
+    expect(await findByText('Test Content')).toBeInTheDocument();
+  });
+
   it('should render LimitedAccess when staff account is required but not present', async () => {
     const { findByRole, getByText } = render(
       <TestComponent requireStaffAccount staffAccountId={null} />,

src/components/Shared/UserTypeAccess/UserTypeAccess.tsx

@@ -12,6 +12,7 @@ export enum RequiredUserGroupEnum {
   NsGoalCalc = 'nsGoalCalc',
   PdsGoalCalc = 'pdsGoalCalc',
   MpdSupervisor = 'mpdSupervisor',
+  NewStaffCohorts = 'newStaffCohorts',
 }
 
 export const isUsStaffLike = (user?: UserTypeEnum) =>
@@ -42,6 +43,7 @@ export const UserTypeAccess: React.FC<UserTypeAccessProps> = ({
     inNsGoalCalcIneligibleGroup,
     inPdsGoalCalcIneligibleGroup,
     inMpdSupervisorIneligibleGroup,
+    canViewNewStaffCohorts,
     userType,
     hasNoStaffAccount,
     userLoading,
@@ -57,6 +59,7 @@ export const UserTypeAccess: React.FC<UserTypeAccessProps> = ({
     [RequiredUserGroupEnum.NsGoalCalc]: inNsGoalCalcIneligibleGroup,
     [RequiredUserGroupEnum.PdsGoalCalc]: inPdsGoalCalcIneligibleGroup,
     [RequiredUserGroupEnum.MpdSupervisor]: inMpdSupervisorIneligibleGroup,
+    [RequiredUserGroupEnum.NewStaffCohorts]: !canViewNewStaffCohorts,
   };
 
   const meetsRequiredUserType =

src/components/User/GetUser.graphql

@@ -10,6 +10,7 @@ query GetUser {
       locale: localeDisplay
     }
     staffAccountId
+    canViewNewStaffCohorts
     primaryDesignation
     userType
     usStaffGroup

src/hooks/NewStaffQuestionnaireStatus.graphql

@@ -0,0 +1,6 @@
+query NewStaffQuestionnaireStatus($accountListId: ID!) {
+  newStaffQuestionnaire(accountListId: $accountListId) {
+    id
+    completed
+  }
+}