Merge pull request #225 from c-bata/datagrid-less-comparator

Porting optuna-dashboard patches to Goptuna.

dashboard/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:14.15.4 AS front-builder
 
-RUN mkdir -p /usr/src/
+RUN mkdir -p /usr/src/public/
 WORKDIR /usr/src
 
 ADD ./package.json /usr/src/package.json

dashboard/src/components/DataGrid.tsx

@@ -51,7 +51,7 @@ interface DataGridColumn<T> {
   field: keyof T
   label: string
   sortable?: boolean
-  less?: (i: number, j: number) => number
+  less?: (a: T, b: T) => number
   filterable?: boolean
   toCellValue?: (rowIndex: number) => string | React.ReactNode
   padding?: "default" | "checkbox" | "none"
@@ -342,7 +342,7 @@ function stableSort<T>(
   const stabilizedThis = array.map((el, index) => [el, index] as [T, number])
   stabilizedThis.sort((a, b) => {
     if (less) {
-      const result = order == "asc" ? -less(a[1], b[1]) : less(a[1], b[1])
+      const result = order == "asc" ? -less(a[0], b[0]) : less(a[0], b[0])
       if (result !== 0) return result
     } else {
       const result = comparator(a[0], b[0])

dashboard/src/components/StudyDetail.tsx

@@ -228,15 +228,15 @@ const TrialTable: FC<{ trials: Trial[] }> = ({ trials = [] }) => {
         return null
       },
       sortable: true,
-      less: (i, j): number => {
-        const firstStartMs = trials[i].datetime_start?.getTime()
-        const firstCompleteMs = trials[i].datetime_complete?.getTime()
+      less: (firstEl, secondEl): number => {
+        const firstStartMs = firstEl.datetime_start?.getTime()
+        const firstCompleteMs = firstEl.datetime_complete?.getTime()
         const firstDurationMs =
           firstStartMs !== undefined && firstCompleteMs !== undefined
             ? firstCompleteMs - firstStartMs
             : undefined
-        const secondStartMs = trials[j].datetime_start?.getTime()
-        const secondCompleteMs = trials[j].datetime_complete?.getTime()
+        const secondStartMs = secondEl.datetime_start?.getTime()
+        const secondCompleteMs = secondEl.datetime_complete?.getTime()
         const secondDurationMs =
           secondStartMs !== undefined && secondCompleteMs !== undefined
             ? secondCompleteMs - secondStartMs