Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions dashboard/src/components/skills/selfReport/QuizSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const setFieldValue = inject('setFieldValue')
const isLoading = ref(true)
const selectedInternal = ref(null)
const availableQuizzes = ref([])
const quizzesLoaded = ref(false)

const noQuizzes = computed(() => {
return availableQuizzes.value && availableQuizzes.value.length === 0;
Expand All @@ -39,23 +40,36 @@ onMounted(() => {
})
const loadData = () => {
isLoading.value = true
QuizService.getQuizDefs()
.then((res) => {
availableQuizzes.value = res;
if (props.initiallySelectedQuizId) {
const found = availableQuizzes.value.find((q) => q.quizId === props.initiallySelectedQuizId);
if (found) {
selectedInternal.value = found;
setFieldValue('associatedQuiz', found);
}
}
}).finally(() => {
isLoading.value = false
});

if (props.initiallySelectedQuizId) {
QuizService.getQuizDef(props.initiallySelectedQuizId).then((res) => {
const found = res;

if(found) {
selectedInternal.value = found;
setFieldValue('associatedQuiz', found);
}
}).finally(() => {
isLoading.value = false
})
} else {
loadAvailableQuizzes()
}
}
const quizSelected = (quiz) => {
emit('changed', quiz ? quiz.quizId : null);
}

const loadAvailableQuizzes = () => {
if(!quizzesLoaded.value) {
QuizService.getQuizDefs().then((res) => {
availableQuizzes.value = res;
quizzesLoaded.value = true
}).finally(() => {
isLoading.value = false
});
}
}
</script>

<template>
Expand All @@ -70,6 +84,7 @@ const quizSelected = (quiz) => {
@update:modelValue="quizSelected"
:emptyMessage="noQuizzes ? 'You currently do not administer any quizzes or surveys.' : 'No results. Please refine your search string.'"
:isRequired="true"
@before-show="loadAvailableQuizzes"
:options="availableQuizzes">
<template #value="slotProps">
<div v-if="slotProps.value" class="p-1" :data-cy="`quizSelected-${slotProps.value.quizId}`">
Expand Down
63 changes: 63 additions & 0 deletions service/src/test/java/skills/intTests/quiz/QuizDefAuthSpecs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,69 @@ class QuizDefAuthSpecs extends DefaultIntSpec {
}
}

def "root users can retrieve quizzes"() {
def users = getRandomUsers(4, true, ['[email protected]', DEFAULT_ROOT_USER_ID])
def user1 = users[0]
def root = users[1]
def user2 = users[2]
def user3 = users[3]
SkillsService quizUser1 = createService(user1)
SkillsService rootUser = createRootSkillService(root)
SkillsService quizUser2 = createService(user2)
SkillsService nonQuizUserService = createService(user3)

def quiz1 = QuizDefFactory.createQuiz(1)
quizUser1.createQuizDef(quiz1)
def questions = QuizDefFactory.createChoiceQuestions(1, 2, 2)
quizUser1.createQuizQuestionDefs(questions)
def proj = createProject(1)
def subj = createSubject(1, 1)
quizUser1.createProjectAndSubjectAndSkills(proj, subj, [])
def skills = createSkills(3, 1, 1, 100, 1)
skills[0].selfReportingType = SkillDef.SelfReportingType.Quiz
skills[0].quizId = quiz1.quizId
quizUser1.createSkills(skills)
quizUser1.saveQuizSettings(quiz1.quizId, [
[setting: "some", value: '2'],
])

def quiz2 = QuizDefFactory.createQuiz(2)
quizUser2.createQuizDef(quiz2)
def questions2 = QuizDefFactory.createChoiceQuestions(2, 2, 2)
quizUser2.createQuizQuestionDefs(questions2)
def proj2 = createProject(2)
def subj2 = createSubject(2, 1)
quizUser2.createProjectAndSubjectAndSkills(proj2, subj2, [])
def skills2 = createSkills(3, 2, 1, 100, 1)
skills2[0].selfReportingType = SkillDef.SelfReportingType.Quiz
skills2[0].quizId = quiz2.quizId
quizUser2.createSkills(skills2)
quizUser2.saveQuizSettings(quiz2.quizId, [
[setting: "some", value: '2'],
])


when:
def user1QuizDefRes = quizUser1.getQuizDef(quiz1.quizId)
def user2QuizDefRes = quizUser2.getQuizDef(quiz2.quizId)
def rootQuizDefRes = rootUser.getQuizDef(quiz1.quizId)
def rootQuiz2DefRes = rootUser.getQuizDef(quiz2.quizId)

then:
rootQuizDefRes
rootQuizDefRes.quizId == quiz1.quizId
rootQuiz2DefRes
rootQuiz2DefRes.quizId == quiz2.quizId
user1QuizDefRes
user1QuizDefRes.quizId == quiz1.quizId
validateForbidden { quizUser1.getQuizDef(quiz2.quizId) }
user2QuizDefRes
user2QuizDefRes.quizId == quiz2.quizId
validateForbidden { quizUser2.getQuizDef(quiz1.quizId) }
validateForbidden { nonQuizUserService.getQuizDef(quiz1.quizId) }
validateForbidden { nonQuizUserService.getQuizDef(quiz2.quizId) }
}

def "if quiz is assigned to skill, although any project admin in that project gets a read-only view of the quiz, catalog imported skills do not get the same treatment"() {
def quiz1 = QuizDefFactory.createQuiz(1)
skillsService.createQuizDef(quiz1)
Expand Down