Merge branch 'master' of https://github.com/spotify/backstage into samiram/aboutCard

plugins/pagerduty/CHANGELOG.md

@@ -0,0 +1,28 @@
+# @backstage/plugin-pagerduty
+
+## 0.2.3
+
+### Patch Changes
+
+- 3b50f833d: Supporting Timezones
+- Updated dependencies [c911061b7]
+- Updated dependencies [8ef71ed32]
+- Updated dependencies [0e6298f7e]
+- Updated dependencies [ac3560b42]
+  - @backstage/catalog-model@0.6.0
+  - @backstage/core@0.4.1
+
+## 0.2.2
+
+### Patch Changes
+
+- 6011b7d3e: Added pagerduty plugin to example app
+- Updated dependencies [2527628e1]
+- Updated dependencies [1c69d4716]
+- Updated dependencies [83b6e0c1f]
+- Updated dependencies [1665ae8bb]
+- Updated dependencies [04f26f88d]
+- Updated dependencies [ff243ce96]
+  - @backstage/core@0.4.0
+  - @backstage/catalog-model@0.5.0
+  - @backstage/theme@0.2.2

plugins/pagerduty/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-pagerduty",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -30,9 +30,9 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-model": "^0.4.0",
-    "@backstage/core": "^0.3.2",
-    "@backstage/theme": "^0.2.1",
+    "@backstage/catalog-model": "^0.6.0",
+    "@backstage/core": "^0.4.1",
+    "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
@@ -44,9 +44,9 @@
     "react-use": "^15.3.3"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.4.0",
-    "@backstage/dev-utils": "^0.1.5",
-    "@backstage/test-utils": "^0.1.4",
+    "@backstage/cli": "^0.4.2",
+    "@backstage/dev-utils": "^0.1.6",
+    "@backstage/test-utils": "^0.1.5",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",

plugins/pagerduty/src/api/client.ts

@@ -66,7 +66,7 @@ export class PagerDutyClient implements PagerDutyApi {
   }
 
   async getOnCallByPolicyId(policyId: string): Promise<OnCall[]> {
-    const params = `time_zone=UTC&include[]=users&escalation_policy_ids[]=${policyId}&include[]=escalation_level`;
+    const params = `time_zone=UTC&include[]=users&escalation_policy_ids[]=${policyId}`;
     const url = `${await this.config.discoveryApi.getBaseUrl(
       'proxy',
     )}/pagerduty/oncalls?${params}`;

plugins/pagerduty/src/components/Incident/IncidentListItem.tsx

@@ -25,7 +25,6 @@ import {
   IconButton,
   Link,
   Typography,
-  Grid,
 } from '@material-ui/core';
 import { StatusError, StatusWarning } from '@backstage/core';
 import { formatDistanceToNowStrict } from 'date-fns';
@@ -77,22 +76,16 @@ export const IncidentListItem = ({ incident }: Props) => {
           className: classes.listItemPrimary,
         }}
         secondary={
-          <Grid container>
-            <Grid item>
-              <Typography noWrap variant="body2" color="textSecondary">
-                Created {createdAt} ago and assigned to{' '}
-              </Typography>
-            </Grid>
-            <Grid item>
-              <Link
-                href={user?.html_url ?? '#'}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                {user?.summary ?? 'nobody'}
-              </Link>
-            </Grid>
-          </Grid>
+          <Typography noWrap variant="body2" color="textSecondary">
+            Created {createdAt} ago and assigned to{' '}
+            <Link
+              href={user?.html_url ?? '#'}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {user?.summary ?? 'nobody'}
+            </Link>
+          </Typography>
         }
       />
       <ListItemSecondaryAction>