From 9172dbc8958cef8fcf572e3f7583859d40150efc Mon Sep 17 00:00:00 2001
From: Lucas Oliveira <lucas.edu.oli@hotmail.com>
Date: Mon, 6 May 2024 18:45:13 +0100
Subject: [PATCH] Fixed size and pagination of globalVariables table

---
 .../src/components/tableComponent/index.tsx     |  4 ++--
 .../pages/GlobalVariablesPage/index.tsx         |  1 -
 .../SettingsPage/pages/ShortcutsPage/index.tsx  | 17 +++++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/frontend/src/components/tableComponent/index.tsx b/src/frontend/src/components/tableComponent/index.tsx
index 7e2cd4b99..236f98067 100644
--- a/src/frontend/src/components/tableComponent/index.tsx
+++ b/src/frontend/src/components/tableComponent/index.tsx
@@ -9,14 +9,14 @@ import { cn } from "../../utils/utils";
 const TableComponent = forwardRef<
   ElementRef<typeof AgGridReact>,
   ComponentPropsWithoutRef<typeof AgGridReact>
->(({ pagination = true, ...props }, ref) => {
+>(({ ...props }, ref) => {
   const dark = useDarkStore((state) => state.dark);
 
   return (
     <div
       className={cn(
         dark ? "ag-theme-quartz-dark" : "ag-theme-quartz",
-        "ag-theme-shadcn flex h-full min-h-2 flex-col",
+        "ag-theme-shadcn flex h-full flex-col",
       )} // applying the grid theme
     >
       <AgGridReact ref={ref} {...props} />
diff --git a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx
index 45fe21452..0ecdd588b 100644
--- a/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/GlobalVariablesPage/index.tsx
@@ -181,7 +181,6 @@ export default function GlobalVariablesPage() {
               }}
               rowSelection="multiple"
               suppressRowClickSelection={true}
-              domLayout="autoHeight"
               pagination={true}
               columnDefs={colDefs}
               rowData={rowData}
diff --git a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
index 65bb3387f..158bf2394 100644
--- a/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
+++ b/src/frontend/src/pages/SettingsPage/pages/ShortcutsPage/index.tsx
@@ -2,6 +2,7 @@ import { ColDef, ColGroupDef } from "ag-grid-community";
 import { useState } from "react";
 import ForwardedIconComponent from "../../../../components/genericIconComponent";
 import TableComponent from "../../../../components/tableComponent";
+import { Card, CardContent } from "../../../../components/ui/card";
 
 export default function ShortcutsPage() {
   const advancedShortcut = "Ctrl + Shift + A";
@@ -95,12 +96,16 @@ export default function ShortcutsPage() {
         </div>
       </div>
       <div className="grid gap-6 pb-8">
-        <TableComponent
-          domLayout="autoHeight"
-          pagination={false}
-          columnDefs={colDefs}
-          rowData={nodesRowData}
-        />
+        <Card x-chunk="dashboard-04-chunk-2" className="h-full pt-4">
+          <CardContent className="h-full">
+            <TableComponent
+              domLayout="autoHeight"
+              pagination={false}
+              columnDefs={colDefs}
+              rowData={nodesRowData}
+            />
+          </CardContent>
+        </Card>
       </div>
     </div>
   );