Skip to content

Commit 606b300

Browse files
Manav AggarwalManav Aggarwal
authored andcommitted
- adding code to extract metadata from submanifest file
- adding test cases for extractIMSMetadata
1 parent 90102de commit 606b300

File tree

4 files changed

+466
-133
lines changed

4 files changed

+466
-133
lines changed

contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@
5454
return this.value;
5555
},
5656
set(items) {
57-
if (this.selected.includes(items[0])) {
58-
this.selected = [];
59-
} else {
60-
this.getChildren(items[0]).forEach(item => items.push(item));
61-
this.$emit('input', items);
62-
}
57+
this.$emit('input', items);
6358
},
6459
},
6560
selectAll: {

contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@
500500
.slice(0, -1)
501501
.join('.');
502502
}
503-
if (file.metadata.orgs === undefined) {
503+
if (file.metadata.folders === undefined) {
504504
this.createNode(
505505
FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
506506
{ title, ...file.metadata }
@@ -513,52 +513,50 @@
513513
contentnode: newNodeId,
514514
});
515515
});
516-
} else if (file.metadata.orgs) {
516+
} else if (file.metadata.folders) {
517517
this.createNode('topic', file.metadata).then(newNodeId => {
518-
Object.values(file.metadata.orgs).forEach(org => {
518+
file.metadata.folders.forEach(org => {
519519
this.createNode('topic', org, newNodeId).then(topicNodeId => {
520-
Object.values(org).forEach(orgFile => {
521-
if (typeof orgFile === 'object') {
522-
const extra_fields = {};
523-
extra_fields['options'] = { entry: orgFile.resourceHref };
524-
extra_fields['title'] = orgFile.title;
525-
let file_kind = null;
526-
FormatPresetsList.forEach(p => {
527-
if (p.id === file.metadata.preset) {
528-
file_kind = p.kind_id;
529-
}
530-
});
520+
org.files.forEach(orgFile => {
521+
const extra_fields = {};
522+
extra_fields['options'] = { entry: orgFile.resourceHref };
523+
extra_fields['title'] = orgFile.title;
524+
let file_kind = null;
525+
FormatPresetsList.forEach(p => {
526+
if (p.id === file.metadata.preset) {
527+
file_kind = p.kind_id;
528+
}
529+
});
531530
532-
this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => {
533-
return File.uploadUrl({
534-
checksum: file.checksum,
535-
size: file.file_size,
536-
type: 'application/zip',
537-
name: file.original_filename,
538-
file_format: file.file_format,
539-
preset: file.metadata.preset,
540-
}).then(data => {
541-
const fileObject = {
542-
...data.file,
543-
loaded: 0,
544-
total: file.size,
545-
};
546-
if (index === 0) {
547-
this.selected = [resourceNodeId];
531+
this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => {
532+
return File.uploadUrl({
533+
checksum: file.checksum,
534+
size: file.file_size,
535+
type: 'application/zip',
536+
name: file.original_filename,
537+
file_format: file.file_format,
538+
preset: file.metadata.preset,
539+
}).then(data => {
540+
const fileObject = {
541+
...data.file,
542+
loaded: 0,
543+
total: file.size,
544+
};
545+
if (index === 0) {
546+
this.selected = [resourceNodeId];
547+
}
548+
this.updateFile({
549+
...fileObject,
550+
contentnode: resourceNodeId,
551+
}).catch(error => {
552+
let errorType = fileErrors.UPLOAD_FAILED;
553+
if (error.response && error.response.status === 412) {
554+
errorType = fileErrors.NO_STORAGE;
548555
}
549-
this.updateFile({
550-
...fileObject,
551-
contentnode: resourceNodeId,
552-
}).catch(error => {
553-
let errorType = fileErrors.UPLOAD_FAILED;
554-
if (error.response && error.response.status === 412) {
555-
errorType = fileErrors.NO_STORAGE;
556-
}
557-
return Promise.reject(errorType);
558-
});
556+
return Promise.reject(errorType);
559557
});
560558
});
561-
}
559+
});
562560
});
563561
});
564562
});

0 commit comments

Comments
 (0)