Checkpoint

Chia-Network · May 15, 2023 · 1c28bc1 · 1c28bc1
1 parent 8fe110c
commit 1c28bc1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/packages/api-react/src/services/farmer.ts b/packages/api-react/src/services/farmer.ts
@@ -32,7 +32,12 @@ export const farmerApi = apiWithTag.injectEndpoints({
       providesTags: [{ type: 'Harvesters', id: 'LIST' }],
       onCacheEntryAdded: onCacheEntryAddedInvalidate(baseQuery, api, [
         {
-          command: 'onHarvesterChanged',
+          command: 'onHarvesterUpdated',
+          service: Farmer,
+          endpoint: 'getHarvesters',
+        },
+        {
+          command: 'onHarvesterRemoved',
           service: Farmer,
           endpoint: 'getHarvesters',
         },

diff --git a/packages/gui/src/components/harvester/HarvesterDetail.tsx b/packages/gui/src/components/harvester/HarvesterDetail.tsx
@@ -28,8 +28,15 @@ function HarvesterLatencyGraph(props: HarvesterLatencyGraphProps) {
   const simpleNodeId = nodeId ? `${nodeId.substring(0, 6)}...${nodeId.substring(nodeId.length - 6)}` : undefined;
   const harvestingMode = harvester?.harvestingMode;
 
-  const cardTitle = React.useMemo(
-    () => (
+  const cardTitle = React.useMemo(() => {
+    let chip;
+    if (harvestingMode === 2) {
+      chip = <Chip label="GPU" color="primary" />;
+    } else if (typeof harvestingMode !== 'number') {
+      chip = <Chip label="Old" />;
+    }
+
+    return (
       <Box marginBottom={2}>
         <Flex flexDirection="column">
           <Flex alignItems="center" justifyContent="space-between" sx={{ width: '100%' }}>
@@ -44,7 +51,7 @@ function HarvesterLatencyGraph(props: HarvesterLatencyGraphProps) {
                 </Typography>
               </Tooltip>
             </Flex>
-            <Box>{harvestingMode === 2 && <Chip label="GPU" color="primary" />}</Box>
+            <Box>{chip}</Box>
           </Flex>
           <Flex alignItems="center" gap={2}>
             <Typography variant="body2" color="textSecondary">
@@ -53,9 +60,8 @@ function HarvesterLatencyGraph(props: HarvesterLatencyGraphProps) {
           </Flex>
         </Flex>
       </Box>
-    ),
-    [isLocal, nodeId, simpleNodeId, host, harvestingMode]
-  );
+    );
+  }, [isLocal, nodeId, simpleNodeId, host, harvestingMode]);
 
   const space = React.useMemo(() => {
     const effectiveSpace = harvester

diff --git a/packages/gui/src/components/harvester/HarvesterLatency.tsx b/packages/gui/src/components/harvester/HarvesterLatency.tsx
@@ -23,29 +23,33 @@ function HarvesterLatency(props: HarvesterLatencyProps) {
   }, [latencyInfo, period]);
 
   const stat = React.useMemo(() => {
-    if (!latencyInfo || latencyInfo.latency.length === 0) {
-      return { avg: 0, max: 0, min: 0 };
+    if (!latencyInfo || latencyInfo.latency.length === 0 || Number.isNaN(latencyInfo.max)) {
+      return { avg: 0, max: 0, avgEl: <Trans>N/A</Trans>, maxEl: <Trans>N/A</Trans> };
     }
     if (period === '24h') {
+      const avg = Math.round((latencyInfo.avg / 1000) * 100) / 100;
+      const max = Math.round((latencyInfo.max / 1000) * 100) / 100;
       return {
-        avg: Math.round((latencyInfo.avg / 1000) * 100) / 100,
-        max: Math.round((latencyInfo.max / 1000) * 100) / 100,
-        min: Math.round((latencyInfo.min / 1000) * 100) / 100,
+        avg,
+        max,
+        avgEl: formatTime(avg),
+        maxEl: formatTime(max),
       };
     }
     let sum = 0;
     let max = 0;
-    let min = 0;
     for (let i = 0; i < slice.length; i++) {
       const latency = slice[i][1];
       sum += latency;
       max = max < latency ? latency : max;
-      min = min > latency ? latency : min;
     }
+    const avg = Math.round((sum / 1000 / slice.length) * 100) / 100;
+    max = Math.round((max / 1000) * 100) / 100;
     return {
-      avg: Math.round((sum / 1000 / slice.length) * 100) / 100,
-      max: Math.round((max / 1000) * 100) / 100,
-      min: Math.round((min / 1000) * 100) / 100,
+      avg,
+      max,
+      avgEl: formatTime(avg),
+      maxEl: formatTime(max),
     };
   }, [slice, latencyInfo, period]);
 
@@ -101,10 +105,10 @@ function HarvesterLatency(props: HarvesterLatencyProps) {
               <tr>
                 <td>
                   <Typography color="primary" sx={{ display: 'inline-block' }}>
-                    <Trans>Ave</Trans> {formatTime(stat.avg)}
+                    <Trans>Ave</Trans> {stat.avgEl}
                   </Typography>
                   <Typography sx={{ display: 'inline-block', marginLeft: 2 }}>
-                    <Trans>Max</Trans> {formatTime(stat.max)}
+                    <Trans>Max</Trans> {stat.maxEl}
                   </Typography>
                 </td>
               </tr>