-
-
+
+
@@ -140,4 +141,8 @@
line-height: 1.3 !important;
}
+ /deep/ .selectedIndeterminate svg {
+ fill: gray !important;
+ }
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
index 9a828591c7..f0795c04dc 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/Clipboard/ContentNode.vue
@@ -32,9 +32,10 @@
- arrow_drop_down
+
more_horiz
+ error
+ error
{{ $tr('missingTitle') }}
@@ -9,9 +9,9 @@
-
+
error
-
+
{{ error }}
@@ -19,9 +19,9 @@
-
+
warning
-
+
{{ warning }}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue
new file mode 100644
index 0000000000..65e2d82f7c
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditAudienceModal.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
new file mode 100644
index 0000000000..5a34b7cf18
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditBooleanMapModal.vue
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue
new file mode 100644
index 0000000000..0a7b77c852
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCategoriesModal.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
new file mode 100644
index 0000000000..61b5816bba
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditCompletionModal.vue
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue
new file mode 100644
index 0000000000..bfc9201ad6
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLanguageModal.vue
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue
new file mode 100644
index 0000000000..f05c8e93c5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLearningActivitiesModal.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue
new file mode 100644
index 0000000000..7bc7c9686f
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditLevelsModal.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue
new file mode 100644
index 0000000000..c5b533031d
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditResourcesNeededModal.vue
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
new file mode 100644
index 0000000000..7014297a18
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditSourceModal.vue
@@ -0,0 +1,343 @@
+
+
+ clear
+ 
+ 
-
-
- $vuetify.icons.light_bulb
-
-
@@ -213,7 +208,7 @@
showPreviewBtnLabel: 'Show me',
resourcePreviewDialogTitle: 'Related resources',
resourcePreviewDialogHelpText:
- 'Related resources in Kolibri display as recommendations alongside the resource that a learner is currently engaging with',
+ 'Related resources are labeled as helpful additions for learners engaging with the current resource.',
dialogCloseBtnLabel: 'Close',
previousStepsTitle: 'Previous steps',
previousStepsExplanation:
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/related-resources-preview.png b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/related-resources-preview.png
deleted file mode 100644
index 24ec7f6a13..0000000000
Binary files a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/related-resources-preview.png and /dev/null differ
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/relatedresources.png b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/relatedresources.png
new file mode 100644
index 0000000000..fb3bab0eff
Binary files /dev/null and b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesTab/relatedresources.png differ
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
index bd62bea98b..3e4a6caecc 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/ResourcePanel.vue
@@ -39,7 +39,7 @@
class="ma-0"
@click="$emit('close')"
>
- clear
+
@@ -81,12 +81,10 @@
{{ $tr('questions') }}
- error
-
+ />
+
- error
-
+ />
+
- error
-
+ />
{{ $tr('noFilesError') }}
@@ -211,9 +206,8 @@
class="red--text"
>
error
+ icon="error"
+ />
{{ $tr('noQuestionsError') }}
@@ -246,9 +240,8 @@
class="red--text"
>
error
+ icon="error"
+ />
{{ $tr('noMasteryModelError') }}
@@ -434,9 +427,8 @@
class="red--text"
>
error
+ icon="error"
+ />
{{ $tr('noLicenseError') }}
-
+
{{ node.resource_count ? "folder" : "folder_open" }}
-
+
{{ getTitle(node) }}
@@ -124,6 +124,7 @@
/>
-
+
-
-
-
-
-
-
- {{ data.item.text }}
-
-
-
-
-
-
-
-
-
- {{ $tr('noCategoryFoundText', { text: categoryText.trim() }) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
index 2ea85d01b3..053a5fd70c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/DetailsTabView.vue
@@ -65,6 +65,7 @@
ref="learning_activities"
v-model="contentLearningActivities"
:disabled="anyIsTopic"
+ :nodeIds="nodeIds"
@focus="trackClick('Learning activities')"
/>
@@ -72,6 +73,7 @@
v-if="oneSelected"
ref="contentLevel"
v-model="contentLevel"
+ :nodeIds="nodeIds"
@focus="trackClick('Levels dropdown')"
/>
@@ -79,6 +81,7 @@
v-if="oneSelected"
ref="resourcesNeeded"
v-model="resourcesNeeded"
+ :nodeIds="nodeIds"
@focus="trackClick('What you will need')"
/>
@@ -111,7 +114,12 @@
-
-
+
error
-
+
{{ errorMessage(erroredFiles[0].checksum) }}
-
check_circle
-
+
- clear
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 6faeb52413..3ab92e6cbb 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -30,7 +30,7 @@
app
>
- clear
+
{{ modalTitle }}
{{ $tr('addTopic') }}
-
+
{{ $tr('uploadButton') }}
-
- error
-
+
@@ -97,12 +101,13 @@
+
@@ -122,6 +127,12 @@
+
+
{{ $tr('saveAnywaysButton') }}
@@ -183,6 +194,7 @@
import SavingIndicator from './SavingIndicator';
import EditView from './EditView';
import EditList from './EditList';
+ import InheritAncestorMetadataModal from './InheritAncestorMetadataModal';
import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
import { fileSizeMixin, routerMixin } from 'shared/mixins';
import FileStorage from 'shared/views/files/FileStorage';
@@ -207,6 +219,7 @@
EditView,
ResizableNavigationDrawer,
Uploader,
+ InheritAncestorMetadataModal,
FileStorage,
FileUploadDefault,
LoadingText,
@@ -245,6 +258,10 @@
promptFailed: false,
listElevated: false,
storagePoll: null,
+ openTime: null,
+ isInheritModalOpen: false,
+ newNodeIds: [],
+ creatingNodes: false,
};
},
computed: {
@@ -265,11 +282,12 @@
uploadMode() {
return this.$route.name === RouteNames.UPLOAD_FILES;
},
- /* eslint-disable kolibri/vue-no-unused-properties */
createExerciseMode() {
return this.$route.name === RouteNames.ADD_EXERCISE;
},
- /* eslint-enable */
+ createMode() {
+ return this.addTopicsMode || this.uploadMode || this.createExerciseMode;
+ },
editMode() {
return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
},
@@ -298,13 +316,26 @@
}
return this.$tr('editingDetailsHeader');
},
+ parent() {
+ return this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
+ },
parentTitle() {
- const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
- return node ? node.title : '';
+ return this.parent ? this.parent.title : '';
},
invalidNodes() {
return this.nodeIds.filter(id => !this.getContentNodeIsValid(id));
},
+ currentSelectedNodes: {
+ get() {
+ if (this.isInheritModalOpen && this.newNodeIds.length) {
+ return this.newNodeIds;
+ }
+ return this.selected;
+ },
+ set(value) {
+ this.selected = value;
+ },
+ },
},
beforeRouteEnter(to, from, next) {
if (
@@ -368,7 +399,11 @@
if (completeCheck !== node.complete) {
validationPromises.push(
- vm.updateContentNode({ id: nodeId, complete: completeCheck })
+ vm.updateContentNode({
+ id: nodeId,
+ complete: completeCheck,
+ checkComplete: true,
+ })
);
}
});
@@ -382,6 +417,14 @@
this.hideHTMLScroll(true);
this.selected = this.targetNodeId ? [this.targetNodeId] : this.nodeIds;
this.storagePoll = setInterval(this.fetchUserStorage, CHECK_STORAGE_INTERVAL);
+ this.openTime = new Date().getTime();
+
+ if (!this.uploadMode) {
+ this.$analytics.trackAction('legacy_edit', 'Open', {
+ eventLabel: this.$route.name,
+ numEditNodes: this.nodeIds.length,
+ });
+ }
},
methods: {
...mapActions(['fetchUserStorage']),
@@ -395,7 +438,15 @@
...mapActions('file', ['loadFiles', 'updateFile']),
...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
- closeModal() {
+ closeModal(changed = false) {
+ if (!this.uploadMode) {
+ const eventAction = changed ? 'Save' : 'Close';
+ this.$analytics.trackAction('legacy_edit', eventAction, {
+ eventLabel: this.$route.name,
+ secondsOpen: Math.ceil((new Date().getTime() - this.openTime) / 1000),
+ });
+ }
+
this.promptUploading = false;
this.promptInvalid = false;
this.promptFailed = false;
@@ -406,7 +457,10 @@
this.hideHTMLScroll(false);
this.$router.push({
name: RouteNames.TREE_VIEW,
- params: { nodeId: this.$route.params.nodeId },
+ params: {
+ nodeId: this.$route.params.nodeId,
+ addedCount: this.nodeIds.length,
+ },
});
},
hideHTMLScroll(hidden) {
@@ -434,7 +488,7 @@
// before the validation pop up is executed
if (this.$refs.editView) {
this.$nextTick(() => {
- this.$refs.editView.immediateSaveAll().then(() => {
+ this.$refs.editView.immediateSaveAll().then(changed => {
// Catch uploads in progress and invalid nodes
if (this.invalidNodes.length) {
this.selected = [this.invalidNodes[0]];
@@ -442,7 +496,7 @@
} else if (this.contentNodesAreUploading(this.nodeIds)) {
this.promptUploading = true;
} else {
- this.closeModal();
+ this.closeModal(changed);
}
});
});
@@ -480,28 +534,37 @@
return newNodeId;
});
},
+ resetInheritMetadataModal() {
+ this.$refs.inheritModal?.checkInheritance();
+ },
createTopic() {
this.createNode('topic', {
title: '',
}).then(newNodeId => {
this.selected = [newNodeId];
+ this.$nextTick(() => {
+ this.resetInheritMetadataModal();
+ });
});
},
- createNodesFromUploads(fileUploads) {
- fileUploads.forEach((file, index) => {
- let title;
- if (file.metadata.title) {
- title = file.metadata.title;
- } else {
- title = file.original_filename
- .split('.')
- .slice(0, -1)
- .join('.');
- }
- this.createNode(
- FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
- { title, ...file.metadata }
- ).then(newNodeId => {
+ async createNodesFromUploads(fileUploads) {
+ this.creatingNodes = true;
+ const parentPropDefinedForInheritModal = Boolean(this.$refs.inheritModal?.parent);
+ this.newNodeIds = await Promise.all(
+ fileUploads.map(async (file, index) => {
+ let title;
+ if (file.metadata.title) {
+ title = file.metadata.title;
+ } else {
+ title = file.original_filename
+ .split('.')
+ .slice(0, -1)
+ .join('.');
+ }
+ const newNodeId = await this.createNode(
+ FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
+ { title, ...file.metadata }
+ );
if (index === 0) {
this.selected = [newNodeId];
}
@@ -509,8 +572,15 @@
...file,
contentnode: newNodeId,
});
- });
- });
+ return newNodeId;
+ })
+ );
+ this.creatingNodes = false;
+ if (parentPropDefinedForInheritModal) {
+ // Only call this if the parent prop was previously defined, otherwise,
+ // rely on the parent prop watcher to trigger the inherit event.
+ this.resetInheritMetadataModal();
+ }
},
updateTitleForPage() {
this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
@@ -520,6 +590,34 @@
eventLabel: 'Upload file',
});
},
+ inheritMetadata(metadata) {
+ if (!this.createMode) {
+ // This shouldn't happen, but prevent this just in case.
+ return;
+ }
+ const setMetadata = () => {
+ const nodeIds = this.uploadMode ? this.newNodeIds : this.selected;
+ for (const nodeId of nodeIds) {
+ this.updateContentNode({
+ id: nodeId,
+ ...metadata,
+ mergeMapFields: true,
+ checkComplete: true,
+ });
+ }
+ this.newNodeIds = [];
+ };
+ if (!this.creatingNodes) {
+ setMetadata();
+ } else {
+ const unwatch = this.$watch('creatingNodes', creatingNodes => {
+ if (!creatingNodes) {
+ unwatch();
+ setMetadata();
+ }
+ });
+ }
+ },
},
$trs: {
editingDetailsHeader: 'Edit details',
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
index 4a1e0cebb5..a4dce1e337 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditView.vue
@@ -13,17 +13,13 @@
-
+
{{ $tr(tabs.DETAILS) }}
-
+
error
-
+
{{ $tr('invalidFieldsToolTip') }}
@@ -39,9 +35,9 @@
{{ $tr(tabs.QUESTIONS) }}
-
+
error
-
+
{{ $tr('invalidFieldsToolTip') }}
@@ -72,21 +68,22 @@
{{ $tr('errorBannerText') }}
+
-
-
+
@@ -110,6 +107,14 @@
import ToolBar from 'shared/views/ToolBar';
import Tabs from 'shared/views/Tabs';
+ const EditFields = {
+ TITLE: 'titleLabel',
+ LICENSE: 'licenseLabel',
+ COPYRIGHT_HOLDER: 'copyrightHolderLabel',
+ COMPLETION: 'completionLabel',
+ LEARNING_ACTIVITY: 'learningActivityLabel',
+ };
+
export default {
name: 'EditView',
components: {
@@ -133,6 +138,7 @@
return {
currentTab: null,
tabsElevated: false,
+ errorsList: [],
};
},
computed: {
@@ -141,6 +147,7 @@
'getContentNodeDetailsAreValid',
'getContentNodeFilesAreValid',
'getImmediateRelatedResourcesCount',
+ 'getNodeDetailsErrorsList',
]),
...mapGetters('assessmentItem', ['getAssessmentItemsAreValid', 'getAssessmentItemsCount']),
firstNode() {
@@ -182,6 +189,7 @@
return this.$tr('editingMultipleCount', totals);
},
areDetailsValid() {
+ this.setErrors(this.nodeIds[0]);
return !this.oneSelected || this.getContentNodeDetailsAreValid(this.nodeIds[0]);
},
areAssessmentItemsValid() {
@@ -243,6 +251,57 @@
trackTab(name) {
this.$analytics.trackClick('channel_editor_modal', name);
},
+ handleErrorClick(error) {
+ const errorRefs = {
+ [EditFields.TITLE]: 'title',
+ [EditFields.LICENSE]: 'license',
+ [EditFields.COPYRIGHT_HOLDER]: 'copyright_holder',
+ [EditFields.COMPLETION]: 'randomize',
+ [EditFields.LEARNING_ACTIVITY]: 'learning_activities',
+ };
+
+ const errorRef = errorRefs[error];
+ const targetElement = this.$refs.detailsTab.$refs[errorRef];
+
+ if (!targetElement) {
+ console.error(`Target element ref not found for error: ${error}`);
+ return;
+ }
+
+ const nativeElement = targetElement.$el;
+ const containerElement = this.$refs.editview;
+ const position = nativeElement.getBoundingClientRect();
+ const offsetY = position.top - nativeElement.clientHeight - 50; // additional padding of 50 to adjust position.
+ containerElement.scrollTo({ top: offsetY, behavior: 'smooth' });
+ },
+ setErrors(nodeId) {
+ const errorsTagList = this.getNodeDetailsErrorsList(nodeId);
+ // fetch unique errors
+ // set that to errorsList
+ const errorRefs = {
+ TITLE_REQUIRED: EditFields.TITLE,
+ LICENSE_REQUIRED: EditFields.LICENSE,
+ COPYRIGHT_HOLDER_REQUIRED: EditFields.COPYRIGHT_HOLDER,
+ MASTERY_MODEL_REQUIRED: EditFields.COMPLETION,
+ MASTERY_MODEL_M_REQUIRED: EditFields.COMPLETION,
+ MASTERY_MODEL_M_WHOLE_NUMBER: EditFields.COMPLETION,
+ MASTERY_MODEL_M_GT_ZERO: EditFields.COMPLETION,
+ MASTERY_MODEL_M_LTE_N: EditFields.COMPLETION,
+ MASTERY_MODEL_N_REQUIRED: EditFields.COMPLETION,
+ MASTERY_MODEL_N_WHOLE_NUMBER: EditFields.COMPLETION,
+ MASTERY_MODEL_N_GT_ZERO: EditFields.COMPLETION,
+ LEARNING_ACTIVITY_REQUIRED: EditFields.LEARNING_ACTIVITY,
+ };
+
+ const uniqueErrorsSet = new Set();
+ for (const error of errorsTagList) {
+ if (errorRefs[error]) {
+ uniqueErrorsSet.add(errorRefs[error]);
+ }
+ }
+ const arr = [...uniqueErrorsSet];
+ this.errorsList = arr;
+ },
/*
* @public
*/
@@ -266,6 +325,11 @@
errorBannerText: 'Please provide the required information',
editingMultipleCount:
'Editing details for {topicCount, plural,\n =1 {# folder}\n other {# folders}}, {resourceCount, plural,\n =1 {# resource}\n other {# resources}}',
+ titleLabel: 'Title',
+ licenseLabel: 'License',
+ copyrightHolderLabel: 'Copyright holder',
+ completionLabel: 'Completion',
+ learningActivityLabel: 'Learning activity',
},
};
@@ -315,4 +379,9 @@
overflow: auto;
}
+ .error-ref {
+ color: inherit;
+ text-decoration: underline;
+ }
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue
new file mode 100644
index 0000000000..333d3f0eab
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/InheritAncestorMetadataModal.vue
@@ -0,0 +1,341 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
deleted file mode 100644
index f3262cebed..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/ResourcesNeededOptions.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js
deleted file mode 100644
index c8a82a30e8..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/categoryOptions.spec.js
+++ /dev/null
@@ -1,331 +0,0 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify';
-import { shallowMount } from '@vue/test-utils';
-import CategoryOptions from '../CategoryOptions.vue';
-
-Vue.use(Vuetify);
-
-const testDropdown = [
- {
- text: 'DAILY_LIFE',
- value: 'PbGoe2MV',
- },
- {
- text: 'CURRENT_EVENTS',
- value: 'PbGoe2MV.J7CU1IxN',
- },
- {
- text: 'DIVERSITY',
- value: 'PbGoe2MV.EHcbjuKq',
- },
- {
- text: 'ENTREPRENEURSHIP',
- value: 'PbGoe2MV.kyxTNsRS',
- },
- {
- text: 'ENVIRONMENT',
- value: 'PbGoe2MV.tS7WKnZ7',
- },
- {
- text: 'FINANCIAL_LITERACY',
- value: 'PbGoe2MV.HGIc9sZq',
- },
- {
- text: 'MEDIA_LITERACY',
- value: 'PbGoe2MV.UOTL#KIV',
- },
- {
- text: 'MENTAL_HEALTH',
- value: 'PbGoe2MV.d8&gCo2N',
- },
- {
- text: 'PUBLIC_HEALTH',
- value: 'PbGoe2MV.kivAZaeX',
- },
- {
- text: 'FOR_TEACHERS',
- value: 'ziJ6PCuU',
- },
- {
- text: 'GUIDES',
- value: 'ziJ6PCuU.RLfhp37t',
- },
- {
- text: 'LESSON_PLANS',
- value: 'ziJ6PCuU.lOBPr5ix',
- },
- {
- text: 'FOUNDATIONS',
- value: 'BCG3&slG',
- },
- {
- text: 'DIGITAL_LITERACY',
- value: 'BCG3&slG.wZ3EAedB',
- },
- {
- text: 'FOUNDATIONS_LOGIC_AND_CRITICAL_THINKING',
- value: 'BCG3&slG.0&d0qTqS',
- },
- {
- text: 'LEARNING_SKILLS',
- value: 'BCG3&slG.fP2j70bj',
- },
- {
- text: 'LITERACY',
- value: 'BCG3&slG.HLo9TbNq',
- },
- {
- text: 'NUMERACY',
- value: 'BCG3&slG.Tsyej9ta',
- },
- {
- text: 'SCHOOL',
- value: 'd&WXdXWF',
- },
- {
- text: 'ARTS',
- value: 'd&WXdXWF.5QAjgfv7',
- },
- {
- text: 'DANCE',
- value: 'd&WXdXWF.5QAjgfv7.BUMJJBnS',
- },
- {
- text: 'DRAMA',
- value: 'd&WXdXWF.5QAjgfv7.XsWznP4o',
- },
- {
- text: 'MUSIC',
- value: 'd&WXdXWF.5QAjgfv7.u0aKjT4i',
- },
- {
- text: 'VISUAL_ART',
- value: 'd&WXdXWF.5QAjgfv7.4LskOFXj',
- },
- {
- text: 'COMPUTER_SCIENCE',
- value: 'd&WXdXWF.e#RTW9E#',
- },
- {
- text: 'MECHANICAL_ENGINEERING',
- value: 'd&WXdXWF.e#RTW9E#.8ZoaPsVW',
- },
- {
- text: 'PROGRAMMING',
- value: 'd&WXdXWF.e#RTW9E#.CfnlTDZ#',
- },
- {
- text: 'WEB_DESIGN',
- value: 'd&WXdXWF.e#RTW9E#.P7s8FxQ8',
- },
- {
- text: 'HISTORY',
- value: 'd&WXdXWF.zWtcJ&F2',
- },
- {
- text: 'LANGUAGE_LEARNING',
- value: 'd&WXdXWF.JDUfJNXc',
- },
- {
- text: 'MATHEMATICS',
- value: 'd&WXdXWF.qs0Xlaxq',
- },
- {
- text: 'ALGEBRA',
- value: 'd&WXdXWF.qs0Xlaxq.0t5msbL5',
- },
- {
- text: 'ARITHMETIC',
- value: 'd&WXdXWF.qs0Xlaxq.nG96nHDc',
- },
- {
- text: 'CALCULUS',
- value: 'd&WXdXWF.qs0Xlaxq.8rJ57ht6',
- },
- {
- text: 'GEOMETRY',
- value: 'd&WXdXWF.qs0Xlaxq.lb7ELcK5',
- },
- {
- text: 'STATISTICS',
- value: 'd&WXdXWF.qs0Xlaxq.jNm15RLB',
- },
- {
- text: 'READING_AND_WRITING',
- value: 'd&WXdXWF.kHKJ&PbV',
- },
- {
- text: 'LITERATURE',
- value: 'd&WXdXWF.kHKJ&PbV.DJLBbaEk',
- },
- {
- text: 'LOGIC_AND_CRITICAL_THINKING',
- value: 'd&WXdXWF.kHKJ&PbV.YMBXStib',
- },
- {
- text: 'READING_COMPREHENSION',
- value: 'd&WXdXWF.kHKJ&PbV.r7RxB#9t',
- },
- {
- text: 'WRITING',
- value: 'd&WXdXWF.kHKJ&PbV.KFJOCr&6',
- },
- {
- text: 'SCIENCES',
- value: 'd&WXdXWF.i1IdaNwr',
- },
- {
- text: 'ASTRONOMY',
- value: 'd&WXdXWF.i1IdaNwr.mjSF4QlF',
- },
- {
- text: 'BIOLOGY',
- value: 'd&WXdXWF.i1IdaNwr.uErN4PdS',
- },
- {
- text: 'CHEMISTRY',
- value: 'd&WXdXWF.i1IdaNwr.#r5ocgid',
- },
- {
- text: 'EARTH_SCIENCE',
- value: 'd&WXdXWF.i1IdaNwr.zbDzxDE7',
- },
- {
- text: 'PHYSICS',
- value: 'd&WXdXWF.i1IdaNwr.r#wbt#jF',
- },
- {
- text: 'SOCIAL_SCIENCES',
- value: 'd&WXdXWF.K80UMYnW',
- },
- {
- text: 'ANTHROPOLOGY',
- value: 'd&WXdXWF.K80UMYnW.ViBlbQR&',
- },
- {
- text: 'CIVIC_EDUCATION',
- value: 'd&WXdXWF.K80UMYnW.F863vKiF',
- },
- {
- text: 'POLITICAL_SCIENCE',
- value: 'd&WXdXWF.K80UMYnW.K72&pITr',
- },
- {
- text: 'SOCIOLOGY',
- value: 'd&WXdXWF.K80UMYnW.75WBu1ZS',
- },
- {
- text: 'WORK',
- value: 'l7DsPDlm',
- },
- {
- text: 'PROFESSIONAL_SKILLS',
- value: 'l7DsPDlm.#N2VymZo',
- },
- {
- text: 'TECHNICAL_AND_VOCATIONAL_TRAINING',
- value: 'l7DsPDlm.ISEXeZt&',
- },
- {
- text: 'INDUSTRY_AND_SECTOR_SPECIFIC',
- value: 'l7DsPDlm.ISEXeZt&.pRvOzJTE',
- },
- {
- text: 'SKILLS_TRAINING',
- value: 'l7DsPDlm.ISEXeZt&.&1WpYE&n',
- },
- {
- text: 'TOOLS_AND_SOFTWARE_TRAINING',
- value: 'l7DsPDlm.ISEXeZt&.1JfIbP&N',
- },
-];
-
-describe('CategoryOptions', () => {
- it('smoke test', () => {
- const wrapper = shallowMount(CategoryOptions);
- expect(wrapper.isVueInstance()).toBe(true);
- });
- it('emits expected data', () => {
- const wrapper = shallowMount(CategoryOptions);
- const value = 'string';
- wrapper.vm.$emit('input', value);
-
- expect(wrapper.emitted().input).toBeTruthy();
- expect(wrapper.emitted().input.length).toBe(1);
- expect(wrapper.emitted().input[0]).toEqual([value]);
- });
- const expectedFamilyTree = [
- { text: 'SCHOOL', value: 'd&WXdXWF' },
- { text: 'ARTS', value: 'd&WXdXWF.5QAjgfv7' },
- { text: 'DANCE', value: 'd&WXdXWF.5QAjgfv7.BUMJJBnS' },
- ];
-
- describe('display', () => {
- it('has a tooltip that displays the tree for value of an item', () => {
- const wrapper = shallowMount(CategoryOptions);
- const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; // 'Dance'
- const expectedToolTip = 'School - Arts - Dance';
-
- expect(wrapper.vm.tooltipHelper(item)).toEqual(expectedToolTip);
- });
- it(`dropdown has 'levels' key necessary to display the nested structure of categories`, () => {
- const wrapper = shallowMount(CategoryOptions);
- const dropdown = wrapper.vm.categoriesList;
- const everyCategoryHasLevelsKey = dropdown.every(item => 'level' in item);
-
- expect(everyCategoryHasLevelsKey).toBeTruthy();
- });
- });
-
- describe('nested family structure', () => {
- it('can display all the ids of family tree of an item', () => {
- const wrapper = shallowMount(CategoryOptions);
- const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; //'Dance'
- const expectedFamilyTreeIds = expectedFamilyTree.map(item => item.value);
-
- expect(wrapper.vm.findFamilyTreeIds(item).sort()).toEqual(expectedFamilyTreeIds.sort());
- });
- it('can display array of objects of family tree of an item', () => {
- const wrapper = shallowMount(CategoryOptions);
- const item = 'd&WXdXWF.5QAjgfv7.BUMJJBnS'; //'Dance'
-
- expect(wrapper.vm.displayFamilyTree(testDropdown, item)).toEqual(expectedFamilyTree);
- });
- });
-
- describe('interactions', () => {
- it('when user checks an item, that is emitted to the parent component', () => {
- const wrapper = shallowMount(CategoryOptions);
- const item = 'abcd';
- wrapper.vm.$emit = jest.fn();
- wrapper.vm.add(item);
-
- expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
- expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual([item]);
- });
- it('when user unchecks an item, that is emitted to the parent component', () => {
- const wrapper = shallowMount(CategoryOptions);
- const item = 'defj';
- wrapper.vm.$emit = jest.fn();
- wrapper.vm.remove(item);
-
- expect(wrapper.vm.$emit.mock.calls[0][0]).toBe('input');
- expect(wrapper.vm.$emit.mock.calls[0][1]).toEqual([]);
- });
- });
-
- describe('close button on chip interactions', () => {
- it('in the autocomplete bar, the chip is removed when user clicks on its close button', () => {
- const wrapper = shallowMount(CategoryOptions, {
- data() {
- return { selected: ['remove me', 'abc', 'def', 'abc.'] };
- },
- });
- const originalChipsLength = wrapper.vm.selected.length;
- wrapper.vm.remove('remove me');
- const chips = wrapper.vm.selected;
-
- expect(chips.length).toEqual(originalChipsLength - 1);
- });
- });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
deleted file mode 100644
index 0fc09b1598..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/__tests__/resourcesNeededOptions.spec.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import Vue from 'vue';
-import Vuetify from 'vuetify';
-import { shallowMount, mount } from '@vue/test-utils';
-import ResourcesNeededOptions from '../ResourcesNeededOptions.vue';
-
-Vue.use(Vuetify);
-
-function makeWrapper(value) {
- return mount(ResourcesNeededOptions, {
- propsData: {
- value,
- },
- });
-}
-
-describe('ResourcesNeededOptions', () => {
- it('smoke test', () => {
- const wrapper = shallowMount(ResourcesNeededOptions);
-
- expect(wrapper.isVueInstance()).toBe(true);
- });
-
- describe('updating state', () => {
- it('should update resources field with new values received from a parent', () => {
- const resourcesNeeded = ['person', 'book'];
- const wrapper = makeWrapper(resourcesNeeded);
- const dropdown = wrapper.find({ name: 'v-select' });
-
- expect(dropdown.props('value')).toEqual(resourcesNeeded);
-
- wrapper.setProps({
- value: ['cat'],
- });
- expect(dropdown.props('value')).toEqual(['cat']);
- });
-
- it('should emit new input values', () => {
- const resourcesNeeded = ['person', 'book', 'train'];
- const wrapper = makeWrapper([]);
- const dropdown = wrapper.find({ name: 'v-select' });
- dropdown.vm.$emit('input', resourcesNeeded);
-
- return Vue.nextTick().then(() => {
- const emittedLevels = wrapper.emitted('input').pop()[0];
- expect(emittedLevels).toEqual(resourcesNeeded);
- });
- });
- });
-});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
index 50e9223e80..a68c50d51b 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/move/MoveModal.vue
@@ -82,9 +82,7 @@
class="mx-1"
@click.stop="previewNodeId = node.id"
>
-
- info
-
+
- keyboard_arrow_right
+
@@ -175,6 +173,10 @@
type: Boolean,
default: false,
},
+ clipboardTopicResourceCount: {
+ type: Object,
+ default: () => ({}),
+ },
},
data() {
return {
@@ -202,7 +204,10 @@
},
},
moveHeader() {
- return this.$tr('moveItems', this.getTopicAndResourceCounts(this.moveNodeIds));
+ const resourceCounts = Object.keys(this.clipboardTopicResourceCount).length
+ ? this.clipboardTopicResourceCount
+ : this.getTopicAndResourceCounts(this.moveNodeIds);
+ return this.$tr('moveItems', resourceCounts);
},
moveHereButtonDisabled() {
if (this.moveNodesInProgress) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
index fd636cb468..58b929de80 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/PublishModal.vue
@@ -15,9 +15,7 @@
@cancel="close"
>
+
+
+
+
+
+
+
+
+
@@ -73,6 +88,7 @@
import { mapActions, mapGetters } from 'vuex';
import HelpTooltip from 'shared/views/HelpTooltip';
import { forceServerSync } from 'shared/data/serverSync';
+ import { LanguagesList } from 'shared/leUtils/Languages';
export default {
name: 'PublishModal',
@@ -90,9 +106,13 @@
step: 0,
publishDescription: '',
size: 0,
- showInvalidText: false, // lazy validation
+ showDescriptionInvalidText: false, // lazy validation
+ showLanguageInvalidText: false,
loading: false,
loadingTaskId: null,
+ language: {},
+ channelLanguages: [],
+ channelLanguageExists: true,
};
},
computed: {
@@ -114,9 +134,34 @@
isDescriptionValid() {
return this.publishDescription && this.publishDescription.trim();
},
+ isLanguageValid() {
+ return Object.keys(this.language).length > 0;
+ },
sizeCalculationTask() {
return this.loadingTaskId ? this.getAsyncTask(this.loadingTaskId) : null;
},
+ isCheffedChannel() {
+ return Boolean(this.currentChannel.ricecooker_version);
+ },
+ isPrivateChannel() {
+ return this.currentChannel.public;
+ },
+ isFirstPublish() {
+ return this.currentChannel.version === 0;
+ },
+ defaultLanguage() {
+ const channelLang = this.filterLanguages(l => l.id === this.currentChannel.language)[0];
+ return this.languages.some(lang => lang.value === channelLang.value) ? channelLang : {};
+ },
+ showLanguageDropdown() {
+ return (
+ ((this.isCheffedChannel || this.isPrivateChannel) && this.isFirstPublish) ||
+ !this.channelLanguageExists
+ );
+ },
+ languages() {
+ return this.filterLanguages(l => this.channelLanguages.includes(l.id));
+ },
},
watch: {
sizeCalculationTask(task) {
@@ -141,16 +186,35 @@
// this.loading = response.stale;
// this.loadingTaskId = response.changes.length ? response.changes[0].key : null;
// });
+ this.channelLanguageExistsInResources().then(exists => {
+ this.channelLanguageExists = exists;
+ if (!exists) {
+ this.getLanguagesInChannelResources().then(languages => {
+ this.channelLanguages = languages.length ? languages : [this.currentChannel.language];
+ this.language = this.defaultLanguage;
+ });
+ } else {
+ this.channelLanguages = [this.currentChannel.language];
+ this.language = this.defaultLanguage;
+ }
+ });
},
methods: {
- ...mapActions('currentChannel', ['publishChannel']),
+ ...mapActions('channel', ['updateChannel']),
+ ...mapActions('currentChannel', [
+ 'publishChannel',
+ 'channelLanguageExistsInResources',
+ 'getLanguagesInChannelResources',
+ ]),
close() {
this.publishDescription = '';
+ this.language = this.defaultLanguage;
this.dialog = false;
},
validate() {
- this.showInvalidText = true;
- return this.isDescriptionValid;
+ this.showDescriptionInvalidText = !this.isDescriptionValid;
+ this.showLanguageInvalidText = !this.isLanguageValid;
+ return !this.showDescriptionInvalidText && !this.showLanguageInvalidText;
},
async handlePublish() {
if (this.validate()) {
@@ -158,9 +222,20 @@
await forceServerSync();
}
- this.publishChannel(this.publishDescription).then(this.close);
+ this.updateChannel({
+ id: this.currentChannel.id,
+ language: this.language.value,
+ }).then(() => {
+ this.publishChannel(this.publishDescription).then(this.close);
+ });
}
},
+ filterLanguages(filterFn) {
+ return LanguagesList.filter(filterFn).map(l => ({
+ value: l.id,
+ label: l.native_name,
+ }));
+ },
},
$trs: {
// Incomplete channel window
@@ -176,8 +251,11 @@
descriptionRequiredMessage: "Please describe what's new in this version before publishing",
descriptionDescriptionTooltip:
'This description will be shown to Kolibri admins before they update channel versions',
+ languageDescriptionTooltip: 'The default language for a channel and its resources',
cancelButton: 'Cancel',
publishButton: 'Publish',
+ languageLabel: 'Language',
+ languageRequiredMessage: 'Please select a language for this channel',
},
};
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
index 3027fae7a3..1de950ceec 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/publish/__tests__/publishModal.spec.js
@@ -85,17 +85,21 @@ describe('publishModal', () => {
});
});
describe('on publish step', () => {
+ const updateChannel = jest.fn();
const publishChannel = jest.fn();
+
beforeEach(() => {
wrapper.setData({ step: steps.PUBLISH });
wrapper.setMethods({
- publishChannel: () => {
+ updateChannel: () => {
return new Promise(resolve => {
+ updateChannel();
publishChannel();
resolve();
});
},
});
+ updateChannel.mockReset();
publishChannel.mockReset();
});
it('publish button should trigger form validation', () => {
@@ -110,20 +114,26 @@ describe('publishModal', () => {
"Please describe what's new in this version before publishing"
);
});
- it('publishing should be blocked if no description is given', () => {
+ it('publishing should be blocked if no description & language are given', () => {
wrapper
.find('[data-test="confirm-publish-modal"]')
.find('form')
.trigger('submit');
+ expect(updateChannel).not.toHaveBeenCalled();
expect(publishChannel).not.toHaveBeenCalled();
});
- it('publish button should call publishChannel if description is given', () => {
+ it('publish button should call updateChannel if description and language are given', () => {
const description = 'Version notes';
- wrapper.setData({ publishDescription: description });
+ const language = {
+ value: 'en',
+ label: 'English',
+ };
+ wrapper.setData({ publishDescription: description, language });
wrapper
.find('[data-test="confirm-publish-modal"]')
.find('form')
.trigger('submit');
+ expect(updateChannel).toHaveBeenCalled();
expect(publishChannel).toHaveBeenCalled();
});
it('cancel button on publish step should also close modal', () => {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/constants.js b/contentcuration/contentcuration/frontend/channelEdit/constants.js
index 6512e9e9b4..36f29a78fd 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/constants.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/constants.js
@@ -80,3 +80,16 @@ export const DraggableRegions = {
* @type {number}
*/
export const ImportSearchPageSize = 10;
+
+export const QuickEditModals = {
+ TITLE_DESCRIPTION: 'TITLE_DESCRIPTION',
+ TAGS: 'TAGS',
+ LANGUAGE: 'LANGUAGE',
+ CATEGORIES: 'CATEGORIES',
+ LEVELS: 'LEVELS',
+ LEARNING_ACTIVITIES: 'LEARNING_ACTIVITIES',
+ SOURCE: 'SOURCE',
+ AUDIENCE: 'AUDIENCE',
+ COMPLETION: 'COMPLETION',
+ WHAT_IS_NEEDED: 'WHAT_IS_NEEDED',
+};
diff --git a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue
index 878b75ea26..b8c7565dcc 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/pages/StagingTreePage/DiffTable.vue
@@ -53,9 +53,8 @@
-
- error
-
+
{{ $tr('deploy') }} {{ currentChannel.name }}
-
+
{{ $tr('backToViewing') }}
-
+
-
@@ -98,7 +98,13 @@
-
+
+
+
{{ $tr('emptyTopicText') }}
-
+
-
-
+
-
-
-
+
-
- arrow_back
-
+
@@ -33,9 +31,9 @@
-
+
check_circle
-
+
{{ $tr('addedText') }}
{{ $tr('removeButton') }}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
index f4a3d546b1..fd4ef86a77 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SavedSearchesModal.vue
@@ -33,15 +33,6 @@
-
-
-
-
-
@@ -86,7 +69,6 @@
@@ -17,7 +23,9 @@
.bottom-bar {
position: fixed;
bottom: 0;
+ left: 0;
z-index: 3;
+ display: flex;
width: 100%;
height: 64px;
background-color: #ffffff;
diff --git a/contentcuration/contentcuration/frontend/shared/views/BottomToolBar.vue b/contentcuration/contentcuration/frontend/shared/views/BottomToolBar.vue
deleted file mode 100644
index 56b421fdd2..0000000000
--- a/contentcuration/contentcuration/frontend/shared/views/BottomToolBar.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
index e016de0bb4..0257d6561a 100644
--- a/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
+++ b/contentcuration/contentcuration/frontend/shared/views/Breadcrumbs.vue
@@ -7,29 +7,25 @@
style="max-height: 100%; width: 100%;"
>
-
- arrow_forward_ios
-
+
- {{ contentNode.resource_count }}
+ {{ contentNodeResourceCount }}
+ {{ resourcesSelectedText }} +
+ ++ {{ $tr('multipleAudience') }} +
++ {{ $tr('visibleTo') }} +
+
+
+ + {{ resourcesSelectedText }} +
++ {{ hasMixedCategoriesMessage }} +
+ ++ {{ resourcesSelectedText }} +
++ {{ $tr('differentLanguages') }} +
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue
new file mode 100644
index 0000000000..3acdde0ad2
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/EditTitleDescriptionModal.vue
@@ -0,0 +1,116 @@
+
+
+ + {{ resourcesSelectedText }} +
+
+
+
+
+ + {{ helpText }} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ helpText }} +
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js
new file mode 100644
index 0000000000..2201530c35
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditAudienceModal.spec.js
@@ -0,0 +1,258 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditAudienceModal from '../EditAudienceModal';
+import { ResourcesNeededTypes } from 'shared/constants';
+import { RolesNames } from 'shared/leUtils/Roles';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const getRolesValues = wrapper => {
+ const roles = {};
+ const radioBtns = wrapper.findAll('[data-test="rol-radio-button"]');
+ radioBtns.wrappers.forEach(checkbox => {
+ const { value, currentValue } = checkbox.vm.$props || {};
+ roles[value] = currentValue === value;
+ });
+ return roles;
+};
+
+const selectRole = (wrapper, rol) => {
+ const radioBtn = wrapper.find(`[data-test="rol-radio-button"] input[value="${rol}"]`);
+ radioBtn.setChecked(true);
+};
+
+const isForBeginnersChecked = wrapper => {
+ return wrapper.find('[data-test="for-beginners-checkbox"] input').element.checked;
+};
+
+const checkForBeginners = wrapper => {
+ wrapper.find('[data-test="for-beginners-checkbox"] input').setChecked(true);
+};
+
+const makeWrapper = nodeIds => {
+ return mount(EditAudienceModal, {
+ store,
+ propsData: {
+ nodeIds,
+ resourcesSelectedText: '2 resources',
+ },
+ });
+};
+
+describe('EditAudienceModal', () => {
+ beforeEach(() => {
+ nodes = {
+ node1: { id: 'node1' },
+ node2: { id: 'node2' },
+ };
+ contentNodeActions = {
+ updateContentNode: jest.fn(),
+ };
+ generalActions = {
+ showSnackbarSimple: jest.fn(),
+ };
+ store = new Vuex.Store({
+ actions: generalActions,
+ modules: {
+ contentNode: {
+ namespaced: true,
+ actions: contentNodeActions,
+ getters: {
+ getContentNodes: () => ids => ids.map(id => nodes[id]),
+ },
+ },
+ },
+ });
+ });
+
+ test('smoke test', () => {
+ const wrapper = makeWrapper(['node1']);
+ expect(wrapper.isVueInstance()).toBe(true);
+ });
+
+ describe('Selected audience on first render', () => {
+ test('no rol should be selected if a single node does not have set rol', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ const rolesValues = getRolesValues(wrapper);
+ Object.values(rolesValues).forEach(value => {
+ expect(value).toBeFalsy();
+ });
+ });
+
+ test('no rol should be selected if just a single node among multiple nodes does not have rol set', () => {
+ nodes['node1'].role_visibility = RolesNames.COACH;
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const rolesValues = getRolesValues(wrapper);
+ Object.values(rolesValues).forEach(value => {
+ expect(value).toBeFalsy();
+ });
+ });
+
+ test('no rol should be selected if there are multiple roles set', () => {
+ nodes['node1'].role_visibility = RolesNames.COACH;
+ nodes['node2'].role_visibility = RolesNames.LEARNER;
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const rolesValues = getRolesValues(wrapper);
+ Object.values(rolesValues).forEach(value => {
+ expect(value).toBeFalsy();
+ });
+ });
+
+ test('the common rol should be selected if all nodes have the same rol visibility', () => {
+ nodes['node1'].role_visibility = RolesNames.COACH;
+ nodes['node2'].role_visibility = RolesNames.COACH;
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const rolesValues = getRolesValues(wrapper);
+ expect(rolesValues[RolesNames.COACH]).toBeTruthy();
+ });
+
+ test('for beginners checkbox should be unselected if no node is set for beginners', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ expect(isForBeginnersChecked(wrapper)).toBeFalsy();
+ });
+
+ test('for beginners checkbox should be unselected if just a single node among multiple nodes is not set for beginners', () => {
+ nodes['node1'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(isForBeginnersChecked(wrapper)).toBeFalsy();
+ });
+
+ test('for beginners checkbox should be selected if all nodes are set for beginners', () => {
+ nodes['node1'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+ nodes['node2'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(isForBeginnersChecked(wrapper)).toBeTruthy();
+ });
+
+ test('should display information message about different roles visibilities if there are multiple roles set', () => {
+ nodes['node1'].role_visibility = RolesNames.COACH;
+ nodes['node2'].role_visibility = RolesNames.LEARNER;
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeTruthy();
+ });
+
+ test('should not display information message about different roles visibilities if just some nodes are set for beginners', () => {
+ nodes['node1'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeTruthy();
+ });
+
+ test('should not display information message about different roles visibilities if all nodes have the same rol visibility and are set for beginners', () => {
+ nodes['node1'].role_visibility = RolesNames.COACH;
+ nodes['node1'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+ nodes['node2'].role_visibility = RolesNames.COACH;
+ nodes['node2'].learner_needs = {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ };
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('[data-test="multiple-audience-message"]').exists()).toBeFalsy();
+ });
+ });
+
+ test('should render the message of the number of resources selected', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2');
+ });
+
+ test('should call updateContentNode with the right rol on success submit', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ selectRole(wrapper, RolesNames.COACH);
+ wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ role_visibility: RolesNames.COACH,
+ });
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should call updateContentNode with the need for beginners set on success submit', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ checkForBeginners(wrapper);
+ wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ learner_needs: {
+ [ResourcesNeededTypes.FOR_BEGINNERS]: true,
+ },
+ });
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on success submit', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ selectRole(wrapper, RolesNames.COACH);
+ wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted('close')).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on cancel', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('cancel');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted('close')).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should show a confirmation snackbar on success submit', () => {
+ const wrapper = makeWrapper(['node1']);
+
+ selectRole(wrapper, RolesNames.COACH);
+ wrapper.find('[data-test="edit-audience-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js
new file mode 100644
index 0000000000..2c49fe6b94
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditBooleanMapModal.spec.js
@@ -0,0 +1,537 @@
+import Vuex from 'vuex';
+import { mount } from '@vue/test-utils';
+import camelCase from 'lodash/camelCase';
+import EditBooleanMapModal from '../EditBooleanMapModal';
+import { metadataTranslationMixin } from 'shared/mixins';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+import { Categories } from 'shared/constants';
+import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const CheckboxValue = {
+ UNCHECKED: 'UNCHECKED',
+ CHECKED: 'CHECKED',
+};
+
+const { translateMetadataString } = metadataTranslationMixin.methods;
+
+const categoriesLookup = {};
+Object.entries(Categories).forEach(([key, value]) => {
+ const newKey = translateMetadataString(camelCase(key));
+ categoriesLookup[newKey] = value;
+});
+
+const getOptionsValues = wrapper => {
+ const categories = {};
+ const checkboxes = wrapper.findAll('[data-test="option-checkbox"]');
+ checkboxes.wrappers.forEach(checkbox => {
+ const { label, checked } = checkbox.vm.$props || {};
+ let value;
+ if (checked) {
+ value = CheckboxValue.CHECKED;
+ } else {
+ value = CheckboxValue.UNCHECKED;
+ }
+ categories[categoriesLookup[label]] = value;
+ });
+ return categories;
+};
+
+const findOptionCheckbox = (wrapper, category) => {
+ const checkboxes = wrapper.findAll('[data-test="option-checkbox"]');
+ return checkboxes.wrappers.find(checkbox => {
+ const { label } = checkbox.vm.$props || {};
+ return categoriesLookup[label] === category;
+ });
+};
+
+const options = Object.entries(Categories).map(([key, value]) => {
+ return {
+ label: key,
+ value,
+ };
+});
+const makeWrapper = ({ nodeIds, field = 'categories', ...restOptions }) => {
+ return mount(EditBooleanMapModal, {
+ store,
+ propsData: {
+ nodeIds,
+ options,
+ title: 'Edit categories',
+ field,
+ autocompleteLabel: 'Select option',
+ confirmationMessage: 'edited',
+ resourcesSelectedText: '2 resources',
+ ...restOptions,
+ },
+ scopedSlots: {
+ input: function(props) {
+ return this.$createElement(CategoryOptions, {
+ props: {
+ ...props,
+ expanded: true,
+ hideLabel: true,
+ nodeIds,
+ },
+ on: {
+ input(value) {
+ props.inputHandler(value);
+ },
+ },
+ });
+ },
+ },
+ });
+};
+
+describe('EditBooleanMapModal', () => {
+ beforeEach(() => {
+ nodes = {
+ node1: { id: 'node1' },
+ node2: { id: 'node2' },
+ node3: { id: 'node3' },
+ node4: { id: 'node4' },
+ };
+ contentNodeActions = {
+ updateContentNode: jest.fn(),
+ updateContentNodeDescendants: jest.fn(),
+ };
+ generalActions = {
+ showSnackbarSimple: jest.fn(),
+ };
+ store = new Vuex.Store({
+ actions: generalActions,
+ modules: {
+ contentNode: {
+ namespaced: true,
+ actions: contentNodeActions,
+ getters: {
+ getContentNodes: () => ids => ids.map(id => nodes[id]),
+ getContentNode: () => id => nodes[id],
+ },
+ },
+ },
+ });
+ });
+
+ test('smoke test', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+ expect(wrapper.isVueInstance()).toBe(true);
+ });
+
+ describe('Selected options on first render', () => {
+ describe('Options checkboxes', () => {
+ test('no option should be selected if a single node does not have options set', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+ const optionsValues = getOptionsValues(wrapper);
+ expect(
+ Object.values(optionsValues).every(value => value === CheckboxValue.UNCHECKED)
+ ).toBeTruthy();
+ });
+
+ test('no option should be selected if multiple nodes dont have options set', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const optionsValues = getOptionsValues(wrapper);
+ expect(
+ Object.values(optionsValues).every(value => value === CheckboxValue.UNCHECKED)
+ ).toBeTruthy();
+ });
+
+ test('checkbox options should be selected depending on the options set for a single node - categories', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+ const optionsValues = getOptionsValues(wrapper);
+ const {
+ [Categories.DAILY_LIFE]: dailyLifeValue,
+ [Categories.FOUNDATIONS]: foundationsValue,
+ ...otheroptionsValues
+ } = optionsValues;
+ expect(
+ Object.values(otheroptionsValues).every(value => value === CheckboxValue.UNCHECKED)
+ ).toBeTruthy();
+ expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
+ expect(foundationsValue).toBe(CheckboxValue.CHECKED);
+ });
+
+ test('checkbox option should be checked if all nodes have the same option set', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const optionsValues = getOptionsValues(wrapper);
+ const {
+ [Categories.DAILY_LIFE]: dailyLifeValue,
+ [Categories.FOUNDATIONS]: foundationsValue,
+ } = optionsValues;
+ expect(dailyLifeValue).toBe(CheckboxValue.CHECKED);
+ expect(foundationsValue).toBe(CheckboxValue.CHECKED);
+ });
+ });
+ });
+
+ test('should render the message of the number of resources selected', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2');
+ });
+
+ test('should render the message of the number of resources selected - 2', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2', 'node3', 'node4'] });
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2 resources');
+ });
+
+ describe('Submit', () => {
+ test('should call updateContentNode with the selected options on an empty boolean map when success submit', async () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+ schoolCheckbox.element.click();
+ const sociologyCheckbox = findOptionCheckbox(wrapper, Categories.SOCIOLOGY);
+ sociologyCheckbox.element.click();
+
+ await wrapper.vm.handleSave();
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {
+ [Categories.SCHOOL]: true,
+ [Categories.SOCIOLOGY]: true,
+ },
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node2',
+ categories: {
+ [Categories.SCHOOL]: true,
+ [Categories.SOCIOLOGY]: true,
+ },
+ });
+ });
+
+ test('should emit close event on success submit', async () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+ await wrapper.vm.handleSave();
+ expect(wrapper.emitted('close')).toBeTruthy();
+ });
+
+ test('should show a confirmation snackbar on success submit', async () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+ await wrapper.vm.handleSave();
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+ });
+ });
+
+ test('should emit close event on cancel', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1'] });
+
+ wrapper.vm.close();
+ expect(wrapper.emitted('close')).toBeTruthy();
+ });
+
+ describe('topic nodes present', () => {
+ test('should display the checkbox to apply change to descendants if a topic is present and is descendants updatable', () => {
+ nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: true });
+
+ expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeTruthy();
+ });
+
+ test('should not display the checkbox to apply change to descendants if a topic is not present even though its descendants updatable', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: true });
+
+ expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+ });
+
+ test('should not display the checkbox to apply change to descendants if is not descendants updatable', () => {
+ nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'], isDescendantsUpdatable: false });
+
+ expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+ });
+
+ test('should call updateContentNode on success submit if the user does not check the update descendants checkbox', async () => {
+ nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+ const wrapper = makeWrapper({ nodeIds: ['node1'], isDescendantsUpdatable: true });
+ await wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {},
+ });
+ });
+
+ test('should call updateContentNodeDescendants on success submit if the user checks the descendants checkbox', async () => {
+ nodes['node1'].kind = ContentKindsNames.TOPIC;
+
+ const wrapper = makeWrapper({ nodeIds: ['node1'], isDescendantsUpdatable: true });
+ wrapper.find('[data-test="update-descendants-checkbox"]').element.click();
+ await wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNodeDescendants).toHaveBeenCalledWith(
+ expect.anything(),
+ {
+ id: 'node1',
+ categories: {},
+ }
+ );
+ });
+ });
+
+ describe('mixed options that are not selected across all nodes', () => {
+ describe('render mixed options message', () => {
+ test('should not render mixed options message if there are not mixed options across selected nodes', () => {
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.find('[data-test="mixed-categories-message"]').exists()).toBeFalsy();
+ });
+
+ test('should not render mixed options message if there are not mixed options across selected nodes - 2', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.find('[data-test="mixed-categories-message"]').exists()).toBeFalsy();
+ });
+
+ test('should render mixed options message if there are mixed options across selected nodes', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ nodes['node2'].categories = {};
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.find('[data-test="mixed-categories-message"]').exists()).toBeTruthy();
+ });
+
+ test('should render mixed options message if there are mixed options across selected nodes - 2', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.find('[data-test="mixed-categories-message"]').exists()).toBeTruthy();
+ });
+ });
+ describe('on submit', () => {
+ test('should add new selected options on submit even if there are not common selected options', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.FOUNDATIONS]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+ schoolCheckbox.element.click();
+
+ wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {
+ // already daily_life category selected plus new school category selected
+ [Categories.SCHOOL]: true,
+ [Categories.DAILY_LIFE]: true,
+ },
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node2',
+ categories: {
+ // already foundations category selected plus new school category selected
+ [Categories.SCHOOL]: true,
+ [Categories.FOUNDATIONS]: true,
+ },
+ });
+ });
+
+ test('should add new selected options on submit even if there are common selected options', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.FOUNDATIONS]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+ schoolCheckbox.element.click();
+
+ wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {
+ // already daily_life and foundation category selected plus new school category selected
+ [Categories.SCHOOL]: true,
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ },
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node2',
+ categories: {
+ // already foundations category selected plus new school category selected
+ [Categories.SCHOOL]: true,
+ [Categories.FOUNDATIONS]: true,
+ },
+ });
+ });
+
+ test('should not remove common selected options even if they are unchecked', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const dailyLifeCheckbox = findOptionCheckbox(wrapper, Categories.DAILY_LIFE);
+ dailyLifeCheckbox.element.click(); // uncheck daily lifye
+
+ const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+ schoolCheckbox.element.click(); // check school
+
+ wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {
+ // already daily_life and foundation category selected plus new school category selected
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ [Categories.SCHOOL]: true,
+ },
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node2',
+ categories: {
+ // already daily life category selected plus new school category selected
+ [Categories.DAILY_LIFE]: true,
+ [Categories.SCHOOL]: true,
+ },
+ });
+ });
+
+ test('should not remove common selected options even if they are unchecked and no new options are checked', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ [Categories.SCHOOL]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const dailyLifeCheckbox = findOptionCheckbox(wrapper, Categories.DAILY_LIFE);
+ dailyLifeCheckbox.element.click(); // uncheck daily lifye
+
+ wrapper.vm.handleSave();
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node1',
+ categories: {
+ // already selected options
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ [Categories.SCHOOL]: true,
+ },
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'node2',
+ categories: {
+ // already selected options
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ },
+ });
+ });
+ });
+ describe('can save method', () => {
+ test('should not can save if there are mixed categories and no options selected', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.FOUNDATIONS]: true,
+ };
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.vm.canSave).toBeFalsy();
+ });
+
+ test('should can save if there are mixed categories but new options are selected', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.FOUNDATIONS]: true,
+ };
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ const schoolCheckbox = findOptionCheckbox(wrapper, Categories.SCHOOL);
+ schoolCheckbox.element.click();
+
+ expect(wrapper.vm.canSave).toBeTruthy();
+ });
+
+ test('should can save if there are mixed categories but at least one common option across all nodes', () => {
+ nodes['node1'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ [Categories.FOUNDATIONS]: true,
+ };
+ nodes['node2'].categories = {
+ [Categories.DAILY_LIFE]: true,
+ };
+
+ const wrapper = makeWrapper({ nodeIds: ['node1', 'node2'] });
+
+ expect(wrapper.vm.canSave).toBeTruthy();
+ });
+ });
+ });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js
new file mode 100644
index 0000000000..4a53039d92
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditLanguageModal.spec.js
@@ -0,0 +1,258 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditLanguageModal from '../EditLanguageModal';
+import { LanguagesList } from 'shared/leUtils/Languages';
+import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
+
+const nodes = [
+ { id: 'test-en-res', language: 'en' },
+ { id: 'test-es-res', language: 'es' },
+ { id: 'test-nolang-res', language: '' },
+ { id: 'test-en-topic', language: 'en', kind: ContentKindsNames.TOPIC },
+];
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const makeWrapper = nodeIds => {
+ return mount(EditLanguageModal, {
+ store,
+ propsData: {
+ nodeIds,
+ resourcesSelectedText: '2 resources',
+ },
+ });
+};
+
+describe('EditLanguageModal', () => {
+ beforeEach(() => {
+ contentNodeActions = {
+ updateContentNode: jest.fn(),
+ updateContentNodeDescendants: jest.fn(),
+ };
+ generalActions = {
+ showSnackbarSimple: jest.fn(),
+ };
+ store = new Vuex.Store({
+ actions: generalActions,
+ modules: {
+ contentNode: {
+ namespaced: true,
+ actions: contentNodeActions,
+ getters: {
+ getContentNodes: () => ids => nodes.filter(node => ids.includes(node.id)),
+ },
+ },
+ },
+ });
+ });
+
+ test('smoke test', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+ expect(wrapper.isVueInstance()).toBe(true);
+ });
+
+ describe('Selected language on first render', () => {
+ test('no language should be selected if a single node does not have a language', () => {
+ const wrapper = makeWrapper(['test-nolang-res']);
+
+ const checkboxes = wrapper.findAll('input[type="radio"]');
+ checkboxes.wrappers.forEach(checkbox => {
+ expect(checkbox.element.checked).toBeFalsy();
+ });
+ });
+
+ test('no language should be selected if just a single node among multiple nodes does not have language', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-nolang-res']);
+
+ const checkboxes = wrapper.findAll('input[type="radio"]');
+ checkboxes.wrappers.forEach(checkbox => {
+ expect(checkbox.element.checked).toBeFalsy();
+ });
+ });
+
+ test('no language should be selected if there are multiple languages set', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+ const checkboxes = wrapper.findAll('input[type="radio"]');
+ checkboxes.wrappers.forEach(checkbox => {
+ expect(checkbox.element.checked).toBeFalsy();
+ });
+ });
+
+ test('the common language should be selected if all nodes have the same language', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-en-topic']);
+
+ const checkbox = wrapper.find('input[value="en"]');
+ expect(checkbox.element.checked).toBeTruthy();
+ });
+ });
+
+ test('should render the message of the number of resources selected', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2');
+ });
+
+ test('should render the message of the number of resources selected - 2', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res', 'test-en-topic', 'test-nolang-res']);
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2 resources');
+ });
+
+ test('should filter languages options based on search query', () => {
+ const wrapper = makeWrapper(['test-en-topic']);
+
+ wrapper.find('[data-test="search-input"]').vm.$emit('input', 'es');
+
+ const optionsList = wrapper.find('[data-test="language-options-list"]');
+ const options = optionsList.findAll('input[type="radio"]');
+ options.wrappers.forEach(option => {
+ const language = LanguagesList.find(lang => lang.id === option.element.value);
+ expect(
+ language.id.toLowerCase().includes('es') ||
+ language.native_name.toLowerCase().includes('es') ||
+ language.readable_name.toLowerCase().includes('es')
+ ).toBeTruthy();
+ });
+ });
+
+ test('should display information message about different languages if there are multiple languages set', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+ expect(wrapper.find('[data-test="different-languages-message"]').exists()).toBeTruthy();
+ });
+
+ test('shouldnt display information message about different languages if only one language is set', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-en-topic']);
+
+ expect(wrapper.find('[data-test="different-languages-message"]').exists()).toBeFalsy();
+ });
+
+ test('the submit button should be disabled if no language is selected', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+ const buttons = wrapper.findAll('button').wrappers;
+ const submitButton = buttons.find(button => button.text() === 'Save');
+
+ expect(submitButton.element.disabled).toBeTruthy();
+ });
+
+ test('the submit button should be enabled if a language is selected', () => {
+ const wrapper = makeWrapper(['test-en-res', 'test-es-res']);
+
+ const buttons = wrapper.findAll('button').wrappers;
+ const submitButton = buttons.find(button => button.text() === 'Save');
+
+ wrapper.find('input[value="en"]').setChecked(true);
+
+ expect(submitButton.element.disabled).toBeFalsy();
+ });
+
+ test('should call updateContentNode with the right language on success submit', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+
+ wrapper.find('input[value="en"]').setChecked(true);
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'test-es-res',
+ language: 'en',
+ });
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'test-en-res',
+ language: 'en',
+ });
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on success submit', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+
+ wrapper.find('input[value="en"]').setChecked(true);
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted('close')).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on cancel', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('cancel');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted('close')).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should show a confirmation snackbar on success submit', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+
+ wrapper.find('input[value="en"]').setChecked(true);
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalled();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ describe('topic nodes present', () => {
+ test('should display the checkbox to apply change to descendants if a topic is present', () => {
+ const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+ expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeTruthy();
+ });
+
+ test('should not display the checkbox to apply change to descendants if a topic is not present', () => {
+ const wrapper = makeWrapper(['test-en-res']);
+
+ expect(wrapper.find('[data-test="update-descendants-checkbox"]').exists()).toBeFalsy();
+ });
+
+ test('should call updateContentNode with the right language on success submit if the user does not check the checkbox', () => {
+ const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+ wrapper.find('input[value="es"]').setChecked(true);
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: 'test-en-topic',
+ language: 'es',
+ });
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should call updateContentNodeDescendants with the right language on success submit if the user checks the checkbox', () => {
+ const wrapper = makeWrapper(['test-en-topic', 'test-en-res']);
+
+ wrapper.find('input[value="es"]').setChecked(true);
+ wrapper.find('[data-test="update-descendants-checkbox"] input').setChecked(true);
+ wrapper.find('[data-test="edit-language-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(contentNodeActions.updateContentNodeDescendants).toHaveBeenCalledWith(
+ expect.anything(),
+ {
+ id: 'test-en-topic',
+ language: 'es',
+ }
+ );
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+ });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js
new file mode 100644
index 0000000000..8be43746f9
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditSourceModal.spec.js
@@ -0,0 +1,306 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditSourceModal from '../EditSourceModal';
+import { LicensesList } from 'shared/leUtils/Licenses';
+import { constantsTranslationMixin } from 'shared/mixins';
+
+let nodes;
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+const MIXED_VALUE = 'Mixed';
+
+const getLicenseId = translatedLicense => {
+ if (translatedLicense === MIXED_VALUE) {
+ return MIXED_VALUE;
+ }
+ const translatedLicenses = LicensesList.reduce((acc, license) => {
+ const { translateConstant } = constantsTranslationMixin.methods;
+ acc[translateConstant(license.license_name)] = license.id;
+ return acc;
+ }, {});
+ return translatedLicenses[translatedLicense];
+};
+
+const getSourceValues = wrapper => {
+ return {
+ author: wrapper.find('[data-test="author-input"] input').element.value,
+ provider: wrapper.find('[data-test="provider-input"] input').element.value,
+ aggregator: wrapper.find('[data-test="aggregator-input"] input').element.value,
+ license: getLicenseId(wrapper.find('.v-select__selections').element.textContent),
+ license_description: wrapper.find('.license-description textarea')?.element?.value,
+ copyright_holder: wrapper.find('[data-test="copyright-holder-input"] input').element.value,
+ };
+};
+
+const makeWrapper = nodeIds => {
+ return mount(EditSourceModal, {
+ store,
+ propsData: {
+ nodeIds,
+ resourcesSelectedText: '2 resources',
+ },
+ });
+};
+
+describe('EditSourceModal', () => {
+ beforeEach(() => {
+ nodes = {
+ node1: {
+ id: 'node1',
+ copyright_holder: 'Test',
+ },
+ node2: {
+ id: 'node2',
+ copyright_holder: 'Test',
+ },
+ };
+ contentNodeActions = {
+ updateContentNode: jest.fn(),
+ };
+ generalActions = {
+ showSnackbarSimple: jest.fn(),
+ };
+ store = new Vuex.Store({
+ actions: generalActions,
+ modules: {
+ contentNode: {
+ namespaced: true,
+ actions: contentNodeActions,
+ getters: {
+ getContentNodes: () => ids => ids.map(id => nodes[id]),
+ },
+ },
+ },
+ });
+ });
+
+ test('smoke test', () => {
+ const wrapper = makeWrapper(['node1']);
+ expect(wrapper.isVueInstance()).toBe(true);
+ });
+
+ describe('Selected source on first render', () => {
+ test('should display the correct source values when one node is selected', () => {
+ const testValues = {
+ author: 'Test author',
+ provider: 'Test provider',
+ aggregator: 'Test aggregator',
+ license: 9,
+ license_description: 'Test license description',
+ copyright_holder: 'Test copyright',
+ };
+ Object.assign(nodes.node1, testValues);
+ const wrapper = makeWrapper(['node1']);
+
+ expect(getSourceValues(wrapper)).toEqual(expect.anything(), testValues);
+ });
+
+ test('should display the common source values when multiple nodes are selected', () => {
+ const testValues = {
+ author: 'Test author',
+ provider: 'Test provider',
+ };
+ Object.assign(nodes.node1, testValues);
+ Object.assign(nodes.node2, testValues);
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(getSourceValues(wrapper)).toEqual(expect.anything(), testValues);
+ });
+
+ test('should display the mixed value when the selected nodes have different values', () => {
+ nodes['node1'].author = 'Test author';
+ nodes['node2'].author = 'Test author 2';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const sourceValues = getSourceValues(wrapper);
+ expect(sourceValues.author).toEqual(MIXED_VALUE);
+ });
+
+ test('should disable inputs when all nodes are imported', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+ nodes['node2'].original_source_node_id = 'original_node2';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+ true
+ );
+ });
+
+ test('should show message that source cannot be edited when all nodes are imported', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+ nodes['node2'].original_source_node_id = 'original_node2';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('.help').text()).toContain(EditSourceModal.$trs.cannotEditPublic);
+ });
+
+ test('should disable inputs when node has freeze_authoring_data set to true', () => {
+ nodes['node1'].freeze_authoring_data = true;
+
+ const wrapper = makeWrapper(['node1']);
+
+ expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(true);
+ expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+ true
+ );
+ });
+
+ test('should show message that source cannot be edited when node has freeze_authoring_data set to true', () => {
+ nodes['node1'].freeze_authoring_data = true;
+
+ const wrapper = makeWrapper(['node1']);
+
+ expect(wrapper.find('.help').text()).toContain(EditSourceModal.$trs.cannotEditPublic);
+ });
+
+ test('should not disable inputs when not all nodes are imported', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('[data-test="author-input"] input').element.disabled).toBe(false);
+ expect(wrapper.find('[data-test="provider-input"] input').element.disabled).toBe(false);
+ expect(wrapper.find('[data-test="aggregator-input"] input').element.disabled).toBe(false);
+ expect(wrapper.find('[data-test="copyright-holder-input"] input').element.disabled).toBe(
+ false
+ );
+ });
+
+ test('should show a message that edits will be reflected only for local resources if just some nodes are imported, but not all', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ expect(wrapper.find('.help').text()).toContain(
+ 'Edits will be reflected only for local resources'
+ );
+ });
+ });
+
+ describe('On submit', () => {
+ test('should not call updateContentNode on submit if copyright holder is missing', () => {
+ nodes['node1'].copyright_holder = '';
+ const wrapper = makeWrapper(['node1']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).not.toHaveBeenCalled();
+ });
+
+ test('should call updateContentNode on success submit for all editable nodes', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalled();
+ });
+
+ test('should call updateContentNode with the correct parameters on success submit for all editable nodes', () => {
+ nodes['node1'].author = 'Test author';
+ const newAuthor = 'new-author';
+
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="author-input"]').vm.$emit('input', newAuthor);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(
+ expect.anything(),
+ expect.objectContaining({
+ id: 'node1',
+ author: newAuthor,
+ })
+ );
+ });
+
+ test('should call updateContentNode on submit just for the editable nodes', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledTimes(1);
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(
+ expect.anything(),
+ expect.objectContaining({
+ id: 'node2',
+ })
+ );
+ expect(contentNodeActions.updateContentNode).not.toHaveBeenCalledWith(
+ expect.anything(),
+ expect.objectContaining({
+ id: 'node1',
+ })
+ );
+ });
+
+ test('should not call updateContentNode on submit if all nodes are imported', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+ nodes['node2'].original_source_node_id = 'original_node2';
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).not.toHaveBeenCalled();
+ });
+
+ test('should show a snackbar with the correct number of edited nodes on success submit', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+ expect.anything(),
+ 'Edited attribution for 2 resources'
+ );
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should show a snack bar with the correct number of edited nodes on success submit if some nodes are imported', () => {
+ nodes['node1'].original_source_node_id = 'original_node1';
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+ expect.anything(),
+ 'Edited attribution for 1 resource'
+ );
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on success submit', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted('close')).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+ });
+
+ test('should render the message of the number of resources selected', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ const resourcesCounter = wrapper.find('[data-test="resources-selected-message"]');
+ expect(resourcesCounter.exists()).toBeTruthy();
+ expect(resourcesCounter.text()).toContain('2');
+ });
+
+ test('should emit close event on cancel', () => {
+ const wrapper = makeWrapper(['node1', 'node2']);
+
+ wrapper.find('[data-test="edit-source-modal"]').vm.$emit('cancel');
+ expect(wrapper.emitted('close')).toBeTruthy();
+ });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js
new file mode 100644
index 0000000000..2c20379601
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/__tests__/EditTitleDescriptionModal.spec.js
@@ -0,0 +1,190 @@
+import { mount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import EditTitleDescriptionModal from '../EditTitleDescriptionModal.vue';
+
+const nodeId = 'test-id';
+
+const node = {
+ id: nodeId,
+ title: 'test-title',
+ description: 'test-description',
+};
+
+let store;
+let contentNodeActions;
+let generalActions;
+
+describe('EditTitleDescriptionModal', () => {
+ beforeEach(() => {
+ contentNodeActions = {
+ updateContentNode: jest.fn(),
+ };
+ generalActions = {
+ showSnackbarSimple: jest.fn(),
+ };
+ store = new Vuex.Store({
+ actions: generalActions,
+ modules: {
+ contentNode: {
+ namespaced: true,
+ actions: contentNodeActions,
+ getters: {
+ getContentNode: () => () => node,
+ },
+ },
+ },
+ });
+ });
+
+ test('smoke test', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+ expect(wrapper.isVueInstance()).toBe(true);
+ });
+
+ test('should display the correct title and description on first render', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ expect(wrapper.find('[data-test="title-input"]').vm.$props.value).toBe(node.title);
+ expect(wrapper.find('[data-test="description-input"]').vm.$props.value).toBe(node.description);
+ });
+
+ test('should call updateContentNode on success submit', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalled();
+ });
+
+ test('should call updateContentNode with the correct parameters on success submit', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ const newTitle = 'new-title';
+ const newDescription = 'new-description';
+ wrapper.find('[data-test="title-input"]').vm.$emit('input', 'new-title');
+ wrapper.find('[data-test="description-input"]').vm.$emit('input', 'new-description');
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: nodeId,
+ title: newTitle,
+ description: newDescription,
+ });
+ });
+
+ test('should let update even if description is empty', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ const newTitle = 'new-title';
+ wrapper.find('[data-test="title-input"]').vm.$emit('input', 'new-title');
+ wrapper.find('[data-test="description-input"]').vm.$emit('input', '');
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+ expect(contentNodeActions.updateContentNode).toHaveBeenCalledWith(expect.anything(), {
+ id: nodeId,
+ title: newTitle,
+ description: '',
+ });
+ });
+
+ test('should validate title on blur', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="title-input"]').vm.$emit('input', '');
+ wrapper.find('[data-test="title-input"]').vm.$emit('blur');
+
+ expect(wrapper.find('[data-test="title-input"]').vm.$props.invalidText).toBeTruthy();
+ });
+
+ test('should validate title on submit', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="title-input"]').vm.$emit('input', '');
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+ expect(wrapper.find('[data-test="title-input"]').vm.$props.invalidText).toBeTruthy();
+ });
+
+ test("should show 'Edited title and description' on a snackbar on success submit", () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(generalActions.showSnackbarSimple).toHaveBeenCalledWith(
+ expect.anything(),
+ 'Edited title and description'
+ );
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test("should emit 'close' event on success submit", () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('submit');
+
+ const animationFrameId = requestAnimationFrame(() => {
+ expect(wrapper.emitted().close).toBeTruthy();
+ cancelAnimationFrame(animationFrameId);
+ });
+ });
+
+ test('should emit close event on cancel', () => {
+ const wrapper = mount(EditTitleDescriptionModal, {
+ store,
+ propsData: {
+ nodeId,
+ },
+ });
+
+ wrapper.find('[data-test="edit-title-description-modal"]').vm.$emit('cancel');
+ expect(wrapper.emitted().close).toBeTruthy();
+ });
+});
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue
new file mode 100644
index 0000000000..f9cb1ed816
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/QuickEditModal/index.vue
@@ -0,0 +1,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesList/RelatedResourcesList.vue b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesList/RelatedResourcesList.vue
index 23deb3a94d..8cd430681c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesList/RelatedResourcesList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/RelatedResourcesList/RelatedResourcesList.vue
@@ -41,7 +41,7 @@
v-on="on"
@click="onRemoveClick(item.id)"
>
-
+
{{ $tr('resourcePreviewDialogHelpText') }}
@@ -447,11 +439,8 @@
class="red--text"
>
{{ accessibilityItem.label }}
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
deleted file mode 100644
index b14c11a839..0000000000
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/CategoryOptions.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
- {{ tooltipHelper(data.item.value) }}
- + {{ helpTextString.$tr('cannotEditPublic') }} +
+ {{ helpTextString.$tr('cannotEditPublic') }} +
@@ -374,20 +390,20 @@ import ContentNodeThumbnail from '../../views/files/thumbnails/ContentNodeThumbnail'; import FileUpload from '../../views/files/FileUpload'; import SubtitlesList from '../../views/files/supplementaryLists/SubtitlesList'; - import { isImportedContent, importedChannelLink } from '../../utils'; + import { isImportedContent, isDisableSourceEdits, importedChannelLink } from '../../utils'; + import EditSourceModal from '../QuickEditModal/EditSourceModal.vue'; import AccessibilityOptions from './AccessibilityOptions.vue'; - import LevelsOptions from './LevelsOptions.vue'; - import ResourcesNeededOptions from './ResourcesNeededOptions.vue'; - import LearningActivityOptions from './LearningActivityOptions.vue'; - import CategoryOptions from './CategoryOptions.vue'; - import CompletionOptions from './CompletionOptions.vue'; - import FormatPresetsMap, { FormatPresetsNames } from 'shared/leUtils/FormatPresets'; + import LevelsOptions from 'shared/views/contentNodeFields/LevelsOptions'; + import CategoryOptions from 'shared/views/contentNodeFields/CategoryOptions'; + import CompletionOptions from 'shared/views/contentNodeFields/CompletionOptions'; + import LearningActivityOptions from 'shared/views/contentNodeFields/LearningActivityOptions'; + import ResourcesNeededOptions from 'shared/views/contentNodeFields/ResourcesNeededOptions'; import { getTitleValidators, getCopyrightHolderValidators, translateValidator, } from 'shared/utils/validation'; - import { findLicense, memoizeDebounce } from 'shared/utils/helpers'; + import { findLicense, memoizeDebounce, getFileDuration } from 'shared/utils/helpers'; import LanguageDropdown from 'shared/views/LanguageDropdown'; import HelpTooltip from 'shared/views/HelpTooltip'; import LicenseDropdown from 'shared/views/LicenseDropdown'; @@ -401,6 +417,7 @@ nonUniqueValue, } from 'shared/constants'; import { constantsTranslationMixin, metadataTranslationMixin } from 'shared/mixins'; + import { crossComponentTranslator } from 'shared/i18n'; function getValueFromResults(results) { if (results.length === 0) { @@ -435,14 +452,10 @@ } /** - * This function is used to generate getter/setters for new metadata fields that are boolean maps: - * - `grade_levels` (sometimes referred to as `content_levels`) - * - `learner_needs` (resources needed) + * This function is used to generate getter/setters having its value as + * an array for metadata fields that are boolean maps: * - `accessibility_labels` (accessibility options) - * - `learning_activities` (learning activities) - * - `categories` (categories) */ - function generateNestedNodesGetterSetter(key) { return { get() { @@ -476,6 +489,42 @@ }; } + /** + * This function is used to generate getter/setters having its value as + * an object for metadata fields that are boolean maps: + * - `grade_levels` (sometimes referred to as `content_levels`) + * - `learner_needs` (resources needed) + * - `learning_activities` (learning activities) + * - `categories` (categories) + */ + function generateNestedNodesGetterSetterObject(key) { + return { + get() { + const value = {}; + for (const node of this.nodes) { + const diffTrackerNode = this.diffTracker[node.id] || {}; + const currentValue = diffTrackerNode[key] || node[key] || {}; + Object.entries(currentValue).forEach(([option, optionValue]) => { + if (optionValue) { + value[option] = value[option] || []; + value[option].push(node.id); + } + }); + } + return value; + }, + set(value) { + const newMap = {}; + for (const option in value) { + if (value[option].length === this.nodes.length) { + newMap[option] = true; + } + } + this.update({ [key]: newMap }); + }, + }; + } + export default { name: 'DetailsTabView', components: { @@ -506,6 +555,8 @@ tagText: null, valid: true, diffTracker: {}, + changed: false, + helpTextString: crossComponentTranslator(EditSourceModal), }; }, computed: { @@ -585,24 +636,28 @@ role: generateGetterSetter('role_visibility'), language: generateGetterSetter('language'), accessibility: generateNestedNodesGetterSetter('accessibility_labels'), - contentLevel: generateNestedNodesGetterSetter('grade_levels'), - resourcesNeeded: generateNestedNodesGetterSetter('learner_needs'), + contentLevel: generateNestedNodesGetterSetterObject('grade_levels'), + resourcesNeeded: generateNestedNodesGetterSetterObject('learner_needs'), forBeginners: { get() { - return this.resourcesNeeded.includes(ResourcesNeededTypes.FOR_BEGINNERS); + const value = this.resourcesNeeded[ResourcesNeededTypes.FOR_BEGINNERS]; + return value && value.length === this.nodes.length; }, set(value) { if (value) { - this.resourcesNeeded = [...this.resourcesNeeded, ResourcesNeededTypes.FOR_BEGINNERS]; + this.resourcesNeeded = { + ...this.resourcesNeeded, + [ResourcesNeededTypes.FOR_BEGINNERS]: this.nodeIds, + }; } else { - this.resourcesNeeded = this.resourcesNeeded.filter( - r => r !== ResourcesNeededTypes.FOR_BEGINNERS - ); + const newMap = { ...this.resourcesNeeded }; + delete newMap[ResourcesNeededTypes.FOR_BEGINNERS]; + this.resourcesNeeded = newMap; } }, }, - contentLearningActivities: generateNestedNodesGetterSetter('learning_activities'), - categories: generateNestedNodesGetterSetter('categories'), + contentLearningActivities: generateNestedNodesGetterSetterObject('learning_activities'), + categories: generateNestedNodesGetterSetterObject('categories'), license() { return this.getValueFromNodes('license'); }, @@ -659,7 +714,7 @@ return this.nodes.some(node => node.freeze_authoring_data); }, disableSourceEdits() { - return this.disableAuthEdits || this.isImported; + return this.nodes.some(isDisableSourceEdits); }, detectedImportText() { const count = this.nodes.filter(node => node.freeze_authoring_data).length; @@ -693,20 +748,7 @@ return (this.firstNode && this.getContentNodeFiles(this.firstNode.id)) || []; }, fileDuration() { - if ( - this.firstNode.kind === ContentKindsNames.AUDIO || - this.firstNode.kind === ContentKindsNames.VIDEO - ) { - // filter for the correct file types, - // to exclude files such as subtitle or cc - const audioVideoFiles = this.nodeFiles.filter(file => this.allowedFileType(file)); - // return the last item in the array - const file = audioVideoFiles[audioVideoFiles.length - 1]; - if (file) { - return file.duration; - } - } - return null; + return getFileDuration(this.nodeFiles, this.firstNode.kind); }, videoSelected() { return this.oneSelected && this.firstNode.kind === ContentKindsNames.VIDEO; @@ -743,17 +785,23 @@ ), saveFromDiffTracker(id) { if (this.diffTracker[id]) { - return this.updateContentNode({ id, ...this.diffTracker[id] }).then(() => { - delete this.diffTracker[id]; - }); + this.changed = true; + return this.updateContentNode({ id, checkComplete: true, ...this.diffTracker[id] }).then( + () => { + delete this.diffTracker[id]; + return this.changed; + } + ); } - return Promise.resolve(); + return Promise.resolve(this.changed); }, /* * @public */ immediateSaveAll() { - return Promise.all(Object.keys(this.diffTracker).map(this.saveFromDiffTracker)); + return Promise.all(Object.keys(this.diffTracker).map(this.saveFromDiffTracker)).then( + results => this.changed || results.some(Boolean) + ); }, update(payload) { this.nodeIds.forEach(id => { @@ -788,17 +836,6 @@ isUnique(value) { return value !== nonUniqueValue; }, - allowedFileType(file) { - let allowedFileTypes = []; - // add the relevant format presets for audio and video - // high res and low res are currently the same, so only one is included - allowedFileTypes.push( - FormatPresetsMap.get(FormatPresetsNames.HIGH_RES_VIDEO).allowed_formats - ); - allowedFileTypes.push(FormatPresetsMap.get(FormatPresetsNames.AUDIO).allowed_formats); - allowedFileTypes = allowedFileTypes.flat(); - return allowedFileTypes.includes(file.file_format); - }, getValueFromNodes(key) { const results = uniq( this.nodes.map(node => { @@ -966,4 +1003,14 @@ } } + // Positions help text underneath + p.help { + position: relative; + top: -20px; + left: 10px; + margin-bottom: 14px; + font-size: 12px; + color: var(--v-text-lighten4); + } + diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue index dc55fe2485..a18b45000d 100644 --- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue +++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue @@ -6,6 +6,7 @@ v-model="selectAll" class="mb-2 ml-1 mt-0 px-3 py-2" :label="$tr('selectAllLabel')" + style="font-size: 16px;" />
-
- error
-
+
{{ $tr('loadErrorText') }}
-
+
- + {{ $tr(error) }} + +
+
+
+
+
+ + {{ $tr('inheritMetadataDescription') }} +
++ {{ $tr('updateLanguage') }} +
++ {{ $tr('doNotShowAgainDescription') }} +
+
-
@@ -291,6 +297,7 @@
},
data() {
return {
+ isLoadingchild: false,
isLoading: true,
displaySummaryDetailsDialog: false,
displayDeployDialog: false,
@@ -387,8 +394,14 @@
watch: {
nodeId(newNodeId) {
this.elevated = false;
- this.loadAncestors({ id: newNodeId });
- this.loadChildren({ parent: newNodeId, root_id: this.stagingId });
+ this.isLoadingchild = true;
+
+ Promise.all([
+ this.loadAncestors({ id: newNodeId }),
+ this.loadChildren({ parent: newNodeId, root_id: this.stagingId }),
+ ]).then(() => {
+ this.isLoadingchild = false;
+ });
},
detailNodeId(newDetailNodeId) {
if (!newDetailNodeId) {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/translator.js b/contentcuration/contentcuration/frontend/channelEdit/translator.js
index d58efa3f33..9479fbbcec 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/translator.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/translator.js
@@ -14,6 +14,8 @@ const MESSAGES = {
errorMissingAnswer: 'Choose a correct answer',
errorChooseAtLeastOneCorrectAnswer: 'Choose at least one correct answer',
errorProvideAtLeastOneCorrectAnswer: 'Provide at least one correct answer',
+ selectionCount:
+ '{topicCount, plural, =0 {} one {# folder, } other {# folders, }}{resourceCount, plural, one {# resource} other {# resources}}',
};
export default createTranslator(NAMESPACE, MESSAGES);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/utils.js b/contentcuration/contentcuration/frontend/channelEdit/utils.js
index 5e7b868ca9..0e28ea4075 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/utils.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/utils.js
@@ -4,77 +4,14 @@ import { ContentKindsNames } from 'shared/leUtils/ContentKinds';
import { MasteryModelsNames } from 'shared/leUtils/MasteryModels';
import { metadataStrings, constantStrings } from 'shared/mixins';
import {
+ ContentModalities,
AssessmentItemTypes,
CompletionCriteriaModels,
- ContentModalities,
SHORT_LONG_ACTIVITY_MIDPOINT,
- CompletionDropdownMap,
+ defaultCompletionCriteriaModels,
+ defaultCompletionCriteriaThresholds,
} from 'shared/constants';
-// The constant mapping below is used to set
-// default completion criteria and durations
-// both as initial values in the edit modal, and
-// to ensure backwards compatibility for contentnodes
-// that were added before this was in place
-export const defaultCompletionCriteriaModels = {
- [ContentKindsNames.VIDEO]: CompletionCriteriaModels.TIME,
- [ContentKindsNames.AUDIO]: CompletionCriteriaModels.TIME,
- [ContentKindsNames.DOCUMENT]: CompletionCriteriaModels.PAGES,
- [ContentKindsNames.H5P]: CompletionCriteriaModels.DETERMINED_BY_RESOURCE,
- [ContentKindsNames.HTML5]: CompletionCriteriaModels.APPROX_TIME,
- [ContentKindsNames.ZIM]: CompletionCriteriaModels.APPROX_TIME,
- [ContentKindsNames.EXERCISE]: CompletionCriteriaModels.MASTERY,
-};
-
-export const defaultCompletionCriteriaThresholds = {
- // Audio and Video threshold defaults are dynamic based
- // on the duration of the file itself.
- [ContentKindsNames.DOCUMENT]: '100%',
- [ContentKindsNames.HTML5]: 300,
- // We cannot set an automatic default threshold for exercises.
-};
-
-export const completionCriteriaToDropdownMap = {
- [CompletionCriteriaModels.TIME]: CompletionDropdownMap.completeDuration,
- [CompletionCriteriaModels.APPROX_TIME]: CompletionDropdownMap.completeDuration,
- [CompletionCriteriaModels.PAGES]: CompletionDropdownMap.allContent,
- [CompletionCriteriaModels.DETERMINED_BY_RESOURCE]: CompletionDropdownMap.determinedByResource,
- [CompletionCriteriaModels.MASTERY]: CompletionDropdownMap.goal,
- [CompletionCriteriaModels.REFERENCE]: CompletionDropdownMap.reference,
-};
-
-export const CompletionOptionsDropdownMap = {
- [ContentKindsNames.DOCUMENT]: [
- CompletionDropdownMap.allContent,
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.reference,
- ],
- [ContentKindsNames.EXERCISE]: [CompletionDropdownMap.goal, CompletionDropdownMap.practiceQuiz],
- [ContentKindsNames.HTML5]: [
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.determinedByResource,
- CompletionDropdownMap.reference,
- ],
- [ContentKindsNames.ZIM]: [
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.determinedByResource,
- CompletionDropdownMap.reference,
- ],
- [ContentKindsNames.H5P]: [
- CompletionDropdownMap.determinedByResource,
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.reference,
- ],
- [ContentKindsNames.VIDEO]: [
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.reference,
- ],
- [ContentKindsNames.AUDIO]: [
- CompletionDropdownMap.completeDuration,
- CompletionDropdownMap.reference,
- ],
-};
-
/**
* Get correct answer index/indices out of an array of answer objects.
* @param {String} questionType single/multiple selection, true/false, input question
@@ -203,6 +140,10 @@ export function isImportedContent(node) {
);
}
+export function isDisableSourceEdits(node) {
+ return node.freeze_authoring_data || isImportedContent(node);
+}
+
export function importedChannelLink(node, router) {
if (node && isImportedContent(node)) {
const channelURI = window.Urls.channel(node.original_channel_id);
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
index 6ec4ffee47..a994e1c9aa 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/CurrentTopicView.vue
@@ -11,7 +11,7 @@
{{ getTitle(item) }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
- {{ selectionText }}
-
-