From fc134a5e2e63c9fab96023e31569e1afc5b45038 Mon Sep 17 00:00:00 2001
From: Star Richardson <67430892+alicenstar@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:50:01 -0600
Subject: [PATCH] remove test data, uncomment route protection, fix redirect
 after license upload

---
 web/src/Root.tsx                              |  63 ++--
 web/src/components/UploadLicenseFile.tsx      |   3 +-
 .../apps/HelmVMClusterManagement.tsx          | 170 +++--------
 web/src/components/apps/HelmVMViewNode.jsx    | 268 +-----------------
 4 files changed, 75 insertions(+), 429 deletions(-)

diff --git a/web/src/Root.tsx b/web/src/Root.tsx
index 866fb6fd44..86bef0aa94 100644
--- a/web/src/Root.tsx
+++ b/web/src/Root.tsx
@@ -101,8 +101,6 @@ type State = {
   selectedAppName: string | null;
   snapshotInProgressApps: string[];
   themeState: ThemeState;
-  isKurl: boolean | null;
-  isHelmVM: boolean | null;
 };
 
 let interval: ReturnType<typeof setInterval> | undefined;
@@ -134,8 +132,6 @@ const Root = () => {
         navbarLogo: null,
       },
       app: null,
-      isKurl: null,
-      isHelmVM: null,
     }
   );
 
@@ -307,8 +303,6 @@ const Root = () => {
           adminConsoleMetadata: data.adminConsoleMetadata,
           featureFlags: data.consoleFeatureFlags,
           fetchingMetadata: false,
-          isKurl: data.isKurl,
-          isHelmVM: data.isHelmVM,
         });
       })
       .catch((err) => {
@@ -538,8 +532,7 @@ const Root = () => {
                     appSlugFromMetadata={state.appSlugFromMetadata || ""}
                     fetchingMetadata={state.fetchingMetadata}
                     onUploadSuccess={getAppsList}
-                    isKurl={!!state.isKurl}
-                    isHelmVM={!!state.isHelmVM}
+                    isHelmVM={Boolean(state.adminConsoleMetadata?.isHelmVM)}
                   />
                 }
               />
@@ -582,33 +575,33 @@ const Root = () => {
                 }
               />
               <Route path="/unsupported" element={<UnsupportedBrowser />} />
-              {/* {state.adminConsoleMetadata?.isHelmVM && ( */}
-              <Route
-                path="/:slug/cluster/manage"
-                element={
-                  <HelmVMClusterManagement
-                    fromLicenseFlow={true}
-                    appName={state.selectedAppName || undefined}
-                  />
-                }
-              />
-              {/* )} */}
-              {/* {(state.adminConsoleMetadata?.isKurl ||
-                  state.adminConsoleMetadata?.isHelmVM) && ( */}
-              <Route
-                path="/cluster/manage"
-                element={
-                  state.adminConsoleMetadata?.isKurl ? (
-                    <KurlClusterManagement />
-                  ) : (
-                    <HelmVMClusterManagement />
-                  )
-                }
-              />
-              {/* )} */}
-              {/* {state.adminConsoleMetadata?.isHelmVM && ( */}
-              <Route path="/cluster/:nodeName" element={<HelmVMViewNode />} />
-              {/* )} */}
+              {state.adminConsoleMetadata?.isHelmVM && (
+                <Route
+                  path="/:slug/cluster/manage"
+                  element={
+                    <HelmVMClusterManagement
+                      fromLicenseFlow={true}
+                      appName={state.selectedAppName || undefined}
+                    />
+                  }
+                />
+              )}
+              {(state.adminConsoleMetadata?.isKurl ||
+                state.adminConsoleMetadata?.isHelmVM) && (
+                <Route
+                  path="/cluster/manage"
+                  element={
+                    state.adminConsoleMetadata?.isKurl ? (
+                      <KurlClusterManagement />
+                    ) : (
+                      <HelmVMClusterManagement />
+                    )
+                  }
+                />
+              )}
+              {state.adminConsoleMetadata?.isHelmVM && (
+                <Route path="/cluster/:nodeName" element={<HelmVMViewNode />} />
+              )}
               <Route
                 path="/gitops"
                 element={<GitOps appName={state.selectedAppName || ""} />}
diff --git a/web/src/components/UploadLicenseFile.tsx b/web/src/components/UploadLicenseFile.tsx
index 2fe1ed8a12..8992f063b2 100644
--- a/web/src/components/UploadLicenseFile.tsx
+++ b/web/src/components/UploadLicenseFile.tsx
@@ -68,7 +68,6 @@ type Props = {
   logo: string | null;
   snapshot?: { name: string };
   isHelmVM: boolean;
-  isKurl: boolean;
 };
 
 const UploadLicenseFile = (props: Props) => {
@@ -267,7 +266,7 @@ const UploadLicenseFile = (props: Props) => {
               return;
             }
 
-            if (props.isHelmVM && !props.isKurl) {
+            if (props.isHelmVM) {
               navigate(`/${data.slug}/cluster/manage`, { replace: true });
               return;
             }
diff --git a/web/src/components/apps/HelmVMClusterManagement.tsx b/web/src/components/apps/HelmVMClusterManagement.tsx
index 1101c11352..aa38833731 100644
--- a/web/src/components/apps/HelmVMClusterManagement.tsx
+++ b/web/src/components/apps/HelmVMClusterManagement.tsx
@@ -1,8 +1,8 @@
+import { useQuery } from "@tanstack/react-query";
 import classNames from "classnames";
 import MaterialReactTable from "material-react-table";
 import React, { ChangeEvent, useMemo, useReducer, useState } from "react";
 import Modal from "react-modal";
-import { useQuery } from "@tanstack/react-query";
 import { Link, useParams } from "react-router-dom";
 
 import { KotsPageTitle } from "@components/Head";
@@ -14,82 +14,6 @@ import CodeSnippet from "../shared/CodeSnippet";
 
 import "@src/scss/components/apps/HelmVMClusterManagement.scss";
 
-const testData = {
-  isHelmVMEnabled: true,
-  ha: false,
-  nodes: [
-    {
-      name: "test-helmvm-node",
-      isConnected: true,
-      isReady: true,
-      isPrimaryNode: true,
-      canDelete: false,
-      kubeletVersion: "v1.28.2",
-      cpu: {
-        capacity: 8,
-        available: 7.466876775,
-      },
-      memory: {
-        capacity: 31.33294677734375,
-        available: 24.23790740966797,
-      },
-      pods: {
-        capacity: 110,
-        available: 77,
-      },
-      labels: [
-        "beta.kubernetes.io/arch:amd64",
-        "beta.kubernetes.io/os:linux",
-        "node-role.kubernetes.io/master:",
-        "node.kubernetes.io/exclude-from-external-load-balancers:",
-        "kubernetes.io/arch:amd64",
-        "kubernetes.io/hostname:laverya-kurl",
-        "kubernetes.io/os:linux",
-        "node-role.kubernetes.io/control-plane:",
-      ],
-      conditions: {
-        memoryPressure: false,
-        diskPressure: false,
-        pidPressure: false,
-        ready: true,
-      },
-    },
-    {
-      name: "test-helmvm-worker",
-      isConnected: true,
-      isReady: true,
-      isPrimaryNode: false,
-      canDelete: false,
-      kubeletVersion: "v1.28.2",
-      cpu: {
-        capacity: 4,
-        available: 3.761070507,
-      },
-      memory: {
-        capacity: 15.50936508178711,
-        available: 11.742542266845703,
-      },
-      pods: {
-        capacity: 110,
-        available: 94,
-      },
-      labels: [
-        "beta.kubernetes.io/arch:amd64",
-        "beta.kubernetes.io/os:linux",
-        "kubernetes.io/arch:amd64",
-        "kubernetes.io/os:linux",
-        "kurl.sh/cluster:true",
-      ],
-      conditions: {
-        memoryPressure: false,
-        diskPressure: false,
-        pidPressure: false,
-        ready: true,
-      },
-    },
-  ],
-};
-
 type State = {
   displayAddNode: boolean;
   confirmDeleteNode: string;
@@ -260,15 +184,6 @@ const HelmVMClusterManagement = ({
   const NODE_TYPES = ["controller"];
 
   const determineDisabledState = () => {
-    // if (nodeType === "controller") {
-    //   const numControllers = testData.nodes.reduce((acc, node) => {
-    //     if (node.labels.includes("controller")) {
-    //       acc += 1;
-    //     }
-    //     return acc;
-    //   }, 0);
-    //   return numControllers === 3;
-    // }
     return false;
   };
 
@@ -338,44 +253,49 @@ const HelmVMClusterManagement = ({
   };
 
   const mappedNodes = useMemo(() => {
-    return (nodesData?.nodes || testData.nodes).map((n) => ({
-      name: slug ? (
-        n.name
-      ) : (
-        <Link
-          to={`/cluster/${n.name}`}
-          className="tw-font-semibold tw-text-blue-300 hover:tw-underline"
-        >
-          {n.name}
-        </Link>
-      ),
-      roles: (
-        <div className="tw-w-full tw-flex tw-flex-wrap tw-gap-1">
-          {n.labels.map((l) => (
-            <span
-              key={l}
-              className="tw-font-semibold tw-text-xs tw-px-1 tw-rounded-sm tw-border tw-border-solid tw-bg-white tw-border-gray-100"
-            >
-              {l}
-            </span>
-          ))}
-        </div>
-      ),
-      status: n.isReady ? "Ready" : "Not Ready",
-      cpu: `${calculateUtilization(n.cpu.capacity, n.cpu.available)}%`,
-      memory: `${calculateUtilization(n.memory.capacity, n.memory.available)}%`,
-      pods: `${n.pods.capacity - n.pods.available} / ${n.pods.capacity}`,
-      pause: (
-        <>
-          <button className="btn secondary">Pause</button>
-        </>
-      ),
-      delete: (
-        <>
-          <button className="btn red primary">Delete</button>
-        </>
-      ),
-    }));
+    return (
+      nodesData?.nodes?.map((n) => ({
+        name: slug ? (
+          n.name
+        ) : (
+          <Link
+            to={`/cluster/${n.name}`}
+            className="tw-font-semibold tw-text-blue-300 hover:tw-underline"
+          >
+            {n.name}
+          </Link>
+        ),
+        roles: (
+          <div className="tw-w-full tw-flex tw-flex-wrap tw-gap-1">
+            {n.labels.map((l) => (
+              <span
+                key={l}
+                className="tw-font-semibold tw-text-xs tw-px-1 tw-rounded-sm tw-border tw-border-solid tw-bg-white tw-border-gray-100"
+              >
+                {l}
+              </span>
+            ))}
+          </div>
+        ),
+        status: n.isReady ? "Ready" : "Not Ready",
+        cpu: `${calculateUtilization(n.cpu.capacity, n.cpu.available)}%`,
+        memory: `${calculateUtilization(
+          n.memory.capacity,
+          n.memory.available
+        )}%`,
+        pods: `${n.pods.capacity - n.pods.available} / ${n.pods.capacity}`,
+        pause: (
+          <>
+            <button className="btn secondary">Pause</button>
+          </>
+        ),
+        delete: (
+          <>
+            <button className="btn red primary">Delete</button>
+          </>
+        ),
+      })) || []
+    );
   }, [nodesData?.nodes?.toString()]);
   // #endregion
 
@@ -412,7 +332,7 @@ const HelmVMClusterManagement = ({
                 {nodesError?.message}
               </p>
             )}
-            {(nodesData?.nodes || testData?.nodes) && (
+            {nodesData?.nodes && (
               <MaterialReactTable
                 columns={columns}
                 data={mappedNodes}
diff --git a/web/src/components/apps/HelmVMViewNode.jsx b/web/src/components/apps/HelmVMViewNode.jsx
index e30b0a9148..2cf9d23359 100644
--- a/web/src/components/apps/HelmVMViewNode.jsx
+++ b/web/src/components/apps/HelmVMViewNode.jsx
@@ -3,272 +3,6 @@ import React, { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Link, useParams } from "react-router-dom";
 
-const testData = {
-  isHelmVMEnabled: true,
-  ha: false,
-  nodes: [
-    {
-      name: "test-helmvm-node",
-      isConnected: true,
-      isReady: true,
-      isPrimaryNode: true,
-      canDelete: false,
-      kubeletVersion: "v1.28.2",
-      cpu: {
-        capacity: 8,
-        available: 7.466876775,
-      },
-      memory: {
-        capacity: 31.33294677734375,
-        available: 24.23790740966797,
-      },
-      pods: {
-        capacity: 110,
-        available: 77,
-      },
-      labels: [
-        "beta.kubernetes.io/arch:amd64",
-        "beta.kubernetes.io/os:linux",
-        "node-role.kubernetes.io/master:",
-        "node.kubernetes.io/exclude-from-external-load-balancers:",
-        "kubernetes.io/arch:amd64",
-        "kubernetes.io/hostname:laverya-kurl",
-        "kubernetes.io/os:linux",
-        "node-role.kubernetes.io/control-plane:",
-      ],
-      conditions: {
-        memoryPressure: false,
-        diskPressure: false,
-        pidPressure: false,
-        ready: true,
-      },
-      podList: [
-        {
-          metadata: {
-            name: "example-es-85fc9df74-g9jbn",
-            generateName: "example-es-85fc9df74-",
-            namespace: "helmvm",
-            uid: "1caba3fb-bd52-430a-9cff-0eb0939317fa",
-            resourceVersion: "40284",
-            creationTimestamp: "2023-10-17T16:22:37Z",
-            labels: {
-              app: "example",
-              component: "es",
-              "kots.io/app-slug": "laverya-minimal-kots",
-              "kots.io/backup": "velero",
-              "pod-template-hash": "85fc9df74",
-            },
-            annotations: {
-              "cni.projectcalico.org/containerID":
-                "c3fa12aad2ed6f726ecda31f7f94d1224c9f50a805a9efc67aaf4959e464434c",
-              "cni.projectcalico.org/podIP": "10.244.45.141/32",
-              "cni.projectcalico.org/podIPs": "10.244.45.141/32",
-              "kots.io/app-slug": "laverya-minimal-kots",
-            },
-            ownerReferences: [
-              {
-                apiVersion: "apps/v1",
-                kind: "ReplicaSet",
-                name: "example-es-85fc9df74",
-                uid: "b5008bca-1ad0-4107-8603-397fc3be74f8",
-                controller: true,
-                blockOwnerDeletion: true,
-              },
-            ],
-          },
-          spec: {
-            volumes: [
-              {
-                name: "kube-api-access-fhfc4",
-                projected: {
-                  sources: [
-                    {
-                      serviceAccountToken: {
-                        expirationSeconds: 3607,
-                        path: "token",
-                      },
-                    },
-                    {
-                      configMap: {
-                        name: "kube-root-ca.crt",
-                        items: [{ key: "ca.crt", path: "ca.crt" }],
-                      },
-                    },
-                    {
-                      downwardAPI: {
-                        items: [
-                          {
-                            path: "namespace",
-                            fieldRef: {
-                              apiVersion: "v1",
-                              fieldPath: "metadata.namespace",
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  ],
-                  defaultMode: 420,
-                },
-              },
-            ],
-            containers: [
-              {
-                name: "es",
-                image:
-                  "docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.21",
-                envFrom: [{ configMapRef: { name: "example-config" } }],
-                resources: {
-                  limits: { cpu: "500m", memory: "256Mi" },
-                  requests: { cpu: "50m", memory: "16Mi" },
-                },
-                volumeMounts: [
-                  {
-                    name: "kube-api-access-fhfc4",
-                    readOnly: true,
-                    mountPath: "/var/run/secrets/kubernetes.io/serviceaccount",
-                  },
-                ],
-                terminationMessagePath: "/dev/termination-log",
-                terminationMessagePolicy: "File",
-                imagePullPolicy: "IfNotPresent",
-              },
-            ],
-            restartPolicy: "Always",
-            terminationGracePeriodSeconds: 30,
-            dnsPolicy: "ClusterFirst",
-            serviceAccountName: "default",
-            serviceAccount: "default",
-            nodeName: "laverya-helmvm",
-            securityContext: {},
-            imagePullSecrets: [{ name: "laverya-minimal-kots-registry" }],
-            schedulerName: "default-scheduler",
-            tolerations: [
-              {
-                key: "node.kubernetes.io/not-ready",
-                operator: "Exists",
-                effect: "NoExecute",
-                tolerationSeconds: 300,
-              },
-              {
-                key: "node.kubernetes.io/unreachable",
-                operator: "Exists",
-                effect: "NoExecute",
-                tolerationSeconds: 300,
-              },
-            ],
-            priority: 0,
-            enableServiceLinks: true,
-            preemptionPolicy: "PreemptLowerPriority",
-          },
-          status: {
-            phase: "Running",
-            conditions: [
-              {
-                type: "Initialized",
-                status: "True",
-                lastProbeTime: null,
-                lastTransitionTime: "2023-10-17T16:22:37Z",
-              },
-              {
-                type: "Ready",
-                status: "False",
-                lastProbeTime: null,
-                lastTransitionTime: "2023-10-17T19:55:16Z",
-                reason: "ContainersNotReady",
-                message: "containers with unready status: [es]",
-              },
-              {
-                type: "ContainersReady",
-                status: "False",
-                lastProbeTime: null,
-                lastTransitionTime: "2023-10-17T19:55:16Z",
-                reason: "ContainersNotReady",
-                message: "containers with unready status: [es]",
-              },
-              {
-                type: "PodScheduled",
-                status: "True",
-                lastProbeTime: null,
-                lastTransitionTime: "2023-10-17T16:22:37Z",
-              },
-            ],
-            hostIP: "10.128.0.44",
-            podIP: "10.244.45.141",
-            podIPs: [{ ip: "10.244.45.141" }],
-            startTime: "2023-10-17T16:22:37Z",
-            containerStatuses: [
-              {
-                name: "es",
-                state: {
-                  waiting: {
-                    reason: "CrashLoopBackOff",
-                    message:
-                      "back-off 5m0s restarting failed container=es pod=example-es-85fc9df74-g9jbn_helmvm(1caba3fb-bd52-430a-9cff-0eb0939317fa)",
-                  },
-                },
-                lastState: {
-                  terminated: {
-                    exitCode: 137,
-                    reason: "OOMKilled",
-                    startedAt: "2023-10-17T19:55:11Z",
-                    finishedAt: "2023-10-17T19:55:13Z",
-                    containerID:
-                      "containerd://9cce5c792b7ad61d040f7b8aca042d13a714100c75ebc40e71eb5444bbb65e83",
-                  },
-                },
-                ready: false,
-                restartCount: 46,
-                image:
-                  "docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.21",
-                imageID:
-                  "docker.elastic.co/elasticsearch/elasticsearch-oss@sha256:86e7750c4d896d41bd638b6e510e0610b98fd9fa48f8caeeed8ccd8424b1dc9f",
-                containerID:
-                  "containerd://9cce5c792b7ad61d040f7b8aca042d13a714100c75ebc40e71eb5444bbb65e83",
-                started: false,
-              },
-            ],
-            qosClass: "Burstable",
-          },
-        },
-      ],
-    },
-    {
-      name: "test-helmvm-worker",
-      isConnected: true,
-      isReady: true,
-      isPrimaryNode: false,
-      canDelete: false,
-      kubeletVersion: "v1.28.2",
-      cpu: {
-        capacity: 4,
-        available: 3.761070507,
-      },
-      memory: {
-        capacity: 15.50936508178711,
-        available: 11.742542266845703,
-      },
-      pods: {
-        capacity: 110,
-        available: 94,
-      },
-      labels: [
-        "beta.kubernetes.io/arch:amd64",
-        "beta.kubernetes.io/os:linux",
-        "kubernetes.io/arch:amd64",
-        "kubernetes.io/os:linux",
-        "kurl.sh/cluster:true",
-      ],
-      conditions: {
-        memoryPressure: false,
-        diskPressure: false,
-        pidPressure: false,
-        ready: true,
-      },
-    },
-  ],
-};
-
 const HelmVMViewNode = () => {
   const { nodeName } = useParams();
   const { data: nodeData } = useQuery({
@@ -306,7 +40,7 @@ const HelmVMViewNode = () => {
     },
   });
 
-  const node = nodeData || testData.nodes[0];
+  const node = nodeData;
 
   // #region table data
   const columns = useMemo(