Skip to content

Commit

Permalink
Merge commit 'dfcce8bf883f0d7671c2137e3e1569003be8dbb8' into feature/…
Browse files Browse the repository at this point in the history
…add-trial-compare
  • Loading branch information
hrntsm committed Jan 12, 2025
2 parents 2f7d5ff + dfcce8b commit 4f5c5fe
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 16 deletions.
52 changes: 42 additions & 10 deletions jupyterlab/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -983,8 +983,41 @@
react-is "^18.3.1"

"@optuna/optuna-dashboard@link:../optuna_dashboard":
version "0.0.0"
uid ""
version "0.0.1"
dependencies:
"@emotion/react" "file:../tslib/react/node_modules/@emotion/react"
"@emotion/styled" "file:../tslib/react/node_modules/@emotion/styled"
"@mui/icons-material" "file:../tslib/react/node_modules/@mui/icons-material"
"@mui/lab" "file:../tslib/react/node_modules/@mui/lab"
"@mui/material" "file:../tslib/react/node_modules/@mui/material"
"@mui/system" "file:../tslib/react/node_modules/@mui/system"
"@optuna/react" "../tslib/react"
"@react-three/drei" "^9.96.4"
"@react-three/fiber" "^8.15.15"
"@tanstack/react-query" "^5.18.1"
"@tanstack/react-table" "file:../tslib/react/node_modules/@tanstack/react-table"
"@tanstack/react-virtual" "^3.1.2"
"@types/papaparse" "^5.3.14"
"@types/three" "^0.160.0"
axios "^1.7.4"
elkjs "^0.9.1"
notistack "^3.0.1"
papaparse "^5.4.1"
plotly.js-dist-min "^2.28.0"
react "file:../tslib/react/node_modules/react"
react-dom "^18.2.0"
react-markdown "^9.0.1"
react-router-dom "^6.21.3"
react-syntax-highlighter "^15.5.0"
reactflow "^11.10.3"
recoil "^0.7.7"
rehype-mathjax "^6.0.0"
rehype-raw "^7.0.0"
remark-gfm "^4.0.0"
remark-math "^6.0.0"
three "^0.160.1"
usehooks-ts "^3.0.2"
wavesurfer.js "^7.7.0"

"@optuna/react@../tslib/react":
version "0.0.1"
Expand All @@ -1001,8 +1034,7 @@
react-dom "^18.2.0"

"@optuna/types@link:../tslib/types":
version "0.0.0"
uid ""
version "0.0.1"

"@popperjs/core@^2.11.8":
version "2.11.8"
Expand Down Expand Up @@ -1744,7 +1776,6 @@

"@types/react@link:../tslib/react/node_modules/@types/react":
version "0.0.0"
uid ""

"@types/send@*":
version "0.17.4"
Expand Down Expand Up @@ -5401,9 +5432,9 @@ [email protected], ms@^2.1.3:
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

nanoid@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==

[email protected]:
version "0.6.3"
Expand Down Expand Up @@ -6012,8 +6043,9 @@ react-transition-group@^4.4.5:
loose-envify "^1.1.0"

"react@link:../tslib/react/node_modules/react":
version "0.0.0"
uid ""
version "18.3.1"
dependencies:
loose-envify "^1.1.0"

reactflow@^11.10.3, reactflow@^11.8.3:
version "11.11.4"
Expand Down
10 changes: 8 additions & 2 deletions tslib/react/src/components/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,19 @@ function DataGrid<T>({
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
[]
)
const rowsPerPageOptions = [10, 50, 100, { label: "All", value: data.length }]
const rowsPerPageOptions = [
5,
10,
50,
100,
{ label: "All", value: data.length },
]
const [pagination, setPagination] = React.useState<PaginationState>({
pageIndex: 0,
pageSize:
initialRowsPerPage && rowsPerPageOptions.includes(initialRowsPerPage)
? initialRowsPerPage
: 50,
: 5,
})

const table = useReactTable({
Expand Down
6 changes: 2 additions & 4 deletions tslib/react/src/components/PlotTimeline.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Card, CardContent, Grid, Typography, useTheme } from "@mui/material"
import { Card, CardContent, Typography, useTheme } from "@mui/material"
import * as Optuna from "@optuna/types"
import * as plotly from "plotly.js-dist-min"
import { FC, useEffect } from "react"
Expand Down Expand Up @@ -32,9 +32,7 @@ export const PlotTimeline: FC<{
>
Timeline
</Typography>
<Grid item xs={9}>
<div id={plotDomId} />
</Grid>
<div id={plotDomId} />
</CardContent>
</Card>
)
Expand Down

0 comments on commit 4f5c5fe

Please sign in to comment.