From 983ef45d7263563aee0ea120742edac4e2fc0a77 Mon Sep 17 00:00:00 2001
From: Remi <remi.d45@gmail.com>
Date: Wed, 10 Feb 2021 19:01:30 +0100
Subject: [PATCH] fix(pagerduty): use the luxon date library

---
 plugins/pagerduty/package.json                         |  8 ++++----
 .../src/components/Incident/IncidentListItem.tsx       | 10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json
index afd41dcc46..b95aa864ad 100644
--- a/plugins/pagerduty/package.json
+++ b/plugins/pagerduty/package.json
@@ -31,14 +31,14 @@
   },
   "dependencies": {
     "@backstage/catalog-model": "^0.7.1",
-    "@backstage/plugin-catalog-react": "^0.0.2",
     "@backstage/core": "^0.6.0",
+    "@backstage/plugin-catalog-react": "^0.0.2",
     "@backstage/theme": "^0.2.3",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
     "classnames": "^2.2.6",
-    "date-fns": "^2.15.0",
+    "luxon": "1.25.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "6.0.0-beta.0",
@@ -53,9 +53,9 @@
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
+    "cross-fetch": "^3.0.6",
     "msw": "^0.21.2",
-    "node-fetch": "^2.6.1",
-    "cross-fetch": "^3.0.6"
+    "node-fetch": "^2.6.1"
   },
   "files": [
     "dist"
diff --git a/plugins/pagerduty/src/components/Incident/IncidentListItem.tsx b/plugins/pagerduty/src/components/Incident/IncidentListItem.tsx
index 860623dcd4..bf0d5d2587 100644
--- a/plugins/pagerduty/src/components/Incident/IncidentListItem.tsx
+++ b/plugins/pagerduty/src/components/Incident/IncidentListItem.tsx
@@ -27,7 +27,7 @@ import {
   Typography,
 } from '@material-ui/core';
 import { StatusError, StatusWarning } from '@backstage/core';
-import { formatDistanceToNowStrict } from 'date-fns';
+import { DateTime, Duration } from 'luxon';
 import { Incident } from '../types';
 import OpenInBrowserIcon from '@material-ui/icons/OpenInBrowser';
 
@@ -53,8 +53,12 @@ type Props = {
 
 export const IncidentListItem = ({ incident }: Props) => {
   const classes = useStyles();
+  const duration =
+    new Date().getTime() - new Date(incident.created_at).getTime();
+  const createdAt = DateTime.local()
+    .minus(Duration.fromMillis(duration))
+    .toRelative({ locale: 'en' });
   const user = incident.assignments[0]?.assignee;
-  const createdAt = formatDistanceToNowStrict(new Date(incident.created_at));
 
   return (
     <ListItem dense key={incident.id}>
@@ -77,7 +81,7 @@ export const IncidentListItem = ({ incident }: Props) => {
         }}
         secondary={
           <Typography noWrap variant="body2" color="textSecondary">
-            Created {createdAt} ago and assigned to{' '}
+            Created {createdAt} and assigned to{' '}
             <Link
               href={user?.html_url ?? '#'}
               target="_blank"