FIX: both refresh and course switching is working now.

FIX: both refresh and course switching is working now.

Author: pstaabp

conf/permissions.dist.yml

@@ -48,7 +48,7 @@ db_permissions:
     getGlobalUsers:
       admin_required: true
     getGlobalUser:
-      admin_required: true
+      allow_self_access: true
     checkGlobalUser:
       allowed_roles: ['course_admin', 'instructor']
     updateGlobalUser:
@@ -78,6 +78,7 @@ db_permissions:
     getGlobalCourseUsers:
       allowed_roles: ['course_admin', 'instructor']
     getCourseUser:
+      allow_self_access: true
       allowed_roles: ['course_admin', 'instructor']
     addCourseUser:
       allowed_roles: ['course_admin', 'instructor']
@@ -99,6 +100,7 @@ db_permissions:
     getAllUserSets:
       allowed_roles: ['course_admin', 'instructor']
     getUserSets:
+      allow_self_access: true
       allowed_roles: ['course_admin', 'instructor']
     addUserSet:
       allowed_roles: ['course_admin', 'instructor']

lib/WeBWorK3/Controller/Permission.pm

@@ -62,9 +62,9 @@ sub checkPermission ($c) {
 	} elsif ($perm_db->admin_required && !$user->{is_admin}) {
 		$permitted = undef;
 		$msg       = 'This route requires admin privileges.';
-	} elsif (!$course_id && $perm_db->allow_self_access && defined($c->param('user_id'))) {
+	} elsif (!$course_id && $perm_db->allow_self_access && defined($user_id)) {
 		# Some routes allow self access, but the course_id is not defined.
-		$permitted = $user->{user_id} == $c->param('user_id');
+		$permitted = $user->{user_id} == $user_id;
 	} elsif ($course_id) {
 		my $course_user = $c->schema->resultset('User')->getCourseUser(
 			info => {

src/common/models/session.ts

@@ -1,8 +1,8 @@
-import type { User } from 'src/common/models/users';
+import type { ParseableUser, User } from 'src/common/models/users';
 import { parseBoolean } from './parsers';
 
 export interface SessionInfo {
-	user: User;
+	user: ParseableUser;
 	logged_in: boolean;
 	message: string;
 }

src/common/views.ts

@@ -51,7 +51,7 @@ export const student_views: Array<ViewInfo> = [
 export const instructor_views: Array<ViewInfo> = [
 	{
 		name: 'Dashboard',
-		component_name: 'Dashboard',
+		component_name: 'InstructorDashboard',
 		icon: 'speed',
 		route: 'dashboard',
 		sidebars: []

src/components/common/Login.vue

@@ -67,6 +67,8 @@ const login = async () => {
 		await permission_store.fetchRoles();
 		await permission_store.fetchRoutePermissions();
 
+		if (session.user.user_id == undefined || session.user.user_id == 0) return;
+
 		let forward = localStorage.getItem('afterLogin');
 		forward ||= (session_info.user.is_admin) ?
 			'/admin' :

src/components/common/UserCourses.vue

@@ -36,47 +36,45 @@ import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { useSessionStore } from 'src/stores/session';
+import { logger } from 'src/boot/logger';
 
-const session = useSessionStore();
+const session_store = useSessionStore();
 const router = useRouter();
 
+const user_courses = computed(() => session_store.user_courses);
+
+const user = computed(() => session_store.user);
+
 // This is used to simplify the UI.
 const course_types = computed(() => [
-	{ name: 'Student', courses: student_courses.value },
-	{ name: 'Instrutor', courses: instructor_courses.value }
+	{ name: 'Student', courses: user_courses.value.filter(c => c.role == 'student') },
+	{ name: 'Instructor', courses: session_store.instructor_user_courses }
 ]);
 
-const student_courses = computed(() =>
-	// for some reason on load the user_course.role is undefined.
-	session.user_courses.filter(user_course => user_course.role === 'student'));
-
-const instructor_courses = computed(() =>
-	// For some reason on load the user_course.role is undefined.
-	session.user_courses.filter(user_course => user_course.role === 'instructor')
-);
-const user = computed(() => session.user);
-
-const switchCourse = async (course_id: number) => {
-	const student_course = student_courses.value.find(c => c.course_id === course_id);
-	const instructor_course = instructor_courses.value.find(c => c.course_id === course_id);
+const switchCourse = async (course_id?: number) => {
+	if (course_id == undefined || course_id === 0) {
+		logger.error('[UserCourses/switchCourse]: the course_id is 0 or undefined.');
+	}
+	const student_course = session_store.student_user_courses.find(c => c.course_id === course_id);
+	const instructor_course = session_store.instructor_user_courses.find(c => c.course_id === course_id);
 	if (student_course) {
-		session.setCourse({
-			course_name: student_course.course_name,
-			course_id: student_course.course_id,
+		session_store.setCourse({
+			course_name: student_course.course_name ?? 'unknown',
+			course_id: student_course.course_id ?? 0,
 			role: 'student'
 		});
 		await router.push({
 			name: 'StudentDashboard',
 			params: { course_id: student_course.course_id }
 		});
 	} else if (instructor_course) {
-		session.setCourse({
-			course_name: instructor_course.course_name,
-			course_id: instructor_course.course_id,
+		session_store.setCourse({
+			course_name: instructor_course.course_name ?? 'unknown',
+			course_id: instructor_course.course_id ?? 0,
 			role: 'instructor'
 		});
 		await router.push({
-			name: 'instructor',
+			name: 'InstructorDashboard',
 			params: { course_id: instructor_course.course_id }
 		});
 	}

src/components/student/Student.vue

@@ -21,13 +21,14 @@ const loadStudentSets = async () => {
 	// Fetch only the current user info.
 	await user_store.setSessionUser();
 
-	logger.debug(`[Student/loadStudenSet]: loading data for course ${session_store.course.course_id}`);
+	logger.debug(`[Student/loadStudentSets]: loading data for course ${session_store.course.course_id}`);
 
 	if (session_store.course.course_id > 0) {
 		// Fetch all problem sets and user sets
 		await problem_set_store.fetchProblemSets(session_store.course.course_id);
-		await problem_set_store.fetchUserSetsForUser({ user_id: session_store.user.user_id });
-
+		if (session_store.user.user_id) {
+			await problem_set_store.fetchUserSetsForUser({ user_id: session_store.user.user_id });
+		}
 	}
 };
 
@@ -36,7 +37,7 @@ const course = session_store.user_courses.find(c => c.course_id === course_id);
 if (course) {
 	session_store.setCourse({
 		course_id: course_id,
-		course_name: course.course_name
+		course_name: course.course_name ?? 'unknown'
 	});
 } else {
 	logger.warn(`Can't find ${course_id} in ${session_store.user_courses
@@ -45,7 +46,6 @@ if (course) {
 await loadStudentSets();
 
 watch(() => session_store.course.course_id, async () => {
-
 	await loadStudentSets();
 });
 </script>

src/layouts/MainLayout.vue

@@ -10,9 +10,9 @@
 		</q-drawer>
 
 		<q-page-container>
-			<Suspense>
+			<suspense>
 				<router-view />
-			</Suspense>
+			</suspense>
 		</q-page-container>
 
 <!-- this only opens the first sidebar in the list

src/layouts/MenuBar.vue

@@ -74,7 +74,6 @@ import { useSessionStore } from 'src/stores/session';
 import { useSettingsStore } from 'src/stores/settings';
 
 import type { CourseSettingInfo } from 'src/common/models/settings';
-import { UserRole } from 'src/common/models/parsers';
 
 defineEmits(['toggle-menu', 'toggle-sidebar']);
 const session = useSessionStore();
@@ -88,18 +87,26 @@ const full_name = computed(() => session.full_name);
 const user_courses = computed(() =>
 	session.user_courses.filter(course => course.course_name !== current_course_name.value));
 
-const changeCourse = (course_id: number, course_name: string) => {
+const changeCourse = (course_id?: number, course_name?: string) => {
+	logger.debug(`[MenuBar/changeCourse]: changing the course to ${course_name ?? 'unknown'}`);
 	const new_course = session.user_courses.find(course => course.course_name === course_name);
+	const new_course_id = new_course?.course_id ?? 0;
+	if (!new_course || new_course_id == 0) return;
+	const role = new_course?.role ?? 'unknown';
+
+	if (role == 'unknown') {
+		logger.error(['MenuBar/changeCourse: the role is not defined']);
+	}
 
 	// This sets the path to the instructor or student dashboard.
-	const role = new_course?.role === UserRole.instructor ?
-		'instructor' : new_course?.role === UserRole.student ? 'student' : 'UNKNOWN';
+	// This only works currently for roles of student/instructor.  We'll need to think about
+	// the UI for other roles.
 
 	if (new_course != undefined) {
-		router.push(`/courses/${new_course.course_id}/${role}`).then(() => {
+		router.push(`/courses/${new_course_id}/${role}`).then(() => {
 			session.setCourse({
-				course_name: new_course.course_name,
-				course_id: new_course.course_id
+				course_name: new_course.course_name ?? 'unknown',
+				course_id: new_course_id
 			});
 		}).catch(() => {
 			logger.error('[MenuBar/changeCourse]: Error occurred.');

src/pages/instructor/Instructor.vue

@@ -1,9 +1,18 @@
 <template>
-	<router-view />
+	<suspense>
+		<router-view />
+	</suspense>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<!-- Switched to a script setup block, which was needed to fix a number of errors.
+To use async within script setup, the router-view needs to be wrapped in a
+suspense tag.
+
+Note as of aug-2022, this is still
+experimental/beta https://vuejs.org/api/sfc-script-setup.html#top-level-await
+-->
+
+<script setup lang="ts">
 import { useRoute } from 'vue-router';
 import { setI18nLanguage } from 'boot/i18n';
 import { logger } from 'boot/logger';
@@ -14,41 +23,30 @@ import { useProblemSetStore } from 'src/stores/problem_sets';
 import { useSessionStore } from 'src/stores/session';
 import { parseRouteCourseID } from 'src/router/utils';
 
-// Eventually we'll switch to a script set-up block, but seems to be still
-// experimental/beta https://vuejs.org/api/sfc-script-setup.html#top-level-await
-
-export default defineComponent({
-	name: 'Instructor',
-	props: {
-		course_name: String,
-		course_id: String
-	},
-	async setup() {
-		const session = useSessionStore();
-		const users = useUserStore();
-		const settings = useSettingsStore();
-		const problem_sets = useProblemSetStore();
-		const route = useRoute();
-
-		const course_id = parseRouteCourseID(route);
-		const course = session.user_courses.find(c => c.course_id === course_id);
-		if (course) {
-			session.setCourse({
-				course_id,
-				course_name: course.course_name
-			});
-		} else {
-			logger.warn(`Can't find ${course_id} in ${session.user_courses
-				.map((c) => c.course_id).join(', ')}`);
-		}
-		await users.fetchGlobalCourseUsers(course_id);
-		await users.fetchCourseUsers(course_id);
-		await problem_sets.fetchProblemSets(course_id);
-		await settings.fetchDefaultSettings(course_id)
-			.then(() => settings.fetchCourseSettings(course_id))
-			.then(() => void setI18nLanguage(settings.getCourseSetting('language').value as string))
-			.catch((err) => logger.error(`${JSON.stringify(err)}`));
-
-	},
-});
+const session = useSessionStore();
+const users = useUserStore();
+const settings = useSettingsStore();
+const problem_sets = useProblemSetStore();
+const route = useRoute();
+
+const course_id = parseRouteCourseID(route);
+const course = session.user_courses.find(c => c.course_id === course_id);
+
+if (course) {
+	session.setCourse({
+		course_id,
+		course_name: course.course_name ?? 'unknown'
+	});
+} else {
+	logger.warn(`Can't find ${course_id} in ${session.user_courses
+		.map((c) => c.course_id).join(', ')}`);
+}
+await users.fetchGlobalCourseUsers(course_id);
+await users.fetchCourseUsers(course_id);
+await problem_sets.fetchProblemSets(course_id);
+await settings.fetchDefaultSettings(course_id)
+	.then(() => settings.fetchCourseSettings(course_id))
+	.then(() => void setI18nLanguage(settings.getCourseSetting('language').value as string))
+	.catch((err) => logger.error(`${JSON.stringify(err)}`));
+
 </script>