From fa56f48461a85131ac58be56becf16689181235c Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Tue, 19 Dec 2023 12:34:00 +0100
Subject: [PATCH] refactor: get data from query

---
 apps/client/src/common/api/ontimeApi.ts       | 10 ++----
 .../src/common/hooks-query/useSheetState.ts   |  4 +--
 .../modals/sheets-modal/SheetsModal.tsx       | 31 +++++++++----------
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/apps/client/src/common/api/ontimeApi.ts b/apps/client/src/common/api/ontimeApi.ts
index 800d32c5a..d1b95123c 100644
--- a/apps/client/src/common/api/ontimeApi.ts
+++ b/apps/client/src/common/api/ontimeApi.ts
@@ -283,14 +283,10 @@ export const postPushSheet = async (id: string, worksheet: string) => {
  * @description HTTP request to retrieve sheets state
  * @return {Promise}
  */
-export const getSheetState = async ({ queryKey }): Promise<SheetState> => {
-  const [_key, id, worksheet] = queryKey;
-  console.log(queryKey);
-
+export const getSheetState = async (id: string, worksheet: string): Promise<SheetState> => {
   const res = await axios.post(`${ontimeURL}/sheet-state`, {
-    id: '',
-    worksheet: '',
+    id,
+    worksheet,
   });
-  console.log(res.data);
   return res.data;
 };
diff --git a/apps/client/src/common/hooks-query/useSheetState.ts b/apps/client/src/common/hooks-query/useSheetState.ts
index 17294b45b..36962dc2a 100644
--- a/apps/client/src/common/hooks-query/useSheetState.ts
+++ b/apps/client/src/common/hooks-query/useSheetState.ts
@@ -3,10 +3,10 @@ import { useQuery } from '@tanstack/react-query';
 import { SHEET_STATE } from '../api/apiConstants';
 import { getSheetState } from '../api/ontimeApi';
 
-export default function useSheetState(id, worksheet) {
+export default function useSheetState(id: string | null, worksheet: string | null) {
   const { data, status, isFetching, isError, refetch } = useQuery({
     queryKey: [SHEET_STATE, { id, worksheet }],
-    queryFn: getSheetState,
+    queryFn: () => (id !== null && worksheet !== null ? getSheetState(id, worksheet) : null),
     placeholderData: null,
     enabled: false,
     networkMode: 'always',
diff --git a/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx b/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
index 9ff53ffcd..a8ba83ae6 100644
--- a/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
+++ b/apps/client/src/features/modals/sheets-modal/SheetsModal.tsx
@@ -15,14 +15,13 @@ import {
   ModalOverlay,
   Select,
 } from '@chakra-ui/react';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQueryClient } from '@tanstack/react-query';
 import { OntimeRundown, ProjectData, UserFields } from 'ontime-types';
 
-import { PROJECT_DATA, RUNDOWN, SHEET_STATE, USERFIELDS } from '../../../common/api/apiConstants';
+import { PROJECT_DATA, RUNDOWN, USERFIELDS } from '../../../common/api/apiConstants';
 import { maybeAxiosError } from '../../../common/api/apiUtils';
 import {
   getSheetsAuthUrl,
-  getSheetState,
   patchData,
   postPreviewSheet,
   postPushSheet,
@@ -51,19 +50,17 @@ export default function SheetsModal(props: SheetsModalProps) {
   const [project, setProject] = useState<ProjectData | null>(null);
 
   const fileInputRef = useRef<HTMLInputElement>(null);
-  const sheetid = useRef<HTMLInputElement>(null);
-  const worksheet = useRef<HTMLSelectElement>(null);
+  const sheetRef = useRef<HTMLInputElement>(null);
+  const worksheetRef = useRef<HTMLSelectElement>(null);
+  const [sheetId, setSheetId] = useState<string | null>(null);
+  const [worksheet, setWorksheet] = useState<string | null>(null);
 
-  const { data: sheetState, refetch } = useQuery({
-    queryKey: [SHEET_STATE, sheetid, sheetid],
-    queryFn: getSheetState,
-    placeholderData: null,
-    enabled: false,
-    networkMode: 'always',
-  });
+  const { data: sheetState, refetch } = useSheetState(sheetId, worksheet);
 
   const onChange = () => {
-    if (sheetid.current?.value && sheetid.current?.value.length > 43) {
+    if (sheetRef.current?.value && sheetRef.current?.value.length > 43 && worksheetRef.current) {
+      setSheetId(sheetRef.current.value);
+      setWorksheet(worksheetRef.current.value);
       refetch();
     }
   };
@@ -113,7 +110,7 @@ export default function SheetsModal(props: SheetsModalProps) {
   };
 
   const handlePullData = () => {
-    postPreviewSheet(sheetid.current?.value ?? '', worksheet.current?.value ?? '').then((data) => {
+    postPreviewSheet(sheetRef.current?.value ?? '', worksheetRef.current?.value ?? '').then((data) => {
       setProject(data.project);
       setRundown(data.rundown);
       setUserFields(data.userFields);
@@ -121,7 +118,7 @@ export default function SheetsModal(props: SheetsModalProps) {
   };
 
   const handlePushData = () => {
-    postPushSheet(sheetid.current?.value ?? '', worksheet.current?.value ?? '');
+    postPushSheet(sheetRef.current?.value ?? '', worksheetRef.current?.value ?? '');
   };
 
   const handleFinalise = async () => {
@@ -214,7 +211,7 @@ export default function SheetsModal(props: SheetsModalProps) {
                   Sheet ID
                   <Input
                     type='text'
-                    ref={sheetid}
+                    ref={sheetRef}
                     id='sheetid'
                     size='sm'
                     onChange={onChange}
@@ -232,7 +229,7 @@ export default function SheetsModal(props: SheetsModalProps) {
               >
                 <label htmlFor='worksheet'>
                   Worksheet
-                  <Select ref={worksheet} size='sm' id='worksheet' disabled={!sheetState?.worksheetOptions}>
+                  <Select ref={worksheetRef} size='sm' id='worksheet' disabled={!sheetState?.worksheetOptions}>
                     {sheetState?.worksheetOptions?.map((value) => (
                       <option key={value} value={value}>
                         {value}