From dd0faab7c3ade3a6a17d36de70abb990158ea1e0 Mon Sep 17 00:00:00 2001
From: c-bata <contact@c-bata.link>
Date: Thu, 12 Jan 2023 18:13:47 +0900
Subject: [PATCH] Update spaces

---
 optuna_dashboard/ts/components/Note.tsx       |   2 +-
 .../ts/components/StudyDetail.tsx             |   6 +-
 optuna_dashboard/ts/components/TrialList.tsx  | 104 +++++++++---------
 3 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/optuna_dashboard/ts/components/Note.tsx b/optuna_dashboard/ts/components/Note.tsx
index 24bd61c9..e482aa47 100644
--- a/optuna_dashboard/ts/components/Note.tsx
+++ b/optuna_dashboard/ts/components/Note.tsx
@@ -364,7 +364,7 @@ const NoteBase: FC<{
 
   const defaultBody = ""
   return (
-    <Card sx={{ margin: theme.spacing(2), overflow: "scroll", ...cardSx }}>
+    <Card sx={{ overflow: "scroll", ...cardSx }}>
       <CardHeader
         title="Note"
         action={
diff --git a/optuna_dashboard/ts/components/StudyDetail.tsx b/optuna_dashboard/ts/components/StudyDetail.tsx
index 55400dee..fbce0b8e 100644
--- a/optuna_dashboard/ts/components/StudyDetail.tsx
+++ b/optuna_dashboard/ts/components/StudyDetail.tsx
@@ -235,7 +235,11 @@ export const StudyDetail: FC<{
             <TrialTable studyDetail={studyDetail} isBeta={false} />
           </Card>
           {studyDetail !== null ? (
-            <StudyNote studyId={studyIdNumber} latestNote={studyDetail.note} />
+            <StudyNote
+              studyId={studyIdNumber}
+              latestNote={studyDetail.note}
+              cardSx={{ margin: theme.spacing(2) }}
+            />
           ) : null}
         </div>
       </Container>
diff --git a/optuna_dashboard/ts/components/TrialList.tsx b/optuna_dashboard/ts/components/TrialList.tsx
index 110bc889..126559c8 100644
--- a/optuna_dashboard/ts/components/TrialList.tsx
+++ b/optuna_dashboard/ts/components/TrialList.tsx
@@ -140,67 +140,67 @@ const TrialListDetail: FC<{
   ]
 
   return (
-    <Box sx={{ width: "100%" }}>
-      <Card sx={{ margin: theme.spacing(2) }}>
-        <CardHeader
-          title={`Trial ${trial.number} (trial_id=${trial.trial_id})`}
+    <Box sx={{ width: "100%", padding: theme.spacing(2, 2, 0, 2) }}>
+      <Typography
+        variant="h4"
+        sx={{
+          marginBottom: theme.spacing(2),
+          fontWeight: theme.typography.fontWeightBold,
+        }}
+      >
+        Trial {trial.number} (trial_id={trial.trial_id})
+      </Typography>
+      <Box sx={{ marginBottom: theme.spacing(1) }}>
+        <Chip
+          color={getChipColor(trial.state)}
+          label={trial.state}
+          sx={{ marginRight: theme.spacing(1) }}
         />
-        <CardContent sx={{ paddingTop: 0 }}>
-          <Box sx={{ marginBottom: theme.spacing(1) }}>
-            <Chip
-              color={getChipColor(trial.state)}
-              label={trial.state}
-              sx={{ marginRight: theme.spacing(1) }}
-            />
-            {isBestTrial(trial.trial_id) ? (
-              <Chip label={"Best Trial"} color="secondary" />
-            ) : null}
-          </Box>
+        {isBestTrial(trial.trial_id) ? (
+          <Chip label={"Best Trial"} color="secondary" />
+        ) : null}
+      </Box>
+      <Box sx={{ marginBottom: theme.spacing(2) }}>
+        <Typography>
+          Values = [{trial.values?.map((v) => v.toString()).join(" ") || "None"}
+          ]
+        </Typography>
+        {trial.state !== "Waiting" ? (
           <Typography>
-            Values = [
-            {trial.values?.map((v) => v.toString()).join(" ") || "None"}]
+            Params = [
+            {trial.params
+              .map((p) => `${p.name}: ${p.param_external_value}`)
+              .join(", ")}
+            ]
           </Typography>
-          {trial.state !== "Waiting" ? (
-            <Typography>
-              Params = [
-              {trial.params
-                .map((p) => `${p.name}: ${p.param_external_value}`)
-                .join(", ")}
-              ]
-            </Typography>
-          ) : (
-            <Typography>
-              Params = [
-              {trial.fixed_params
-                .map((p) => `${p.name}: ${p.param_external_value}`)
-                .join(", ")}
-              ]
-            </Typography>
-          )}
+        ) : (
           <Typography>
-            Started At ={" "}
-            {trial?.datetime_start ? trial?.datetime_start.toString() : null}
+            Params = [
+            {trial.fixed_params
+              .map((p) => `${p.name}: ${p.param_external_value}`)
+              .join(", ")}
+            ]
           </Typography>
-          <Typography>
-            Completed At ={" "}
-            {trial?.datetime_complete
-              ? trial?.datetime_complete.toString()
-              : null}
-          </Typography>
-          <Typography>Duration = {duration} ms</Typography>
-        </CardContent>
-      </Card>
+        )}
+        <Typography>
+          Started At ={" "}
+          {trial?.datetime_start ? trial?.datetime_start.toString() : null}
+        </Typography>
+        <Typography>
+          Completed At ={" "}
+          {trial?.datetime_complete
+            ? trial?.datetime_complete.toString()
+            : null}
+        </Typography>
+        <Typography>Duration = {duration} ms</Typography>
+      </Box>
       <TrialNote
         studyId={trial.study_id}
         trialId={trial.trial_id}
         latestNote={trial.note}
+        cardSx={{ marginBottom: theme.spacing(2) }}
       />
-      <Grid
-        container
-        direction="row"
-        spacing={2}
-        sx={{ p: theme.spacing(0, 2) }}
-      >
+      <Grid container direction="row" spacing={2}>
         <Grid item xs={6}>
           <Card>
             <CardHeader title="Intermediate Values" />
@@ -253,7 +253,7 @@ export const TrialList: FC<{ studyDetail: StudyDetail | null }> = ({
     <Box sx={{ display: "flex", flexDirection: "row", width: "100%" }}>
       <Box
         sx={{
-          width: trialListWidth,
+          minWidth: trialListWidth,
           overflow: "auto",
           height: `calc(100vh - ${theme.spacing(8)})`,
         }}