Merge branch 'dev-c' of https://github.com/amosproj/amos2024ss04-buil…

…ding-information-enhancer into dev-c
amosproj · May 28, 2024 · 804af30 · 804af30
2 parents 50850a1 + 578e4e9
commit 804af30
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 152 deletions.
diff --git a/frontend/src/components/DataView/DataPanel.css b/frontend/src/components/DataView/DataPanel.css
@@ -20,3 +20,10 @@
 .MuiGrid-item {
   padding: 1rem !important;
 }
+
+.search-box-label {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.3rem;
+}
diff --git a/frontend/src/components/DataView/DataPanel.tsx b/frontend/src/components/DataView/DataPanel.tsx
@@ -5,15 +5,15 @@
   Quick filter outside of the grid https://mui.com/x/react-data-grid/filtering-recipes/#quick-filter-outside-of-the-grid
 
 */
-import * as React from 'react';
 import { DataGrid, GridColDef, GridRenderCellParams } from "@mui/x-data-grid";
 import Grid from "@mui/material/Grid";
 import Box from "@mui/material/Box";
 import IconButton from "@mui/material/IconButton";
-import { MapTrifold } from "@phosphor-icons/react";
+import { Funnel, MapTrifold } from "@phosphor-icons/react";
 import "./DataPanel.css";
 import { Tooltip, TextField } from "@mui/material";
 import { GridToolbar, GridToolbarProps } from "@mui/x-data-grid";
+import { useState, Fragment } from "react";
 
 // Returns a button if the "button" value is set to 1
 const renderDetailsButton = (params: GridRenderCellParams) => {
@@ -42,7 +42,13 @@ const columns: GridColDef[] = [
     renderCell: renderDetailsButton,
   },
   { field: "key", headerName: "key", width: 150 },
-  { field: "value", headerName: "value", type: "number", width: 150, getApplyQuickFilterFn: undefined },
+  {
+    field: "value",
+    headerName: "value",
+    type: "number",
+    width: 150,
+    getApplyQuickFilterFn: undefined,
+  },
 ];
 
 // Data
@@ -74,173 +80,176 @@ const rows = [
 ];
 
 function MyCustomToolbar(props: GridToolbarProps) {
-  return (
-    <GridToolbar {...props} />
-  );
+  return <GridToolbar {...props} />;
 }
 
 // All DataGrid options explained https://mui.com/x/api/data-grid/data-grid/
-export default function DataPanel({
-  listTitle,
-}: {
-  listTitle: string;
-}) {
-  const [filterValue, setFilterValue] = React.useState('');
+export default function DataPanel({ listTitle }: { listTitle: string }) {
+  const [filterValue, setFilterValue] = useState("");
 
   const handleFilterChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setFilterValue(event.target.value);
   };
 
   return (
-    <>
-    <div className="data-panel-container">
-      <div className="data-panel-title">{listTitle}</div>
+    <Fragment>
       <Grid item>
-          <Box id="filter-panel" >
+        <Box id="filter-panel">
           <TextField
-            label="Filter"
+            label={
+              <div className="search-box-label">
+                <Funnel size={20} /> Search
+              </div>
+            }
             variant="outlined"
             size="small"
             value={filterValue}
             onChange={handleFilterChange}
             fullWidth
           />
-          </Box>
-        </Grid>
-      <Grid container spacing={2} className="data-panel-grid">
-        <Grid item style={{ width: "100%" }}>
-          <DataGrid
-            disableColumnMenu
-            columnHeaderHeight={0}
-            rows={rows}
-            columns={columns}
-            slots={{
-              toolbar: MyCustomToolbar,
-            }}
-            slotProps={{
-              toolbar: {
-                printOptions: { disableToolbarButton: true },
-                csvOptions: { disableToolbarButton: true },
-              },
-            }}
-            disableDensitySelector
-            disableColumnFilter
-            disableColumnSelector
-            disableColumnSorting
-            initialState={{
-              pagination: {
-                paginationModel: { page: 0, pageSize: 5 },
-              },
-              filter: {
-                filterModel: {
-                  items: [],
-                  quickFilterValues: [filterValue],
-                  quickFilterExcludeHiddenColumns: true,
+        </Box>
+      </Grid>
+      <div className="data-panel-container">
+        <div className="data-panel-title">{listTitle}</div>
+        <Grid container spacing={2} className="data-panel-grid">
+          <Grid item style={{ width: "100%" }}>
+            <DataGrid
+              disableColumnMenu
+              columnHeaderHeight={0}
+              rows={rows}
+              columns={columns}
+              slots={{
+                toolbar: MyCustomToolbar,
+              }}
+              slotProps={{
+                toolbar: {
+                  printOptions: { disableToolbarButton: true },
+                  csvOptions: { disableToolbarButton: true },
                 },
-              },
-            }}
-            filterModel={{
-              items: [{ field: 'key', operator: 'contains', value: filterValue }],
-            }}
-            pageSizeOptions={[5, 10]}
-            density="compact"
-            disableRowSelectionOnClick
-            autoHeight
-          />
-          </Grid>
+              }}
+              disableDensitySelector
+              disableColumnFilter
+              disableColumnSelector
+              disableColumnSorting
+              initialState={{
+                pagination: {
+                  paginationModel: { page: 0, pageSize: 5 },
+                },
+                filter: {
+                  filterModel: {
+                    items: [],
+                    quickFilterValues: [filterValue],
+                    quickFilterExcludeHiddenColumns: true,
+                  },
+                },
+              }}
+              filterModel={{
+                items: [
+                  { field: "key", operator: "contains", value: filterValue },
+                ],
+              }}
+              pageSizeOptions={[5, 10]}
+              density="compact"
+              disableRowSelectionOnClick
+              autoHeight
+            />
           </Grid>
-          </div>
-          <div className="data-panel-container">
-      <div className="data-panel-title">General Data</div>
-          <Grid container spacing={2} className="data-panel-grid">
-           <Grid item style={{ width: "100%" }}>
-          <DataGrid
-            disableColumnMenu
-            columnHeaderHeight={0}
-            rows={rows}
-            columns={columns}
-            slots={{
-              toolbar: MyCustomToolbar,
-            }}
-            slotProps={{
-              toolbar: {
-                printOptions: { disableToolbarButton: true },
-                csvOptions: { disableToolbarButton: true },
-              },
-            }}
-            disableDensitySelector
-            disableColumnFilter
-            disableColumnSelector
-            disableColumnSorting
-            initialState={{
-              pagination: {
-                paginationModel: { page: 0, pageSize: 5 },
-              },
-              filter: {
-                filterModel: {
-                  items: [],
-                  quickFilterValues: [filterValue],
-                  quickFilterExcludeHiddenColumns: true,
+        </Grid>
+      </div>
+      <div className="data-panel-container">
+        <div className="data-panel-title">General Data</div>
+        <Grid container spacing={2} className="data-panel-grid">
+          <Grid item style={{ width: "100%" }}>
+            <DataGrid
+              disableColumnMenu
+              columnHeaderHeight={0}
+              rows={rows}
+              columns={columns}
+              slots={{
+                toolbar: MyCustomToolbar,
+              }}
+              slotProps={{
+                toolbar: {
+                  printOptions: { disableToolbarButton: true },
+                  csvOptions: { disableToolbarButton: true },
                 },
-              },
-            }}
-            filterModel={{
-              items: [{ field: 'key', operator: 'contains', value: filterValue }],
-            }}
-            pageSizeOptions={[5, 10]}
-            density="compact"
-            disableRowSelectionOnClick
-            autoHeight
-          />
+              }}
+              disableDensitySelector
+              disableColumnFilter
+              disableColumnSelector
+              disableColumnSorting
+              initialState={{
+                pagination: {
+                  paginationModel: { page: 0, pageSize: 5 },
+                },
+                filter: {
+                  filterModel: {
+                    items: [],
+                    quickFilterValues: [filterValue],
+                    quickFilterExcludeHiddenColumns: true,
+                  },
+                },
+              }}
+              filterModel={{
+                items: [
+                  { field: "key", operator: "contains", value: filterValue },
+                ],
+              }}
+              pageSizeOptions={[5, 10]}
+              density="compact"
+              disableRowSelectionOnClick
+              autoHeight
+            />
+          </Grid>
         </Grid>
-      </Grid>
-    </div>
-    <div className="data-panel-container">
-      <div className="data-panel-title">Extra Capabilities</div>
-          <Grid container spacing={2} className="data-panel-grid">
-           <Grid item style={{ width: "100%" }}>
-          <DataGrid
-            disableColumnMenu
-            columnHeaderHeight={0}
-            rows={rows}
-            columns={columns}
-            slots={{
-              toolbar: MyCustomToolbar,
-            }}
-            slotProps={{
-              toolbar: {
-                printOptions: { disableToolbarButton: true },
-                csvOptions: { disableToolbarButton: true },
-              },
-            }}
-            disableDensitySelector
-            disableColumnFilter
-            disableColumnSelector
-            disableColumnSorting
-            initialState={{
-              pagination: {
-                paginationModel: { page: 0, pageSize: 5 },
-              },
-              filter: {
-                filterModel: {
-                  items: [],
-                  quickFilterValues: [filterValue],
-                  quickFilterExcludeHiddenColumns: true,
+      </div>
+      <div className="data-panel-container">
+        <div className="data-panel-title">Extra Capabilities</div>
+        <Grid container spacing={2} className="data-panel-grid">
+          <Grid item style={{ width: "100%" }}>
+            <DataGrid
+              disableColumnMenu
+              columnHeaderHeight={0}
+              rows={rows}
+              columns={columns}
+              slots={{
+                toolbar: MyCustomToolbar,
+              }}
+              slotProps={{
+                toolbar: {
+                  printOptions: { disableToolbarButton: true },
+                  csvOptions: { disableToolbarButton: true },
                 },
-              },
-            }}
-            filterModel={{
-              items: [{ field: 'key', operator: 'contains', value: filterValue }],
-            }}
-            pageSizeOptions={[5, 10]}
-            density="compact"
-            disableRowSelectionOnClick
-            autoHeight
-          />
+              }}
+              disableDensitySelector
+              disableColumnFilter
+              disableColumnSelector
+              disableColumnSorting
+              initialState={{
+                pagination: {
+                  paginationModel: { page: 0, pageSize: 5 },
+                },
+                filter: {
+                  filterModel: {
+                    items: [],
+                    quickFilterValues: [filterValue],
+                    quickFilterExcludeHiddenColumns: true,
+                  },
+                },
+              }}
+              filterModel={{
+                items: [
+                  { field: "key", operator: "contains", value: filterValue },
+                ],
+              }}
+              pageSizeOptions={[5, 10]}
+              density="compact"
+              disableRowSelectionOnClick
+              autoHeight
+            />
+          </Grid>
         </Grid>
-      </Grid>
-    </div>
-    </>
+      </div>
+    </Fragment>
   );
 }
-
diff --git a/frontend/src/components/DataView/DataView.tsx b/frontend/src/components/DataView/DataView.tsx
@@ -30,7 +30,6 @@ function DataView() {
     setIfOpenedDialog(!ifOpenedDialog);
   };
 
-
   return (
     <div className="dataview-container">
       <TabContext value="1">
@@ -63,13 +62,10 @@ function DataView() {
             ></Tab>
           </TabList>
         </div>
-
         <TabPanel value="1" className="tab dataview-tab">
           <div className="datapanels-container">
             <div className="data-panels-container">
-
               <DataPanel listTitle={getCurrentTabTitle()} />
-
             </div>
             <Button variant="outlined">Load data</Button>
           </div>