Skip to content

Commit d0ab309

Browse files
committed
Replace useCidReq composable with getCourseContext utility throughout the codebase. Centralize course context resolution logic for consistency and reusability.
1 parent 9885736 commit d0ab309

45 files changed

Lines changed: 165 additions & 157 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

assets/vue/components/assignments/AssignmentsForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ import useVuelidate from "@vuelidate/core"
159159
import { computed, reactive, ref, watchEffect } from "vue"
160160
import { maxValue, minValue, required } from "@vuelidate/validators"
161161
import { useI18n } from "vue-i18n"
162-
import { useCidReq } from "../../composables/cidReq"
162+
import { getCourseContext } from "../../utils/courseContext"
163163
import { useRoute } from "vue-router"
164164
import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
165165
@@ -177,7 +177,7 @@ const props = defineProps({
177177
const emit = defineEmits(["submit"])
178178
179179
const { t } = useI18n()
180-
const { cid, sid, gid } = useCidReq()
180+
const { cid, sid, gid } = getCourseContext()
181181
const route = useRoute()
182182
183183
const showAdvancedSettings = ref(false)

assets/vue/components/assignments/AssignmentsLayout.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
import { ref } from "vue"
77
import { useRoute, useRouter } from "vue-router"
88
import { useI18n } from "vue-i18n"
9-
import { useCidReq } from "../../composables/cidReq"
9+
import { getCourseContext } from "../../utils/courseContext"
1010
import { useSecurityStore } from "../../store/securityStore"
1111
1212
const route = useRoute()
1313
const router = useRouter()
1414
const { t } = useI18n()
1515
16-
const { cid, sid, gid } = useCidReq()
16+
const { cid, sid, gid } = getCourseContext()
1717
const securityStore = useSecurityStore()
1818
1919
const isCurrentTeacher = securityStore.isCurrentTeacher

assets/vue/components/assignments/MoveSubmissionModal.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import Button from "primevue/button"
4848
import Dialog from "primevue/dialog"
4949
import cStudentPublicationService from "../../services/cstudentpublication"
5050
import { useNotification } from "../../composables/notification"
51-
import { useCidReq } from "../../composables/cidReq"
51+
import { getCourseContext } from "../../utils/courseContext"
5252
5353
const props = defineProps({
5454
modelValue: Boolean,
@@ -57,7 +57,7 @@ const props = defineProps({
5757
})
5858
5959
const emit = defineEmits(["update:modelValue", "moved"])
60-
const { cid, sid, gid } = useCidReq()
60+
const { cid, sid, gid } = getCourseContext()
6161
const { t } = useI18n()
6262
const notification = useNotification()
6363

assets/vue/components/assignments/StudentAssignmentList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ import { ref, onMounted, nextTick, computed } from "vue"
8080
import { useI18n } from "vue-i18n"
8181
import { useFormatDate } from "../../composables/formatDate"
8282
import { useRoute, useRouter } from "vue-router"
83-
import { useCidReq } from "../../composables/cidReq"
83+
import { getCourseContext } from "../../utils/courseContext"
8484
import cStudentPublicationService from "../../services/cstudentpublication"
8585
import BaseIcon from "../basecomponents/BaseIcon.vue"
8686
import BaseButton from "../basecomponents/BaseButton.vue"
@@ -91,7 +91,7 @@ const { t, locale } = useI18n()
9191
const { abbreviatedDatetime } = useFormatDate()
9292
const router = useRouter()
9393
const route = useRoute()
94-
const { cid, sid, gid } = useCidReq()
94+
const { cid, sid, gid } = getCourseContext()
9595
9696
const assignments = ref([])
9797
const loading = ref(false)

assets/vue/components/assignments/TeacherAssignmentList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ import Column from "primevue/column"
141141
import { computed, reactive, ref, watch } from "vue"
142142
import { useI18n } from "vue-i18n"
143143
import cStudentPublicationService from "../../services/cstudentpublication"
144-
import { useCidReq } from "../../composables/cidReq"
144+
import { getCourseContext } from "../../utils/courseContext"
145145
import { useFormatDate } from "../../composables/formatDate"
146146
import BaseTag from "../basecomponents/BaseTag.vue"
147147
import BaseButton from "../basecomponents/BaseButton.vue"
@@ -163,7 +163,7 @@ const selected = ref([])
163163
const loading = ref(false)
164164
const totalRecords = ref(0)
165165
166-
const { cid, sid, gid } = useCidReq()
166+
const { cid, sid, gid } = getCourseContext()
167167
168168
const notification = useNotification()
169169

assets/vue/components/attendance/AttendanceForm.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ import BaseInputText from "../basecomponents/BaseInputText.vue"
110110
import ResourceLanguageSelector from "../resources/ResourceLanguageSelector.vue"
111111
import { useRoute, useRouter } from "vue-router"
112112
import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
113-
import { useCidReq } from "../../composables/cidReq"
113+
import { getCourseContext } from "../../utils/courseContext"
114114
import gradebookService from "../../services/gradebookService"
115115
116116
const { t } = useI18n()
117117
const route = useRoute()
118118
const router = useRouter()
119-
const { sid, cid } = useCidReq()
119+
const { sid, cid } = getCourseContext()
120120
const emit = defineEmits(["backPressed"])
121121
const props = defineProps({
122122
initialData: {

assets/vue/components/chat/DockedChat.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@
247247
import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue"
248248
import { useI18n } from "vue-i18n"
249249
import { useRoute } from "vue-router"
250-
import { useCidReq } from "../../composables/cidReq"
250+
import { getCourseContext } from "../../utils/courseContext"
251251
import DOMPurify from "dompurify"
252252

253253
const { t } = useI18n({ useScope: "global" })
@@ -303,12 +303,12 @@ function readCidReqFromRouteAndLocation() {
303303
}
304304

305305
/**
306-
* Keep compatibility: if useCidReq() works, bind to it.
306+
* Keep compatibility: if getCourseContext() works, bind to it.
307307
* If it doesn't provide cid for path-based routes, route watcher will override via readCidReqFromRouteAndLocation().
308308
*/
309309
function safeBindCidReq() {
310310
try {
311-
const r = useCidReq()
311+
const r = getCourseContext()
312312
if (r?.cid && typeof r.cid === "object" && "value" in r.cid) cid.value = toInt(r.cid.value) || 0
313313
if (r?.sid && typeof r.sid === "object" && "value" in r.sid) sid.value = toInt(r.sid.value) || 0
314314
if (r?.gid && typeof r.gid === "object" && "value" in r.gid) gid.value = toInt(r.gid.value) || 0

assets/vue/components/documents/DocumentAiMediaDialog.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ import Dropdown from "primevue/dropdown"
284284
import InputText from "primevue/inputtext"
285285
import { useI18n } from "vue-i18n"
286286
import { useRoute } from "vue-router"
287-
import { useCidReq } from "../../composables/cidReq"
287+
import { getCourseContext } from "../../utils/courseContext"
288288
import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
289289
import BaseButton from "../basecomponents/BaseButton.vue"
290290
import { usePlatformConfig } from "../../store/platformConfig"
@@ -307,7 +307,7 @@ const emit = defineEmits(["update:visible", "accepted"])
307307
308308
const route = useRoute()
309309
const { t, locale } = useI18n()
310-
const { cid, sid, gid } = useCidReq()
310+
const { cid, sid, gid } = getCourseContext()
311311
312312
const platformConfig = usePlatformConfig()
313313
const courseSettingsStore = useCourseSettings()

assets/vue/components/documents/DocumentAudioRecorder.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ import BaseInputText from "../basecomponents/BaseInputText.vue"
5555
import AudioRecorder from "../AudioRecorder.vue"
5656
import BaseButton from "../basecomponents/BaseButton.vue"
5757
import { RESOURCE_LINK_PUBLISHED } from "../../constants/entity/resourcelink"
58-
import { useCidReq } from "../../composables/cidReq"
58+
import { getCourseContext } from "../../utils/courseContext"
5959
import documentsService from "../../services/documents"
6060
6161
const { t } = useI18n()
62-
const queryParams = useCidReq()
62+
const queryParams = getCourseContext()
6363
6464
const props = defineProps({
6565
parentResourceNodeId: {

assets/vue/components/documents/DocumentEntry.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<script setup>
7777
import { computed } from "vue"
7878
import ResourceIcon from "./ResourceIcon.vue"
79-
import { useCidReq } from "../../composables/cidReq"
79+
import { getCourseContext } from "../../utils/courseContext"
8080
import { useFileUtils } from "../../composables/fileUtils"
8181
import { usePlatformConfig } from "../../store/platformConfig"
8282
@@ -87,7 +87,7 @@ const props = defineProps({
8787
},
8888
})
8989
90-
const cidQuery = useCidReq()
90+
const cidQuery = getCourseContext()
9191
const platformConfigStore = usePlatformConfig()
9292
const { isFile: utilsIsFile, isImage, isVideo, isAudio, isPreviewable: utilsIsPreviewable } = useFileUtils()
9393

0 commit comments

Comments
 (0)