From caa10feedbdfd6892c41c5ceca47c643a2cfe70a Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com> Date: Wed, 4 Dec 2024 12:46:52 -0500 Subject: [PATCH] Fix request to get course before enter the home page - refs BT#22265 --- assets/vue/router/index.js | 2 +- assets/vue/services/courseService.js | 43 +++++++++++----------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js index aa70794570..edc7527b34 100644 --- a/assets/vue/router/index.js +++ b/assets/vue/router/index.js @@ -116,7 +116,7 @@ const router = createRouter({ return false } - const course = await courseService.getCourseDetails(courseId) + const course = await courseService.findById(courseId, { sid: sessionId }) if (!course) { return false } diff --git a/assets/vue/services/courseService.js b/assets/vue/services/courseService.js index 60e65ec3ca..1f6e10737b 100644 --- a/assets/vue/services/courseService.js +++ b/assets/vue/services/courseService.js @@ -4,6 +4,13 @@ import baseService from "./baseService" export default { find: baseService.get, + /** + * @param {number} cid + * @param {object} params + * @returns {Promise} + */ + findById: async (cid, params) => baseService.get(`/api/courses/${cid}`, params), + /** * @param {number} courseId * @param {number=} sessionId @@ -107,22 +114,6 @@ export default { })) }, - /** - * Fetches course details by course ID. - * - * @param {number} courseId - The ID of the course. - * @returns {Promise} - The course details or null if an error occurs. - */ - getCourseDetails: async (courseId) => { - try { - const response = await api.get(`/api/courses/${courseId}`) - return response.data - } catch (error) { - console.error("Error fetching course details:", error) - return null - } - }, - /** * Retrieves the ID of the auto-launchable exercise in a course, if configured. * @@ -136,16 +127,16 @@ export default { params: { sid: sessionId, }, - }); + }) if (data && data.exerciseId) { - return data.exerciseId; + return data.exerciseId } - return null; + return null } catch (error) { - console.error("Error fetching auto-launch exercise ID:", error); - return null; + console.error("Error fetching auto-launch exercise ID:", error) + return null } }, /** @@ -161,16 +152,16 @@ export default { params: { sid: sessionId, }, - }); + }) if (data && data.lpId) { - return data.lpId; + return data.lpId } - return null; + return null } catch (error) { - console.error("Error fetching auto-launch LP ID:", error); - return null; + console.error("Error fetching auto-launch LP ID:", error) + return null } }, }