From 04e1504e858d3cb69dd34c8cc45a48bcdb9e4b3b Mon Sep 17 00:00:00 2001
From: Phil Kuang <pkuang@factset.com>
Date: Thu, 16 Jun 2022 13:57:53 -0400
Subject: [PATCH] fix(githubPrBoard): support namespaced teams and all kinds

Signed-off-by: Phil Kuang <pkuang@factset.com>
---
 .changeset/nasty-zoos-cross.md                        |  5 +++++
 .../src/hooks/useUserRepositories.tsx                 | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .changeset/nasty-zoos-cross.md

diff --git a/.changeset/nasty-zoos-cross.md b/.changeset/nasty-zoos-cross.md
new file mode 100644
index 0000000000..7a658d7209
--- /dev/null
+++ b/.changeset/nasty-zoos-cross.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-github-pull-requests-board': patch
+---
+
+Support namespaced teams and fetch all kinds
diff --git a/plugins/github-pull-requests-board/src/hooks/useUserRepositories.tsx b/plugins/github-pull-requests-board/src/hooks/useUserRepositories.tsx
index 638a8cb487..b905811aea 100644
--- a/plugins/github-pull-requests-board/src/hooks/useUserRepositories.tsx
+++ b/plugins/github-pull-requests-board/src/hooks/useUserRepositories.tsx
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 import { useApi } from '@backstage/core-plugin-api';
-import { useEntity, catalogApiRef } from '@backstage/plugin-catalog-react';
+import {
+  catalogApiRef,
+  humanizeEntityRef,
+  useEntity,
+} from '@backstage/plugin-catalog-react';
 import { useCallback, useEffect, useState } from 'react';
 import { getProjectNameFromEntity } from '../utils/functions';
 
@@ -26,8 +30,7 @@ export function useUserRepositories() {
   const getRepositoriesNames = useCallback(async () => {
     const entitiesList = await catalogApi.getEntities({
       filter: {
-        kind: 'Component',
-        'spec.owner': teamEntity?.metadata?.name,
+        'spec.owner': humanizeEntityRef(teamEntity, { defaultKind: 'group' }),
       },
     });
 
@@ -36,7 +39,7 @@ export function useUserRepositories() {
     );
 
     setRepositories([...new Set(entitiesNames)]);
-  }, [catalogApi, teamEntity?.metadata?.name]);
+  }, [catalogApi, teamEntity]);
 
   useEffect(() => {
     getRepositoriesNames();