feat: xpress call filter load active call by default (#959)

UserOfficeProject · Feb 24, 2025 · 228e50e · 228e50e
1 parent a489606
commit 228e50e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/apps/frontend/src/components/menu/MenuItems.tsx b/apps/frontend/src/components/menu/MenuItems.tsx
@@ -27,6 +27,7 @@ import { TimeSpan } from 'components/experiment/PresetDateSelector';
 import { FeatureContext } from 'context/FeatureContextProvider';
 import { FeatureId, SettingsId, UserRole } from 'generated/sdk';
 import { useFormattedDateTime } from 'hooks/admin/useFormattedDateTime';
+import { CallsDataQuantity, useCallsData } from 'hooks/call/useCallsData';
 import { useXpressAccess } from 'hooks/common/useXpressAccess';
 
 import SettingsMenuListItem from './SettingsMenuListItem';
@@ -91,6 +92,20 @@ const MenuItems = ({ currentRole }: MenuItemsProps) => {
     UserRole.INSTRUMENT_SCIENTIST,
   ]);
 
+  const calls = useCallsData(
+    {
+      proposalStatusShortCode: 'QUICK_REVIEW',
+    },
+    CallsDataQuantity.MINIMAL
+  ).calls;
+
+  const openCall = calls?.find((call) => call.isActive);
+
+  const xpressUrl =
+    openCall && openCall.id
+      ? `/XpressProposals?call=${openCall?.id}`
+      : '/XpressProposals';
+
   const { from, to } = getRelativeDatesFromToday(TimeSpan.NEXT_30_DAYS);
 
   const formattedDate = (value?: Date) =>
@@ -150,7 +165,7 @@ const MenuItems = ({ currentRole }: MenuItemsProps) => {
       </Tooltip>
       {isXpressRouteEnabled && (
         <Tooltip title="Xpress Proposals">
-          <ListItemButton component={NavLink} to="/XpressProposals">
+          <ListItemButton component={NavLink} to={xpressUrl}>
             <ListItemIcon>
               <Topic />
             </ListItemIcon>
@@ -287,7 +302,7 @@ const MenuItems = ({ currentRole }: MenuItemsProps) => {
         <ListItemText primary="Proposals" />
       </ListItemButton>
       {isXpressRouteEnabled && (
-        <ListItemButton component={NavLink} to="/XpressProposals">
+        <ListItemButton component={NavLink} to={xpressUrl}>
           <ListItemIcon>
             <Topic />
           </ListItemIcon>

diff --git a/apps/frontend/src/components/xpress/XpressProposalTable.tsx b/apps/frontend/src/components/xpress/XpressProposalTable.tsx
@@ -85,7 +85,7 @@ const XpressProposalTable = ({ confirm }: { confirm: WithConfirmType }) => {
 
   const isUserOfficer = useCheckAccess([UserRole.USER_OFFICER]);
 
-  const callId = searchParams.get('callId');
+  const callId = searchParams.get('call');
   const instrument = searchParams.get('instrument');
   const technique = searchParams.get('technique');
   const proposalId = searchParams.get('proposalId');

diff --git a/apps/frontend/src/graphql/call/getCallsMinimal.graphql b/apps/frontend/src/graphql/call/getCallsMinimal.graphql
@@ -10,5 +10,6 @@ query getCallsMinimal($filter: CallsFilter) {
     description
     cycleComment
     allocationTimeUnit
+    isActive
   }
 }