refactor: Use redux thunk for rust mode

discretize · Oct 25, 2024 · b26ac8d · b26ac8d
1 parent ca8252e
commit b26ac8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/src/components/nav/NavSettings.tsx b/src/components/nav/NavSettings.tsx
@@ -194,7 +194,7 @@ export default function NavSettings({
                     dispatch(stopCalc);
                   } else {
                     // workers.forEach(({ worker }) => worker.postMessage({ type: STOP }));
-                    stopCalculationParallel(dispatch);
+                    dispatch(stopCalculationParallel);
                   }
 
                   const newMulticore = e.target.checked;

diff --git a/src/components/sections/controls/Controls.tsx b/src/components/sections/controls/Controls.tsx
@@ -6,7 +6,7 @@ import ErrorIcon from '@mui/icons-material/Error';
 import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
 import { Box, Button, Chip, Typography } from '@mui/material';
 import { Trans, useTranslation } from 'react-i18next';
-import { useSelector, useStore } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { makeStyles } from 'tss-react/mui';
 import { resumeCalc, startCalc, stopCalc } from '../../../state/async/calculationThunks';
 import {
@@ -31,7 +31,6 @@ import {
   getStatus,
 } from '../../../state/slices/controlsSlice';
 import { getAffixes } from '../../../state/slices/priorities';
-import type { RootState } from '../../../state/store';
 import ProgressIcon from '../../baseComponents/ProgressIcon';
 import ResultTableSettings from './ResultTableSettings';
 
@@ -55,7 +54,6 @@ const ControlsBox = () => {
   const { classes, cx } = useStyles();
   const dispatch = useAppDispatch();
   const { t } = useTranslation();
-  const store = useStore();
 
   const status = useSelector(getStatus);
   const error = useSelector(getError);
@@ -76,7 +74,7 @@ const ControlsBox = () => {
       dispatch(changeError(''));
       dispatch(startCalc);
     } else {
-      calculateParallel(store.getState() as RootState, dispatch);
+      dispatch(calculateParallel);
     }
   };
 
@@ -94,7 +92,7 @@ const ControlsBox = () => {
       dispatch(stopCalc);
     } else {
       // workers.forEach(({ worker }) => worker.postMessage({ type: STOP }));
-      stopCalculationParallel(dispatch);
+      dispatch(stopCalculationParallel);
     }
   };
 

diff --git a/src/state/optimizer-parallel/calculate.ts b/src/state/optimizer-parallel/calculate.ts
@@ -1,4 +1,5 @@
 import { STOPPED } from '../optimizer/status';
+import type { AppThunk } from '../redux-hooks';
 import {
   changeFilteredLists,
   changeList,
@@ -7,7 +8,6 @@ import {
   getHeuristics,
   getHwThreads,
 } from '../slices/controlsSlice';
-import type { AppDispatch, RootState } from '../store';
 import runCalcHeuristics from './modes/heuristics';
 import runCalcNormal from './modes/normal';
 import { createCalculationSettings, setupNormal } from './optimizerSetup';
@@ -40,7 +40,8 @@ const terminateActiveWorkers = () => {
   });
 };
 
-export function calculateParallel(reduxState: RootState, dispatch: AppDispatch): WorkerWrapper[] {
+export const calculateParallel: AppThunk = (dispatch, getState) => {
+  const reduxState = getState();
   const selectedMaxThreads = getHwThreads(reduxState);
 
   dispatch(changeList([]));
@@ -91,11 +92,9 @@ export function calculateParallel(reduxState: RootState, dispatch: AppDispatch):
       false,
     );
   }
+};
 
-  return workers;
-}
-
-export function stopCalculationParallel(dispatch: AppDispatch) {
+export const stopCalculationParallel: AppThunk = (dispatch) => {
   terminateActiveWorkers();
   dispatch(changeStatus(STOPPED));
-}
+};