Rebase against main

optuna · May 2, 2024 · 9070a8e · 9070a8e
1 parent 822c21c
commit 9070a8e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 43 deletions.
diff --git a/optuna_dashboard/ts/components/DataGrid.tsx b/optuna_dashboard/ts/components/DataGrid.tsx
@@ -1,11 +1,12 @@
 import CheckBoxIcon from "@mui/icons-material/CheckBox"
 import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank"
 import FilterListIcon from "@mui/icons-material/FilterList"
-import KeyboardArrowDownIcon from "@mui/icons-material/KeyboardArrowDown"
-import KeyboardArrowUpIcon from "@mui/icons-material/KeyboardArrowUp"
+import FirstPageIcon from "@mui/icons-material/FirstPage"
+import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft"
+import KeyboardArrowRight from "@mui/icons-material/KeyboardArrowRight"
+import LastPageIcon from "@mui/icons-material/LastPage"
 import {
   Box,
-  Collapse,
   IconButton,
   Menu,
   MenuItem,
@@ -18,39 +19,27 @@ import {
   TableRow,
   TableSortLabel,
   TextField,
-  IconButton,
-  Menu,
-  MenuItem,
-  Box,
   useTheme,
 } from "@mui/material"
-import { styled } from "@mui/system"
-import CheckBoxOutlineBlankIcon from "@mui/icons-material/CheckBoxOutlineBlank"
-import CheckBoxIcon from "@mui/icons-material/CheckBox"
-import FilterListIcon from "@mui/icons-material/FilterList"
 import ListItemIcon from "@mui/material/ListItemIcon"
-import { styled } from "@mui/system"
-import React from "react"
 import Paper from "@mui/material/Paper"
 import { TablePaginationActionsProps } from "@mui/material/TablePagination/TablePaginationActions"
-import FirstPageIcon from "@mui/icons-material/FirstPage"
-import KeyboardArrowLeft from "@mui/icons-material/KeyboardArrowLeft"
-import KeyboardArrowRight from "@mui/icons-material/KeyboardArrowRight"
-import LastPageIcon from "@mui/icons-material/LastPage"
+import { styled } from "@mui/system"
+import React from "react"
 
 import {
   ColumnDef,
+  ColumnFiltersState,
+  Header,
+  PaginationState,
+  SortingState,
   flexRender,
   getCoreRowModel,
-  getSortedRowModel,
-  getPaginationRowModel,
-  getFilteredRowModel,
-  getFacetedUniqueValues,
   getFacetedRowModel,
-  Header,
-  SortingState,
-  PaginationState,
-  ColumnFiltersState,
+  getFacetedUniqueValues,
+  getFilteredRowModel,
+  getPaginationRowModel,
+  getSortedRowModel,
   useReactTable,
 } from "@tanstack/react-table"
 

diff --git a/optuna_dashboard/ts/components/Preferential/PreferentialAnalytics.tsx b/optuna_dashboard/ts/components/Preferential/PreferentialAnalytics.tsx
@@ -7,15 +7,11 @@ import {
   useTheme,
 } from "@mui/material"
 import Grid2 from "@mui/material/Unstable_Grid2"
-import { DataGrid } from "../DataGrid"
-import { BestTrialsCard } from "../BestTrialsCard"
-import { useStudyDetailValue, useStudySummaryValue } from "../../state"
-import { Contour } from "../GraphContour"
 import * as Optuna from "@optuna/types"
 import React, { FC } from "react"
 import { useStudyDetailValue, useStudySummaryValue } from "../../state"
 import { BestTrialsCard } from "../BestTrialsCard"
-import { DataGrid, DataGridColumn } from "../DataGrid"
+import { DataGrid } from "../DataGrid"
 import { Contour } from "../GraphContour"
 
 import { ColumnDef, createColumnHelper } from "@tanstack/react-table"

diff --git a/optuna_dashboard/ts/components/StudyHistory.tsx b/optuna_dashboard/ts/components/StudyHistory.tsx
@@ -10,11 +10,7 @@ import {
 import FormControlLabel from "@mui/material/FormControlLabel"
 import Grid2 from "@mui/material/Unstable_Grid2"
 import * as Optuna from "@optuna/types"
-import { DataGrid } from "./DataGrid"
-import { GraphHyperparameterImportance } from "./GraphHyperparameterImportances"
-import { UserDefinedPlot } from "./UserDefinedPlot"
-import { BestTrialsCard } from "./BestTrialsCard"
-import { StudyArtifactCards } from "./Artifact/StudyArtifactCards"
+import { FC, useState } from "react"
 import { useRecoilValue } from "recoil"
 import { Trial } from "ts/types/optuna"
 import {
@@ -25,7 +21,7 @@ import {
 import { artifactIsAvailable } from "../state"
 import { StudyArtifactCards } from "./Artifact/StudyArtifactCards"
 import { BestTrialsCard } from "./BestTrialsCard"
-import { DataGrid, DataGridColumn } from "./DataGrid"
+import { DataGrid } from "./DataGrid"
 import { GraphHistory } from "./GraphHistory"
 import { GraphHyperparameterImportance } from "./GraphHyperparameterImportances"
 import { GraphIntermediateValues } from "./GraphIntermediateValues"

diff --git a/optuna_dashboard/ts/components/TrialTable.tsx b/optuna_dashboard/ts/components/TrialTable.tsx
@@ -1,21 +1,17 @@
-import React, { FC } from "react"
-import { IconButton, Button, useTheme } from "@mui/material"
-import LinkIcon from "@mui/icons-material/Link"
 import DownloadIcon from "@mui/icons-material/Download"
 import LinkIcon from "@mui/icons-material/Link"
 import { Button, IconButton, useTheme } from "@mui/material"
 import React, { FC } from "react"
 
-import { DataGrid } from "./DataGrid"
 import { Link } from "react-router-dom"
 import { StudyDetail, Trial } from "ts/types/optuna"
-import { DataGrid, DataGridColumn } from "./DataGrid"
+import { DataGrid } from "./DataGrid"
 
 import {
   ColumnDef,
-  createColumnHelper,
-  Row,
   FilterFn,
+  Row,
+  createColumnHelper,
 } from "@tanstack/react-table"
 
 const multiValueFilter: FilterFn<Trial> = <D extends object>(