Skip to content

Commit

Permalink
Merge pull request #866 from porink0424/fix/biome-config
Browse files Browse the repository at this point in the history
Make biome-linter ignore ts files in `optuna_dashboard`
  • Loading branch information
c-bata authored Apr 19, 2024
2 parents eb6c79e + 00856c7 commit f58f306
Show file tree
Hide file tree
Showing 51 changed files with 410 additions and 406 deletions.
1 change: 1 addition & 0 deletions .github/workflows/typescript-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
paths:
- '.github/workflows/typescript-tests.yml'
- '.eslintrc.js'
- 'biome.json'
- '**.ts'
- '**.tsx'
- 'optuna_dashboard/package.json'
Expand Down
3 changes: 3 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
"tslib/react/types/*"
]
},
"linter": {
"ignore": ["optuna_dashboard/ts/**/*.ts", "optuna_dashboard/ts/**/*.tsx"]
},
"javascript": {
"formatter": {
"trailingComma": "es5",
Expand Down
40 changes: 20 additions & 20 deletions optuna_dashboard/ts/action.ts
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
import * as Optuna from "@optuna/types"
import { useRecoilState, useSetRecoilState } from "recoil"
import { useSnackbar } from "notistack"
import { useRecoilState, useSetRecoilState } from "recoil"
import {
getStudyDetailAPI,
getStudySummariesAPI,
createNewStudyAPI,
deleteStudyAPI,
deleteStudyArtifactAPI,
deleteTrialArtifactAPI,
getMetaInfoAPI,
getStudyDetailAPI,
getStudySummariesAPI,
removePreferentialHistoryAPI,
renameStudyAPI,
reportFeedbackComponentAPI,
reportPreferenceAPI,
restorePreferentialHistoryAPI,
saveStudyNoteAPI,
saveTrialNoteAPI,
tellTrialAPI,
saveTrialUserAttrsAPI,
renameStudyAPI,
uploadTrialArtifactAPI,
uploadStudyArtifactAPI,
getMetaInfoAPI,
deleteTrialArtifactAPI,
deleteStudyArtifactAPI,
reportPreferenceAPI,
skipPreferentialTrialAPI,
removePreferentialHistoryAPI,
restorePreferentialHistoryAPI,
reportFeedbackComponentAPI,
tellTrialAPI,
uploadStudyArtifactAPI,
uploadTrialArtifactAPI,
} from "./apiClient"
import { getDominatedTrials } from "./dominatedTrials"
import {
studyDetailsState,
studySummariesState,
isFileUploading,
artifactIsAvailable,
isFileUploading,
plotlypyIsAvailableState,
studyDetailLoadingState,
reloadIntervalState,
trialsUpdatingState,
studyDetailLoadingState,
studyDetailsState,
studySummariesLoadingState,
studySummariesState,
trialsUpdatingState,
} from "./state"
import { getDominatedTrials } from "./dominatedTrials"
import {
Artifact,
FeedbackComponentType,
Expand Down
4 changes: 2 additions & 2 deletions optuna_dashboard/ts/apiClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as plotly from "plotly.js-dist-min"
import axios from "axios"
import * as Optuna from "@optuna/types"
import axios from "axios"
import * as plotly from "plotly.js-dist-min"
import {
Artifact,
FeedbackComponentType,
Expand Down
20 changes: 10 additions & 10 deletions optuna_dashboard/ts/components/App.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
import React, { FC, useMemo, useState, useEffect } from "react"
import { RecoilRoot } from "recoil"
import { BrowserRouter as Router, Routes, Route } from "react-router-dom"
import { SnackbarProvider } from "notistack"
import blue from "@mui/material/colors/blue"
import pink from "@mui/material/colors/pink"
import {
createTheme,
useMediaQuery,
ThemeProvider,
Box,
CssBaseline,
ThemeProvider,
createTheme,
useMediaQuery,
} from "@mui/material"
import blue from "@mui/material/colors/blue"
import pink from "@mui/material/colors/pink"
import { SnackbarProvider } from "notistack"
import React, { FC, useMemo, useState, useEffect } from "react"
import { BrowserRouter as Router, Route, Routes } from "react-router-dom"
import { RecoilRoot } from "recoil"

import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
import { CompareStudies } from "./CompareStudies"
import { StudyDetail } from "./StudyDetail"
import { StudyList } from "./StudyList"
import { QueryClient, QueryClientProvider } from "@tanstack/react-query"

const queryClient = new QueryClient({
defaultOptions: {
Expand Down
48 changes: 24 additions & 24 deletions optuna_dashboard/ts/components/AppDrawer.tsx
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
import React, { FC } from "react"
import { useRecoilState, useRecoilValue } from "recoil"
import { styled, useTheme, Theme, CSSObject } from "@mui/material/styles"
import Modal from "@mui/material/Modal"
import { Settings } from "./Settings"
import Box from "@mui/material/Box"
import MuiDrawer from "@mui/material/Drawer"
import AutoGraphIcon from "@mui/icons-material/AutoGraph"
import Brightness4Icon from "@mui/icons-material/Brightness4"
import Brightness7Icon from "@mui/icons-material/Brightness7"
import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"
import ChevronRightIcon from "@mui/icons-material/ChevronRight"
import RateReviewIcon from "@mui/icons-material/RateReview"
import SettingsIcon from "@mui/icons-material/Settings"
import SyncIcon from "@mui/icons-material/Sync"
import SyncDisabledIcon from "@mui/icons-material/SyncDisabled"
import TableViewIcon from "@mui/icons-material/TableView"
import ViewListIcon from "@mui/icons-material/ViewList"
import MuiAppBar, { AppBarProps as MuiAppBarProps } from "@mui/material/AppBar"
import Toolbar from "@mui/material/Toolbar"
import List from "@mui/material/List"
import Box from "@mui/material/Box"
import Divider from "@mui/material/Divider"
import MuiDrawer from "@mui/material/Drawer"
import IconButton from "@mui/material/IconButton"
import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"
import ChevronRightIcon from "@mui/icons-material/ChevronRight"
import List from "@mui/material/List"
import ListItem from "@mui/material/ListItem"
import ListItemButton from "@mui/material/ListItemButton"
import ListItemIcon from "@mui/material/ListItemIcon"
import ListItemText from "@mui/material/ListItemText"
import Modal from "@mui/material/Modal"
import Toolbar from "@mui/material/Toolbar"
import { CSSObject, Theme, styled, useTheme } from "@mui/material/styles"
import React, { FC } from "react"
import { Link } from "react-router-dom"
import { useRecoilState, useRecoilValue } from "recoil"
import {
drawerOpenState,
reloadIntervalState,
useStudyIsPreferential,
} from "../state"
import { Link } from "react-router-dom"
import AutoGraphIcon from "@mui/icons-material/AutoGraph"
import ViewListIcon from "@mui/icons-material/ViewList"
import SyncIcon from "@mui/icons-material/Sync"
import SyncDisabledIcon from "@mui/icons-material/SyncDisabled"
import Brightness4Icon from "@mui/icons-material/Brightness4"
import Brightness7Icon from "@mui/icons-material/Brightness7"
import TableViewIcon from "@mui/icons-material/TableView"
import RateReviewIcon from "@mui/icons-material/RateReview"
import SettingsIcon from "@mui/icons-material/Settings"
import { Settings } from "./Settings"

import MenuIcon from "@mui/icons-material/Menu"
import GitHubIcon from "@mui/icons-material/GitHub"
import HistoryIcon from "@mui/icons-material/History"
import LanIcon from "@mui/icons-material/Lan"
import MenuIcon from "@mui/icons-material/Menu"
import OpenInNewIcon from "@mui/icons-material/OpenInNew"
import QueryStatsIcon from "@mui/icons-material/QueryStats"
import ThumbUpAltIcon from "@mui/icons-material/ThumbUpAlt"
import HistoryIcon from "@mui/icons-material/History"
import LanIcon from "@mui/icons-material/Lan"
import { Switch } from "@mui/material"
import { actionCreator } from "../action"

Expand Down
6 changes: 3 additions & 3 deletions optuna_dashboard/ts/components/Artifact/ArtifactCardMedia.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import InsertDriveFileIcon from "@mui/icons-material/InsertDriveFile"
import { Box, CardMedia } from "@mui/material"
import React, { FC } from "react"
import { Artifact } from "ts/types/optuna"
import {
ThreejsArtifactViewer,
isThreejsArtifact,
} from "./ThreejsArtifactViewer"
import { WaveSurferArtifactViewer } from "./WaveSurferArtifactViewer"
import InsertDriveFileIcon from "@mui/icons-material/InsertDriveFile"
import { CardMedia, Box } from "@mui/material"
import { Artifact } from "ts/types/optuna"

export const ArtifactCardMedia: FC<{
artifact: Artifact
Expand Down
10 changes: 5 additions & 5 deletions optuna_dashboard/ts/components/Artifact/DeleteArtifactDialog.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { ReactNode, useState, FC } from "react"
import {
Button,
Dialog,
DialogTitle,
DialogActions,
DialogContent,
DialogContentText,
Button,
DialogActions,
DialogTitle,
} from "@mui/material"
import { actionCreator } from "../../action"
import React, { ReactNode, useState, FC } from "react"
import { Artifact } from "ts/types/optuna"
import { actionCreator } from "../../action"

export const useDeleteTrialArtifactDialog = (): [
(studyId: number, trialId: number, artifact: Artifact) => void,
Expand Down
32 changes: 16 additions & 16 deletions optuna_dashboard/ts/components/Artifact/StudyArtifactCards.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
import DeleteIcon from "@mui/icons-material/Delete"
import DownloadIcon from "@mui/icons-material/Download"
import FullscreenIcon from "@mui/icons-material/Fullscreen"
import UploadFileIcon from "@mui/icons-material/UploadFile"
import {
Box,
Card,
CardActionArea,
CardContent,
IconButton,
Typography,
useTheme,
} from "@mui/material"
import React, {
ChangeEventHandler,
DragEventHandler,
Expand All @@ -6,28 +19,15 @@ import React, {
useRef,
useState,
} from "react"
import {
Typography,
Box,
useTheme,
IconButton,
Card,
CardContent,
CardActionArea,
} from "@mui/material"
import UploadFileIcon from "@mui/icons-material/UploadFile"
import DownloadIcon from "@mui/icons-material/Download"
import DeleteIcon from "@mui/icons-material/Delete"
import FullscreenIcon from "@mui/icons-material/Fullscreen"

import { StudyDetail } from "ts/types/optuna"
import { actionCreator } from "../../action"
import { ArtifactCardMedia } from "./ArtifactCardMedia"
import { useDeleteStudyArtifactDialog } from "./DeleteArtifactDialog"
import {
useThreejsArtifactModal,
isThreejsArtifact,
useThreejsArtifactModal,
} from "./ThreejsArtifactViewer"
import { ArtifactCardMedia } from "./ArtifactCardMedia"
import { StudyDetail } from "ts/types/optuna"

export const StudyArtifactCards: FC<{ study: StudyDetail }> = ({ study }) => {
const theme = useTheme()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as THREE from "three"
import React, { useEffect, useState, ReactNode } from "react"
import { Canvas } from "@react-three/fiber"
import ClearIcon from "@mui/icons-material/Clear"
import { Box, Modal, useTheme } from "@mui/material"
import IconButton from "@mui/material/IconButton"
import { GizmoHelper, GizmoViewport, OrbitControls } from "@react-three/drei"
import { STLLoader } from "three/examples/jsm/loaders/STLLoader"
import { Canvas } from "@react-three/fiber"
import React, { useEffect, useState, ReactNode } from "react"
import * as THREE from "three"
import { PerspectiveCamera } from "three"
import { Rhino3dmLoader } from "three/examples/jsm/loaders/3DMLoader"
import { OBJLoader } from "three/examples/jsm/loaders/OBJLoader"
import { PerspectiveCamera } from "three"
import { Modal, Box, useTheme } from "@mui/material"
import ClearIcon from "@mui/icons-material/Clear"
import IconButton from "@mui/material/IconButton"
import { STLLoader } from "three/examples/jsm/loaders/STLLoader"
import { Artifact } from "ts/types/optuna"

export const isThreejsArtifact = (artifact: Artifact): boolean => {
Expand Down
32 changes: 16 additions & 16 deletions optuna_dashboard/ts/components/Artifact/TrialArtifactCards.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
import DeleteIcon from "@mui/icons-material/Delete"
import DownloadIcon from "@mui/icons-material/Download"
import FullscreenIcon from "@mui/icons-material/Fullscreen"
import UploadFileIcon from "@mui/icons-material/UploadFile"
import {
Box,
Card,
CardActionArea,
CardContent,
IconButton,
Typography,
useTheme,
} from "@mui/material"
import React, {
ChangeEventHandler,
DragEventHandler,
Expand All @@ -6,28 +19,15 @@ import React, {
useRef,
useState,
} from "react"
import {
Typography,
Box,
useTheme,
IconButton,
Card,
CardContent,
CardActionArea,
} from "@mui/material"
import UploadFileIcon from "@mui/icons-material/UploadFile"
import DownloadIcon from "@mui/icons-material/Download"
import DeleteIcon from "@mui/icons-material/Delete"
import FullscreenIcon from "@mui/icons-material/Fullscreen"

import { Trial } from "ts/types/optuna"
import { actionCreator } from "../../action"
import { ArtifactCardMedia } from "./ArtifactCardMedia"
import { useDeleteTrialArtifactDialog } from "./DeleteArtifactDialog"
import {
useThreejsArtifactModal,
isThreejsArtifact,
useThreejsArtifactModal,
} from "./ThreejsArtifactViewer"
import { ArtifactCardMedia } from "./ArtifactCardMedia"
import { Trial } from "ts/types/optuna"

export const TrialArtifactCards: FC<{ trial: Trial }> = ({ trial }) => {
const theme = useTheme()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Box } from "@mui/material"
import React, { useCallback, useEffect, useState, useRef } from "react"
import WaveSurfer from "wavesurfer.js"
import { Box } from "@mui/material"

interface WaveSurferArtifactViewerProps {
height: number
Expand Down
4 changes: 2 additions & 2 deletions optuna_dashboard/ts/components/BestTrialsCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { FC, ReactNode, useMemo } from "react"
import LinkIcon from "@mui/icons-material/Link"
import {
Box,
Button,
Expand All @@ -12,8 +12,8 @@ import {
Typography,
useTheme,
} from "@mui/material"
import React, { FC, ReactNode, useMemo } from "react"
import { Link } from "react-router-dom"
import LinkIcon from "@mui/icons-material/Link"
import { StudyDetail, Trial } from "ts/types/optuna"

const useBestTrials = (studyDetail: StudyDetail | null): Trial[] => {
Expand Down
Loading

0 comments on commit f58f306

Please sign in to comment.