From 2de1d82bd1b8f4f23e0117a7530cba9da10c18eb Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Wed, 2 Mar 2022 10:23:30 +0100
Subject: [PATCH] chore: added changeset

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/strong-suns-hope.md                      |  5 +++++
 plugins/catalog-react/api-report.md                 |  2 +-
 .../catalog-react/src/hooks/useEntityOwnership.ts   | 13 +++++--------
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/strong-suns-hope.md

diff --git a/.changeset/strong-suns-hope.md b/.changeset/strong-suns-hope.md
new file mode 100644
index 0000000000..ca59e43deb
--- /dev/null
+++ b/.changeset/strong-suns-hope.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-catalog-react': patch
+---
+
+Removing the `EntityName` path for the `useEntityOwnership` as it has never worked correctly. Please pass in an entire `Entity` instead.
diff --git a/plugins/catalog-react/api-report.md b/plugins/catalog-react/api-report.md
index 2d2b56b634..c5d102cc29 100644
--- a/plugins/catalog-react/api-report.md
+++ b/plugins/catalog-react/api-report.md
@@ -544,7 +544,7 @@ export function useEntityListProvider<
 // @public
 export function useEntityOwnership(): {
   loading: boolean;
-  isOwnedEntity: (entity: Entity | EntityName) => boolean;
+  isOwnedEntity: (entity: Entity) => boolean;
 };
 
 // @alpha
diff --git a/plugins/catalog-react/src/hooks/useEntityOwnership.ts b/plugins/catalog-react/src/hooks/useEntityOwnership.ts
index 77f6c4bf24..de3eca9dab 100644
--- a/plugins/catalog-react/src/hooks/useEntityOwnership.ts
+++ b/plugins/catalog-react/src/hooks/useEntityOwnership.ts
@@ -17,7 +17,6 @@
 import { CatalogApi } from '@backstage/catalog-client';
 import {
   Entity,
-  EntityName,
   parseEntityRef,
   RELATION_MEMBER_OF,
   RELATION_OWNED_BY,
@@ -77,7 +76,7 @@ export async function loadCatalogOwnerRefs(
  */
 export function useEntityOwnership(): {
   loading: boolean;
-  isOwnedEntity: (entity: Entity | EntityName) => boolean;
+  isOwnedEntity: (entity: Entity) => boolean;
 } {
   const identityApi = useApi(identityApiRef);
   const catalogApi = useApi(catalogApiRef);
@@ -94,12 +93,10 @@ export function useEntityOwnership(): {
 
   const isOwnedEntity = useMemo(() => {
     const myOwnerRefs = new Set(refs ?? []);
-    return (entity: Entity | EntityName) => {
-      const entityOwnerRefs = (
-        'metadata' in entity
-          ? getEntityRelations(entity, RELATION_OWNED_BY)
-          : [entity]
-      ).map(stringifyEntityRef);
+    return (entity: Entity) => {
+      const entityOwnerRefs = getEntityRelations(entity, RELATION_OWNED_BY).map(
+        stringifyEntityRef,
+      );
       for (const ref of entityOwnerRefs) {
         if (myOwnerRefs.has(ref)) {
           return true;