Merge branch 'backstage:master' into topic/add-entity-pull-requests

2021-11-12 13:25:26 -06:00
parent a06242e5cc d0ea59bee8
commit 70b96a8d65
10 changed files with 121 additions and 72 deletions
@@ -56,7 +56,7 @@ const generateTestData = (rows = 10): RepoBuild[] => {
      title: `backstage ci - 1.0.0-preview-${rows - i}`,
      status,
      result,
-      queueTime: new Date(Date.now() - i * 60000),
+      queueTime: new Date(Date.now() - i * 60000).toISOString(),
      source: 'refs/heads/main',
      link: '',
    });
@@ -163,7 +163,10 @@ const columns: TableColumn[] = [
    field: 'queueTime',
    width: 'auto',
    render: (row: Partial<RepoBuild>) =>
-      DateTime.fromJSDate(row.queueTime ?? new Date()).toRelative(),
+      (row.queueTime
+        ? DateTime.fromISO(row.queueTime)
+        : DateTime.now()
+      ).toRelative(),
  },
 ];