update variable names, fix redirect to cluster manage

replicatedhq · Oct 19, 2023 · 9fc6084 · 9fc6084
1 parent 2cfa91d
commit 9fc6084
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/web/src/components/UploadLicenseFile.tsx b/web/src/components/UploadLicenseFile.tsx
@@ -261,13 +261,13 @@ const UploadLicenseFile = (props: Props) => {
               return;
             }
 
-            if (data.isConfigurable) {
-              navigate(`/${data.slug}/config`, { replace: true });
+            if (props.isHelmVM) {
+              navigate(`/${data.slug}/cluster/manage`, { replace: true });
               return;
             }
 
-            if (props.isHelmVM) {
-              navigate(`/${data.slug}/cluster/manage`, { replace: true });
+            if (data.isConfigurable) {
+              navigate(`/${data.slug}/config`, { replace: true });
               return;
             }
 

diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx
@@ -65,15 +65,15 @@ const HelmVMClusterManagement = ({
       kubeletVersion: string;
       cpu: {
         capacity: number;
-        available: number;
+        used: number;
       };
       memory: {
         capacity: number;
-        available: number;
+        used: number;
       };
       pods: {
         capacity: number;
-        available: number;
+        used: number;
       };
       labels: string[];
       conditions: {
@@ -273,13 +273,11 @@ const HelmVMClusterManagement = ({
           </div>
         ),
         status: n.isReady ? "Ready" : "Not Ready",
-        cpu: `${(n.cpu.capacity - n.cpu.available).toFixed(
+        cpu: `${n.cpu.used.toFixed(2)} / ${n.cpu.capacity.toFixed(2)}`,
+        memory: `${n.memory.used.toFixed(2)}GB / ${n.memory.capacity.toFixed(
           2
-        )} / ${n.cpu.capacity.toFixed(2)}`,
-        memory: `${(n.memory.capacity - n.memory.available).toFixed(
-          2
-        )}GB / ${n.memory.capacity.toFixed(2)}GB`,
-        pods: `${n.pods.capacity - n.pods.available} / ${n.pods.capacity}`,
+        )}GB`,
+        pods: `${n.pods.used} / ${n.pods.capacity}`,
         pause: (
           <>
             <button className="btn secondary">Pause</button>

diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx
@@ -79,10 +79,10 @@ const HelmVMViewNode = () => {
 
   const mappedPods = useMemo(() => {
     return node?.podList?.map((p) => ({
-      name: p.metadata.name,
-      status: p.status.phase,
-      cpu: null,
-      memory: null,
+      name: p.name,
+      status: p.status,
+      cpu: p.cpu,
+      memory: `${p.memory}GB`,
       delete: (
         <>
           <button className="btn red primary">Delete</button>