From 57a6dc753cf984f42dba532409e9e588d2b38050 Mon Sep 17 00:00:00 2001 From: c-bata Date: Tue, 8 Jun 2021 22:40:57 +0900 Subject: [PATCH] Run prettier --- optuna_dashboard/static/action.ts | 10 ++- optuna_dashboard/static/apiClient.ts | 40 +++++------ .../static/components/DataGrid.tsx | 13 ++-- .../static/components/StudyDetail.tsx | 67 +++++++++---------- .../static/components/StudyList.tsx | 11 ++- renovate.json | 5 +- 6 files changed, 68 insertions(+), 78 deletions(-) diff --git a/optuna_dashboard/static/action.ts b/optuna_dashboard/static/action.ts index b62e8b03..bcda9def 100644 --- a/optuna_dashboard/static/action.ts +++ b/optuna_dashboard/static/action.ts @@ -10,12 +10,10 @@ import { studyDetailsState, studySummariesState } from "./state" export const actionCreator = () => { const { enqueueSnackbar } = useSnackbar() - const [studySummaries, setStudySummaries] = useRecoilState( - studySummariesState - ) - const [studyDetails, setStudyDetails] = useRecoilState( - studyDetailsState - ) + const [studySummaries, setStudySummaries] = + useRecoilState(studySummariesState) + const [studyDetails, setStudyDetails] = + useRecoilState(studyDetailsState) const updateStudySummaries = (successMsg?: string) => { getStudySummariesAPI() diff --git a/optuna_dashboard/static/apiClient.ts b/optuna_dashboard/static/apiClient.ts index d6dafdb1..3077d14a 100644 --- a/optuna_dashboard/static/apiClient.ts +++ b/optuna_dashboard/static/apiClient.ts @@ -50,11 +50,9 @@ export const getStudyDetailAPI = (studyId: number): Promise => { return axiosInstance .get(`/api/studies/${studyId}`, {}) .then((res) => { - const trials = res.data.trials.map( - (trial): Trial => { - return convertTrialResponse(trial) - } - ) + const trials = res.data.trials.map((trial): Trial => { + return convertTrialResponse(trial) + }) return { name: res.data.name, datetime_start: new Date(res.data.datetime_start), @@ -97,24 +95,22 @@ export const getStudySummariesAPI = (): Promise => { return axiosInstance .get(`/api/studies`, {}) .then((res) => { - return res.data.study_summaries.map( - (study): StudySummary => { - const best_trial = study.best_trial - ? convertTrialResponse(study.best_trial) - : undefined - return { - study_id: study.study_id, - study_name: study.study_name, - directions: study.directions, - best_trial: best_trial, - user_attrs: study.user_attrs, - system_attrs: study.system_attrs, - datetime_start: study.datetime_start - ? new Date(study.datetime_start) - : undefined, - } + return res.data.study_summaries.map((study): StudySummary => { + const best_trial = study.best_trial + ? convertTrialResponse(study.best_trial) + : undefined + return { + study_id: study.study_id, + study_name: study.study_name, + directions: study.directions, + best_trial: best_trial, + user_attrs: study.user_attrs, + system_attrs: study.system_attrs, + datetime_start: study.datetime_start + ? new Date(study.datetime_start) + : undefined, } - ) + }) }) } diff --git a/optuna_dashboard/static/components/DataGrid.tsx b/optuna_dashboard/static/components/DataGrid.tsx index 61d0fa44..0a42a5b8 100644 --- a/optuna_dashboard/static/components/DataGrid.tsx +++ b/optuna_dashboard/static/components/DataGrid.tsx @@ -128,13 +128,12 @@ function DataGrid(props: { ) // Sorting - const createSortHandler = (columnId: number) => ( - event: React.MouseEvent - ) => { - const isAsc = orderBy === columnId && order === "asc" - setOrder(isAsc ? "desc" : "asc") - setOrderBy(columnId) - } + const createSortHandler = + (columnId: number) => (event: React.MouseEvent) => { + const isAsc = orderBy === columnId && order === "asc" + setOrder(isAsc ? "desc" : "asc") + setOrderBy(columnId) + } const sortedRows = stableSort(filteredRows, order, orderBy, columns) const currentPageRows = rowsPerPage > 0 diff --git a/optuna_dashboard/static/components/StudyDetail.tsx b/optuna_dashboard/static/components/StudyDetail.tsx index 7af107eb..2ce8e230 100644 --- a/optuna_dashboard/static/components/StudyDetail.tsx +++ b/optuna_dashboard/static/components/StudyDetail.tsx @@ -101,9 +101,8 @@ export const StudyDetail: FC = () => { const { studyId } = useParams() const studyIdNumber = parseInt(studyId, 10) const studyDetail = useStudyDetailValue(studyIdNumber) - const [openReloadIntervalSelect, setOpenReloadIntervalSelect] = useState< - boolean - >(false) + const [openReloadIntervalSelect, setOpenReloadIntervalSelect] = + useState(false) const [reloadInterval, setReloadInterval] = useState(10) useEffect(() => { @@ -287,33 +286,32 @@ const TrialTable: FC<{ studyDetail: StudyDetail | null }> = ({ }, }) } else { - const objectiveColumns: DataGridColumn< - Trial - >[] = studyDetail.directions.map((s, objectiveId) => ({ - field: "values", - label: `Objective ${objectiveId}`, - sortable: true, - less: (firstEl, secondEl): number => { - const firstVal = firstEl.values?.[objectiveId] - const secondVal = secondEl.values?.[objectiveId] + const objectiveColumns: DataGridColumn[] = + studyDetail.directions.map((s, objectiveId) => ({ + field: "values", + label: `Objective ${objectiveId}`, + sortable: true, + less: (firstEl, secondEl): number => { + const firstVal = firstEl.values?.[objectiveId] + const secondVal = secondEl.values?.[objectiveId] - if (firstVal === secondVal) { - return 0 - } else if (firstVal && secondVal) { - return firstVal < secondVal ? 1 : -1 - } else if (firstVal) { - return -1 - } else { - return 1 - } - }, - toCellValue: (i) => { - if (trials[i].values === undefined) { - return null - } - return trials[i].values?.[objectiveId] - }, - })) + if (firstVal === secondVal) { + return 0 + } else if (firstVal && secondVal) { + return firstVal < secondVal ? 1 : -1 + } else if (firstVal) { + return -1 + } else { + return 1 + } + }, + toCellValue: (i) => { + if (trials[i].values === undefined) { + return null + } + return trials[i].values?.[objectiveId] + }, + })) columns.push(...objectiveColumns) } columns.push({ @@ -367,12 +365,11 @@ const TrialTable: FC<{ studyDetail: StudyDetail | null }> = ({ { field: "name", label: "Name", sortable: true }, { field: "value", label: "Value", sortable: true }, ] - const collapseIntermediateValueColumns: DataGridColumn< - TrialIntermediateValue - >[] = [ - { field: "step", label: "Step", sortable: true }, - { field: "value", label: "Value", sortable: true }, - ] + const collapseIntermediateValueColumns: DataGridColumn[] = + [ + { field: "step", label: "Step", sortable: true }, + { field: "value", label: "Value", sortable: true }, + ] const collapseAttrColumns: DataGridColumn[] = [ { field: "key", label: "Key", sortable: true }, { field: "value", label: "Value", sortable: true }, diff --git a/optuna_dashboard/static/components/StudyList.tsx b/optuna_dashboard/static/components/StudyList.tsx index ba1cc029..ac8ad5e5 100644 --- a/optuna_dashboard/static/components/StudyList.tsx +++ b/optuna_dashboard/static/components/StudyList.tsx @@ -49,10 +49,8 @@ const useStyles = makeStyles((theme: Theme) => export const StudyList: FC = () => { const classes = useStyles() - const [ - newStudySelectionAnchorEl, - setNewStudySelectionAnchorEl, - ] = React.useState(null) + const [newStudySelectionAnchorEl, setNewStudySelectionAnchorEl] = + React.useState(null) const openNewStudySelection = Boolean(newStudySelectionAnchorEl) const [ openNewSingleObjectiveStudyDialog, @@ -62,9 +60,8 @@ export const StudyList: FC = () => { openNewMultiObjectiveStudyDialog, setOpenNewMultiObjectiveStudyDialog, ] = React.useState(false) - const [openDeleteStudyDialog, setOpenDeleteStudyDialog] = React.useState( - false - ) + const [openDeleteStudyDialog, setOpenDeleteStudyDialog] = + React.useState(false) const [deleteStudyID, setDeleteStudyID] = React.useState(-1) const [newStudyName, setNewStudyName] = React.useState("") diff --git a/renovate.json b/renovate.json index 2ea7a00a..6c0741cc 100644 --- a/renovate.json +++ b/renovate.json @@ -15,12 +15,15 @@ "groupName": "javascript", "separateMajorMinor": false, "schedule": ["before 3am on the first day of the month"], + "ignoreDeps": [ + "prettier" + ] }, { "matchPaths": [".github/**"], "separateMajorMinor": false, "groupName": "github-actions", - "schedule": ["before 3am on the first day of the month"], + "schedule": ["before 3am on the first day of the month"] } ] }