Correct filters

UserOfficeProject · Oct 30, 2024 · 4d5af62 · 4d5af62
1 parent daabe81
commit 4d5af62
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/apps/frontend/src/components/xpress/XpressProposalTable.tsx b/apps/frontend/src/components/xpress/XpressProposalTable.tsx
@@ -328,11 +328,12 @@ const XpressProposalTable = () => {
     const {
       callId,
       instrumentFilter,
+      techniqueFilter,
       proposalStatusId,
-      questionaryIds,
       text,
-      questionFilter,
       referenceNumbers,
+      dateFilter,
+      excludeProposalStatusIds,
     } = proposalFilter;
 
     const result: {
@@ -345,15 +346,15 @@ const XpressProposalTable = () => {
         filter: {
           callId: callId,
           instrumentFilter: instrumentFilter,
+          techniqueFilter: techniqueFilter,
           proposalStatusId: proposalStatusId,
-          questionaryIds: questionaryIds,
-          referenceNumbers: referenceNumbers,
-          questionFilter: questionFilter && {
-            ...questionFilter,
-            value:
-              JSON.stringify({ value: questionFilter?.value }) ?? undefined,
-          }, // We wrap the value in JSON formatted string, because GraphQL can not handle UnionType input
           text: text,
+          referenceNumbers: referenceNumbers,
+          dateFilter: dateFilter,
+          ...(currentRole === UserRole.INSTRUMENT_SCIENTIST ||
+          currentRole === UserRole.INTERNAL_REVIEWER
+            ? { excludeProposalStatusIds: excludeProposalStatusIds }
+            : {}),
         },
         searchText: searchParams.get('search'),
       })