Switched type to mastery_model on extra_fields#2832

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
jayoshih merged 2 commits into from
Jan 19, 2021
Merged

Switched type to mastery_model on extra_fields #2832

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
3adc832
Switched type to mastery_model on extra_fields
jayoshih Jan 19, 2021
e2f9d06
Fixed linting
jayoshih Jan 19, 2021
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
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
return '';
}

const masteryModel = this.node.extra_fields.type;
const masteryModel = this.node.extra_fields.mastery_model;
if (!masteryModel) {
return this.defaultText;
} else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down
4 changes: 2 additions & 2 deletions contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
role: generateGetterSetter('role_visibility'),
language: generateGetterSetter('language'),
mastery_model() {
return this.getExtraFieldsValueFromNodes('type');
return this.getExtraFieldsValueFromNodes('mastery_model');
},
m() {
return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
masteryModelItem: {
get() {
return {
type: this.mastery_model,
mastery_model: this.mastery_model,
m: this.m,
n: this.n,
};
Expand Down
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
});

let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
randomize: false,
};

Expand Down
4 changes: 2 additions & 2 deletions ...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
role: DEFAULT_EXERCISE.role_visibility,
randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
},
copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
});
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
});
it('exercise fields should set selected node data extra_fields', () => {
wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
});
});
describe('on validation', () => {
Expand Down
4 changes: 2 additions & 2 deletions contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
}
if (extra_fields !== NOVALUE) {
contentNodeData.extra_fields = contentNodeData.extra_fields || {};
if (extra_fields.type) {
contentNodeData.extra_fields.type = extra_fields.type;
if (extra_fields.mastery_model) {
contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
}
if (extra_fields.m) {
contentNodeData.extra_fields.m = extra_fields.m;
Expand Down
6 changes: 3 additions & 3 deletions contentcuration/contentcuration/frontend/shared/utils/validation.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
const mastery = _getMasteryModel(node);
return getMasteryModelValidators()
.map(validator => validator(mastery && mastery.type))
.map(validator => validator(mastery && mastery.mastery_model))
.filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
const mastery = _getMasteryModel(node);
if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
return [];
}
return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
const mastery = _getMasteryModel(node);
if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
return [];
}
return getMasteryModelNValidators()
Expand Down
24 changes: 12 additions & 12 deletions contentcuration/contentcuration/frontend/shared/utils/validation.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
});

it('returns no errors when a mastery model specified', () => {
const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
expect(getNodeMasteryModelErrors(node)).toEqual([]);
});
});

describe('getNodeMasteryModelMErrors', () => {
it(`returns no errors for empty m value
when no mastery model is specified`, () => {
const node = { extra_fields: { type: null, m: null } };
const node = { extra_fields: { mastery_model: null, m: null } };
expect(getNodeMasteryModelMErrors(node)).toEqual([]);
});

it(`returns no errors for empty m value
for mastery models other than m of n`, () => {
const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
expect(getNodeMasteryModelMErrors(node)).toEqual([]);
});

describe('for a mastery model m of n', () => {
let node;
beforeEach(() => {
node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
});

it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
describe('getNodeMasteryModelNErrors', () => {
it(`returns no errors for empty n value
when no mastery model is specified`, () => {
const node = { extra_fields: { type: null, n: null } };
const node = { extra_fields: { mastery_model: null, n: null } };
expect(getNodeMasteryModelNErrors(node)).toEqual([]);
});

it(`returns no errors for empty n value
for mastery models other than m of n`, () => {
const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
expect(getNodeMasteryModelNErrors(node)).toEqual([]);
});

describe('for a mastery model m of n', () => {
let node;
beforeEach(() => {
node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
});

it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
kind: ContentKindsNames.EXERCISE,
license: { id: 8 },
extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
},
};
assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
kind: 'exercise',
license: 8,
extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
},
},
[],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
kind: 'exercise',
license: 8,
extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
m: 3,
},
},
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
kind: 'exercise',
license: 8,
extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
m: 3,
n: 2,
},
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
kind: 'exercise',
license: 8,
extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
m: 2,
n: 3,
},
Expand Down
13 changes: 9 additions & 4 deletions contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
type: Object,
required: false,
validator: function(value) {
return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
return (
!value ||
!value.mastery_model ||
!value.mastery_model.toString() ||
MasteryModels.has(value.mastery_model)
);
},
},
placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
computed: {
masteryModel: {
get() {
return this.value && this.value.type;
return this.value && this.value.mastery_model;
},
set(type) {
this.handleInput({ type });
set(mastery_model) {
this.handleInput({ mastery_model });
},
},
mValue: {
Expand Down
22 changes: 11 additions & 11 deletions contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
beforeEach(() => {
formWrapper = makeWrapper();
wrapper = formWrapper.find(MasteryDropdown);
wrapper.setProps({ value: { type: 'm_of_n' } });
wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
wrapper.vm.$nextTick(() => {
mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
});
it('should render according to masteryModel prop', () => {
function test(model) {
wrapper.setProps({ value: { type: model } });
wrapper.setProps({ value: { mastery_model: model } });
expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
}
MasteryModels.forEach(test);
});
it('should render correct mValue and nValue props', () => {
wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
expect(wrapper.vm.$refs.mValue.value).toEqual(10);
expect(wrapper.vm.$refs.nValue.value).toEqual(20);
});
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
expect(wrapper.emitted('input')).toBeFalsy();
modelInput.setValue('do_all');
expect(wrapper.emitted('input')).toBeTruthy();
expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
});
it('input should be emitted when mValue is updated', () => {
expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
});
describe('validation', () => {
it('should flag empty required mastery models', () => {
wrapper.setProps({ value: { type: null } });
wrapper.setProps({ value: { mastery_model: null } });
formWrapper.vm.validate();
expect(
wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
).toBe(false);
});
it('should flag if m is not a whole number', () => {
wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
formWrapper.vm.validate();
expect(
wrapper
.find({ ref: 'mValue' })
.find('.error--text')
.exists()
).toBe(true);
wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
formWrapper.vm.validate();
expect(
wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
).toBe(false);
});
it('should flag if m < 1', () => {
wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
formWrapper.vm.validate();
expect(
wrapper
.find({ ref: 'mValue' })
.find('.error--text')
.exists()
).toBe(true);
wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
formWrapper.vm.validate();
expect(
wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
).toBe(false);
});
it('should flag if m > n', () => {
wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
formWrapper.vm.validate();
expect(
wrapper
.find({ ref: 'mValue' })
.find('.error--text')
.exists()
).toBe(true);
wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
formWrapper.vm.validate();
expect(
wrapper
Expand Down
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/utils/db_tools.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
mastery_model = {
"type": exercises.M_OF_N,
"mastery_model": exercises.M_OF_N,
"randomize": False,
"m": 3,
"n": 5,
Expand Down
2 changes: 1 addition & 1 deletion contentcuration/contentcuration/viewsets/contentnode.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
choices=exercises.MASTERY_MODELS, allow_null=True, required=False
)
m = IntegerField(allow_null=True, required=False)
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Switched type to mastery_model on extra_fields#2832

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

jayoshih
merged 2 commits into

from

Jan 19, 2021
 Merged


Switched type to mastery_model on extra_fields
#2832
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
3adc832

Switched type to mastery_model on extra_fields


jayoshih Jan 19, 2021
e2f9d06

Fixed linting


jayoshih Jan 19, 2021

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


2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,7 +433,7 @@
 return '';
 }

 const masteryModel = this.node.extra_fields.type;
 const masteryModel = this.node.extra_fields.mastery_model;
 if (!masteryModel) {
 return this.defaultText;
 } else if (masteryModel === MasteryModelsNames.M_OF_N) {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -430,7 +430,7 @@
 role: generateGetterSetter('role_visibility'),
 language: generateGetterSetter('language'),
 mastery_model() {
 return this.getExtraFieldsValueFromNodes('type');
 return this.getExtraFieldsValueFromNodes('mastery_model');
 },
 m() {
 return this.getExtraFieldsValueFromNodes('m');
Expand All@@ -441,7 +441,7 @@
 masteryModelItem: {
 get() {
 return {
type: this.mastery_model,
mastery_model: this.mastery_model,
 m: this.m,
 n: this.n,
 };
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/data.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ export function generateNode(props = {}) {
 });

 let extra_fields = {
type: 'do_all',
mastery_model: 'do_all',
 randomize: false,
 };

Expand Down

4 changes: 2 additions & 2 deletions
...ion/contentcuration/frontend/channelEdit/components/edit/__tests__/detailsTabView.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,7 @@ describe.skip('detailsTabView', () => {
 role: DEFAULT_EXERCISE.role_visibility,
 randomizeOrder: DEFAULT_EXERCISE.extra_fields.randomize,
 masteryModel: {
type: DEFAULT_EXERCISE.extra_fields.type,
mastery_model: DEFAULT_EXERCISE.extra_fields.mastery_model,
 },
 copyrightHolder: DEFAULT_EXERCISE.copyright_holder,
 });
Expand DownExpand Up@@ -146,7 +146,7 @@ describe.skip('detailsTabView', () => {
 });
 it('exercise fields should set selected node data extra_fields', () => {
 wrapper.find({ ref: 'mastery_model' }).vm.$emit('input', { type: 'm_of_n' });
 expect(wrapper.vm.masteryModel.type).toEqual('m_of_n');
 expect(wrapper.vm.masteryModel.mastery_model).toEqual('m_of_n');
 });
 });
 describe('on validation', () => {
Expand Down

4 changes: 2 additions & 2 deletions
contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -241,8 +241,8 @@ function generateContentNodeData({
 }
 if (extra_fields !== NOVALUE) {
 contentNodeData.extra_fields = contentNodeData.extra_fields || {};
 if (extra_fields.type) {
 contentNodeData.extra_fields.type = extra_fields.type;
 if (extra_fields.mastery_model) {
 contentNodeData.extra_fields.mastery_model = extra_fields.mastery_model;
 }
 if (extra_fields.m) {
 contentNodeData.extra_fields.m = extra_fields.m;
Expand Down

6 changes: 3 additions & 3 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -185,13 +185,13 @@ export function getNodeLicenseDescriptionErrors(node) {
export function getNodeMasteryModelErrors(node) {
 const mastery = _getMasteryModel(node);
 return getMasteryModelValidators()
 .map(validator => validator(mastery && mastery.type))
 .map(validator => validator(mastery && mastery.mastery_model))
 .filter(value => value !== true);
}

export function getNodeMasteryModelMErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelMValidators(mastery.n)
Expand All@@ -201,7 +201,7 @@ export function getNodeMasteryModelMErrors(node) {

export function getNodeMasteryModelNErrors(node) {
 const mastery = _getMasteryModel(node);
 if (!mastery || mastery.type !== MasteryModelsNames.M_OF_N) {
 if (!mastery || mastery.mastery_model !== MasteryModelsNames.M_OF_N) {
 return [];
 }
 return getMasteryModelNValidators()
Expand Down

24 changes: 12 additions & 12 deletions
contentcuration/contentcuration/frontend/shared/utils/validation.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -182,28 +182,28 @@ describe('channelEdit utils', () => {
 });

 it('returns no errors when a mastery model specified', () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL } };
 expect(getNodeMasteryModelErrors(node)).toEqual([]);
 });
 });

 describe('getNodeMasteryModelMErrors', () => {
 it(`returns no errors for empty m value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, m: null } };
 const node = { extra_fields: { mastery_model: null, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty m value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, m: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, m: null } };
 expect(getNodeMasteryModelMErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty m value', () => {
Expand DownExpand Up@@ -255,20 +255,20 @@ describe('channelEdit utils', () => {
 describe('getNodeMasteryModelNErrors', () => {
 it(`returns no errors for empty n value
 when no mastery model is specified`, () => {
 const node = { extra_fields: { type: null, n: null } };
 const node = { extra_fields: { mastery_model: null, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 it(`returns no errors for empty n value
 for mastery models other than m of n`, () => {
 const node = { extra_fields: { type: MasteryModelsNames.DO_ALL, n: null } };
 const node = { extra_fields: { mastery_model: MasteryModelsNames.DO_ALL, n: null } };
 expect(getNodeMasteryModelNErrors(node)).toEqual([]);
 });

 describe('for a mastery model m of n', () => {
 let node;
 beforeEach(() => {
 node = { extra_fields: { type: MasteryModelsNames.M_OF_N } };
 node = { extra_fields: { mastery_model: MasteryModelsNames.M_OF_N } };
 });

 it('returns errors for empty n value', () => {
Expand DownExpand Up@@ -348,7 +348,7 @@ describe('channelEdit utils', () => {
 kind: ContentKindsNames.EXERCISE,
 license: { id: 8 },
 extra_fields: {
type: MasteryModelsNames.DO_ALL,
mastery_model: MasteryModelsNames.DO_ALL,
 },
 };
 assessmentItems = [
Expand DownExpand Up@@ -571,7 +571,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'do_all',
mastery_model: 'do_all',
 },
 },
 [],
Expand All@@ -582,7 +582,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 },
 },
Expand All@@ -599,7 +599,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 3,
 n: 2,
 },
Expand All@@ -612,7 +612,7 @@ describe('channelEdit utils', () => {
 kind: 'exercise',
 license: 8,
 extra_fields: {
type: 'm_of_n',
mastery_model: 'm_of_n',
 m: 2,
 n: 3,
 },
Expand Down

13 changes: 9 additions & 4 deletions
contentcuration/contentcuration/frontend/shared/views/MasteryDropdown.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -109,7 +109,12 @@
 type: Object,
 required: false,
 validator: function(value) {
 return !value || !value.type || !value.type.toString() || MasteryModels.has(value.type);
 return (
 !value ||
 !value.mastery_model ||
 !value.mastery_model.toString() ||
 MasteryModels.has(value.mastery_model)
 );
 },
 },
 placeholder: {
Expand DownExpand Up@@ -145,10 +150,10 @@
 computed: {
 masteryModel: {
 get() {
 return this.value && this.value.type;
 return this.value && this.value.mastery_model;
 },
 set(type) {
 this.handleInput({ type });
 set(mastery_model) {
 this.handleInput({ mastery_model });
 },
 },
 mValue: {
Expand Down

22 changes: 11 additions & 11 deletions
contentcuration/contentcuration/frontend/shared/views/__tests__/masteryDropdown.spec.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@ describe('masteryDropdown', () => {
 beforeEach(() => {
 formWrapper = makeWrapper();
 wrapper = formWrapper.find(MasteryDropdown);
 wrapper.setProps({ value: { type: 'm_of_n' } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n' } });
 modelInput = wrapper.find({ ref: 'masteryModel' }).find('input');
 wrapper.vm.$nextTick(() => {
 mInput = wrapper.find({ ref: 'mValue' }).find('input');
Expand All@@ -41,15 +41,15 @@ describe('masteryDropdown', () => {
 });
 it('should render according to masteryModel prop', () => {
 function test(model) {
 wrapper.setProps({ value: { type: model } });
 wrapper.setProps({ value: { mastery_model: model } });
 expect(wrapper.vm.$refs.masteryModel.value).toEqual(model);
 expect(wrapper.find({ ref: 'mValue' }).exists()).toBe(model === 'm_of_n');
 expect(wrapper.find({ ref: 'nValue' }).exists()).toBe(model === 'm_of_n');
 }
 MasteryModels.forEach(test);
 });
 it('should render correct mValue and nValue props', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 10, n: 20 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 10, n: 20 } });
 expect(wrapper.vm.$refs.mValue.value).toEqual(10);
 expect(wrapper.vm.$refs.nValue.value).toEqual(20);
 });
Expand DownExpand Up@@ -102,7 +102,7 @@ describe('masteryDropdown', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
 modelInput.setValue('do_all');
 expect(wrapper.emitted('input')).toBeTruthy();
 expect(wrapper.emitted('input')[0][0].type).toEqual('do_all');
 expect(wrapper.emitted('input')[0][0].mastery_model).toEqual('do_all');
 });
 it('input should be emitted when mValue is updated', () => {
 expect(wrapper.emitted('input')).toBeFalsy();
Expand All@@ -119,7 +119,7 @@ describe('masteryDropdown', () => {
 });
 describe('validation', () => {
 it('should flag empty required mastery models', () => {
 wrapper.setProps({ value: { type: null } });
 wrapper.setProps({ value: { mastery_model: null } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand DownExpand Up@@ -166,15 +166,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m is not a whole number', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0.1231, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0.1231, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -184,15 +184,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m < 1', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 0, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 0, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 1, n: 10 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 1, n: 10 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand All@@ -202,15 +202,15 @@ describe('masteryDropdown', () => {
 ).toBe(false);
 });
 it('should flag if m > n', () => {
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 1 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 1 } });
 formWrapper.vm.validate();
 expect(
 wrapper
 .find({ ref: 'mValue' })
 .find('.error--text')
 .exists()
 ).toBe(true);
 wrapper.setProps({ value: { type: 'm_of_n', m: 2, n: 2 } });
 wrapper.setProps({ value: { mastery_model: 'm_of_n', m: 2, n: 2 } });
 formWrapper.vm.validate();
 expect(
 wrapper
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/utils/db_tools.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -152,7 +152,7 @@ def create_topic(title, parent, description=""):

def create_exercise(title, parent, license_id, description="", user=None, empty=False, complete=True):
 mastery_model = {
 "type": exercises.M_OF_N,
 "mastery_model": exercises.M_OF_N,
 "randomize": False,
 "m": 3,
 "n": 5,
Expand Down

2 changes: 1 addition & 1 deletion
contentcuration/contentcuration/viewsets/contentnode.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -192,7 +192,7 @@ def update(self, queryset, all_validated_data):


class ExtraFieldsSerializer(JSONFieldDictSerializer):
type = ChoiceField(
mastery_model = ChoiceField(
 choices=exercises.MASTERY_MODELS, allow_null=True, required=False
 )
 m = IntegerField(allow_null=True, required=False)
Expand Down