- changing metadata key names, removing comments, replacing replace w…

…ith trim
learningequality · Sep 19, 2023 · 2db6a02 · 2db6a02
1 parent 606b300
commit 2db6a02
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 30 deletions.
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue
@@ -8,7 +8,7 @@
       @input="trackSelect"
       @removed="handleRemoved"
     />
-    <div v-if="getChildren !== undefined">
+    <div v-if="getChildren !== undefined && getChildren.length">
       <EditListItems
         v-for="childId in getChildren"
         :key="childId"

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -515,12 +515,12 @@
             });
           } else if (file.metadata.folders) {
             this.createNode('topic', file.metadata).then(newNodeId => {
-              file.metadata.folders.forEach(org => {
-                this.createNode('topic', org, newNodeId).then(topicNodeId => {
-                  org.files.forEach(orgFile => {
+              file.metadata.folders.forEach(folder => {
+                this.createNode('topic', folder, newNodeId).then(topicNodeId => {
+                  folder.files.forEach(folderFile => {
                     const extra_fields = {};
-                    extra_fields['options'] = { entry: orgFile.resourceHref };
-                    extra_fields['title'] = orgFile.title;
+                    extra_fields['options'] = { entry: folderFile.resourceHref };
+                    extra_fields['title'] = folderFile.title;
                     let file_kind = null;
                     FormatPresetsList.forEach(p => {
                       if (p.id === file.metadata.preset) {
@@ -532,7 +532,6 @@
                       return File.uploadUrl({
                         checksum: file.checksum,
                         size: file.file_size,
-                        type: 'application/zip',
                         name: file.original_filename,
                         file_format: file.file_format,
                         preset: file.metadata.preset,
@@ -542,7 +541,7 @@
                           loaded: 0,
                           total: file.size,
                         };
-                        if (index === 0) {
+                        if (!this.selected.length) {
                           this.selected = [resourceNodeId];
                         }
                         this.updateFile({

diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
@@ -247,7 +247,6 @@ describe('file store', () => {
         });
       });
       it('extractIMSMetadata should extract metadata from imsmanifest.xml', async () => {
-        // const manifestFile = get_imsmanifest_file({ title: 'Test file' });
         const manifestContent = `
         <manifest xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2">
           <metadata>
@@ -317,7 +316,6 @@ describe('file store', () => {
 
         const zip = new JSZip();
         zip.file('imsmanifest.xml', manifestContent);
-        // zip.folder('ims_package.zip');
         await zip.generateAsync({ type: 'blob' }).then(async function(imsBlob) {
           await expect(extractIMSMetadata(imsBlob)).resolves.toEqual({
             title: 'Test File',
@@ -506,7 +504,7 @@ describe('file store', () => {
             <imsmd:lom>
               <imsmd:general>
                 <imsmd:title>
-                  <imsmd:langstring xml:lang="en">Test File</imsmd:langstring>
+                  <imsmd:langstring xml:lang="und">\t\t\t\n\n\n\nTest File\n</imsmd:langstring>
                 </imsmd:title>
                 <imsmd:language>und</imsmd:language>
               </imsmd:general>

diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -62,7 +62,7 @@ async function getFolderMetadata(data, xmlDoc, zip, procssedFiles) {
         };
         if (orgNode.nodeType === 1) {
           const title = orgNode.getElementsByTagName('title');
-          org.title = title[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          org.title = title[0].textContent.trim();
           const files = orgNode.getElementsByTagName('item');
           const immediateChildNodes = [];
           const childNodes = Object.values(orgNode.children);
@@ -74,7 +74,7 @@ async function getFolderMetadata(data, xmlDoc, zip, procssedFiles) {
           await Promise.all(
             immediateChildNodes.map(async (fileNode, k) => {
               const file = {};
-              file.title = title[1 + k].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+              file.title = title[1 + k].textContent.trim();
               file.identifierref = fileNode.getAttribute('identifierref');
               file.resourceHref = xmlDoc
                 .querySelectorAll(`[identifier=${file.identifierref}]`)[0]
@@ -149,41 +149,37 @@ async function getManifestMetadata(manifestFile, zip, procssedFiles) {
       if (xmlDoc.getElementsByTagName('lomes:title').length) {
         metadata.title = xmlDoc
           .getElementsByTagName('lomes:title')[0]
-          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          .children[0].textContent.trim();
       }
       if (
         xmlDoc.getElementsByTagName('lomes:idiom').length &&
-        xmlDoc
-          .getElementsByTagName('lomes:idiom')[0]
-          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '') !== 'und'
+        LanguagesMap.has(xmlDoc.getElementsByTagName('lomes:idiom')[0].textContent.trim()) &&
+        xmlDoc.getElementsByTagName('lomes:idiom')[0].textContent.trim() !== 'und'
       ) {
         metadata.language = xmlDoc
           .getElementsByTagName('lomes:idiom')[0]
-          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          .children[0].textContent.trim();
       }
       if (xmlDoc.getElementsByTagName('lomes:description').length) {
         metadata.description = xmlDoc
           .getElementsByTagName('lomes:description')[0]
-          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          .children[0].textContent.trim();
       }
     } else {
       if (xmlDoc.getElementsByTagName('imsmd:title').length) {
-        metadata.title = xmlDoc
-          .getElementsByTagName('imsmd:title')[0]
-          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+        metadata.title = xmlDoc.getElementsByTagName('imsmd:title')[0].textContent.trim();
       }
       if (
         xmlDoc.getElementsByTagName('imsmd:language').length &&
-        xmlDoc.getElementsByTagName('imsmd:language')[0].textContent !== 'und'
+        LanguagesMap.has(xmlDoc.getElementsByTagName('imsmd:language')[0].textContent.trim()) &&
+        xmlDoc.getElementsByTagName('imsmd:language')[0].textContent.trim() !== 'und'
       ) {
-        metadata.language = xmlDoc
-          .getElementsByTagName('imsmd:language')[0]
-          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+        metadata.language = xmlDoc.getElementsByTagName('imsmd:language')[0].textContent.trim();
       }
       if (xmlDoc.getElementsByTagName('imsmd:description').length) {
         metadata.description = xmlDoc
           .getElementsByTagName('imsmd:description')[0]
-          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          .textContent.trim();
       }
     }
     return metadata;
@@ -204,9 +200,7 @@ export async function extractIMSMetadata(fileInput) {
       }
     })
     .then(async manifestFile => {
-      return await getManifestMetadata(manifestFile, zip, procssedFiles).then(metadata => {
-        return metadata;
-      });
+      return await getManifestMetadata(manifestFile, zip, procssedFiles)
     });
 }