Skip to content

Update reference selection for duration for audioVideo resources #3583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjester merged 2 commits into from
Aug 29, 2022
Merged

Update reference selection for duration for audioVideo resources #3583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5731d4f
Update reference selection for duration for audioVideo resources
marcellamaki Aug 25, 2022
b55eb93
Update test
marcellamaki Aug 25, 2022
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
12 changes: 6 additions & 6 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/CompletionOptions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Layout when practice quizzes are enabled -->
<VLayout v-if="hideCompletionDropdown" xs6 md6>
<!-- "Completion" dropdown menu -->
<VFlex xs6 md6 class="completion-container pr-2">
<VFlex v-if="!audioVideoResource" xs6 md6 class="completion-container pr-2">
<VSelect
ref="completion"
v-model="completionDropdown"
Expand Down Expand Up @@ -201,10 +201,11 @@
return true;
}
return (
this.currentCompletionDropdown === CompletionDropdownMap.reference ||
(this.currentCompletionDropdown === CompletionDropdownMap.reference &&
!this.audioVideoResource) ||
(this.value.model === CompletionCriteriaModels.REFERENCE &&
!this.currentCompletionDropdown &&
this.audioVideoResource) ||
!this.audioVideoResource) ||
//should be hidden if model is reference and we're getting this from the BE
this.currentCompletionDropdown === CompletionDropdownMap.determinedByResource
);
Expand Down Expand Up @@ -764,9 +765,8 @@
*/
selectableDurationOptions() {
if (
(this.kind === ContentKindsNames.DOCUMENT &&
this.currentCompletionDropdown === CompletionDropdownMap.completeDuration) ||
this.audioVideoResource
this.kind === ContentKindsNames.DOCUMENT &&
this.currentCompletionDropdown === CompletionDropdownMap.completeDuration
) {
return this.allPossibleDurationOptions.map(model => ({
value: model.id,
Expand Down
4 changes: 2 additions & 2 deletions .../contentcuration/frontend/channelEdit/components/edit/__tests__/completionOptions.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,15 @@ describe('CompletionOptions', () => {
});
});
describe(`audio/video`, () => {
it(`'Duration dropdown' is not visible and reference hint is visible when 'Reference' is selected`, () => {
it(`'Completion dropdown' is not visible and reference hint is visible when 'Reference' is selected`, () => {
const wrapper = mount(CompletionOptions, {
propsData: {
kind: 'audio',
value: { model: 'reference' },
},
});
expect(wrapper.vm.showReferenceHint).toBe(true);
expect(wrapper.find({ ref: 'duration' }).exists()).toBe(false);
expect(wrapper.find({ ref: 'completion' }).exists()).toBe(false);
});
});
describe(`exercise`, () => {
Expand Down