feat: add namespace field to form and table column

fix: fix failing tests fix: fix default namespace issues
flanksource · Nov 16, 2023 · 53b1d1a · 53b1d1a
1 parent 178444f
commit 53b1d1a
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 247 deletions.
diff --git a/src/components/Connections/ConnectionForm.tsx b/src/components/Connections/ConnectionForm.tsx
@@ -38,9 +38,13 @@ export function ConnectionForm({
       (item) => item.value === connectionType.value
     );
     if (connection) {
-      return connection.convertToFormSpecificValue
+      const res = connection.convertToFormSpecificValue
         ? connection.convertToFormSpecificValue(formValue as any)
         : formValue;
+      return {
+        ...res,
+        namespace: res?.namespace ?? "default"
+      };
     }
   }, [connectionType.value, formValue]);
 
@@ -70,20 +74,20 @@ export function ConnectionForm({
 
   return (
     <Formik
-      initialValues={
-        formInitialValue || {
-          name: "",
-          type: undefined,
-          url: "",
-          username: "",
-          password: "",
-          certificate: "",
-          domain: "",
-          region: "",
-          profile: "",
-          insecure_tls: false
-        }
-      }
+      initialValues={{
+        name: "",
+        type: undefined,
+        url: "",
+        username: "",
+        password: "",
+        certificate: "",
+        domain: "",
+        region: "",
+        profile: "",
+        insecure_tls: false,
+        namespace: "default",
+        ...formInitialValue
+      }}
       onSubmit={handleSubmit}
     >
       <Form className="flex flex-col flex-1 overflow-y-auto">

diff --git a/src/components/Connections/ConnectionFormModal.tsx b/src/components/Connections/ConnectionFormModal.tsx
@@ -51,6 +51,7 @@ export type Connection = {
   workstation?: string;
   properties?: Record<string, any>;
   ref?: string;
+  namespace?: string;
 };
 
 type ConnectionFormProps = React.HTMLProps<HTMLDivElement> & {

diff --git a/src/components/Connections/ConnectionsList.tsx b/src/components/Connections/ConnectionsList.tsx
@@ -31,6 +31,10 @@ const columns: ColumnDef<Connection>[] = [
     accessorKey: "name",
     cell: NameCell
   },
+  {
+    header: "Namespace",
+    accessorKey: "namespace"
+  },
   {
     header: "Type",
     accessorKey: "type"

diff --git a/src/components/Connections/__tests__/ConnectionForm.unit.test.tsx b/src/components/Connections/__tests__/ConnectionForm.unit.test.tsx
@@ -53,13 +53,14 @@ describe("ConnectionForm", () => {
       expect(onConnectionSubmit).toHaveBeenCalledWith({
         certificate: "test",
         name: "Test Connection",
-        password: undefined,
+        password: "",
         properties: {
           ref: "ref"
         },
         type: "git",
         url: "https://test.com",
-        username: undefined
+        username: "",
+        namespace: "default"
       });
     });
   });

diff --git a/src/components/Connections/__tests__/ConnectionFormModal.unit.test.tsx b/src/components/Connections/__tests__/ConnectionFormModal.unit.test.tsx
@@ -49,13 +49,14 @@ describe("ConnectionForm", () => {
       expect(onConnectionSubmit).toHaveBeenCalledWith({
         certificate: "test",
         name: "Test Connection",
-        password: undefined,
+        password: "",
         properties: {
           ref: "ref"
         },
         type: "git",
         url: "https://test.com",
-        username: undefined
+        username: "",
+        namespace: "default"
       });
     });
   });