Frontend - Polishing up before release (#364)

amosproj · Jul 7, 2024 · 0357b4b · 0357b4b
2 parents 4468160 + 38f6f55
commit 0357b4b
Show file tree

Hide file tree

Showing 26 changed files with 819 additions and 387 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,12 +20,14 @@
     "@phosphor-icons/react": "^2.1.5",
     "@types/autosuggest-highlight": "^3.2.3",
     "@types/geojson": "^7946.0.14",
+    "@types/leaflet-draw": "^1.0.11",
     "@types/leaflet.markercluster": "^1.5.4",
     "@types/proj4leaflet": "^1.0.10",
     "autosuggest-highlight": "^3.3.4",
     "axios": "^1.7.2",
     "geojson": "^0.5.0",
     "leaflet": "^1.9.4",
+    "leaflet-draw": "^1.0.4",
     "leaflet-geosearch": "^4.0.0",
     "leaflet.markercluster": "^1.5.3",
     "proj4leaflet": "^1.0.2",

diff --git a/frontend/src/components/DataView/DataPanel.tsx b/frontend/src/components/DataView/DataPanel.tsx
@@ -5,43 +5,15 @@ import { CaretDown, MapTrifold } from "@phosphor-icons/react";
 import "./DataPanel.css";
 import { Tooltip } from "@mui/material";
 import { GridToolbar, GridToolbarProps } from "@mui/x-data-grid";
-import { useState } from "react";
-
-// Returns a button if the "button" value is set to 1
-const renderDetailsButton = (params: GridRenderCellParams) => {
-  const value = params.value;
-  if (value === 1) {
-    return (
-      <strong>
-        <Tooltip arrow title="Open as a map">
-          <IconButton aria-label="open as map" size="small">
-            <MapTrifold />
-          </IconButton>
-        </Tooltip>
-      </strong>
-    );
-  } else {
-    return null;
-  }
-};
-
-// Defines the columns of the Datagrid
-const columns: GridColDef[] = [
-  {
-    field: "button",
-    headerName: "button",
-    width: 60,
-    renderCell: renderDetailsButton,
-  },
-  { field: "key", headerName: "key", width: 250 },
-  {
-    field: "value",
-    headerName: "value",
-    type: "number",
-    width: 250,
-    getApplyQuickFilterFn: undefined,
-  },
-];
+import { useContext, useState } from "react";
+import { DatasetItem } from "../../types/LocationDataTypes";
+import { TabsContext } from "../../contexts/TabsContext";
+import { fetchDatasets } from "../../services/datasetsService";
+import { AlertContext } from "../../contexts/AlertContext";
+import { Dataset } from "../../types/DatasetTypes";
+import L from "leaflet";
+import CustomSvgIcon from "../DatasetsList/CustomSvgIcon";
+import { svgIconDefault } from "../DatasetsList/DatasetsList";
 
 function MyCustomToolbar(props: GridToolbarProps) {
   return <GridToolbar {...props} />;
@@ -50,9 +22,9 @@ function MyCustomToolbar(props: GridToolbarProps) {
 interface DataPanelProps {
   listTitle: string;
   filterValue: string;
-  mapRows: object[];
-  genericRows: object[];
-  extraRows: object[];
+  mapRows: DatasetItem[];
+  genericRows: DatasetItem[];
+  extraRows: DatasetItem[];
 }
 
 /*
@@ -72,6 +44,88 @@ const DataPanel: React.FC<DataPanelProps> = ({
     useState<boolean>(false);
   const [ifExtraDataTabHidden, toggleExtraDataHidden] =
     useState<boolean>(false);
+  const { currentAlertCache, setCurrentAlertCache } = useContext(AlertContext);
+
+  const { openNewTab } = useContext(TabsContext);
+
+  const openDatasetFromMapIcon = async (mapId: string) => {
+    const datasetsData = await fetchDatasets();
+    if (datasetsData) {
+      const datasetToOpen = datasetsData.find(
+        (dataset) => dataset.datasetId === mapId
+      );
+      if (datasetToOpen) {
+        const datasetToOpenTransformed: Dataset = {
+          id: datasetToOpen.datasetId,
+          displayName: datasetToOpen.name,
+          shortDescription: datasetToOpen.shortDescription,
+          datasetIcon: datasetToOpen.icon ? (
+            <CustomSvgIcon svgString={datasetToOpen.icon} size={24} />
+          ) : (
+            <CustomSvgIcon svgString={svgIconDefault} size={24} />
+          ),
+          metaData: undefined,
+          data: {
+            type: "FeatureCollection",
+            features: [],
+          },
+          lastDataRequestBounds: L.latLngBounds(L.latLng(0, 0), L.latLng(0, 0)),
+        };
+
+        openNewTab(datasetToOpenTransformed);
+      } else {
+        // Display alert
+        setCurrentAlertCache({
+          ...currentAlertCache,
+          isAlertOpened: true,
+          text: "Dataset with provided ID does not exist.",
+        });
+        console.error("Dataset with provided ID does not exist.");
+      }
+    }
+  };
+
+  // Returns a button if the "button" value is set to 1
+  const renderDetailsButton = (params: GridRenderCellParams) => {
+    const dataObject = params.row as DatasetItem;
+    if (dataObject.mapId !== "") {
+      return (
+        <strong>
+          <Tooltip arrow title="Open a map ">
+            <IconButton
+              aria-label="open as map"
+              size="small"
+              onClick={() => {
+                openDatasetFromMapIcon(dataObject.mapId);
+              }}
+            >
+              <MapTrifold />
+            </IconButton>
+          </Tooltip>
+        </strong>
+      );
+    } else {
+      return null;
+    }
+  };
+
+  // Defines the columns of the Datagrid
+  const columns: GridColDef[] = [
+    {
+      field: "button",
+      headerName: "button",
+      width: 60,
+      renderCell: renderDetailsButton,
+    },
+    { field: "key", headerName: "key", width: 250 },
+    {
+      field: "value",
+      headerName: "value",
+      type: "number",
+      width: 250,
+      getApplyQuickFilterFn: undefined,
+    },
+  ];
 
   return (
     <div className="datapanels-container">
@@ -99,6 +153,9 @@ const DataPanel: React.FC<DataPanelProps> = ({
           }`}
         >
           <DataGrid
+            getRowId={(row: DatasetItem) => {
+              return row.key + row.value;
+            }}
             hideFooter={true}
             disableColumnMenu
             columnHeaderHeight={0}
@@ -161,6 +218,9 @@ const DataPanel: React.FC<DataPanelProps> = ({
           }`}
         >
           <DataGrid
+            getRowId={(row: DatasetItem) => {
+              return row.key + row.value;
+            }}
             hideFooter={true}
             disableColumnMenu
             columnHeaderHeight={0}
@@ -223,6 +283,9 @@ const DataPanel: React.FC<DataPanelProps> = ({
           }`}
         >
           <DataGrid
+            getRowId={(row: DatasetItem) => {
+              return row.key + row.value;
+            }}
             hideFooter={true}
             disableColumnMenu
             columnHeaderHeight={0}

diff --git a/frontend/src/components/DataView/DataView.css b/frontend/src/components/DataView/DataView.css
@@ -86,3 +86,8 @@
   width: 1rem;
   height: 1rem;
 }
+
+.sub-text {
+  color: gray;
+  font-size: 0.6rem;
+}