remove isFileLoaded and move position of startQuery definition

Henry8192 · Feb 4, 2025 · 7d446bd · 7d446bd
1 parent 7761079
commit 7d446bd
Showing 1 changed file with 24 additions and 29 deletions.
diff --git a/src/contexts/StateContextProvider.tsx b/src/contexts/StateContextProvider.tsx
@@ -253,7 +253,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
     const [exportProgress, setExportProgress] =
         useState<Nullable<number>>(STATE_DEFAULT.exportProgress);
     const [fileName, setFileName] = useState<string>(STATE_DEFAULT.fileName);
-    const [isFileLoaded, setIsFileLoaded] = useState<boolean>(false);
     const [isSettingsModalOpen, setIsSettingsModalOpen] =
         useState<boolean>(STATE_DEFAULT.isSettingsModalOpen);
     const [logData, setLogData] = useState<string>(STATE_DEFAULT.logData);
@@ -276,6 +275,16 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
     const pageNumRef = useRef<number>(pageNum);
     const uiStateRef = useRef<UI_STATE>(uiState);
 
+    const startQuery = useCallback((queryArgs: QueryArgs) => {
+        setQueryResults(STATE_DEFAULT.queryResults);
+        if (null === mainWorkerRef.current) {
+            console.error("Unexpected null mainWorkerRef.current");
+
+            return;
+        }
+        workerPostReq(mainWorkerRef.current, WORKER_REQ_CODE.START_QUERY, queryArgs);
+    }, []);
+
     const handleMainWorkerResp = useCallback((ev: MessageEvent<MainWorkerRespMessage>) => {
         const {code, args} = ev.data;
         console.log(`[MainWorker -> Renderer] code=${code}`);
@@ -309,7 +318,18 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
                 setFileName(args.fileName);
                 setNumEvents(args.numEvents);
                 setOnDiskFileSizeInBytes(args.onDiskFileSizeInBytes);
-                setIsFileLoaded(true);
+                if (
+                    URL_SEARCH_PARAMS_DEFAULT.queryString !== queryString &&
+                    URL_SEARCH_PARAMS_DEFAULT.isCaseSensitive !== isCaseSensitive &&
+                    URL_SEARCH_PARAMS_DEFAULT.isRegex !== isRegex
+                ) {
+                    startQuery({queryString, isCaseSensitive, isRegex});
+                }
+                updateWindowUrlSearchParams({
+                    [SEARCH_PARAM_NAMES.QUERY_STRING]: URL_SEARCH_PARAMS_DEFAULT.queryString,
+                    [SEARCH_PARAM_NAMES.IS_CASE_SENSITIVE]: URL_SEARCH_PARAMS_DEFAULT.isCaseSensitive,
+                    [SEARCH_PARAM_NAMES.IS_REGEX]: URL_SEARCH_PARAMS_DEFAULT.isRegex,
+                });
                 break;
             case WORKER_RESP_CODE.NOTIFICATION:
                 postPopUp({
@@ -369,16 +389,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
         }
     }, [postPopUp]);
 
-    const startQuery = useCallback((queryArgs: QueryArgs) => {
-        setQueryResults(STATE_DEFAULT.queryResults);
-        if (null === mainWorkerRef.current) {
-            console.error("Unexpected null mainWorkerRef.current");
-
-            return;
-        }
-        workerPostReq(mainWorkerRef.current, WORKER_REQ_CODE.START_QUERY, queryArgs);
-    }, []);
-
     const exportLogs = useCallback(() => {
         if (null === mainWorkerRef.current) {
             console.error("Unexpected null mainWorkerRef.current");
@@ -407,6 +417,8 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
         setLogData("Loading...");
         setOnDiskFileSizeInBytes(STATE_DEFAULT.onDiskFileSizeInBytes);
         setExportProgress(STATE_DEFAULT.exportProgress);
+        setQueryResults(STATE_DEFAULT.queryResults);
+        setQueryProgress(QUERY_PROGRESS_VALUE_MIN);
 
         if ("string" !== typeof fileSrc) {
             updateWindowUrlSearchParams({[SEARCH_PARAM_NAMES.FILE_PATH]: null});
@@ -424,8 +436,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
             cursor: cursor,
             decoderOptions: getConfig(CONFIG_KEY.DECODER_OPTIONS),
         });
-        setQueryResults(STATE_DEFAULT.queryResults);
-        setQueryProgress(QUERY_PROGRESS_VALUE_MIN);
     }, [
         handleMainWorkerResp,
     ]);
@@ -459,21 +469,6 @@ const StateContextProvider = ({children}: StateContextProviderProps) => {
         });
     }, []);
 
-    useEffect(() => {
-        if (
-            URL_SEARCH_PARAMS_DEFAULT.queryString !== queryString &&
-            URL_SEARCH_PARAMS_DEFAULT.isCaseSensitive !== isCaseSensitive &&
-            URL_SEARCH_PARAMS_DEFAULT.isRegex !== isRegex
-        ) {
-            startQuery({queryString, isCaseSensitive, isRegex});
-        }
-        updateWindowUrlSearchParams({
-            [SEARCH_PARAM_NAMES.QUERY_STRING]: URL_SEARCH_PARAMS_DEFAULT.queryString,
-            [SEARCH_PARAM_NAMES.IS_CASE_SENSITIVE]: URL_SEARCH_PARAMS_DEFAULT.isCaseSensitive,
-            [SEARCH_PARAM_NAMES.IS_REGEX]: URL_SEARCH_PARAMS_DEFAULT.isRegex,
-        });
-    }, [isFileLoaded]);
-
     // Synchronize `logEventNumRef` with `logEventNum`.
     useEffect(() => {
         logEventNumRef.current = logEventNum;