From db35a037eb0473691ebc734ca6a1abc9f717cd74 Mon Sep 17 00:00:00 2001
From: Elia Bieri <elia.bieri@iterativ.ch>
Date: Thu, 25 May 2023 13:34:23 +0200
Subject: [PATCH] Jump to cockpit for trainers and superusers

---
 .../src/components/header/MainNavigationBar.vue |  2 +-
 client/src/pages/DashboardPage.vue              | 14 ++++++++++++--
 client/src/router/guards.ts                     |  2 +-
 client/src/stores/courseSessions.ts             | 17 +++++++++++------
 client/src/types.ts                             |  1 +
 server/vbv_lernwelt/course/models.py            |  5 ++++-
 server/vbv_lernwelt/course/serializers.py       |  5 +++++
 server/vbv_lernwelt/learnpath/models.py         |  5 ++++-
 8 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 7ebbe0e7..5a7f599b 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -106,7 +106,7 @@ onMounted(() => {
                   v-if="
                     inCourse() &&
                     courseSessionsStore.currentCourseSession &&
-                    courseSessionsStore.hasCockpit
+                    courseSessionsStore.currentCourseSessionHasCockpit
                   "
                   :to="`${courseSessionsStore.currentCourseSession.course_url}/cockpit`"
                   class="nav-item"
diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue
index e7b1f3bf..8afb26a9 100644
--- a/client/src/pages/DashboardPage.vue
+++ b/client/src/pages/DashboardPage.vue
@@ -2,8 +2,9 @@
 import LearningPathDiagramSmall from "@/components/learningPath/LearningPathDiagramSmall.vue";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { useUserStore } from "@/stores/user";
+import type { CourseSession } from "@/types";
 import log from "loglevel";
-import { onMounted } from "vue";
+import { computed, onMounted } from "vue";
 
 log.debug("DashboardPage created");
 
@@ -19,6 +20,15 @@ function employer() {
 onMounted(async () => {
   log.debug("DashboardPage mounted");
 });
+
+const getNextStepLink = (courseSession: CourseSession) => {
+  return computed(() => {
+    if (courseSessionsStore.hasCockpit(courseSession)) {
+      return courseSession.cockpit_url;
+    }
+    return courseSession.learning_path_url;
+  });
+};
 </script>
 
 <template>
@@ -50,7 +60,7 @@ onMounted(async () => {
                 <div>
                   <router-link
                     class="btn-blue"
-                    :to="courseSession.learning_path_url"
+                    :to="getNextStepLink(courseSession)"
                     :data-cy="`continue-course-${courseSession.course.id}`"
                   >
                     {{ $t("general.nextStep") }}
diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts
index 65bc1a32..f23091ee 100644
--- a/client/src/router/guards.ts
+++ b/client/src/router/guards.ts
@@ -36,7 +36,7 @@ const loginRequired = (to: RouteLocationNormalized) => {
 
 export const expertRequired: NavigationGuard = (to: RouteLocationNormalized) => {
   const courseSessionsStore = useCourseSessionsStore();
-  if (courseSessionsStore.hasCockpit) {
+  if (courseSessionsStore.currentCourseSessionHasCockpit) {
     return true;
   } else {
     const courseSlug = to.params.courseSlug as string;
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index c673f3fe..b7640ac6 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -124,13 +124,9 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
     return allCourseSessionsForCourse(_currentCourseSlug.value);
   });
 
-  const hasCockpit = computed(() => {
+  const currentCourseSessionHasCockpit = computed(() => {
     if (currentCourseSession.value) {
-      const userStore = useUserStore();
-      return (
-        userStore.course_session_experts.includes(currentCourseSession.value.id) ||
-        userStore.is_superuser
-      );
+      return hasCockpit(currentCourseSession.value);
     }
 
     return false;
@@ -182,6 +178,14 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
     );
   });
 
+  function hasCockpit(couseSession: CourseSession) {
+    const userStore = useUserStore();
+    return (
+      userStore.course_session_experts.includes(couseSession.id) ||
+      userStore.is_superuser
+    );
+  }
+
   function addDocument(document: CircleDocument) {
     currentCourseSession.value?.documents.push(document);
   }
@@ -232,6 +236,7 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
     courseSessionForCourse,
     switchCourseSession,
     hasCockpit,
+    currentCourseSessionHasCockpit,
     canUploadCircleDocuments,
     circleDocuments,
     circleExperts,
diff --git a/client/src/types.ts b/client/src/types.ts
index e8b871b5..ea4bc867 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -415,6 +415,7 @@ export interface CourseSession {
   start_date: string;
   end_date: string;
   learning_path_url: string;
+  cockpit_url: string;
   competence_url: string;
   course_url: string;
   media_library_url: string;
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index 15a2fa4a..b38542a0 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -33,7 +33,10 @@ class Course(models.Model):
         return self.coursepage.get_children().exact_type(LearningPath).first().specific
 
     def get_learning_path_url(self):
-        return self.get_learning_path().get_frontend_url()
+        return self.get_learning_path().get_learning_path_url()
+
+    def get_cockpit_url(self):
+        return self.get_learning_path().get_cockpit_url()
 
     def get_competence_url(self):
         from vbv_lernwelt.competence.models import CompetenceProfilePage
diff --git a/server/vbv_lernwelt/course/serializers.py b/server/vbv_lernwelt/course/serializers.py
index 63061161..787ec523 100644
--- a/server/vbv_lernwelt/course/serializers.py
+++ b/server/vbv_lernwelt/course/serializers.py
@@ -46,6 +46,7 @@ class CourseSessionSerializer(serializers.ModelSerializer):
     course = serializers.SerializerMethodField()
     course_url = serializers.SerializerMethodField()
     learning_path_url = serializers.SerializerMethodField()
+    cockpit_url = serializers.SerializerMethodField()
     competence_url = serializers.SerializerMethodField()
     media_library_url = serializers.SerializerMethodField()
     documents = serializers.SerializerMethodField()
@@ -59,6 +60,9 @@ class CourseSessionSerializer(serializers.ModelSerializer):
     def get_learning_path_url(self, obj):
         return obj.course.get_learning_path_url()
 
+    def get_cockpit_url(self, obj):
+        return obj.course.get_cockpit_url()
+
     def get_media_library_url(self, obj):
         return obj.course.get_media_library_url()
 
@@ -85,6 +89,7 @@ class CourseSessionSerializer(serializers.ModelSerializer):
             "attendance_days",
             "assignment_details_list",
             "learning_path_url",
+            "cockpit_url",
             "competence_url",
             "media_library_url",
             "course_url",
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index 1e7ad1ea..f35a65a2 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -30,9 +30,12 @@ class LearningPath(CourseBasePage):
     def __str__(self):
         return f"{self.title}"
 
-    def get_frontend_url(self):
+    def get_learning_path_url(self):
         return f"/course/{self.slug.replace('-lp', '')}/learn"
 
+    def get_cockpit_url(self):
+        return f"/course/{self.slug.replace('-lp', '')}/cockpit"
+
 
 class Topic(CourseBasePage):
     serialize_field_names = ["is_visible"]