From 300c291a098d6a2b5a696c9a6dd33cea0608f648 Mon Sep 17 00:00:00 2001
From: Andreas Stenius <git@astekk.se>
Date: Thu, 18 Feb 2021 09:43:28 +0100
Subject: [PATCH] badges: tweak badge URLs.

Signed-off-by: Andreas Stenius <git@astekk.se>
---
 plugins/badges-backend/src/service/router.ts       | 4 ++--
 plugins/badges/src/components/EntityBadgesCard.tsx | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/badges-backend/src/service/router.ts b/plugins/badges-backend/src/service/router.ts
index 1cc367a0c6..b171977cf6 100644
--- a/plugins/badges-backend/src/service/router.ts
+++ b/plugins/badges-backend/src/service/router.ts
@@ -39,8 +39,8 @@ export async function createRouter(
 
   // router.use(express.json());
 
-  router.get('/:kind/:namespace/:entityname', async (req, res) => {
-    const { kind, namespace, entityname } = req.params;
+  router.get('/entity/:namespace/:kind/:name', async (req, res) => {
+    const { namespace, kind, name } = req.params;
     const badge = badgesApi.getPoweredByBadge();
 
     res.setHeader('Content-Type', 'image/svg+xml');
diff --git a/plugins/badges/src/components/EntityBadgesCard.tsx b/plugins/badges/src/components/EntityBadgesCard.tsx
index bf11493655..334575e9db 100644
--- a/plugins/badges/src/components/EntityBadgesCard.tsx
+++ b/plugins/badges/src/components/EntityBadgesCard.tsx
@@ -22,19 +22,20 @@ export const EntityBadgesCard = () => {
   const { entity } = useEntity();
 
   // TODO: extract kind, namespace, entity name from entity data...
-  const { kind, namespace, entityname } = {
+  const { kind, namespace, name } = {
     kind: 'Component',
     namespace: 'default',
-    entityname: 'demo',
+    name: 'demo',
   };
 
   // TODO: get url for backstage and the badges api
   const backstage_ui = 'http://localhost:3000';
   const backstage_api = 'http://localhost:7000';
-  const badge = `${backstage_api}/badges/${kind}/${namespace}/${entityname}`;
 
-  const target = backstage_ui;
+  const badge = `${backstage_api}/badges/entity/${namespace}/${kind}/${name}`.toLowerCase();
+  const target = `${backstage_ui}/catalog/${namespace}/${kind}/${name}`.toLowerCase();
   const markdown_code = `[![Powered by Backstage](${badge})](${target})`;
+
   return (
     <InfoCard title="Badges">
       <Typography paragraph>