Run prettier

This commit is contained in:
c-bata
2021-06-08 22:41:07 +09:00
parent c9cbcd7e4e
commit 57a6dc753c
6 changed files with 68 additions and 78 deletions
+4 -6
View File
@@ -10,12 +10,10 @@ import { studyDetailsState, studySummariesState } from "./state"
export const actionCreator = () => {
const { enqueueSnackbar } = useSnackbar()
const [studySummaries, setStudySummaries] = useRecoilState<StudySummary[]>(
studySummariesState
)
const [studyDetails, setStudyDetails] = useRecoilState<StudyDetails>(
studyDetailsState
)
const [studySummaries, setStudySummaries] =
useRecoilState<StudySummary[]>(studySummariesState)
const [studyDetails, setStudyDetails] =
useRecoilState<StudyDetails>(studyDetailsState)
const updateStudySummaries = (successMsg?: string) => {
getStudySummariesAPI()
+18 -22
View File
@@ -50,11 +50,9 @@ export const getStudyDetailAPI = (studyId: number): Promise<StudyDetail> => {
return axiosInstance
.get<StudyDetailResponse>(`/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<StudySummary[]> => {
return axiosInstance
.get<StudySummariesResponse>(`/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,
}
)
})
})
}
@@ -128,13 +128,12 @@ function DataGrid<T>(props: {
)
// Sorting
const createSortHandler = (columnId: number) => (
event: React.MouseEvent<unknown>
) => {
const isAsc = orderBy === columnId && order === "asc"
setOrder(isAsc ? "desc" : "asc")
setOrderBy(columnId)
}
const createSortHandler =
(columnId: number) => (event: React.MouseEvent<unknown>) => {
const isAsc = orderBy === columnId && order === "asc"
setOrder(isAsc ? "desc" : "asc")
setOrderBy(columnId)
}
const sortedRows = stableSort<T>(filteredRows, order, orderBy, columns)
const currentPageRows =
rowsPerPage > 0
@@ -101,9 +101,8 @@ export const StudyDetail: FC = () => {
const { studyId } = useParams<ParamTypes>()
const studyIdNumber = parseInt(studyId, 10)
const studyDetail = useStudyDetailValue(studyIdNumber)
const [openReloadIntervalSelect, setOpenReloadIntervalSelect] = useState<
boolean
>(false)
const [openReloadIntervalSelect, setOpenReloadIntervalSelect] =
useState<boolean>(false)
const [reloadInterval, setReloadInterval] = useState<number>(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<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]
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<TrialIntermediateValue>[] =
[
{ field: "step", label: "Step", sortable: true },
{ field: "value", label: "Value", sortable: true },
]
const collapseAttrColumns: DataGridColumn<Attribute>[] = [
{ field: "key", label: "Key", sortable: true },
{ field: "value", label: "Value", sortable: true },
@@ -49,10 +49,8 @@ const useStyles = makeStyles((theme: Theme) =>
export const StudyList: FC = () => {
const classes = useStyles()
const [
newStudySelectionAnchorEl,
setNewStudySelectionAnchorEl,
] = React.useState<null | HTMLElement>(null)
const [newStudySelectionAnchorEl, setNewStudySelectionAnchorEl] =
React.useState<null | HTMLElement>(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("")
+4 -1
View File
@@ -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"]
}
]
}