Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@
:label="$tr('randomizeQuestionLabel')"
:indeterminate="!isUnique(randomizeOrder)"
/>

<!-- Feature flag: Channel quizzes -->
<Checkbox
v-if="allowChannelQuizzes"
v-model="channelQuiz"
:label="$tr('channelQuizzesLabel')"
:indeterminate="!oneSelected"
/>
</VFlex>
</VLayout>

Expand Down Expand Up @@ -308,7 +316,7 @@
import VisibilityDropdown from 'shared/views/VisibilityDropdown';
import Checkbox from 'shared/views/form/Checkbox';
import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
import { NEW_OBJECT } from 'shared/constants';
import { NEW_OBJECT, FeatureFlagKeys, ContentModalities } from 'shared/constants';

// Define an object to act as the place holder for non unique values.
const nonUniqueValue = {};
Expand Down Expand Up @@ -479,6 +487,16 @@
},
},
thumbnailEncoding: generateGetterSetter('thumbnail_encoding'),
channelQuiz: {
get() {
const options = this.getExtraFieldsValueFromNodes('options') || {};
return options.modality === ContentModalities.QUIZ;
},
set(val) {
const options = { modality: val ? ContentModalities.QUIZ : null };
this.updateExtraFields({ options });
},
},

/* COMPUTED PROPS */
disableAuthEdits() {
Expand Down Expand Up @@ -521,6 +539,9 @@
newContent() {
return !this.nodes.some(n => n[NEW_OBJECT]);
},
allowChannelQuizzes() {
return this.$store.getters.hasFeatureEnabled(FeatureFlagKeys.channel_quizzes);
},
},
watch: {
nodes: {
Expand Down Expand Up @@ -656,6 +677,7 @@
tagsLabel: 'Tags',
noTagsFoundText: 'No results found for "{text}". Press \'Enter\' key to create a new tag',
randomizeQuestionLabel: 'Randomize question order for learners',
channelQuizzesLabel: 'Allow as a channel quiz',
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@ function generateContentNodeData({
if (extra_fields.randomize !== undefined) {
contentNodeData.extra_fields.randomize = extra_fields.randomize;
}
if (extra_fields.options) {
contentNodeData.extra_fields.options = extra_fields.options;
}
}
if (prerequisite !== NOVALUE) {
contentNodeData.prerequisite = prerequisite;
Expand All @@ -282,11 +285,21 @@ export function updateContentNode(context, { id, ...payload } = {}) {

// Don't overwrite existing extra_fields data
if (contentNodeData.extra_fields) {
const extraFields = node.extra_fields || {};

// Don't overwrite existing options data
if (contentNodeData.extra_fields.options) {
contentNodeData.extra_fields.options = {
...(extraFields.options || {}),
...contentNodeData.extra_fields.options,
};
}

contentNodeData = {
...contentNodeData,
extra_fields: {
...(node.extra_fields || {}),
...(contentNodeData.extra_fields || {}),
...extraFields,
...contentNodeData.extra_fields,
},
};
}
Expand Down
6 changes: 5 additions & 1 deletion contentcuration/contentcuration/frontend/shared/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,14 @@ export const ValidationErrors = {

export const FeatureFlagsSchema = featureFlagsSchema;

export const FeatureFlagKeys = Object.keys(FeatureFlagsSchema).reduce(
export const FeatureFlagKeys = Object.keys(FeatureFlagsSchema.properties).reduce(
(featureFlags, featureFlag) => {
featureFlags[featureFlag] = featureFlag;
return featureFlags;
},
{}
);

export const ContentModalities = {
QUIZ: 'QUIZ',
};
5 changes: 5 additions & 0 deletions contentcuration/contentcuration/static/feature_flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
"title": "Test development feature",
"description": "This no-op feature flag is excluded from non-dev environments",
"$env": "development"
},
"channel_quizzes": {
"type": "boolean",
"title": "Channel quizzes",
"description": "Allows an exercise to be marked as a channel quiz"
}
},
"examples": [
Expand Down
5 changes: 5 additions & 0 deletions contentcuration/contentcuration/viewsets/contentnode.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,18 @@ def update(self, queryset, all_validated_data):
return all_objects


class ExtraFieldsOptionsSerializer(JSONFieldDictSerializer):
modality = ChoiceField(choices=(("QUIZ", "Quiz"),), allow_null=True, required=False)


class ExtraFieldsSerializer(JSONFieldDictSerializer):
mastery_model = ChoiceField(
choices=exercises.MASTERY_MODELS, allow_null=True, required=False
)
randomize = BooleanField()
m = IntegerField(allow_null=True, required=False)
n = IntegerField(allow_null=True, required=False)
options = ExtraFieldsOptionsSerializer(required=False)


class TagField(DotPathValueMixin, DictField):
Expand Down