From 19b95f46f8aca365f15f2d4e21b0bc5286970b8c Mon Sep 17 00:00:00 2001
From: Christian Banse <christian.banse@aisec.fraunhofer.de>
Date: Thu, 9 Nov 2023 11:46:43 +0100
Subject: [PATCH] Jumping from activity to resource graph

---
 src/lib/components/DiscoveryGraph.svelte            | 5 +++--
 src/routes/(app)/cloud/[id]/activity/+page.svelte   | 2 +-
 src/routes/(app)/cloud/[id]/compliance/+page.svelte | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/DiscoveryGraph.svelte b/src/lib/components/DiscoveryGraph.svelte
index 1d4ea82..3df1b50 100644
--- a/src/lib/components/DiscoveryGraph.svelte
+++ b/src/lib/components/DiscoveryGraph.svelte
@@ -64,7 +64,8 @@
     });
 
     if (initialSelect) {
-      cy.nodes(`node[id="${initialSelect}"]`).select();
+      var node = cy.nodes(`node[id="${initialSelect}"]`);
+      node.select();
     }
 
     cy.on('tap', function (e) {
@@ -219,4 +220,4 @@
   })();
 </script>
 
-<div class="graph h-[calc(100vh-23rem)] max-w-7xl" bind:this={graph} />
+<div class="graph h-[calc(100vh-25rem)] max-w-7xl" bind:this={graph} />
diff --git a/src/routes/(app)/cloud/[id]/activity/+page.svelte b/src/routes/(app)/cloud/[id]/activity/+page.svelte
index 7b33b0f..3cc6299 100644
--- a/src/routes/(app)/cloud/[id]/activity/+page.svelte
+++ b/src/routes/(app)/cloud/[id]/activity/+page.svelte
@@ -33,7 +33,7 @@
       timeline.push({
         content: `Assessed ${group.length} metrics for ${group[0].resourceTypes[0]}`,
         target: shortResourceId(group[0].resourceId),
-        href: '/cloud/' + data.service.id + '/resources/' + group[0].resourceId,
+        href: '/cloud/' + data.service.id + '/graph/?id=' + group[0].resourceId,
         date: formatDate(date),
         datetime: group[0].timestamp,
         icon: QueueList,
diff --git a/src/routes/(app)/cloud/[id]/compliance/+page.svelte b/src/routes/(app)/cloud/[id]/compliance/+page.svelte
index 10a82fb..f778004 100644
--- a/src/routes/(app)/cloud/[id]/compliance/+page.svelte
+++ b/src/routes/(app)/cloud/[id]/compliance/+page.svelte
@@ -69,7 +69,7 @@
   {/each}
   {#if data.leftOverCatalogs.length > 0}
     <li>
-      <a href="/v1/orchestrator/cloud_services/{data.service.id}/compliance/new">
+      <a href="/cloud/{data.service.id}/compliance/new">
         <EnableCatalogButton />
       </a>
     </li>