fix: rebasing

inspectIT · Nov 27, 2024 · 60fa0c4 · 60fa0c4
1 parent af793a9
commit 60fa0c4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 28 deletions.
diff --git a/frontend/src/components/features/connections/ConnectionsView.tsx b/frontend/src/components/features/connections/ConnectionsView.tsx
@@ -1,12 +1,6 @@
 import { Connection } from "@/types/Connection";
 import ConnectionTable from "./table/ConnectionTable";
-import {
-  Page,
-  PageContent,
-  PageDescription,
-  PageHeader,
-  PageTitle,
-} from "@/components/ui/page";
+import { Page, PageContent, PageHeader, PageTitle } from "@/components/ui/page";
 import useConnectionTable from "@/hooks/features/connections/useConnectionTable";
 import ConnectionFilters from "./filter/ConnectionFilters";
 import TablePagination from "@/components/ui/table-pagination";
@@ -23,9 +17,7 @@ export default function ConnectionsView({
     <Page>
       <PageHeader>
         <PageTitle>Connections</PageTitle>
-        <PageDescription>
-          <ConnectionFilters table={table} />
-        </PageDescription>
+        <ConnectionFilters table={table} />
       </PageHeader>
       <PageContent>
         <ConnectionTable table={table} />

diff --git a/frontend/src/components/features/connections/table/ConnectionsTableColumns.tsx b/frontend/src/components/features/connections/table/ConnectionsTableColumns.tsx
@@ -44,21 +44,6 @@ export const ConnectionsTableColumns: ColumnDef<Connection>[] = [
       title: "Connection Status",
     },
   },
-  // {
-  //   accessorKey: "vmId",
-  //   header: ({ column }) => {
-  //     return <SortableTableColumn column={column} title="VM ID" />;
-  //   },
-  //   cell: ({ row }) => {
-  //     return (
-  //       <div className="px-4 align-middle font-medium">
-  //         {row.getValue("vmId")}
-  //       </div>
-  //     );
-  //   },
-  //   enableGlobalFilter: true,
-
-  // },
   {
     accessorKey: "javaVersion",
     header: ({ column }) => {
@@ -130,6 +115,15 @@ export const ConnectionsTableColumns: ColumnDef<Connection>[] = [
       );
     },
   },
+  {
+    accessorKey: "attributes",
+    //@ts-expect-error Seems like a library bug, that filterFn is not found by typescript.
+    filterFn: "attributeEquals",
+    meta: {
+      filterVariant: "attributes",
+      title: "Java Version",
+    },
+  },
   {
     accessorKey: "details",
     header: () => {

diff --git a/frontend/tests/components/features/connections/ConnectionsView.test.tsx b/frontend/tests/components/features/connections/ConnectionsView.test.tsx
@@ -17,9 +17,6 @@ describe("ConnectionsView", () => {
   it("renders ConnectionsView component", () => {
     render(<ConnectionsView connections={mockConnections} />);
     expect(screen.getByText("Connections")).toBeInTheDocument();
-    expect(
-      screen.getByText("All currently connected agents.")
-    ).toBeInTheDocument();
   });
 
   it("renders the correct number of connections", () => {