Merge branch 'master' into mobile-sidebar

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>

packages/app/CHANGELOG.md

@@ -1,5 +1,23 @@
 # example-app
 
+## 0.2.57
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-github-actions@0.4.27
+  - @backstage/core-app-api@0.2.1
+  - @backstage/plugin-kubernetes@0.5.1
+  - @backstage/core-plugin-api@0.3.1
+  - @backstage/core-components@0.8.1
+  - @backstage/plugin-org@0.3.31
+  - @backstage/plugin-azure-devops@0.1.7
+  - @backstage/cli@0.10.2
+  - @backstage/catalog-model@0.9.8
+  - @backstage/plugin-techdocs@0.12.10
+  - @backstage/plugin-catalog-react@0.6.7
+  - @backstage/plugin-apache-airflow@0.1.0
+
 ## 0.2.56
 
 ### Patch Changes

packages/app/package.json

@@ -1,39 +1,39 @@
 {
   "name": "example-app",
-  "version": "0.2.56",
+  "version": "0.2.57",
   "private": true,
   "bundled": true,
   "dependencies": {
     "@backstage/app-defaults": "^0.1.2",
-    "@backstage/catalog-model": "^0.9.7",
-    "@backstage/cli": "^0.10.1",
-    "@backstage/core-app-api": "^0.2.0",
-    "@backstage/core-components": "^0.8.0",
-    "@backstage/core-plugin-api": "^0.3.0",
+    "@backstage/catalog-model": "^0.9.8",
+    "@backstage/cli": "^0.10.2",
+    "@backstage/core-app-api": "^0.2.1",
+    "@backstage/core-components": "^0.8.1",
+    "@backstage/core-plugin-api": "^0.3.1",
     "@backstage/integration-react": "^0.1.15",
     "@backstage/plugin-api-docs": "^0.6.18",
-    "@backstage/plugin-azure-devops": "^0.1.6",
-    "@backstage/plugin-apache-airflow": "^0.0.0",
+    "@backstage/plugin-azure-devops": "^0.1.7",
+    "@backstage/plugin-apache-airflow": "^0.1.0",
     "@backstage/plugin-badges": "^0.2.16",
     "@backstage/plugin-catalog": "^0.7.4",
     "@backstage/plugin-catalog-graph": "^0.2.3",
     "@backstage/plugin-catalog-import": "^0.7.5",
-    "@backstage/plugin-catalog-react": "^0.6.5",
+    "@backstage/plugin-catalog-react": "^0.6.7",
     "@backstage/plugin-circleci": "^0.2.31",
     "@backstage/plugin-cloudbuild": "^0.2.29",
     "@backstage/plugin-code-coverage": "^0.1.19",
     "@backstage/plugin-cost-insights": "^0.11.13",
     "@backstage/plugin-explore": "^0.3.22",
     "@backstage/plugin-gcp-projects": "^0.3.10",
-    "@backstage/plugin-github-actions": "^0.4.26",
+    "@backstage/plugin-github-actions": "^0.4.27",
     "@backstage/plugin-graphiql": "^0.2.24",
     "@backstage/plugin-home": "^0.4.7",
     "@backstage/plugin-jenkins": "^0.5.14",
     "@backstage/plugin-kafka": "^0.2.22",
-    "@backstage/plugin-kubernetes": "^0.5.0",
+    "@backstage/plugin-kubernetes": "^0.5.1",
     "@backstage/plugin-lighthouse": "^0.2.31",
     "@backstage/plugin-newrelic": "^0.3.10",
-    "@backstage/plugin-org": "^0.3.30",
+    "@backstage/plugin-org": "^0.3.31",
     "@backstage/plugin-pagerduty": "0.3.19",
     "@backstage/plugin-rollbar": "^0.3.20",
     "@backstage/plugin-scaffolder": "^0.11.14",
@@ -41,7 +41,7 @@
     "@backstage/plugin-sentry": "^0.3.30",
     "@backstage/plugin-shortcuts": "^0.1.15",
     "@backstage/plugin-tech-radar": "^0.4.13",
-    "@backstage/plugin-techdocs": "^0.12.9",
+    "@backstage/plugin-techdocs": "^0.12.10",
     "@backstage/plugin-todo": "^0.1.16",
     "@backstage/plugin-user-settings": "^0.3.13",
     "@backstage/search-common": "^0.2.0",

packages/app/src/components/catalog/EntityPage.tsx

@@ -126,6 +126,8 @@ import {
 } from '@roadiehq/backstage-plugin-travis-ci';
 import React, { ReactNode, useMemo, useState } from 'react';
 
+const customEntityFilterKind = ['Component', 'API', 'System'];
+
 const EntityLayoutWrapper = (props: { children?: ReactNode }) => {
   const [badgesDialogOpen, setBadgesDialogOpen] = useState(false);
 
@@ -523,7 +525,10 @@ const userPage = (
           <EntityUserProfileCard variant="gridItem" />
         </Grid>
         <Grid item xs={12} md={6}>
-          <EntityOwnershipCard variant="gridItem" />
+          <EntityOwnershipCard
+            variant="gridItem"
+            entityFilterKind={customEntityFilterKind}
+          />
         </Grid>
       </Grid>
     </EntityLayout.Route>
@@ -539,7 +544,10 @@ const groupPage = (
           <EntityGroupProfileCard variant="gridItem" />
         </Grid>
         <Grid item xs={12} md={6}>
-          <EntityOwnershipCard variant="gridItem" />
+          <EntityOwnershipCard
+            variant="gridItem"
+            entityFilterKind={customEntityFilterKind}
+          />
         </Grid>
         <Grid item xs={12}>
           <EntityMembersListCard />