Refactor WakeComponent: integrate useSWRMutation for waking machines, update API endpoint usage, and enhance type definitions

master^2
Tudor Stanciu 2024-11-16 02:11:09 +02:00
parent 618bfb38e1
commit 04e80a0ac0
4 changed files with 29 additions and 27 deletions

View File

@ -4,9 +4,10 @@ import { PowerSettingsNew } from "@mui/icons-material";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { blip } from "../../../../utils"; import { blip } from "../../../../utils";
import { msToMinAndSec } from "../../../../utils/time"; import { msToMinAndSec } from "../../../../utils/time";
import { routes, post } from "../../../../utils/api"; import { endpoints } from "../../../../utils/api";
import { Machine } from "types"; import { Machine, MachineWaked, WakeMachine } from "types";
import { usePingTrigger } from "../../hooks"; import { usePingTrigger } from "../../hooks";
import { Key, mutationFetcher, useSWRMutation } from "units/swr";
const initialState = { on: false }; const initialState = { on: false };
const defaultPingInterval = 1200000; //20 minutes const defaultPingInterval = 1200000; //20 minutes
@ -57,12 +58,12 @@ const WakeComponent: React.FC<Props> = ({ machine, addLog, disabled }) => {
} }
}); });
const wakeMachine = useCallback(async () => { const { trigger: wakeMachineTrigger } = useSWRMutation<MachineWaked, Error, Key, WakeMachine>(
await post( endpoints.network.machine.wake,
routes.wakeMachine, mutationFetcher<WakeMachine>,
{ machineId: machine.machineId },
{ {
onCompleted: (result: any) => { onError: err => blip.error(err.message),
onSuccess: result => {
setState(prev => ({ ...prev, on: result.success })); setState(prev => ({ ...prev, on: result.success }));
log(`[Wake]: Success: ${result.success}. Status: ${result.status}`); log(`[Wake]: Success: ${result.success}. Status: ${result.status}`);
if (result.success) { if (result.success) {
@ -79,7 +80,6 @@ const WakeComponent: React.FC<Props> = ({ machine, addLog, disabled }) => {
} }
} }
); );
}, [log, machine.machineId]);
const pingMachine = useCallback(async () => { const pingMachine = useCallback(async () => {
if (disabled) return; if (disabled) return;
@ -90,8 +90,8 @@ const WakeComponent: React.FC<Props> = ({ machine, addLog, disabled }) => {
pingMachine(); pingMachine();
}, [trigger, pingMachine]); }, [trigger, pingMachine]);
const handleWakeClick = (event: any) => { const handleWakeClick = (event: React.MouseEvent<HTMLButtonElement>) => {
wakeMachine(); wakeMachineTrigger({ machineId: machine.machineId });
event.stopPropagation(); event.stopPropagation();
}; };

View File

@ -1,3 +1,7 @@
export type WakeMachine = {
machineId: number;
};
export type PingMachine = { export type PingMachine = {
machineId: number; machineId: number;
}; };

View File

@ -3,8 +3,7 @@ export type MachineActionResult = {
status: string; status: string;
}; };
export type MachineWaked = MachineActionResult;
export type MachinePinged = MachineActionResult; export type MachinePinged = MachineActionResult;
export type MachineShutdown = MachineActionResult; export type MachineShutdown = MachineActionResult;
export type MachineRestarted = MachineActionResult; export type MachineRestarted = MachineActionResult;

View File

@ -10,7 +10,6 @@ const powerActionsRoute = `${apiHost}/resurrector`;
const securityRoute = `${apiHost}/security`; const securityRoute = `${apiHost}/security`;
const routes = { const routes = {
wakeMachine: `${powerActionsRoute}/wake`,
network: { network: {
machines: `${networkRoute}/machines`, machines: `${networkRoute}/machines`,
machine: { machine: {