perf: optimize instr sci call query (#864)

UserOfficeProject · Nov 21, 2024 · 93aa4e8 · 93aa4e8
2 parents ad8fdc4 + 869ef5b
commit 93aa4e8
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/apps/frontend/src/components/common/proposalFilters/CallFilter.tsx b/apps/frontend/src/components/common/proposalFilters/CallFilter.tsx
@@ -9,7 +9,7 @@ import { useSearchParams } from 'react-router-dom';
 import { Call } from 'generated/sdk';
 
 type CallFilterProps = {
-  calls?: Call[];
+  calls?: Pick<Call, 'shortCode' | 'id'>[];
   isLoading?: boolean;
   onChange?: Dispatch<number>;
   shouldShowAll?: boolean;

diff --git a/apps/frontend/src/components/proposal/ProposalFilterBar.tsx b/apps/frontend/src/components/proposal/ProposalFilterBar.tsx
@@ -37,7 +37,10 @@ export const questionaryFilterFromUrlQuery = (urlQuery: {
   }
 };
 type ProposalFilterBarProps = {
-  calls?: { data: Call[]; isLoading: boolean };
+  calls?: {
+    data: Pick<Call, 'shortCode' | 'id' | 'templateId'>[];
+    isLoading: boolean;
+  };
   instruments?: { data: InstrumentMinimalFragment[]; isLoading: boolean };
   proposalStatuses?: { data: ProposalStatus[]; isLoading: boolean };
   setProposalFilter: (filter: ProposalsFilter) => void;

diff --git a/apps/frontend/src/graphql/call/getCallsByInstrumentScientist.graphql b/apps/frontend/src/graphql/call/getCallsByInstrumentScientist.graphql
@@ -1,5 +1,7 @@
 query getCallsByInstrumentScientist($scientistId: Int!) {
   callsByInstrumentScientist(scientistId: $scientistId) {
-    ...call
+    id
+    shortCode
+    templateId
   }
 }
diff --git a/apps/frontend/src/hooks/call/useInstrumentScientistCallsData.ts b/apps/frontend/src/hooks/call/useInstrumentScientistCallsData.ts
@@ -1,10 +1,15 @@
 import { useEffect, useState } from 'react';
 
-import { Call } from 'generated/sdk';
 import { useDataApi } from 'hooks/common/useDataApi';
 
+export type InstrumentScientistCallsData = {
+  id: number;
+  shortCode: string;
+  templateId: number;
+};
+
 export function useInstrumentScientistCallsData(scientistId: number) {
-  const [calls, setCalls] = useState<Call[]>([]);
+  const [calls, setCalls] = useState<InstrumentScientistCallsData[]>([]);
   const [loadingCalls, setLoadingCalls] = useState(true);
 
   const api = useDataApi();
@@ -21,7 +26,7 @@ export function useInstrumentScientistCallsData(scientistId: number) {
         }
 
         if (data.callsByInstrumentScientist) {
-          setCalls(data.callsByInstrumentScientist as Call[]);
+          setCalls(data.callsByInstrumentScientist);
         }
         setLoadingCalls(false);
       });