From 8e076c3dacc3fa1898047d42176365b5a3e6fa3f Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Wed, 13 Mar 2024 16:02:03 +0100
Subject: [PATCH] fix: various links that broke when moving stuff around

---
 .../pages/cockpit/assignmentsPage/AssignmentDetails.vue    | 2 +-
 client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue | 2 +-
 client/src/pages/learningPath/circlePage/CirclePage.vue    | 2 +-
 client/src/router/index.ts                                 | 7 +++++--
 .../learning_mentor/content/praxis_assignment.py           | 2 +-
 .../vbv_lernwelt/learning_mentor/tests/test_assignments.py | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 69a5327d..cdb64aec 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -171,7 +171,7 @@ function findUserPointsHtml(userId: string) {
                   props.learningContent.content_type !==
                     'learnpath.LearningContentEdoniqTest'
                 "
-                :to="`/course/${props.courseSession.course.slug}/cockpit/assignment/${learningContent.content_assignment.id}/${csu.user_id}`"
+                :to="`/course/${props.courseSession.course.slug}/assignment-evaluation/${learningContent.content_assignment.id}/${csu.user_id}`"
                 class="link lg:w-full lg:text-right"
                 data-cy="show-results"
               >
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
index 42ee401a..744a94de 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
@@ -148,7 +148,7 @@ const courseSessionDetailResult = useCourseSessionDetailQuery();
                 </template>
                 <template #link>
                   <router-link
-                    :to="`/course/${props.courseSlug}/cockpit/profile/${csu.user_id}`"
+                    :to="`/course/${props.courseSlug}/profile/${csu.user_id}`"
                     class="link w-full lg:text-right"
                   >
                     {{ $t("general.profileLink") }}
diff --git a/client/src/pages/learningPath/circlePage/CirclePage.vue b/client/src/pages/learningPath/circlePage/CirclePage.vue
index 7b6fa8cd..90e92244 100644
--- a/client/src/pages/learningPath/circlePage/CirclePage.vue
+++ b/client/src/pages/learningPath/circlePage/CirclePage.vue
@@ -172,7 +172,7 @@ watch(
                 <div>
                   <router-link
                     class="link"
-                    :to="`/course/${courseSlug}/cockpit/profile/${profileUser.user_id}`"
+                    :to="`/course/${courseSlug}/profile/${profileUser.user_id}`"
                   >
                     {{ $t("general.profileLink") }}
                   </router-link>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index c8097829..c92e7bb2 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -234,10 +234,13 @@ const router = createRouter({
     },
     {
       path: "/course/:courseSlug/cockpit",
-      component: () => import("@/pages/cockpit/cockpitPage/CockpitExpertPage.vue"),
-      props: true,
       name: "cockpit",
       children: [
+        {
+          path: "",
+          component: () => import("@/pages/cockpit/cockpitPage/CockpitExpertPage.vue"),
+          props: true,
+        },
         {
           path: "profile/:userId/:circleSlug",
           component: () => import("@/pages/cockpit/CockpitUserCirclePage.vue"),
diff --git a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
index 6e74e3f1..3505cec2 100644
--- a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
+++ b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
@@ -72,7 +72,7 @@ def get_assignment_completions(
             )[0],
             user_id=user.id,
             last_name=user.last_name,
-            url=f"/course/{course_session.course.slug}/cockpit/assignment/{assignment.id}/{user.id}",
+            url=f"/course/{course_session.course.slug}/assignment-evaluation/{assignment.id}/{user.id}",
         )
         for user in sorted_participants
     ]
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
index 794e721a..9c765412 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
@@ -86,7 +86,7 @@ class AttendanceServicesTestCase(TestCase):
             self.assertEqual(result.status, expected_statuses[result.last_name])
             self.assertEqual(
                 result.url,
-                f"/course/test-lehrgang/cockpit/assignment/{self.assignment.id}/{result.user_id}",
+                f"/course/test-lehrgang/assignment-evaluation/{self.assignment.id}/{result.user_id}",
             )
 
     def test_praxis_assignment_status(self):