diff --git a/web/src/components/apps/AppDetailPage.tsx b/web/src/components/apps/AppDetailPage.tsx index e969b8535d..dbe0d00df5 100644 --- a/web/src/components/apps/AppDetailPage.tsx +++ b/web/src/components/apps/AppDetailPage.tsx @@ -98,8 +98,6 @@ function AppDetailPage(props: Props) { navigate(`/app/${appsList[0].slug}`, { replace: true }); } else if (props.isHelmManaged) { navigate("/install-with-helm", { replace: true }); - } else if (props.isHelmVM) { - navigate(`/${selectedApp?.slug}/cluster/manage`, { replace: true }); } else { navigate("/upload-license", { replace: true }); } @@ -324,6 +322,10 @@ function AppDetailPage(props: Props) { const firstVersion = downstream.pendingVersions.find( (version: Version) => version?.sequence === 0 ); + if (props.isHelmVM) { + navigate(`/${appNeedsConfiguration.slug}/cluster/manage`); + return; + } if (firstVersion?.status === "pending_config") { navigate(`/${appNeedsConfiguration.slug}/config`); return; diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx index 5825a893b2..1ab0615805 100644 --- a/web/src/components/apps/HelmVMClusterManagement.tsx +++ b/web/src/components/apps/HelmVMClusterManagement.tsx @@ -1,6 +1,6 @@ import { useQuery } from "@tanstack/react-query"; import classNames from "classnames"; -import MaterialReactTable from "material-react-table"; +import MaterialReactTable, { MRT_ColumnDef } from "material-react-table"; import React, { ChangeEvent, useMemo, useReducer, useState } from "react"; import Modal from "react-modal"; import { Link, useParams } from "react-router-dom"; @@ -199,7 +199,17 @@ const HelmVMClusterManagement = ({ }; // #endregion - const columns = useMemo( + type NodeColumns = { + name: string | JSX.Element; + roles: JSX.Element; + status: string; + cpu: string; + memory: string; + pause: JSX.Element; + delete: JSX.Element; + }; + + const columns = useMemo[]>( () => [ { accessorKey: "name", @@ -211,7 +221,7 @@ const HelmVMClusterManagement = ({ { accessorKey: "roles", header: "Role(s)", - size: 404, + size: 150, }, { accessorKey: "status", @@ -234,11 +244,6 @@ const HelmVMClusterManagement = ({ align: "right", }, }, - { - accessorKey: "pods", - header: "Pods", - size: 150, - }, // { // accessorKey: "pause", // header: "Pause", @@ -280,10 +285,9 @@ const HelmVMClusterManagement = ({ ), status: n.isReady ? "Ready" : "Not Ready", cpu: `${n.cpu.used.toFixed(2)} / ${n.cpu.capacity.toFixed(2)}`, - memory: `${n.memory.used.toFixed(2)}GB / ${n.memory.capacity.toFixed( + memory: `${n.memory.used.toFixed(2)} / ${n.memory.capacity.toFixed( 2 - )}GB`, - pods: `${n.pods.used} / ${n.pods.capacity}`, + )} GB`, pause: ( <> diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx index 2efef120ce..8cf533312b 100644 --- a/web/src/components/apps/HelmVMViewNode.jsx +++ b/web/src/components/apps/HelmVMViewNode.jsx @@ -143,8 +143,10 @@ const HelmVMViewNode = () => {

{node?.kubeProxyVersion}

-

OS

-

{node?.operatingSystem}

+

+ kernel version +

+

{node?.kernelVersion}