Implement redux in device health check

This commit is contained in:
Hristo Nedelkov 2023-08-17 12:01:11 +03:00
parent fb21d8d499
commit ec90dfb13a
3 changed files with 58 additions and 66 deletions

View File

@ -7,6 +7,8 @@ import LandingPage from './pages/LandingPage/LandingPage'
import DeviceHealthCheck from './pages/DeviceHealthCheck/DeviceHealthCheck' import DeviceHealthCheck from './pages/DeviceHealthCheck/DeviceHealthCheck'
import ConnectDevicePage from './pages/ConnectDevicePage/ConnectDevicePage' import ConnectDevicePage from './pages/ConnectDevicePage/ConnectDevicePage'
import DeviceSyncStatus from './pages/DeviceSyncStatus/DeviceSyncStatus' import DeviceSyncStatus from './pages/DeviceSyncStatus/DeviceSyncStatus'
import { Provider as ReduxProvider } from 'react-redux'
import store from './redux/store'
const router = createBrowserRouter([ const router = createBrowserRouter([
{ {
@ -20,20 +22,21 @@ const router = createBrowserRouter([
{ {
path: '/connect-device', path: '/connect-device',
element: <ConnectDevicePage />, element: <ConnectDevicePage />,
}, },
{ {
path: '/device-sync-status', path: '/device-sync-status',
element: <DeviceSyncStatus />, element: <DeviceSyncStatus />,
} },
]) ])
function App() { function App() {
return ( return (
<TamaguiProvider config={config}> <TamaguiProvider config={config}>
<StatusProvider> <ReduxProvider store={store}>
<RouterProvider router={router} /> <StatusProvider>
</StatusProvider> <RouterProvider router={router} />
</StatusProvider>
</ReduxProvider>
</TamaguiProvider> </TamaguiProvider>
) )
} }

View File

@ -9,8 +9,13 @@ import { Button, InformationBox } from '@status-im/components'
import Icon from '../../components/General/Icon' import Icon from '../../components/General/Icon'
import DeviceMemory from '../../components/Charts/DeviceMemoryHealth' import DeviceMemory from '../../components/Charts/DeviceMemoryHealth'
import DeviceNetworkHealth from '../../components/Charts/DeviceNetworkHealth' import DeviceNetworkHealth from '../../components/Charts/DeviceNetworkHealth'
import { useSelector } from 'react-redux'
import { RootState } from '../../redux/store'
const DeviceHealthCheck = () => { const DeviceHealthCheck = () => {
// Extract state from Redux store
const deviceHealthState = useSelector((state: RootState) => state.deviceHealth)
console.log(deviceHealthState)
return ( return (
<PageWrapperShadow rightImageSrc="/background-images/eye-background.png"> <PageWrapperShadow rightImageSrc="/background-images/eye-background.png">
<YStack <YStack
@ -29,12 +34,21 @@ const DeviceHealthCheck = () => {
isAdvancedSettings={true} isAdvancedSettings={true}
/> />
<XStack space={'$4'}> <XStack space={'$4'}>
<DeviceStorageHealth storage={44} maxStorage={30} /> <DeviceStorageHealth
<DeviceCPULoad load={[12, 123, 4, 90]} /> storage={deviceHealthState.storage}
maxStorage={deviceHealthState.maxMemory}
/>
<DeviceCPULoad load={deviceHealthState.cpuLoad} />
</XStack> </XStack>
<XStack space={'$4'}> <XStack space={'$4'}>
<DeviceMemory currentMemory={[25, 31, 5, 14, 20, 81]} maxMemory={38} /> <DeviceMemory
<DeviceNetworkHealth uploadRate={[1, 4, 23, 55]} downloadRate={[20, 3, 40, 56]} /> currentMemory={deviceHealthState.memory}
maxMemory={deviceHealthState.maxMemory}
/>
<DeviceNetworkHealth
uploadRate={deviceHealthState.uploadRate}
downloadRate={deviceHealthState.downloadRate}
/>
</XStack> </XStack>
<HealthInfoSection <HealthInfoSection
usedStorage={120} usedStorage={120}

View File

@ -1,76 +1,51 @@
import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import { createSlice, PayloadAction } from '@reduxjs/toolkit'
interface DeviceHealthState { interface DeviceHealthState {
storage: number; storage: number
maxStorage: number; maxStorage: number
cpuLoad: number[]; cpuLoad: number[]
memory: number[]; memory: number[]
maxMemory: number; maxMemory: number
uploadRate: number[]; uploadRate: number[]
downloadRate: number[]; downloadRate: number[]
usedStorage: number;
maxRamMemory: number;
usedRamMemory: number;
cpuClockRate: number;
networkLatency: number;
} }
const initialState: DeviceHealthState = { const initialState: DeviceHealthState = {
storage: 0, storage: 44,
maxStorage: 0, maxStorage: 100,
cpuLoad: [], cpuLoad: [12, 123, 4, 90],
memory: [], memory: [25, 31, 5, 14, 20, 81],
maxMemory: 0, maxMemory: 120,
uploadRate: [], uploadRate: [1, 4, 25, 65],
downloadRate: [], downloadRate: [20, 3, 50, 30],
usedStorage: 0, }
maxRamMemory: 0,
usedRamMemory: 0,
cpuClockRate: 0,
networkLatency: 0,
};
const deviceHealthSlice = createSlice({ const deviceHealthSlice = createSlice({
name: 'deviceHealth', name: 'deviceHealth',
initialState, initialState,
reducers: { reducers: {
setStorage: (state, action: PayloadAction<{ storage: number; maxStorage: number }>) => { setStorage: (state, action: PayloadAction<{ storage: number; maxStorage: number }>) => {
state.storage = action.payload.storage; state.storage = action.payload.storage
state.maxStorage = action.payload.maxStorage; state.maxStorage = action.payload.maxStorage
}, },
setCpuLoad: (state, action: PayloadAction<number[]>) => { setCpuLoad: (state, action: PayloadAction<number[]>) => {
state.cpuLoad = action.payload; state.cpuLoad = action.payload
}, },
setMemory: (state, action: PayloadAction<{ memory: number[]; maxMemory: number }>) => { setMemory: (state, action: PayloadAction<{ memory: number[]; maxMemory: number }>) => {
state.memory = action.payload.memory; state.memory = action.payload.memory
state.maxMemory = action.payload.maxMemory; state.maxMemory = action.payload.maxMemory
}, },
setNetworkHealth: (state, action: PayloadAction<{ uploadRate: number[]; downloadRate: number[] }>) => { setNetworkHealth: (
state.uploadRate = action.payload.uploadRate; state,
state.downloadRate = action.payload.downloadRate; action: PayloadAction<{ uploadRate: number[]; downloadRate: number[] }>,
) => {
state.uploadRate = action.payload.uploadRate
state.downloadRate = action.payload.downloadRate
}, },
setHealthInfo: (state, action: PayloadAction<{ },
usedStorage: number; })
maxRamMemory: number;
usedRamMemory: number;
cpuClockRate: number;
networkLatency: number;
}>) => {
state.usedStorage = action.payload.usedStorage;
state.maxRamMemory = action.payload.maxRamMemory;
state.usedRamMemory = action.payload.usedRamMemory;
state.cpuClockRate = action.payload.cpuClockRate;
state.networkLatency = action.payload.networkLatency;
},
}
});
export const { export const { setStorage, setCpuLoad, setMemory, setNetworkHealth} =
setStorage, deviceHealthSlice.actions
setCpuLoad,
setMemory,
setNetworkHealth,
setHealthInfo
} = deviceHealthSlice.actions;
export default deviceHealthSlice.reducer; export default deviceHealthSlice.reducer