Просмотр исходного кода

remove hardcoding for relative times and chart icon

Alexander Belanger 4 лет назад
Родитель
Сommit
b6be606d8a

+ 1 - 1
dashboard/src/main/home/cluster-dashboard/chart/JobRunTable.tsx

@@ -15,7 +15,7 @@ type Props = {
   sortType: "Newest" | "Oldest" | "Alphabetical";
 };
 
-export const dateFormatter = (date: string) => {
+export const dateFormatter = (date: string | number) => {
   if (!date) {
     return "N/A";
   }

+ 5 - 2
dashboard/src/main/home/cluster-dashboard/dashboard/incidents/IncidentPage.tsx

@@ -113,8 +113,8 @@ const IncidentPage = () => {
                 {capitalize(incident.latest_state)}
               </Status>
               <StatusText>
-                - started {dateFormatter("2022-03-18T21:02:50.602847-04:00")},
-                last updated {dateFormatter("2022-03-18T21:02:50.602847-04:00")}
+                - started {dateFormatter(incident.created_at * 1000)}, last
+                updated {dateFormatter(incident.updated_at * 1000)}
               </StatusText>
               <Description></Description>
             </StatusContainer>,
@@ -259,6 +259,9 @@ export type Incident = {
   latest_reason: string; // eg: "Out of memory",
   latest_message: string; // eg: "Application crash due to out of memory issue"
   events: IncidentEvent[];
+  created_at: number;
+  updated_at: number;
+  chart_name: string;
 };
 
 const LineBreak = styled.div`

+ 16 - 7
dashboard/src/main/home/cluster-dashboard/dashboard/incidents/IncidentsTable.tsx

@@ -68,7 +68,12 @@ const IncidentsTable = () => {
 
           return (
             <KindContainer>
-              <Icon src={hardcodedIcons["web"]} />
+              <Icon
+                src={
+                  hardcodedIcons[original?.chart_name || "web"] ||
+                  hardcodedIcons["web"]
+                }
+              />
               <Kind>{original.release_name}</Kind>
             </KindContainer>
           );
@@ -99,16 +104,20 @@ const IncidentsTable = () => {
       },
       {
         Header: "Started",
-        accessor: "",
-        Cell: () => {
-          return dateFormatter("2022-03-18T21:02:50.602847-04:00");
+        accessor: "created_at",
+        Cell: ({ row }) => {
+          let original = row.original;
+
+          return dateFormatter(original.created_at * 1000);
         },
       },
       {
         Header: "Last Updated",
-        accessor: "",
-        Cell: () => {
-          return dateFormatter("2022-03-18T21:02:50.602847-04:00");
+        accessor: "updated_at",
+        Cell: ({ row }) => {
+          let original = row.original;
+
+          return dateFormatter(original.updated_at * 1000);
         },
       },
     ] as Column<IncidentsWithoutEvents>[];