feat: separate query for sent for review tab

opencrvs · Dec 30, 2024 · 64a4b6e · 64a4b6e
1 parent f7785d0
commit 64a4b6e
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 4 deletions.
diff --git a/packages/client/src/ListSyncController.ts b/packages/client/src/ListSyncController.ts
@@ -12,13 +12,15 @@ import { client } from '@client/utils/apolloClient'
 import { REGISTRATION_HOME_QUERY } from '@client/views/OfficeHome/queries'
 
 export async function syncRegistrarWorkqueue(
+  userId: string,
   locationId: string,
   reviewStatuses: string[],
   pageSize: number,
   inProgressSkip: number,
   healthSystemSkip: number,
   reviewSkip: number,
   rejectSkip: number,
+  sentForReviewSkip: number,
   approvalSkip: number,
   externalValidationSkip: number,
   printSkip: number,
@@ -28,13 +30,15 @@ export async function syncRegistrarWorkqueue(
     const queryResult = await client.query({
       query: REGISTRATION_HOME_QUERY,
       variables: {
+        userId,
         declarationLocationId: locationId,
         pageSize,
         reviewStatuses: reviewStatuses,
         inProgressSkip: inProgressSkip,
         healthSystemSkip: healthSystemSkip,
         reviewSkip: reviewSkip,
         rejectSkip: rejectSkip,
+        sentForReviewSkip,
         approvalSkip: approvalSkip,
         externalValidationSkip: externalValidationSkip,
         printSkip: printSkip,

diff --git a/packages/client/src/components/interface/Navigation.tsx b/packages/client/src/components/interface/Navigation.tsx
@@ -236,6 +236,9 @@ const NavigationView = (props: IFullProps) => {
     sentForApproval: !initialSyncDone
       ? 0
       : filteredData.approvalTab?.totalItems || 0,
+    sentForReview: !initialSyncDone
+      ? 0
+      : filteredData.sentForReviewTab?.totalItems || 0,
     externalValidation:
       window.config.FEATURES.EXTERNAL_VALIDATION_WORKQUEUE && !initialSyncDone
         ? 0
@@ -318,7 +321,7 @@ const NavigationView = (props: IFullProps) => {
               label={intl.formatMessage(
                 navigationMessages[WORKQUEUE_TABS.sentForReview]
               )}
-              count={declarationCount.readyForReview}
+              count={declarationCount.sentForReview}
               isSelected={tabId === WORKQUEUE_TABS.sentForReview}
               onClick={() => {
                 props.router.navigate(

diff --git a/packages/client/src/declarations/index.test.ts b/packages/client/src/declarations/index.test.ts
@@ -115,6 +115,16 @@ describe('query result filtering tests', () => {
           ],
           totalItems: 5
         },
+        sentForReviewTab: {
+          results: [
+            { id: 'READY_TO_SUBMIT' },
+            { id: 'SUBMITTING' },
+            { id: 'SUBMITED' },
+            { id: 'FAILED' },
+            { id: 'SUBMITTING' }
+          ],
+          totalItems: 5
+        },
         externalValidationTab: {
           results: [{ id: 'WAITING_FOR_VALIDATION' }],
           totalItems: 1

diff --git a/packages/client/src/declarations/index.ts b/packages/client/src/declarations/index.ts
@@ -1972,6 +1972,10 @@ export function filterProcessingDeclarationsFromQuery(
       queryData.rejectTab,
       processingDeclarationIds
     ),
+    sentForReviewTab: filterProcessingDeclarations(
+      queryData.sentForReviewTab,
+      processingDeclarationIds
+    ),
     approvalTab: filterProcessingDeclarations(
       queryData.approvalTab,
       processingDeclarationIds

diff --git a/packages/client/src/views/OfficeHome/OfficeHome.tsx b/packages/client/src/views/OfficeHome/OfficeHome.tsx
@@ -241,6 +241,7 @@ class OfficeHomeView extends React.Component<
     healthSystemCurrentPage: number,
     progressCurrentPage: number,
     reviewCurrentPage: number,
+    sentForReviewCurrentPage: number,
     approvalCurrentPage: number,
     printCurrentPage: number,
     issueCurrentPage: number,
@@ -357,9 +358,9 @@ class OfficeHomeView extends React.Component<
         {tabId === WORKQUEUE_TABS.sentForReview && (
           <SentForReview
             queryData={{
-              data: filteredData.reviewTab
+              data: filteredData.sentForReviewTab
             }}
-            paginationId={reviewCurrentPage}
+            paginationId={sentForReviewCurrentPage}
             pageSize={this.pageSize}
             onPageChange={this.onPageChange}
             loading={loading}
@@ -391,6 +392,7 @@ class OfficeHomeView extends React.Component<
       notificationTab,
       inProgressTab,
       reviewTab,
+      sentForReviewTab,
       approvalTab,
       printTab,
       issueTab,
@@ -415,6 +417,7 @@ class OfficeHomeView extends React.Component<
           notificationTab,
           inProgressTab,
           reviewTab,
+          sentForReviewTab,
           approvalTab,
           printTab,
           issueTab,

diff --git a/packages/client/src/views/OfficeHome/queries.ts b/packages/client/src/views/OfficeHome/queries.ts
@@ -76,13 +76,15 @@ const EVENT_SEARCH_RESULT_FIELDS = gql`
 export const REGISTRATION_HOME_QUERY = gql`
   ${EVENT_SEARCH_RESULT_FIELDS}
   query registrationHome(
+    $userId: String!
     $declarationLocationId: String!
     $pageSize: Int
     $inProgressSkip: Int
     $healthSystemSkip: Int
     $reviewStatuses: [String]
     $reviewSkip: Int
     $rejectSkip: Int
+    $sentForReviewSkip: Int
     $approvalSkip: Int
     $externalValidationSkip: Int
     $printSkip: Int
@@ -152,7 +154,28 @@ export const REGISTRATION_HOME_QUERY = gql`
         ...EventSearchFields
       }
     }
+    sentForReviewTab: searchEvents(
+      userId: $userId
+      advancedSearchParameters: {
+        declarationLocationId: $declarationLocationId
+        registrationStatuses: [
+          "DECLARED"
+          "IN_PROGRESS"
+          "VALIDATED"
+          "WAITING_VALIDATION"
+          "REGISTERED"
+        ]
+      }
+      count: $pageSize
+      skip: $sentForReviewSkip
+    ) {
+      totalItems
+      results {
+        ...EventSearchFields
+      }
+    }
     approvalTab: searchEvents(
+      userId: $userId
       advancedSearchParameters: {
         declarationLocationId: $declarationLocationId
         registrationStatuses: ["VALIDATED", "CORRECTION_REQUESTED"]

diff --git a/packages/client/src/workqueue/actions.ts b/packages/client/src/workqueue/actions.ts
@@ -16,6 +16,7 @@ export interface IQueryData {
   notificationTab: GQLEventSearchResultSet
   reviewTab: GQLEventSearchResultSet
   rejectTab: GQLEventSearchResultSet
+  sentForReviewTab: GQLEventSearchResultSet
   approvalTab: GQLEventSearchResultSet
   printTab: GQLEventSearchResultSet
   issueTab: GQLEventSearchResultSet

diff --git a/packages/client/src/workqueue/reducer.ts b/packages/client/src/workqueue/reducer.ts
@@ -74,6 +74,7 @@ const workqueueInitialState: WorkqueueState = {
       notificationTab: { totalItems: 0, results: [] },
       reviewTab: { totalItems: 0, results: [] },
       rejectTab: { totalItems: 0, results: [] },
+      sentForReviewTab: { totalItems: 0, results: [] },
       approvalTab: { totalItems: 0, results: [] },
       printTab: { totalItems: 0, results: [] },
       issueTab: { totalItems: 0, results: [] },
@@ -86,6 +87,7 @@ const workqueueInitialState: WorkqueueState = {
     notificationTab: 1,
     reviewTab: 1,
     rejectTab: 1,
+    sentForReviewTab: 1,
     approvalTab: 1,
     externalValidationTab: 1,
     printTab: 1,
@@ -94,12 +96,12 @@ const workqueueInitialState: WorkqueueState = {
 }
 
 interface IWorkqueuePaginationParams {
-  userId?: string
   pageSize: number
   inProgressSkip: number
   healthSystemSkip: number
   reviewSkip: number
   rejectSkip: number
+  sentForReviewSkip: number
   approvalSkip: number
   externalValidationSkip: number
   printSkip: number
@@ -355,19 +357,22 @@ async function getWorkqueueData(
     reviewSkip,
     rejectSkip,
     approvalSkip,
+    sentForReviewSkip,
     externalValidationSkip,
     printSkip,
     issueSkip
   } = workqueuePaginationParams
 
   const result = await syncRegistrarWorkqueue(
+    userDetails.practitionerId,
     registrationLocationId,
     reviewStatuses,
     pageSize,
     inProgressSkip,
     healthSystemSkip,
     reviewSkip,
     rejectSkip,
+    sentForReviewSkip,
     approvalSkip,
     externalValidationSkip,
     printSkip,
@@ -449,6 +454,7 @@ export const workqueueReducer: LoopReducer<WorkqueueState, WorkqueueActions> = (
       const {
         printTab,
         reviewTab,
+        sentForReviewTab,
         approvalTab,
         inProgressTab,
         externalValidationTab,
@@ -465,6 +471,7 @@ export const workqueueReducer: LoopReducer<WorkqueueState, WorkqueueActions> = (
         healthSystemSkip: Math.max(notificationTab - 1, 0) * pageSize,
         reviewSkip: Math.max(reviewTab - 1, 0) * pageSize,
         rejectSkip: Math.max(rejectTab - 1, 0) * pageSize,
+        sentForReviewSkip: Math.max(sentForReviewTab - 1, 0) * pageSize,
         approvalSkip: Math.max(approvalTab - 1, 0) * pageSize,
         externalValidationSkip:
           Math.max(externalValidationTab - 1, 0) * pageSize,