From 060f6ef0feb8418d3a5da73934c60227d50df7dc Mon Sep 17 00:00:00 2001
From: etan221 <eric.tan@auckland.ac.nz>
Date: Mon, 30 Oct 2023 15:02:13 +1300
Subject: [PATCH 1/2] RSM-3036: stage: replace search with url

---
 .../activities-page.component.html            | 21 ++++++++-----------
 .../queries/all-research-stages.query.graphql |  3 ++-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/research-hub-web/src/app/components/activities-page/activities-page.component.html b/research-hub-web/src/app/components/activities-page/activities-page.component.html
index c1d323645..6334b2a8d 100644
--- a/research-hub-web/src/app/components/activities-page/activities-page.component.html
+++ b/research-hub-web/src/app/components/activities-page/activities-page.component.html
@@ -11,17 +11,14 @@ <h1>{{ title }}</h1>
     <div fxLayout="column" fxLayoutGap="8px" class="research-activity-content">
       <div *ngFor="let item of allStages">
         <!-- Panel Container -->
-        <a
-            [attr.aria-label]="'Search in ' + item.name"
-            routerLink="/search"
-            [queryParams]="
-              searchService.generateQueryParams('', {
-                category: [],
-                stage: [item.sys.id],
-                relatedOrgs: []
-              })
-            "
-          >
+        <!-- absolute path -->
+        <a [attr.aria-label]="item.name"
+          [href]="item.linkedTo"
+        >
+        <!-- Relative path -->
+        <!-- <a [attr.aria-label]="item.name"
+          routerLink="/subhub/research-impact"
+        > -->
           <div class="outer-panel" fxLayout="row">
             <div class="inner-panel">
               <div>
@@ -29,7 +26,7 @@ <h2>{{ item.name }}</h2>
                   <p>{{ item.description }}</p>
               </div>
             </div>
-            
+
             <!-- Panel Image -->
             <div fxHide.lt-md class="research-category-img">
               <picture *ngIf="item.image?.url">
diff --git a/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql b/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
index 65c512cfc..3f59a1e78 100644
--- a/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
+++ b/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
@@ -10,6 +10,7 @@ query AllStages {
             sys {
                 id
             }
+            linkedTo
         }
     }
-}
\ No newline at end of file
+}

From 327c1749457aa2c9ffcfafe9cb9f537142a641f8 Mon Sep 17 00:00:00 2001
From: etan221 <eric.tan@auckland.ac.nz>
Date: Tue, 31 Oct 2023 13:12:51 +1300
Subject: [PATCH 2/2] RSM-3036: stage: use reference instead of string

---
 .../activities-page/activities-page.component.html         | 7 +------
 .../app/graphql/queries/all-research-stages.query.graphql  | 4 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/research-hub-web/src/app/components/activities-page/activities-page.component.html b/research-hub-web/src/app/components/activities-page/activities-page.component.html
index 6334b2a8d..82ee228d1 100644
--- a/research-hub-web/src/app/components/activities-page/activities-page.component.html
+++ b/research-hub-web/src/app/components/activities-page/activities-page.component.html
@@ -11,14 +11,9 @@ <h1>{{ title }}</h1>
     <div fxLayout="column" fxLayoutGap="8px" class="research-activity-content">
       <div *ngFor="let item of allStages">
         <!-- Panel Container -->
-        <!-- absolute path -->
         <a [attr.aria-label]="item.name"
-          [href]="item.linkedTo"
+          [routerLink]="'/subhub/' + item?.linkedToRef?.slug"
         >
-        <!-- Relative path -->
-        <!-- <a [attr.aria-label]="item.name"
-          routerLink="/subhub/research-impact"
-        > -->
           <div class="outer-panel" fxLayout="row">
             <div class="inner-panel">
               <div>
diff --git a/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql b/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
index 3f59a1e78..1f4d5982f 100644
--- a/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
+++ b/research-hub-web/src/app/graphql/queries/all-research-stages.query.graphql
@@ -10,7 +10,9 @@ query AllStages {
             sys {
                 id
             }
-            linkedTo
+            linkedToRef {
+              slug
+            }
         }
     }
 }