From 1f1f8de2c15dbf8dd754bc0dbf0a5db8a1178db0 Mon Sep 17 00:00:00 2001
From: Tim Klever <tim.v.klever@aexp.com>
Date: Tue, 1 Apr 2025 19:15:30 -0700
Subject: [PATCH] feat: loosen `entityRouteParams` to accept references

Signed-off-by: Tim Klever <tim.v.klever@aexp.com>
---
 plugins/catalog-react/src/routes.test.ts | 18 ++++++++++-
 plugins/catalog-react/src/routes.ts      | 41 ++++++++++++++++++++----
 2 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/plugins/catalog-react/src/routes.test.ts b/plugins/catalog-react/src/routes.test.ts
index 58b8707edd..2b172ae201 100644
--- a/plugins/catalog-react/src/routes.test.ts
+++ b/plugins/catalog-react/src/routes.test.ts
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { DEFAULT_NAMESPACE, Entity } from '@backstage/catalog-model';
+import {
+  DEFAULT_NAMESPACE,
+  Entity,
+  getCompoundEntityRef,
+} from '@backstage/catalog-model';
 import { entityRouteParams } from './routes';
 
 const entity: Entity = {
@@ -49,11 +53,23 @@ const expectedNamespacedEntityRouteParams = {
 describe('entityRouteParams', () => {
   it.each([
     ['Entity', entity, expectedEntityRouteParams],
+    ['ComponentRef', getCompoundEntityRef(entity), expectedEntityRouteParams],
+    ['string', 'component:Test-Component', expectedEntityRouteParams],
     [
       'namespaced Entity',
       namespacedEntity,
       expectedNamespacedEntityRouteParams,
     ],
+    [
+      'namespaced ComponentRef',
+      getCompoundEntityRef(namespacedEntity),
+      expectedNamespacedEntityRouteParams,
+    ],
+    [
+      'namespaced string',
+      'component:Test-Namespace/Test-Namespaced-Component',
+      expectedNamespacedEntityRouteParams,
+    ],
   ])(
     'should return correct route params for %s',
     (_type, entityOrRef, expectedRouteParams) => {
diff --git a/plugins/catalog-react/src/routes.ts b/plugins/catalog-react/src/routes.ts
index 013bf7b5be..13421fafef 100644
--- a/plugins/catalog-react/src/routes.ts
+++ b/plugins/catalog-react/src/routes.ts
@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-import { Entity, DEFAULT_NAMESPACE } from '@backstage/catalog-model';
+import {
+  Entity,
+  DEFAULT_NAMESPACE,
+  CompoundEntityRef,
+  parseEntityRef,
+} from '@backstage/catalog-model';
 import { createRouteRef } from '@backstage/core-plugin-api';
 import { getOrCreateGlobalSingleton } from '@backstage/version-bridge';
 
@@ -41,12 +46,34 @@ export const entityRouteRef = getOrCreateGlobalSingleton(
  * Utility function to get suitable route params for entityRoute, given an
  * @public
  */
-export function entityRouteParams(entity: Entity) {
+export function entityRouteParams(
+  entityOrRef: Entity | CompoundEntityRef | string,
+) {
+  let kind;
+  let namespace;
+  let name;
+
+  if (typeof entityOrRef === 'string') {
+    const parsed = parseEntityRef(entityOrRef);
+    kind = parsed.kind;
+    namespace = parsed.namespace;
+    name = parsed.name;
+  } else if ('metadata' in entityOrRef) {
+    kind = entityOrRef.kind;
+    namespace = entityOrRef.metadata.namespace;
+    name = entityOrRef.metadata.name;
+  } else {
+    kind = entityOrRef.kind;
+    namespace = entityOrRef.namespace;
+    name = entityOrRef.name;
+  }
+
+  kind = kind.toLocaleLowerCase('en-US');
+  namespace = namespace?.toLocaleLowerCase('en-US') ?? DEFAULT_NAMESPACE;
+
   return {
-    kind: entity.kind.toLocaleLowerCase('en-US'),
-    namespace:
-      entity.metadata.namespace?.toLocaleLowerCase('en-US') ??
-      DEFAULT_NAMESPACE,
-    name: entity.metadata.name,
+    kind,
+    namespace,
+    name,
   } as const;
 }