From 21c8c8a7524e007774f6bc4d449968fd2a12e583 Mon Sep 17 00:00:00 2001
From: 20041540MichaelKelly <20041540@mail.wit.ie>
Date: Sun, 10 Sep 2023 10:05:12 +0100
Subject: [PATCH 1/2] fix: The solution was to access the route from the
 parentTopic and also add in a null safety operator just to ensure against
 nulls

---
 .../TopicNavigator/TopicNavigator.svelte       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte b/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
index 49ce0fbdf..bf722bb2d 100644
--- a/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
+++ b/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
@@ -6,15 +6,15 @@
 </script>
 
 {#each topic.toc as lo}
-  <a href={lo.route} class="flex py-1">
-    <Icon type={lo.type} />
-    <span class="ml-2 mb-1"> {@html lo.title} </span>
-    {#if lo.video && lo.type != "panelvideo"}
-      <a class="flex pl-1" href={lo.video}>
-        <Icon type="video" />
-      </a>
-    {/if}
-  </a>
+    <a href={lo?.parentTopic?.route} class="flex py-1">
+      <Icon type={lo.type} />
+      <span class="ml-2 mb-1"> {@html lo.title} </span>
+      {#if lo.video && lo.type != "panelvideo"}
+        <a class="flex pl-1" href={lo.video}>
+          <Icon type="video" />
+        </a>
+      {/if}
+    </a>
   {#if lo.type != "lab"}
     {#if lo.los}
       {#each lo.los as lo}

From a2dd193898da517a874922404bf514842986b574 Mon Sep 17 00:00:00 2001
From: 20041540MichaelKelly <20041540@mail.wit.ie>
Date: Sun, 10 Sep 2023 13:22:57 +0100
Subject: [PATCH 2/2] fix: I added in a ternary conditional to check if type is
 side and unit to got to lo.parentTopic.route if not go lo.route

---
 .../TopicNavigator/TopicNavigator.svelte       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte b/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
index bf722bb2d..3f592f12b 100644
--- a/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
+++ b/app/src/lib/ui/legacy/Organisms/TopicNavigator/TopicNavigator.svelte
@@ -6,15 +6,15 @@
 </script>
 
 {#each topic.toc as lo}
-    <a href={lo?.parentTopic?.route} class="flex py-1">
-      <Icon type={lo.type} />
-      <span class="ml-2 mb-1"> {@html lo.title} </span>
-      {#if lo.video && lo.type != "panelvideo"}
-        <a class="flex pl-1" href={lo.video}>
-          <Icon type="video" />
-        </a>
-      {/if}
-    </a>
+  <a href={lo.type === "unit" ? lo?.parentTopic?.route : lo.type === "side" ? lo?.parentTopic?.route : lo?.route} class="flex py-1">
+    <Icon type={lo.type} />
+    <span class="ml-2 mb-1"> {@html lo.title} </span>
+    {#if lo.video && lo.type != "panelvideo"}
+      <a class="flex pl-1" href={lo.video}>
+        <Icon type="video" />
+      </a>
+    {/if}
+  </a>
   {#if lo.type != "lab"}
     {#if lo.los}
       {#each lo.los as lo}