Hide new columns by default, default to - if no data, and remove .ide…

…a folder
paritytech · Aug 29, 2024 · 7805fe1 · 7805fe1
1 parent c69e044
commit 7805fe1
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 74 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/substrate-telemetry.iml b/.idea/substrate-telemetry.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -56,8 +56,6 @@ export default class App extends React.Component {
         networkId: false,
         peers: true,
         txs: true,
-        cpu: true,
-        mem: true,
         upload: false,
         download: false,
         stateCacheSize: false,
@@ -66,25 +64,27 @@ export default class App extends React.Component {
         diskWrite: false,
         blocknumber: true,
         blockhash: true,
-        blocktime: true,
         finalized: false,
         finalizedhash: false,
+        blocktime: true,
         blockpropagation: true,
         blocklasttime: false,
         uptime: false,
-        version: true,
-        target_os: true,
-        target_arch: true,
-        core_count: true,
-        memory: true,
-        is_virtual_machine: true,
-        linux_distro: true,
-        linux_kernel: true,
+        version: false,
+        target_os: false,
+        target_arch: false,
+        cpu: false,
         cpu_hashrate_score: true,
+        cpu_vendor: true,
+        core_count: false,
+        mem: true,
+        memory: false,
+        linux_distro: false,
+        linux_kernel: false,
         memory_memcpy_score: true,
         disk_sequential_write_score: true,
         disk_random_write_score: true,
-        cpu_vendor: true,
+        is_virtual_machine: false,
       },
       (settings) => {
         const selectedColumns = this.selectedColumns(settings);

diff --git a/frontend/src/common/types.ts b/frontend/src/common/types.ts
@@ -53,13 +53,13 @@ export type BytesPerSecond = Opaque<number, 'BytesPerSecond'>;
 export type NetworkId = Opaque<string, 'NetworkId'>;
 
 export type NodeSysInfo = {
-  cpu: string | null;
-  memory: number | null;
-  core_count: number | null;
-  linux_kernel: string | null;
-  linux_distro: string | null;
-  is_virtual_machine: boolean | null;
-} | null;
+  cpu: string;
+  memory: number;
+  core_count: number;
+  linux_kernel: string;
+  linux_distro: string;
+  is_virtual_machine: boolean;
+};
 
 export type BlockDetails = [
   BlockNumber,

diff --git a/frontend/src/components/List/Column/CpuArchitectureColumn.tsx b/frontend/src/components/List/Column/CpuArchitectureColumn.tsx
@@ -38,6 +38,6 @@ export class CpuArchitectureColumn extends React.Component<ColumnProps> {
 
     this.data = target_arch;
 
-    return <td className="Column">{target_arch}</td>;
+    return <td className="Column">{target_arch || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/CpuColumn.tsx b/frontend/src/components/List/Column/CpuColumn.tsx
@@ -39,6 +39,6 @@ export class CpuColumn extends React.Component<ColumnProps> {
 
     this.data = cpu;
 
-    return <td className="Column">{cpu}</td>;
+    return <td className="Column">{cpu || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/CpuCoresColumn.tsx b/frontend/src/components/List/Column/CpuCoresColumn.tsx
@@ -36,6 +36,6 @@ export class CpuCoresColumn extends React.Component<ColumnProps> {
 
     this.data = core_count;
 
-    return <td className="Column">{core_count}</td>;
+    return <td className="Column">{core_count || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/IsVirtualMachineColumn.tsx b/frontend/src/components/List/Column/IsVirtualMachineColumn.tsx
@@ -39,6 +39,6 @@ export class IsVirtualMachineColumn extends React.Component<ColumnProps> {
 
     this.data = is_virtual_machine;
 
-    return <td className="Column">{is_virtual_machine ? 'True' : 'False'}</td>;
+    return <td className="Column">{is_virtual_machine ? 'Yes' : 'No'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/LinuxDistroColumn.tsx b/frontend/src/components/List/Column/LinuxDistroColumn.tsx
@@ -40,6 +40,6 @@ export class LinuxDistroColumn extends React.Component<ColumnProps> {
 
     this.data = linux_distro;
 
-    return <td className="Column">{linux_distro}</td>;
+    return <td className="Column">{linux_distro || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/LinuxKernelColumn.tsx b/frontend/src/components/List/Column/LinuxKernelColumn.tsx
@@ -38,6 +38,6 @@ export class LinuxKernelColumn extends React.Component<ColumnProps> {
 
     this.data = linux_kernel;
 
-    return <td className="Column">{linux_kernel}</td>;
+    return <td className="Column">{linux_kernel || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/MemoryColumn.tsx b/frontend/src/components/List/Column/MemoryColumn.tsx
@@ -38,6 +38,6 @@ export class MemoryColumn extends React.Component<ColumnProps> {
 
     this.data = memory;
 
-    return <td className="Column">{memory}</td>;
+    return <td className="Column">{memory || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/OperatingSystemColumn.tsx b/frontend/src/components/List/Column/OperatingSystemColumn.tsx
@@ -39,6 +39,6 @@ export class OperatingSystemColumn extends React.Component<ColumnProps> {
 
     this.data = target_os;
 
-    return <td className="Column">{target_os}</td>;
+    return <td className="Column">{target_os || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Column/VersionColumn.tsx b/frontend/src/components/List/Column/VersionColumn.tsx
@@ -39,6 +39,6 @@ export class VersionColumn extends React.Component<ColumnProps> {
 
     this.data = version;
 
-    return <td className="Column">{version}</td>;
+    return <td className="Column">{version || '-'}</td>;
   }
 }
diff --git a/frontend/src/components/List/Row.tsx b/frontend/src/components/List/Row.tsx
@@ -82,14 +82,14 @@ export class Row extends React.Component<RowProps, RowState> {
     BlockPropagationColumn,
     LastBlockColumn,
     UptimeColumn,
+    VersionColumn,
+    OperatingSystemColumn,
     CpuArchitectureColumn,
     CpuColumn,
     CpuCoresColumn,
+    MemoryColumn,
     LinuxDistroColumn,
     LinuxKernelColumn,
-    MemoryColumn,
-    OperatingSystemColumn,
-    VersionColumn,
     IsVirtualMachineColumn,
   ];
   private renderedChangeRef = 0;

diff --git a/frontend/src/state.ts b/frontend/src/state.ts
@@ -26,8 +26,8 @@ export const PINNED_CHAINS = {
 };
 
 export function comparePinnedChains(a: string, b: string) {
-  const aWeight = PINNED_CHAINS[a] || 1024;
-  const bWeight = PINNED_CHAINS[b] || 1024;
+  const aWeight: number = (PINNED_CHAINS as any)[a] || 1024;
+  const bWeight: number = (PINNED_CHAINS as any)[b] || 1024;
 
   return aWeight - bWeight;
 }