alova - refactor wifi scan

interface/src/framework/network/WiFiNetworkScanner.tsx

@@ -1,8 +1,8 @@
 import PermScanWifiIcon from '@mui/icons-material/PermScanWifi';
 import { Button } from '@mui/material';
-import { useRequest } from 'alova';
-import { useState, useCallback, useRef } from 'react';
-import { toast } from 'react-toastify';
+// eslint-disable-next-line import/named
+import { updateState, useRequest } from 'alova';
+import { useState, useRef } from 'react';
 
 import WiFiNetworkSelector from './WiFiNetworkSelector';
 import type { FC } from 'react';
@@ -15,48 +15,37 @@ const NUM_POLLS = 10;
 const POLLING_FREQUENCY = 1000;
 
 const WiFiNetworkScanner: FC = () => {
-  const { LL } = useI18nContext();
-
   const pollCount = useRef(0);
+  const { LL } = useI18nContext();
   const [errorMessage, setErrorMessage] = useState<string>();
 
-  const { data: networkList, send: getNetworkList } = useRequest(NetworkApi.listNetworks, {
+  const { send: scanNetworks, onComplete: onCompleteScanNetworks } = useRequest(NetworkApi.scanNetworks); // is called on page load to start network scan
+  const {
+    data: networkList,
+    send: getNetworkList,
+    onSuccess: onSuccessNetworkList
+  } = useRequest(NetworkApi.listNetworks, {
     immediate: false
   });
 
-  const {
-    send: scanNetworks,
-    onSuccess: onSuccessScanNetworks,
-    onError: onErrorScanNetworks
-  } = useRequest(NetworkApi.scanNetworks);
-
-  const finishedWithError = useCallback((message: string) => {
-    toast.error(message);
-    setErrorMessage(message);
-    pollCount.current = 0;
-  }, []);
-
-  onErrorScanNetworks((event) => {
-    console.log('onErrorScanNetworks'); // TODO fix
-    if (event.error?.message === 'Wait') {
-      // 202
-      console.log('not ready...: ', event.error?.message); // TODO fix
+  onSuccessNetworkList((event) => {
+    if (!event.data) {
       const completedPollCount = pollCount.current + 1;
       if (completedPollCount < NUM_POLLS) {
         pollCount.current = completedPollCount;
-        setTimeout(scanNetworks, POLLING_FREQUENCY);
+        setTimeout(getNetworkList, POLLING_FREQUENCY);
       } else {
-        finishedWithError(LL.PROBLEM_LOADING());
+        setErrorMessage(LL.PROBLEM_LOADING());
+        pollCount.current = 0;
       }
-    } else {
-      finishedWithError(LL.PROBLEM_LOADING());
     }
   });
 
-  onSuccessScanNetworks(() => {
-    console.log('onCompleteScanNetworks'); // TODO fix
+  onCompleteScanNetworks(() => {
     pollCount.current = 0;
-    void getNetworkList(); // fetch the list
+    setErrorMessage(undefined);
+    updateState('listNetworks', () => undefined);
+    void getNetworkList();
   });
 
   const renderNetworkScanner = () => {

interface/src/framework/security/ManageUsersForm.tsx

@@ -23,6 +23,7 @@ import { useRest } from 'utils';
 import { createUserValidator } from 'validators';
 
 const ManageUsersForm: FC = () => {
+  // TODO move to Alova
   const { loadData, saving, data, setData, saveData, errorMessage } = useRest<SecuritySettings>({
     read: SecurityApi.readSecuritySettings,
     update: SecurityApi.updateSecuritySettings

interface/src/framework/security/SecuritySettingsForm.tsx

@@ -18,6 +18,7 @@ const SecuritySettingsForm: FC = () => {
   const { LL } = useI18nContext();
 
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
+  // TODO move to Alova
   const { loadData, saving, data, setData, origData, dirtyFlags, blocker, setDirtyFlags, saveData, errorMessage } =
     useRest<SecuritySettings>({
       read: SecurityApi.readSecuritySettings,

interface/src/framework/system/GeneralFileUpload.tsx

@@ -12,7 +12,7 @@ import { useI18nContext } from 'i18n/i18n-react';
 import * as EMSESP from 'project/api';
 
 interface UploadFileProps {
-  // TODO fileupload upload move to alova
+  // TODO fileupload move to alova
   uploadGeneralFile: (file: File, config?: FileUploadConfig) => AxiosPromise<void>;
 }
 

interface/src/framework/system/RestartMonitor.tsx

@@ -8,7 +8,6 @@ import { FormLoader } from 'components';
 import { useI18nContext } from 'i18n/i18n-react';
 
 const RESTART_TIMEOUT = 2 * 60 * 1000;
-const POLL_TIMEOUT = 2000;
 const POLL_INTERVAL = 5000;
 
 const RestartMonitor: FC = () => {
@@ -17,14 +16,15 @@ const RestartMonitor: FC = () => {
 
   const { LL } = useI18nContext();
 
-  const { send: readSystemStatus } = useRequest((timeout) => SystemApi.readSystemStatus(timeout), {
+  const { send: readSystemStatus } = useRequest(SystemApi.readSystemStatus(), {
+    force: true,
     immediate: false
   });
 
   const timeoutAt = useRef(new Date().getTime() + RESTART_TIMEOUT);
   const poll = useRef(async () => {
     try {
-      await readSystemStatus(POLL_TIMEOUT);
+      await readSystemStatus();
       document.location.href = '/fileUpdated';
     } catch (error) {
       if (new Date().getTime() < timeoutAt.current) {

interface/src/framework/system/SystemStatusForm.tsx

@@ -73,7 +73,7 @@ const SystemStatusForm: FC = () => {
     immediate: false
   });
 
-  const { data: data, send: loadData, error } = useRequest(SystemApi.readSystemStatus);
+  const { data: data, send: loadData, error } = useRequest(SystemApi.readSystemStatus, { force: true });
 
   useEffect(() => {
     void axios.get(VERSIONCHECK_ENDPOINT).then((response) => {