From ab27aa313c98987d0d66dd63e0984f1ffebcb149 Mon Sep 17 00:00:00 2001 From: Jeremy Guarini Date: Thu, 4 Nov 2021 09:52:59 -0700 Subject: [PATCH 1/4] Minor UI updates to make numbers and dates a bit more human friendly Signed-off-by: Jeremy Guarini --- .../CoverageHistoryChart/CoverageHistoryChart.tsx | 9 +++++++-- .../src/components/FileExplorer/FileExplorer.tsx | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx b/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx index 61dc7d7158..a251bb1a68 100644 --- a/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx +++ b/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx @@ -69,6 +69,11 @@ const getTrendIcon = (trend: number, classes: ClassNameMap) => { } }; +// convert timestamp to human friendly form +function formatDateToHuman(timeStamp: string | number) { + return new Date(timeStamp).toUTCString(); +} + export const CoverageHistoryChart = () => { const { entity } = useEntity(); const codeCoverageApi = useApi(codeCoverageApiRef); @@ -149,10 +154,10 @@ export const CoverageHistoryChart = () => { margin={{ right: 48, top: 32 }} > - + - + { title: 'Coverage', type: 'numeric', field: 'coverage', - render: (row: CoverageTableRow) => `${row.coverage}%`, + render: (row: CoverageTableRow) => `${row.coverage.toFixed(2)}%`, }, { title: 'Missing lines', From a5512851a0991ec27f3eea530bc223a99013f1ed Mon Sep 17 00:00:00 2001 From: Jeremy Guarini Date: Thu, 4 Nov 2021 10:02:11 -0700 Subject: [PATCH 2/4] add changeset Signed-off-by: Jeremy Guarini --- .changeset/neat-pugs-wait.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/neat-pugs-wait.md diff --git a/.changeset/neat-pugs-wait.md b/.changeset/neat-pugs-wait.md new file mode 100644 index 0000000000..8902f44c9d --- /dev/null +++ b/.changeset/neat-pugs-wait.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-code-coverage': patch +--- + +Change represented test date from epoch to something more human friendly. Round test coverage to 2 decimal places. From 367e3bf130a5cfa9ee0c31de32d5440250636113 Mon Sep 17 00:00:00 2001 From: Jeremy Guarini Date: Mon, 8 Nov 2021 09:29:21 -0800 Subject: [PATCH 3/4] updated timestamp conversion to use Luxon and adrs-adr012 guideline, added luxon as dependency Signed-off-by: Jeremy Guarini --- plugins/code-coverage/package.json | 1 + .../CoverageHistoryChart/CoverageHistoryChart.tsx | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index 2b09b4d99f..8b6b4aef09 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -33,6 +33,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "@material-ui/styles": "^4.11.0", "highlight.js": "^10.6.0", + "luxon": "^2.1.0", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router": "6.0.0-beta.0", diff --git a/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx b/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx index a251bb1a68..4291599098 100644 --- a/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx +++ b/plugins/code-coverage/src/components/CoverageHistoryChart/CoverageHistoryChart.tsx @@ -46,6 +46,8 @@ import { codeCoverageApiRef } from '../../api'; import { Progress, ResponseErrorPanel } from '@backstage/core-components'; import { useApi } from '@backstage/core-plugin-api'; +import { DateTime } from 'luxon'; + type Coverage = 'line' | 'branch'; const useStyles = makeStyles(theme => ({ @@ -71,7 +73,9 @@ const getTrendIcon = (trend: number, classes: ClassNameMap) => { // convert timestamp to human friendly form function formatDateToHuman(timeStamp: string | number) { - return new Date(timeStamp).toUTCString(); + return DateTime.fromMillis(Number(timeStamp)).toLocaleString( + DateTime.DATETIME_MED, + ); } export const CoverageHistoryChart = () => { From 1a915b49d44d04f73792d2c60f9820d5c98b26ba Mon Sep 17 00:00:00 2001 From: Jeremy Guarini Date: Mon, 8 Nov 2021 09:58:17 -0800 Subject: [PATCH 4/4] change luxon version to match others Signed-off-by: Jeremy Guarini --- plugins/code-coverage/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index 8b6b4aef09..d01e12dff5 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -33,7 +33,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "@material-ui/styles": "^4.11.0", "highlight.js": "^10.6.0", - "luxon": "^2.1.0", + "luxon": "^2.0.2", "react": "^16.13.1", "react-dom": "^16.13.1", "react-router": "6.0.0-beta.0",