From b66026382bd1bf9798da28fb0f0afca45ba5899c Mon Sep 17 00:00:00 2001
From: Timo De Meyst <timo.demeyst@ugent.be>
Date: Mon, 19 May 2025 21:36:11 +0200
Subject: [PATCH 1/7] fix: geselecteerde leerobject wordt weer aangeduidt in
 discussions sidebar

---
 frontend/src/components/DiscussionsSideBar.vue      | 6 +++++-
 frontend/src/views/discussions/SingleDiscussion.vue | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DiscussionsSideBar.vue b/frontend/src/components/DiscussionsSideBar.vue
index 5c68e6ac..100e6a37 100644
--- a/frontend/src/components/DiscussionsSideBar.vue
+++ b/frontend/src/components/DiscussionsSideBar.vue
@@ -10,6 +10,10 @@
     const { t, locale } = useI18n();
     const route = useRoute();
 
+    const props = defineProps<{
+            learningObjectHruid: string;
+        }>();
+
     const navigationDrawerShown = ref(true);
     const currentLocale = ref(locale.value);
     const expanded = ref([route.params.hruid]);
@@ -42,7 +46,7 @@
                     <DiscussionSideBarElement
                         v-for="learningPath in learningPaths.data"
                         :path="learningPath"
-                        :activeObjectId="'' as string"
+                        :activeObjectId="props.learningObjectHruid"
                         :key="learningPath.hruid"
                     />
                 </using-query-result>
diff --git a/frontend/src/views/discussions/SingleDiscussion.vue b/frontend/src/views/discussions/SingleDiscussion.vue
index 51230c51..6af44b0e 100644
--- a/frontend/src/views/discussions/SingleDiscussion.vue
+++ b/frontend/src/views/discussions/SingleDiscussion.vue
@@ -75,7 +75,9 @@ const { t } = useI18n();
 </script>
 
 <template>
-    <DiscussionsSideBar></DiscussionsSideBar>
+    <DiscussionsSideBar
+        :learningObjectHruid="props.learningObjectHruid">
+    </DiscussionsSideBar>
     <div class="discussions-container">
         <QuestionBox
             :hruid="props.hruid"

From 4be55e1b9a7f3ba7ad1ab4fe73e554c2509eeabf Mon Sep 17 00:00:00 2001
From: Timo De Meyst <timo.demeyst@ugent.be>
Date: Mon, 19 May 2025 21:37:16 +0200
Subject: [PATCH 2/7] feat: leerobjecten in discussions sidebar tonen wanneer
 er een vraag is gesteld

---
 frontend/src/components/DiscussionSideBarElement.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/DiscussionSideBarElement.vue b/frontend/src/components/DiscussionSideBarElement.vue
index a5b909e4..92131f03 100644
--- a/frontend/src/components/DiscussionSideBarElement.vue
+++ b/frontend/src/components/DiscussionSideBarElement.vue
@@ -4,6 +4,7 @@ import type { LearningPath } from '@/data-objects/learning-paths/learning-path';
 import { useLearningObjectListForPathQuery } from '@/queries/learning-objects';
 import { useRoute } from 'vue-router';
 import UsingQueryResult from '@/components/UsingQueryResult.vue';
+import QuestionNotification from "@/components/QuestionNotification.vue";
 
 const route = useRoute();
 
@@ -37,6 +38,9 @@ const route = useRoute();
                             :title="node.title"
                             :active="node.key === props.activeObjectId"
                         >
+                        <template v-slot:append>
+                            <QuestionNotification :node="node"></QuestionNotification>
+                        </template>
                         </v-list-item>
                     </template>
                 </using-query-result>

From 62ba67b5b6ca79630664c21d69d55b016c71f1ee Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 20 May 2025 10:07:24 +0000
Subject: [PATCH 3/7] style: fix linting issues met Prettier

---
 .../src/components/DiscussionSideBarElement.vue  | 16 ++++++++--------
 frontend/src/components/DiscussionsSideBar.vue   |  4 ++--
 .../src/views/discussions/SingleDiscussion.vue   |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/DiscussionSideBarElement.vue b/frontend/src/components/DiscussionSideBarElement.vue
index 12257f36..a439b2fa 100644
--- a/frontend/src/components/DiscussionSideBarElement.vue
+++ b/frontend/src/components/DiscussionSideBarElement.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-    import type { LearningObject } from '@/data-objects/learning-objects/learning-object';
-    import type { LearningPath } from '@/data-objects/learning-paths/learning-path';
-    import { useLearningObjectListForPathQuery } from '@/queries/learning-objects';
-    import { useRoute } from 'vue-router';
-    import UsingQueryResult from '@/components/UsingQueryResult.vue';
+    import type { LearningObject } from "@/data-objects/learning-objects/learning-object";
+    import type { LearningPath } from "@/data-objects/learning-paths/learning-path";
+    import { useLearningObjectListForPathQuery } from "@/queries/learning-objects";
+    import { useRoute } from "vue-router";
+    import UsingQueryResult from "@/components/UsingQueryResult.vue";
     import QuestionNotification from "@/components/QuestionNotification.vue";
 
     const route = useRoute();
@@ -38,9 +38,9 @@
                             :title="node.title"
                             :active="node.key === props.activeObjectId"
                         >
-                        <template v-slot:append>
-                            <QuestionNotification :node="node"></QuestionNotification>
-                        </template>
+                            <template v-slot:append>
+                                <QuestionNotification :node="node"></QuestionNotification>
+                            </template>
                         </v-list-item>
                     </template>
                 </using-query-result>
diff --git a/frontend/src/components/DiscussionsSideBar.vue b/frontend/src/components/DiscussionsSideBar.vue
index 100e6a37..47590864 100644
--- a/frontend/src/components/DiscussionsSideBar.vue
+++ b/frontend/src/components/DiscussionsSideBar.vue
@@ -11,8 +11,8 @@
     const route = useRoute();
 
     const props = defineProps<{
-            learningObjectHruid: string;
-        }>();
+        learningObjectHruid: string;
+    }>();
 
     const navigationDrawerShown = ref(true);
     const currentLocale = ref(locale.value);
diff --git a/frontend/src/views/discussions/SingleDiscussion.vue b/frontend/src/views/discussions/SingleDiscussion.vue
index d0e11b76..405e1c0f 100644
--- a/frontend/src/views/discussions/SingleDiscussion.vue
+++ b/frontend/src/views/discussions/SingleDiscussion.vue
@@ -75,9 +75,7 @@
 </script>
 
 <template>
-    <DiscussionsSideBar
-        :learningObjectHruid="props.learningObjectHruid">
-    </DiscussionsSideBar>
+    <DiscussionsSideBar :learningObjectHruid="props.learningObjectHruid"> </DiscussionsSideBar>
     <div class="discussions-container">
         <QuestionBox
             :hruid="props.hruid"

From a88390f46b09030b1b5cc84e813aa09d2d42161f Mon Sep 17 00:00:00 2001
From: Joyelle Ndagijimana <njoyelle2@gmail.com>
Date: Tue, 20 May 2025 15:18:15 +0200
Subject: [PATCH 4/7] fix: query oproepen buiten de template

---
 frontend/src/components/DiscussionSideBarElement.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/DiscussionSideBarElement.vue b/frontend/src/components/DiscussionSideBarElement.vue
index a439b2fa..cda9e849 100644
--- a/frontend/src/components/DiscussionSideBarElement.vue
+++ b/frontend/src/components/DiscussionSideBarElement.vue
@@ -12,6 +12,8 @@
         path: LearningPath;
         activeObjectId: string;
     }>();
+
+    const learningObjectsQuery = useLearningObjectListForPathQuery(props.path);
 </script>
 
 <template>
@@ -22,7 +24,7 @@
         <v-expansion-panel-text>
             <v-lazy>
                 <using-query-result
-                    :query-result="useLearningObjectListForPathQuery(props.path)"
+                    :query-result="learningObjectsQuery"
                     v-slot="learningObjects: { data: LearningObject[] }"
                 >
                     <template

From 4ca57d8b8c5de55d72d67187a781e5b3f0d6a9e4 Mon Sep 17 00:00:00 2001
From: Tibo De Peuter <tibo.depeuter@ugent.be>
Date: Tue, 20 May 2025 15:33:40 +0200
Subject: [PATCH 5/7] fix(frontend): Alleen fetchen bij open

---
 .../components/DiscussionSideBarElement.vue   | 57 ++++++++-----------
 .../src/components/DiscussionsSideBar.vue     | 21 +++++--
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/frontend/src/components/DiscussionSideBarElement.vue b/frontend/src/components/DiscussionSideBarElement.vue
index cda9e849..2d7eb1df 100644
--- a/frontend/src/components/DiscussionSideBarElement.vue
+++ b/frontend/src/components/DiscussionSideBarElement.vue
@@ -13,42 +13,33 @@
         activeObjectId: string;
     }>();
 
-    const learningObjectsQuery = useLearningObjectListForPathQuery(props.path);
+    const learningObjects = useLearningObjectListForPathQuery(props.path);
 </script>
 
 <template>
-    <v-expansion-panel :value="props.path.hruid">
-        <v-expansion-panel-title>
-            {{ path.title }}
-        </v-expansion-panel-title>
-        <v-expansion-panel-text>
-            <v-lazy>
-                <using-query-result
-                    :query-result="learningObjectsQuery"
-                    v-slot="learningObjects: { data: LearningObject[] }"
-                >
-                    <template
-                        v-for="node in learningObjects.data"
-                        :key="node.key"
-                    >
-                        <v-list-item
-                            link
-                            :to="{
-                                path: `/discussion-reload/${props.path.hruid}/${node.language}/${node.key}`,
-                                query: route.query,
-                            }"
-                            :title="node.title"
-                            :active="node.key === props.activeObjectId"
-                        >
-                            <template v-slot:append>
-                                <QuestionNotification :node="node"></QuestionNotification>
-                            </template>
-                        </v-list-item>
-                    </template>
-                </using-query-result>
-            </v-lazy>
-        </v-expansion-panel-text>
-    </v-expansion-panel>
+    <using-query-result
+        :query-result="learningObjects"
+        v-slot="learningObjects: { data: LearningObject[] }"
+    >
+        <template
+            v-for="node in learningObjects.data"
+            :key="node.key"
+        >
+            <v-list-item
+                link
+                :to="{
+                    path: `/discussion-reload/${props.path.hruid}/${node.language}/${node.key}`,
+                    query: route.query,
+                }"
+                :title="node.title"
+                :active="node.key === props.activeObjectId"
+            >
+                <template v-slot:append>
+                    <QuestionNotification :node="node"></QuestionNotification>
+                </template>
+            </v-list-item>
+        </template>
+    </using-query-result>
 </template>
 
 <style scoped></style>
diff --git a/frontend/src/components/DiscussionsSideBar.vue b/frontend/src/components/DiscussionsSideBar.vue
index 47590864..4b5b1b86 100644
--- a/frontend/src/components/DiscussionsSideBar.vue
+++ b/frontend/src/components/DiscussionsSideBar.vue
@@ -43,12 +43,21 @@
                     :query-result="allLearningPathsResult"
                     v-slot="learningPaths: { data: LearningPath[] }"
                 >
-                    <DiscussionSideBarElement
-                        v-for="learningPath in learningPaths.data"
-                        :path="learningPath"
-                        :activeObjectId="props.learningObjectHruid"
-                        :key="learningPath.hruid"
-                    />
+                    <v-expansion-panel v-for="learningPath in learningPaths.data"
+                                       :key="learningPath.hruid"
+                                       :value="learningPath.hruid">
+                        <v-expansion-panel-title>
+                            {{ learningPath.title }}
+                        </v-expansion-panel-title>
+                        <v-expansion-panel-text>
+                            <v-lazy>
+                                <DiscussionSideBarElement
+                                    :path="learningPath"
+                                    :activeObjectId="props.learningObjectHruid"
+                                />
+                            </v-lazy>
+                        </v-expansion-panel-text>
+                    </v-expansion-panel>
                 </using-query-result>
             </v-expansion-panels>
         </div>

From bbbb23b7001de1f2a3b25e025699fb7bb86cd58b Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 20 May 2025 13:34:44 +0000
Subject: [PATCH 6/7] style: fix linting issues met Prettier

---
 frontend/src/components/DiscussionsSideBar.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DiscussionsSideBar.vue b/frontend/src/components/DiscussionsSideBar.vue
index 4b5b1b86..47f70976 100644
--- a/frontend/src/components/DiscussionsSideBar.vue
+++ b/frontend/src/components/DiscussionsSideBar.vue
@@ -43,9 +43,11 @@
                     :query-result="allLearningPathsResult"
                     v-slot="learningPaths: { data: LearningPath[] }"
                 >
-                    <v-expansion-panel v-for="learningPath in learningPaths.data"
-                                       :key="learningPath.hruid"
-                                       :value="learningPath.hruid">
+                    <v-expansion-panel
+                        v-for="learningPath in learningPaths.data"
+                        :key="learningPath.hruid"
+                        :value="learningPath.hruid"
+                    >
                         <v-expansion-panel-title>
                             {{ learningPath.title }}
                         </v-expansion-panel-title>

From 13c95c9021b488c73fc46dd7ff13fe9b6bd1c097 Mon Sep 17 00:00:00 2001
From: Lint Action <lint-action@samuelmeuli.com>
Date: Tue, 20 May 2025 17:16:12 +0000
Subject: [PATCH 7/7] style: fix linting issues met Prettier

---
 .../src/components/DiscussionsSideBar.vue     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/DiscussionsSideBar.vue b/frontend/src/components/DiscussionsSideBar.vue
index 8c4a2a32..d32a2f62 100644
--- a/frontend/src/components/DiscussionsSideBar.vue
+++ b/frontend/src/components/DiscussionsSideBar.vue
@@ -45,21 +45,21 @@
                         v-slot="learningPaths: { data: LearningPath[] }"
                     >
                         <v-expansion-panel
-                        v-for="learningPath in learningPaths.data"
-                        :key="learningPath.hruid"
-                        :value="learningPath.hruid"
-                    >
-                        <v-expansion-panel-title>
-                            {{ learningPath.title }}
-                        </v-expansion-panel-title>
-                        <v-expansion-panel-text>
-                            <v-lazy>
-                                <DiscussionSideBarElement
-                                    :path="learningPath"
-                                    :activeObjectId="props.learningObjectHruid"
-                                />
-                            </v-lazy>
-                        </v-expansion-panel-text>
+                            v-for="learningPath in learningPaths.data"
+                            :key="learningPath.hruid"
+                            :value="learningPath.hruid"
+                        >
+                            <v-expansion-panel-title>
+                                {{ learningPath.title }}
+                            </v-expansion-panel-title>
+                            <v-expansion-panel-text>
+                                <v-lazy>
+                                    <DiscussionSideBarElement
+                                        :path="learningPath"
+                                        :activeObjectId="props.learningObjectHruid"
+                                    />
+                                </v-lazy>
+                            </v-expansion-panel-text>
                         </v-expansion-panel>
                     </using-query-result>
                 </v-expansion-panels>