[EASI-4412] related reqs table (#2728)

* Contract number portion when no contract numbers * starting on table * beginning on types for table * (no verify) working on getting `relatedIntakes` and `relatedTRBRequests` in the gen types - couldn't figure that out yet * (no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen(no verify) working on types and updated query to regen * add relatedIntakes and relatedTRBrequest fields to TRB type as well * (no verify) building out table data * (no verify) progress on table including columns and skeleton of table * (no verify) debugging eslint issue, but making good progress on table * (no verify) remove unused, will get table eslint issues figured out * (no verify) testing eslint * phew! eslint fix and doc * fix mapping and text display * add mapping for system intake decision state * format date * implicit return * naming, cleanup * change taks list to admin routes * starting on tests... * still trying to figure out these mocks * still tinkering with some tests * tests run! * remove unused * update usage and types * one more basic render test. starting on role-based tests * working on mock store for testing * whoops - fix mock store passage * test for different roles * add some mock data * update format of negative tests * use screen * rename function, fix up link conditionals * fix spacing, tests * unused * whoops - lint * clean up margins * add ff
CMS-Enterprise · Aug 8, 2024 · c62d624 · c62d624
1 parent fba612b
commit c62d624
Show file tree

Hide file tree

Showing 32 changed files with 1,297 additions and 62 deletions.
diff --git a/src/components/NavigationBar/index.tsx b/src/components/NavigationBar/index.tsx
@@ -37,7 +37,11 @@ export const navLinks = (
   {
     link: '/',
     label:
-      isUserSet && user.isTrbAdmin(userGroups, flags) ? 'adminHome' : 'home',
+      isUserSet &&
+      (user.isTrbAdmin(userGroups, flags) ||
+        user.isITGovAdmin(userGroups, flags))
+        ? 'adminHome'
+        : 'home',
     isEnabled: true
   },
   {

diff --git a/src/data/mock/systemIntake.ts b/src/data/mock/systemIntake.ts
@@ -44,7 +44,8 @@ import {
   SystemIntakeStatusAdmin,
   SystemIntakeStatusRequester,
   SystemIntakeStep,
-  SystemIntakeTRBFollowUp
+  SystemIntakeTRBFollowUp,
+  TRBRequestStatus
 } from 'types/graphql-global-types';
 import { MockedQuery } from 'types/util';
 
@@ -272,7 +273,9 @@ export const emptySystemIntake: SystemIntake = {
         }
       ]
     }
-  ]
+  ],
+  relatedIntakes: [],
+  relatedTRBRequests: []
 };
 
 export const systemIntake: SystemIntake = {
@@ -397,6 +400,38 @@ export const systemIntake: SystemIntake = {
         }
       ]
     }
+  ],
+  relatedIntakes: [
+    {
+      __typename: 'SystemIntake',
+      id: '1',
+      requestName: 'related intake 1',
+      contractNumbers: [
+        { __typename: 'SystemIntakeContractNumber', contractNumber: '1' },
+        { __typename: 'SystemIntakeContractNumber', contractNumber: '2' }
+      ],
+      decisionState: SystemIntakeDecisionState.NO_DECISION,
+      submittedAt: new Date().toString()
+    }
+  ],
+  relatedTRBRequests: [
+    {
+      __typename: 'TRBRequest',
+      id: '2',
+      name: 'related trb 1',
+      contractNumbers: [
+        {
+          __typename: 'TRBRequestContractNumber',
+          contractNumber: '1'
+        },
+        {
+          __typename: 'TRBRequestContractNumber',
+          contractNumber: '2'
+        }
+      ],
+      status: TRBRequestStatus.FOLLOW_UP_REQUESTED,
+      createdAt: new Date().toString()
+    }
   ]
 };
 

diff --git a/src/data/mock/trbRequest.ts b/src/data/mock/trbRequest.ts
@@ -156,7 +156,9 @@ export const trbRequest: GetTrbRequest['trbRequest'] = {
     fundingSources: null,
     submittedAt: null,
     __typename: 'TRBRequestForm'
-  }
+  },
+  relatedTRBRequests: [],
+  relatedIntakes: []
 };
 
 export const getTrbRequestQuery: MockedQuery<

diff --git a/src/i18n/en-US/admin.ts b/src/i18n/en-US/admin.ts
@@ -14,7 +14,21 @@ const admin = {
     'EASi cannot display any additional information or related requests because this IT Governance request is not currently linked to a system, service, or contract. If this is an error, please use the button below to link the request.',
   newSystemAlert:
     'This request is for a completely new system, service, or contract and may not have other requests related to it. If this is an error, please use the button below to link the request to a system, service, or contract.',
-  linkSystem: 'Link this request to a system, service, or contract'
+  linkSystem: 'Link this request to a system, service, or contract',
+  noContractNumber: 'No contract number listed',
+  relatedRequests: 'Related requests',
+  tableColumns: {
+    projectTitle: 'Project title',
+    process: 'Process',
+    contractNumber: 'Contract number',
+    status: 'Status',
+    submissionDate: 'Submission date'
+  },
+  relatedRequestsTable: {
+    id: 'related-requests-table',
+    title: 'Related requests',
+    empty: 'There are no additional requests linked to this system'
+  }
 };
 
 export default admin;
diff --git a/src/i18n/en-US/articles/governanceReviewTeam.ts b/src/i18n/en-US/articles/governanceReviewTeam.ts
@@ -1,5 +1,6 @@
 import {
   SystemIntakeActionType,
+  SystemIntakeDecisionState,
   SystemIntakeStatusAdmin,
   SystemIntakeStatusRequester
 } from 'types/graphql-global-types';
@@ -85,6 +86,13 @@ const systemIntakeStatusRequester: Record<
   NOT_GOVERNANCE: 'Not an IT Governance request'
 };
 
+const systemIntakeDecisionState: Record<SystemIntakeDecisionState, string> = {
+  LCID_ISSUED: 'LCID Issued',
+  NOT_APPROVED: 'Not Approved',
+  NOT_GOVERNANCE: 'Not Governance',
+  NO_DECISION: 'No Decision'
+};
+
 const governanceReviewTeam = {
   title: 'Prepare for the Governance Review Team meeting',
   description:
@@ -311,6 +319,7 @@ const governanceReviewTeam = {
   },
   systemIntakeStatusAdmin,
   systemIntakeStatusRequester,
+  systemIntakeDecisionState,
   adminLeads: {
     assignModal: {
       header: 'Choose an Admin Lead for {{-requestName}}',

diff --git a/src/queries/GetSystemIntakeQuery.ts b/src/queries/GetSystemIntakeQuery.ts
@@ -134,6 +134,24 @@ export const SystemIntake = gql`
         assigneeLastName
       }
     }
+    relatedTRBRequests {
+      id
+      name
+      contractNumbers {
+        contractNumber
+      }
+      status
+      createdAt
+    }
+    relatedIntakes {
+      id
+      requestName
+      contractNumbers {
+        contractNumber
+      }
+      decisionState
+      submittedAt
+    }
   }
 `;
 

diff --git a/src/queries/GetSystemIntakeRelatedRequestsQuery.ts b/src/queries/GetSystemIntakeRelatedRequestsQuery.ts
@@ -0,0 +1,29 @@
+import { gql } from '@apollo/client';
+
+const GetSystemIntakeRelatedRequestsQuery = gql`
+  query GetSystemIntakeRelatedRequests($systemIntakeID: UUID!) {
+    systemIntake(id: $systemIntakeID) {
+      id
+      relatedIntakes {
+        id
+        requestName
+        contractNumbers {
+          contractNumber
+        }
+        decisionState
+        submittedAt
+      }
+      relatedTRBRequests {
+        id
+        name
+        contractNumbers {
+          contractNumber
+        }
+        status
+        createdAt
+      }
+    }
+  }
+`;
+
+export default GetSystemIntakeRelatedRequestsQuery;
diff --git a/src/queries/TrbRequestFormFieldsFragment.ts b/src/queries/TrbRequestFormFieldsFragment.ts
@@ -61,5 +61,23 @@ export default gql`
       }
       createdAt
     }
+    relatedTRBRequests {
+      id
+      name
+      contractNumbers {
+        contractNumber
+      }
+      status
+      createdAt
+    }
+    relatedIntakes {
+      id
+      requestName
+      contractNumbers {
+        contractNumber
+      }
+      decisionState
+      submittedAt
+    }
   }
 `;
diff --git a/src/queries/types/CreateTrbRequest.ts b/src/queries/types/CreateTrbRequest.ts
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { TRBRequestType, TRBRequestState, TRBFormStatus, TRBFeedbackStatus, TRBConsultPrepStatus, TRBAttendConsultStatus, TRBAdviceLetterStatus, TRBWhereInProcessOption, TRBCollabGroupOption, TRBSubjectAreaOption, TRBFeedbackAction } from "./../../types/graphql-global-types";
+import { TRBRequestType, TRBRequestState, TRBFormStatus, TRBFeedbackStatus, TRBConsultPrepStatus, TRBAttendConsultStatus, TRBAdviceLetterStatus, TRBWhereInProcessOption, TRBCollabGroupOption, TRBSubjectAreaOption, TRBFeedbackAction, TRBRequestStatus, SystemIntakeDecisionState } from "./../../types/graphql-global-types";
 
 // ====================================================
 // GraphQL mutation operation: CreateTrbRequest
@@ -77,6 +77,40 @@ export interface CreateTrbRequest_createTRBRequest_feedback {
   createdAt: Time;
 }
 
+export interface CreateTrbRequest_createTRBRequest_relatedTRBRequests_contractNumbers {
+  __typename: "TRBRequestContractNumber";
+  contractNumber: string;
+}
+
+export interface CreateTrbRequest_createTRBRequest_relatedTRBRequests {
+  __typename: "TRBRequest";
+  id: UUID;
+  name: string | null;
+  /**
+   * Linked contract numbers
+   */
+  contractNumbers: CreateTrbRequest_createTRBRequest_relatedTRBRequests_contractNumbers[];
+  status: TRBRequestStatus;
+  createdAt: Time;
+}
+
+export interface CreateTrbRequest_createTRBRequest_relatedIntakes_contractNumbers {
+  __typename: "SystemIntakeContractNumber";
+  contractNumber: string;
+}
+
+export interface CreateTrbRequest_createTRBRequest_relatedIntakes {
+  __typename: "SystemIntake";
+  id: UUID;
+  requestName: string | null;
+  /**
+   * Linked contract numbers
+   */
+  contractNumbers: CreateTrbRequest_createTRBRequest_relatedIntakes_contractNumbers[];
+  decisionState: SystemIntakeDecisionState;
+  submittedAt: Time | null;
+}
+
 export interface CreateTrbRequest_createTRBRequest {
   __typename: "TRBRequest";
   id: UUID;
@@ -86,6 +120,14 @@ export interface CreateTrbRequest_createTRBRequest {
   taskStatuses: CreateTrbRequest_createTRBRequest_taskStatuses;
   form: CreateTrbRequest_createTRBRequest_form;
   feedback: CreateTrbRequest_createTRBRequest_feedback[];
+  /**
+   * Other TRB Requests that share a CEDAR System or Contract Number
+   */
+  relatedTRBRequests: CreateTrbRequest_createTRBRequest_relatedTRBRequests[];
+  /**
+   * System Intakes that share a CEDAR System or Contract Number
+   */
+  relatedIntakes: CreateTrbRequest_createTRBRequest_relatedIntakes[];
 }
 
 export interface CreateTrbRequest {

diff --git a/src/queries/types/GetSystemIntake.ts b/src/queries/types/GetSystemIntake.ts
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.
 
-import { GovernanceRequestFeedbackTargetForm, GovernanceRequestFeedbackType, SystemIntakeLCIDStatus, SystemIntakeRequestType, SystemIntakeStatusAdmin, SystemIntakeStatusRequester, SystemIntakeDocumentCommonType, SystemIntakeDocumentStatus, SystemIntakeState, SystemIntakeDecisionState, SystemIntakeTRBFollowUp, SystemIntakeFormState, RequestRelationType } from "./../../types/graphql-global-types";
+import { GovernanceRequestFeedbackTargetForm, GovernanceRequestFeedbackType, SystemIntakeLCIDStatus, SystemIntakeRequestType, SystemIntakeStatusAdmin, SystemIntakeStatusRequester, SystemIntakeDocumentCommonType, SystemIntakeDocumentStatus, SystemIntakeState, SystemIntakeDecisionState, SystemIntakeTRBFollowUp, SystemIntakeFormState, RequestRelationType, TRBRequestStatus } from "./../../types/graphql-global-types";
 
 // ====================================================
 // GraphQL query operation: GetSystemIntake
@@ -147,6 +147,40 @@ export interface GetSystemIntake_systemIntake_systems {
   businessOwnerRoles: GetSystemIntake_systemIntake_systems_businessOwnerRoles[];
 }
 
+export interface GetSystemIntake_systemIntake_relatedTRBRequests_contractNumbers {
+  __typename: "TRBRequestContractNumber";
+  contractNumber: string;
+}
+
+export interface GetSystemIntake_systemIntake_relatedTRBRequests {
+  __typename: "TRBRequest";
+  id: UUID;
+  name: string | null;
+  /**
+   * Linked contract numbers
+   */
+  contractNumbers: GetSystemIntake_systemIntake_relatedTRBRequests_contractNumbers[];
+  status: TRBRequestStatus;
+  createdAt: Time;
+}
+
+export interface GetSystemIntake_systemIntake_relatedIntakes_contractNumbers {
+  __typename: "SystemIntakeContractNumber";
+  contractNumber: string;
+}
+
+export interface GetSystemIntake_systemIntake_relatedIntakes {
+  __typename: "SystemIntake";
+  id: UUID;
+  requestName: string | null;
+  /**
+   * Linked contract numbers
+   */
+  contractNumbers: GetSystemIntake_systemIntake_relatedIntakes_contractNumbers[];
+  decisionState: SystemIntakeDecisionState;
+  submittedAt: Time | null;
+}
+
 export interface GetSystemIntake_systemIntake {
   __typename: "SystemIntake";
   id: UUID;
@@ -208,6 +242,14 @@ export interface GetSystemIntake_systemIntake {
    * Linked systems
    */
   systems: GetSystemIntake_systemIntake_systems[];
+  /**
+   * TRB Requests that share a CEDAR System or Contract Number
+   */
+  relatedTRBRequests: GetSystemIntake_systemIntake_relatedTRBRequests[];
+  /**
+   * Other System Intakes that share a CEDAR System or Contract Number
+   */
+  relatedIntakes: GetSystemIntake_systemIntake_relatedIntakes[];
 }
 
 export interface GetSystemIntake {