Merge pull request #212 from yohamta/feat/dags-table-sorting-order

feat: make time chart graph scrollable on Dashboard page
dagu-org · Jul 26, 2022 · d486db6 · d486db6
2 parents 201c739 + 44acab6
commit d486db6
Showing 1 changed file with 68 additions and 36 deletions.
diff --git a/admin/src/components/DashboardTimechart.tsx b/admin/src/components/DashboardTimechart.tsx
@@ -1,3 +1,4 @@
+import { Box } from '@mui/material';
 import moment from 'moment';
 import React from 'react';
 import {
@@ -44,49 +45,80 @@ function DashboardTimechart({ data: input }: Props) {
       }
     });
     const sorted = ret.sort((a, b) => {
-      return a.name < b.name ? -1 : 1;
+      return a.values[0] < b.values[0] ? -1 : 1;
     });
     setData(sorted);
   }, [input]);
   const now = moment();
+  const shouldScroll = data.length >= 40;
   return (
-    <ResponsiveContainer width="100%" height="90%">
-      <BarChart data={data} layout="vertical">
-        <XAxis
-          name="Time"
-          tickFormatter={(unixTime) => moment.unix(unixTime).format('HH:mm')}
-          type="number"
-          dataKey="values"
-          tickCount={96}
-          domain={[now.startOf('day').unix(), now.endOf('day').unix()]}
-        />
-        <YAxis dataKey="name" type="category" hide />
-        <Bar background dataKey="values" fill="lightblue" minPointSize={2}>
-          {data.map((_, index) => {
-            const color = statusColorMapping[data[index].status];
-            return <Cell key={index} fill={color.backgroundColor} />;
-          })}
-          <LabelList
-            dataKey="name"
-            position="insideLeft"
-            content={({ x, y, width, height, value }: LabelProps) => {
-              return (
-                <text
-                  x={Number(x) + Number(width) + 2}
-                  y={Number(y) + (Number(height) || 0) / 2}
-                  fill="#000"
-                  fontSize={12}
-                  textAnchor="start"
-                >
-                  {value}
-                </text>
-              );
-            }}
+    <TimelineWrapper shouldScroll={shouldScroll}>
+      <ResponsiveContainer
+        width="100%"
+        minHeight={shouldScroll ? data.length * 12 : undefined}
+        height={shouldScroll ? undefined : '90%'}
+      >
+        <BarChart data={data} layout="vertical">
+          <XAxis
+            name="Time"
+            tickFormatter={(unixTime) => moment.unix(unixTime).format('HH:mm')}
+            type="number"
+            dataKey="values"
+            tickCount={96}
+            domain={[now.startOf('day').unix(), now.endOf('day').unix()]}
           />
-        </Bar>
-      </BarChart>
-    </ResponsiveContainer>
+          <YAxis dataKey="name" type="category" hide />
+          <Bar background dataKey="values" fill="lightblue" minPointSize={2}>
+            {data.map((_, index) => {
+              const color = statusColorMapping[data[index].status];
+              return <Cell key={index} fill={color.backgroundColor} />;
+            })}
+            <LabelList
+              dataKey="name"
+              position="insideLeft"
+              content={({ x, y, width, height, value }: LabelProps) => {
+                return (
+                  <text
+                    x={Number(x) + Number(width) + 2}
+                    y={Number(y) + (Number(height) || 0) / 2}
+                    fill="#000"
+                    fontSize={12}
+                    textAnchor="start"
+                  >
+                    {value}
+                  </text>
+                );
+              }}
+            />
+          </Bar>
+        </BarChart>
+      </ResponsiveContainer>
+    </TimelineWrapper>
   );
 }
 
+function TimelineWrapper({
+  children,
+  shouldScroll,
+}: {
+  children: React.ReactNode;
+  shouldScroll: boolean;
+}) {
+  if (shouldScroll) {
+    return (
+      <Box
+        sx={{
+          width: '100%',
+          maxWidth: '100%',
+          height: '90%',
+          overflow: 'auto',
+        }}
+      >
+        {children}
+      </Box>
+    );
+  }
+  return <React.Fragment>{children}</React.Fragment>;
+}
+
 export default DashboardTimechart;