From ba1e0d43ed932debea73cb82b207102b3f3876fc Mon Sep 17 00:00:00 2001
From: Manav Aggarwal <manavagr1108@Manavs-MacBook-Air.local>
Date: Sat, 15 Jul 2023 21:17:44 +0530
Subject: [PATCH 1/4] - extract metadata from IMS cp - Create topic and resouce
 node for the metadata

---
 .../channelEdit/components/edit/EditModal.vue | 801 ++++++++++--------
 .../views/files/ContentRenderer.vue           |   6 +-
 .../frontend/shared/vuex/file/utils.js        | 134 ++-
 3 files changed, 579 insertions(+), 362 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 995072d190..6562538e32 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -177,331 +177,351 @@
 
 <script>
 
-  import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
-  import FileUploadDefault from '../../views/files/FileUploadDefault';
-  import { RouteNames, TabNames } from '../../constants';
-  import SavingIndicator from './SavingIndicator';
-  import EditView from './EditView';
-  import EditList from './EditList';
-  import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
-  import { fileSizeMixin, routerMixin } from 'shared/mixins';
-  import FileStorage from 'shared/views/files/FileStorage';
-  import MessageDialog from 'shared/views/MessageDialog';
-  import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
-  import Uploader from 'shared/views/files/Uploader';
-  import LoadingText from 'shared/views/LoadingText';
-  import FormatPresets from 'shared/leUtils/FormatPresets';
-  import OfflineText from 'shared/views/OfflineText';
-  import ToolBar from 'shared/views/ToolBar';
-  import BottomBar from 'shared/views/BottomBar';
-  import FileDropzone from 'shared/views/files/FileDropzone';
-  import { isNodeComplete } from 'shared/utils/validation';
-  import { DELAYED_VALIDATION } from 'shared/constants';
+import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
+import FileUploadDefault from '../../views/files/FileUploadDefault';
+import { RouteNames, TabNames } from '../../constants';
+import SavingIndicator from './SavingIndicator';
+import EditView from './EditView';
+import EditList from './EditList';
+import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
+import { fileSizeMixin, routerMixin } from 'shared/mixins';
+import FileStorage from 'shared/views/files/FileStorage';
+import MessageDialog from 'shared/views/MessageDialog';
+import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
+import Uploader from 'shared/views/files/Uploader';
+import LoadingText from 'shared/views/LoadingText';
+import FormatPresets from 'shared/leUtils/FormatPresets';
+import OfflineText from 'shared/views/OfflineText';
+import ToolBar from 'shared/views/ToolBar';
+import BottomBar from 'shared/views/BottomBar';
+import FileDropzone from 'shared/views/files/FileDropzone';
+import { isNodeComplete } from 'shared/utils/validation';
+import { DELAYED_VALIDATION } from 'shared/constants';
+import { File } from 'shared/data/resources';
 
-  const CHECK_STORAGE_INTERVAL = 10000;
+const CHECK_STORAGE_INTERVAL = 10000;
 
-  export default {
-    name: 'EditModal',
-    components: {
-      EditList,
-      EditView,
-      ResizableNavigationDrawer,
-      Uploader,
-      FileStorage,
-      FileUploadDefault,
-      LoadingText,
-      MessageDialog,
-      OfflineText,
-      FileDropzone,
-      SavingIndicator,
-      ToolBar,
-      BottomBar,
+export default {
+  name: 'EditModal',
+  components: {
+    EditList,
+    EditView,
+    ResizableNavigationDrawer,
+    Uploader,
+    FileStorage,
+    FileUploadDefault,
+    LoadingText,
+    MessageDialog,
+    OfflineText,
+    FileDropzone,
+    SavingIndicator,
+    ToolBar,
+    BottomBar,
+  },
+  mixins: [fileSizeMixin, routerMixin],
+  props: {
+    detailNodeIds: {
+      type: String,
+      default: '',
     },
-    mixins: [fileSizeMixin, routerMixin],
-    props: {
-      detailNodeIds: {
-        type: String,
-        default: '',
-      },
-      tab: {
-        type: String,
-        default: TabNames.DETAILS,
-      },
-      // Catch cases where user is navigating back from another view
-      // (e.g. selecting related resources)
-      targetNodeId: {
-        type: String,
-        required: false,
-        default: null,
-      },
+    tab: {
+      type: String,
+      default: TabNames.DETAILS,
     },
-    data() {
-      return {
-        loading: false,
-        loadError: false,
-        selected: this.nodeIds,
-        promptInvalid: false,
-        promptUploading: false,
-        promptFailed: false,
-        listElevated: false,
-        storagePoll: null,
-      };
+    // Catch cases where user is navigating back from another view
+    // (e.g. selecting related resources)
+    targetNodeId: {
+      type: String,
+      required: false,
+      default: null,
     },
-    computed: {
-      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
-      ...mapGetters('assessmentItem', ['getAssessmentItems']),
-      ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
-      ...mapGetters('file', ['contentNodesAreUploading', 'getContentNodeFiles']),
-      ...mapState({
+  },
+  data() {
+    return {
+      loading: false,
+      loadError: false,
+      selected: this.nodeIds,
+      promptInvalid: false,
+      promptUploading: false,
+      promptFailed: false,
+      listElevated: false,
+      storagePoll: null,
+    };
+  },
+  computed: {
+    ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
+    ...mapGetters('assessmentItem', ['getAssessmentItems']),
+    ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
+    ...mapGetters('file', ['contentNodesAreUploading', 'getContentNodeFiles']),
+    ...mapState({
         online: state => state.connection.online,
-      }),
-      multipleNodes() {
-        // Only hide drawer when editing a single item
-        return this.nodeIds.length > 1;
-      },
-      addTopicsMode() {
-        return this.$route.name === RouteNames.ADD_TOPICS;
-      },
-      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 */
-      editMode() {
-        return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
-      },
-      showStorage() {
-        return this.uploadMode || this.editMode;
-      },
-      showDrawer() {
-        return (
-          !this.loading &&
-          (this.multipleNodes || (this.uploadMode && this.nodeIds.length) || this.addTopicsMode)
-        );
-      },
-      showFileUploadDefault() {
-        return this.uploadMode && !this.nodeIds.length;
-      },
-      nodeIds() {
-        return (this.detailNodeIds && this.detailNodeIds.split(',')) || [];
-      },
-      modalTitle() {
-        if (this.createExerciseMode) {
-          return this.$tr('createExerciseHeader');
-        } else if (this.uploadMode) {
-          return this.nodeIds.length ? this.$tr('editFilesHeader') : this.$tr('uploadFilesHeader');
-        } else if (this.addTopicsMode) {
-          return this.$tr('addTopicsHeader');
-        }
-        return this.$tr('editingDetailsHeader');
-      },
-      parentTitle() {
-        const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
-        return node ? node.title : '';
-      },
-      invalidNodes() {
+    }),
+    node() {
+        return this.getContentNode(this.parentId);
+    },
+    multipleNodes() {
+      // Only hide drawer when editing a single item
+      return this.nodeIds.length > 1;
+    },
+    addTopicsMode() {
+      return this.$route.name === RouteNames.ADD_TOPICS;
+    },
+    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 */
+    editMode() {
+      return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
+    },
+    showStorage() {
+      return this.uploadMode || this.editMode;
+    },
+    showDrawer() {
+      return (
+        !this.loading &&
+        (this.multipleNodes || (this.uploadMode && this.nodeIds.length) || this.addTopicsMode)
+      );
+    },
+    showFileUploadDefault() {
+      return this.uploadMode && !this.nodeIds.length;
+    },
+    nodeIds() {
+      return (this.detailNodeIds && this.detailNodeIds.split(',')) || [];
+    },
+    modalTitle() {
+      if (this.createExerciseMode) {
+        return this.$tr('createExerciseHeader');
+      } else if (this.uploadMode) {
+        return this.nodeIds.length ? this.$tr('editFilesHeader') : this.$tr('uploadFilesHeader');
+      } else if (this.addTopicsMode) {
+        return this.$tr('addTopicsHeader');
+      }
+      return this.$tr('editingDetailsHeader');
+    },
+    parentTitle() {
+      const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
+      return node ? node.title : '';
+    },
+    invalidNodes() {
         return this.nodeIds.filter(id => !this.getContentNodeIsValid(id));
-      },
     },
-    beforeRouteEnter(to, from, next) {
-      if (
-        to.name === RouteNames.CONTENTNODE_DETAILS ||
-        to.name === RouteNames.ADD_TOPICS ||
-        to.name === RouteNames.ADD_EXERCISE ||
-        to.name === RouteNames.UPLOAD_FILES
-      ) {
+  },
+  beforeRouteEnter(to, from, next) {
+    if (
+      to.name === RouteNames.CONTENTNODE_DETAILS ||
+      to.name === RouteNames.ADD_TOPICS ||
+      to.name === RouteNames.ADD_EXERCISE ||
+      to.name === RouteNames.UPLOAD_FILES
+    ) {
         return next(vm => {
-          // Catch view-only enters before loading data
-          if (!vm.canEdit) {
-            return vm.navigateBack();
-          }
-          vm.loading = true;
+        // Catch view-only enters before loading data
+        if (!vm.canEdit) {
+          return vm.navigateBack();
+        }
+        vm.loading = true;
 
-          let promises;
+        let promises;
 
-          const parentTopicId = to.params.nodeId;
-          const childrenNodesIds =
-            to.params.detailNodeIds !== undefined ? to.params.detailNodeIds.split(',') : [];
-          // remove duplicates - if a topic is being edited,
-          // then parent topic ID is also in children nodes IDs
-          const allNodesIds = [...new Set([...childrenNodesIds, parentTopicId])];
+        const parentTopicId = to.params.nodeId;
+        const childrenNodesIds =
+          to.params.detailNodeIds !== undefined ? to.params.detailNodeIds.split(',') : [];
+        // remove duplicates - if a topic is being edited,
+        // then parent topic ID is also in children nodes IDs
+        const allNodesIds = [...new Set([...childrenNodesIds, parentTopicId])];
 
-          // Nice to have TODO: Refactor EditModal to make each tab
-          // responsible for fetching data that it needs
-          if (childrenNodesIds.length) {
-            promises = [
-              vm.loadContentNodes({ id__in: allNodesIds }),
+        // Nice to have TODO: Refactor EditModal to make each tab
+        // responsible for fetching data that it needs
+        if (childrenNodesIds.length) {
+          promises = [
+            vm.loadContentNodes({ id__in: allNodesIds }),
               ...childrenNodesIds.map(nodeId => vm.loadRelatedResources(nodeId)),
-              // Do not remove - there is a logic that relies heavily
-              // on assessment items and files being properly loaded
-              // (especially marking nodes as (in)complete)
-              vm.loadFiles({ contentnode__in: childrenNodesIds }),
-              vm.loadAssessmentItems({ contentnode__in: childrenNodesIds }),
-            ];
-          } else {
-            // no need to load assessment items or files as topics have none
-            promises = [vm.loadContentNode(parentTopicId)];
-          }
-          return Promise.all(promises)
-            .then(() => {
-              vm.updateTitleForPage();
-              vm.loading = false;
-            })
-            .catch(() => {
-              vm.loading = false;
-              vm.loadError = true;
-            })
-            .then(() => {
-              // self-healing of nodes' validation status
-              // in case we receive incorrect data from backend
-              const validationPromises = [];
+            // Do not remove - there is a logic that relies heavily
+            // on assessment items and files being properly loaded
+            // (especially marking nodes as (in)complete)
+            vm.loadFiles({ contentnode__in: childrenNodesIds }),
+            vm.loadAssessmentItems({ contentnode__in: childrenNodesIds }),
+          ];
+        } else {
+          // no need to load assessment items or files as topics have none
+          promises = [vm.loadContentNode(parentTopicId)];
+        }
+        return Promise.all(promises)
+          .then(() => {
+            vm.updateTitleForPage();
+            vm.loading = false;
+          })
+          .catch(() => {
+            vm.loading = false;
+            vm.loadError = true;
+          })
+          .then(() => {
+            // self-healing of nodes' validation status
+            // in case we receive incorrect data from backend
+            const validationPromises = [];
               allNodesIds.forEach(nodeId => {
-                const node = vm.getContentNode(nodeId);
-                const completeCheck = isNodeComplete({
-                  nodeDetails: node,
-                  assessmentItems: vm.getAssessmentItems(nodeId),
-                  files: vm.getContentNodeFiles(nodeId),
-                });
-
-                if (completeCheck !== node.complete) {
-                  validationPromises.push(
-                    vm.updateContentNode({ id: nodeId, complete: completeCheck })
-                  );
-                }
+              const node = vm.getContentNode(nodeId);
+              const completeCheck = isNodeComplete({
+                nodeDetails: node,
+                assessmentItems: vm.getAssessmentItems(nodeId),
+                files: vm.getContentNodeFiles(nodeId),
               });
-              return Promise.all(validationPromises);
+
+              if (completeCheck !== node.complete) {
+                validationPromises.push(
+                  vm.updateContentNode({ id: nodeId, complete: completeCheck })
+                );
+              }
             });
-        });
-      }
-      return next(false);
+            return Promise.all(validationPromises);
+          });
+      });
+    }
+    return next(false);
+  },
+  mounted() {
+    this.hideHTMLScroll(true);
+    this.selected = this.targetNodeId ? [this.targetNodeId] : this.nodeIds;
+    this.storagePoll = setInterval(this.fetchUserStorage, CHECK_STORAGE_INTERVAL);
+  },
+  methods: {
+    ...mapActions(['fetchUserStorage']),
+    ...mapActions('contentNode', [
+      'loadContentNode',
+      'loadContentNodes',
+      'updateContentNode',
+      'loadRelatedResources',
+      'createContentNode',
+    ]),
+    ...mapActions('file', ['loadFiles', 'updateFile']),
+    ...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
+    ...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
+    closeModal() {
+      this.promptUploading = false;
+      this.promptInvalid = false;
+      this.promptFailed = false;
+      clearInterval(this.storagePoll);
+      this.navigateBack();
     },
-    mounted() {
-      this.hideHTMLScroll(true);
-      this.selected = this.targetNodeId ? [this.targetNodeId] : this.nodeIds;
-      this.storagePoll = setInterval(this.fetchUserStorage, CHECK_STORAGE_INTERVAL);
+    navigateBack() {
+      this.hideHTMLScroll(false);
+      this.$router.push({
+        name: RouteNames.TREE_VIEW,
+        params: { nodeId: this.$route.params.nodeId },
+      });
+    },
+    hideHTMLScroll(hidden) {
+      document.querySelector('html').style = hidden
+        ? 'overflow-y: hidden !important;'
+        : 'overflow-y: auto !important';
+    },
+    scroll(e) {
+      this.listElevated = e.target.scrollTop > 0;
     },
-    methods: {
-      ...mapActions(['fetchUserStorage']),
-      ...mapActions('contentNode', [
-        'loadContentNode',
-        'loadContentNodes',
-        'updateContentNode',
-        'loadRelatedResources',
-        'createContentNode',
-      ]),
-      ...mapActions('file', ['loadFiles', 'updateFile']),
-      ...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
-      ...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
-      closeModal() {
-        this.promptUploading = false;
-        this.promptInvalid = false;
-        this.promptFailed = false;
-        clearInterval(this.storagePoll);
-        this.navigateBack();
-      },
-      navigateBack() {
-        this.hideHTMLScroll(false);
-        this.$router.push({
-          name: RouteNames.TREE_VIEW,
-          params: { nodeId: this.$route.params.nodeId },
-        });
-      },
-      hideHTMLScroll(hidden) {
-        document.querySelector('html').style = hidden
-          ? 'overflow-y: hidden !important;'
-          : 'overflow-y: auto !important';
-      },
-      scroll(e) {
-        this.listElevated = e.target.scrollTop > 0;
-      },
 
-      /* Button actions */
-      handleClose() {
-        // X button action
-        this.selected = this.nodeIds;
-        this.$nextTick(() => {
-          this.enableValidation(this.nodeIds);
-          const assessmentItems = this.getAssessmentItems(this.nodeIds);
+    /* Button actions */
+    handleClose() {
+      // X button action
+      this.selected = this.nodeIds;
+      this.$nextTick(() => {
+        this.enableValidation(this.nodeIds);
+        const assessmentItems = this.getAssessmentItems(this.nodeIds);
           assessmentItems.forEach(item =>
-            item.question ? (item[DELAYED_VALIDATION] = false) : ''
-          );
-          this.updateAssessmentItems(assessmentItems);
+          item.question ? (item[DELAYED_VALIDATION] = false) : ''
+        );
+        this.updateAssessmentItems(assessmentItems);
 
-          // reaches into Details Tab to run save of diffTracker
-          // before the validation pop up is executed
-          if (this.$refs.editView) {
-            this.$nextTick(() => {
-              this.$refs.editView.immediateSaveAll().then(() => {
-                // Catch uploads in progress and invalid nodes
-                if (this.invalidNodes.length) {
-                  this.selected = [this.invalidNodes[0]];
-                  this.promptInvalid = true;
-                } else if (this.contentNodesAreUploading(this.nodeIds)) {
-                  this.promptUploading = true;
-                } else {
-                  this.closeModal();
-                }
-              });
+        // reaches into Details Tab to run save of diffTracker
+        // before the validation pop up is executed
+        if (this.$refs.editView) {
+          this.$nextTick(() => {
+            this.$refs.editView.immediateSaveAll().then(() => {
+              // Catch uploads in progress and invalid nodes
+              if (this.invalidNodes.length) {
+                this.selected = [this.invalidNodes[0]];
+                this.promptInvalid = true;
+              } else if (this.contentNodesAreUploading(this.nodeIds)) {
+                this.promptUploading = true;
+              } else {
+                this.closeModal();
+              }
             });
-          } else {
-            this.closeModal();
-          }
-        });
-      },
-
-      /* Creation actions */
-      createNode(kind, payload = {}) {
-        this.enableValidation(this.nodeIds);
-        // Default learning activity on upload
-        if (
-          !Object.keys(payload.learning_activities || {}).length &&
-          kind in ContentKindLearningActivityDefaults
-        ) {
-          payload.learning_activities = {
-            [ContentKindLearningActivityDefaults[kind]]: true,
-          };
+          });
+        } else {
+          this.closeModal();
         }
-        return this.createContentNode({
-          kind,
-          parent: this.$route.params.nodeId,
-          channel_id: this.currentChannel.id,
-          ...payload,
+      });
+    },
+
+    /* Creation actions */
+    createNode(kind, payload = {}) {
+      this.enableValidation(this.nodeIds);
+      // Default learning activity on upload
+      if (
+        !Object.keys(payload.learning_activities || {}).length &&
+        kind in ContentKindLearningActivityDefaults
+      ) {
+        payload.learning_activities = {
+          [ContentKindLearningActivityDefaults[kind]]: true,
+        };
+      }
+      return this.createContentNode({
+        kind,
+        parent: this.$route.params.nodeId,
+        channel_id: this.currentChannel.id,
+        ...payload,
         }).then(newNodeId => {
-          this.$router.push({
-            name: this.$route.name,
-            params: {
-              nodeId: this.$route.params.nodeId,
-              detailNodeIds: this.nodeIds.concat(newNodeId).join(','),
-            },
-          });
-          return newNodeId;
+        this.$router.push({
+          name: this.$route.name,
+          params: {
+            nodeId: this.$route.params.nodeId,
+            detailNodeIds: this.nodeIds.concat(newNodeId).join(','),
+          },
         });
-      },
-      createTopic() {
-        this.createNode('topic', {
-          title: '',
+        return newNodeId;
+      });
+    },
+    createTopic() {
+      this.createNode('topic', {
+        title: '',
         }).then(newNodeId => {
-          this.selected = [newNodeId];
-        });
-      },
-      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.selected = [newNodeId];
+      });
+    },
+    async uploadResourceNode(file, orgFile) {
+      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,
+        // ...orgFile,
+      }).catch((error) => {
+        let errorType = fileErrors.UPLOAD_FAILED;
+        if (error.response && error.response.status === 412) {
+          errorType = fileErrors.NO_STORAGE;
+        }
+        return Promise.reject(errorType);
+      });
+      return Promise.all([response]);
+    },
+    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('.');
+        }
+        if (file.metadata.orgs === undefined) {
           this.createNode(
             FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
             { title, ...file.metadata }
-          ).then(newNodeId => {
+          ).then((newNodeId) => {
             if (index === 0) {
               this.selected = [newNodeId];
             }
@@ -510,76 +530,141 @@
               contentnode: newNodeId,
             });
           });
-        });
-      },
-      updateTitleForPage() {
-        this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
-      },
-      trackUpload() {
-        this.$analytics.trackAction('file_uploader', 'Add files', {
-          eventLabel: 'Upload file',
-        });
-      },
+        } else if (file.metadata.orgs) {
+          this.createContentNode({
+            parent: this.$route.params.nodeId,
+            kind: 'topic',
+            ...file.metadata,
+          }).then((newNodeId) => {
+            for (let i = 0; ; i++) {
+              if (file.metadata.orgs[`org${i}`] === undefined) {
+                break;
+              } else {
+                const org = file.metadata.orgs[`org${i}`];
+                this.createContentNode({
+                  parent: newNodeId,
+                  kind: 'topic',
+                  ...org,
+                }).then((id) => {
+                  for (let j = 0; ; j++) {
+                    if (org[`file${j}`] === undefined) {
+                      break;
+                    } else {
+                      const orgFile = org[`file${j}`];
+                      const extra_fields = {};
+                      extra_fields['options'] = { entry: orgFile.resourceHref };
+                      let nodeId;
+                      this.createContentNode({
+                        parent: id,
+                        kind: file.metadata.preset,
+                        title: orgFile.title,
+                        ...extra_fields,
+                      }).then((resourceNodeId) => {
+                        nodeId = resourceNodeId;
+                        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,
+                        })
+                          .catch((error) => {
+                            let errorType = fileErrors.UPLOAD_FAILED;
+                            if (error.response && error.response.status === 412) {
+                              errorType = fileErrors.NO_STORAGE;
+                            }
+                            return Promise.reject(errorType);
+                          })
+                          .then((data) => {
+                            const fileObject = {
+                              ...data.file,
+                              loaded: 0,
+                              total: file.size,
+                            };
+                            if (index === 0) {
+                              this.selected = [nodeId];
+                            }
+                            this.updateFile({
+                              ...fileObject,
+                              contentnode: nodeId,
+                            });
+                          });
+                      });
+                    }
+                  }
+                });
+              }
+            }
+          });
+        }
+      });
     },
-    $trs: {
-      editingDetailsHeader: 'Edit details',
-      uploadFilesHeader: 'Upload files',
-      editFilesHeader: 'Edit files',
-      createExerciseHeader: 'New exercise',
-      addTopicsHeader: 'New folder',
-      invalidNodesFound:
-        '{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}',
-      invalidNodesFoundText:
-        'Incomplete resources will not be published until these errors are resolved',
-      saveAnywaysButton: 'Exit anyway',
-      keepEditingButton: 'Keep editing',
-      saveFailedHeader: 'Save failed',
-      saveFailedText: 'There was a problem saving your content',
-      addTopic: 'Add new folder',
-      uploadButton: 'Upload more',
-      uploadInProgressHeader: 'Upload in progress',
-      uploadInProgressText: 'Uploads that are in progress will be lost if you exit',
-      dismissDialogButton: 'Cancel',
-      cancelUploadsButton: 'Exit',
-      closeWithoutSavingButton: 'Close without saving',
-      okButton: 'OK',
-      loadErrorText: 'Failed to load content',
-      finishButton: 'Finish',
+    updateTitleForPage() {
+      this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
     },
-  };
-
+    trackUpload() {
+      this.$analytics.trackAction('file_uploader', 'Add files', {
+        eventLabel: 'Upload file',
+      });
+    },
+  },
+  $trs: {
+    editingDetailsHeader: 'Edit details',
+    uploadFilesHeader: 'Upload files',
+    editFilesHeader: 'Edit files',
+    createExerciseHeader: 'New exercise',
+    addTopicsHeader: 'New folder',
+    invalidNodesFound:
+      '{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}',
+    invalidNodesFoundText:
+      'Incomplete resources will not be published until these errors are resolved',
+    saveAnywaysButton: 'Exit anyway',
+    keepEditingButton: 'Keep editing',
+    saveFailedHeader: 'Save failed',
+    saveFailedText: 'There was a problem saving your content',
+    addTopic: 'Add new folder',
+    uploadButton: 'Upload more',
+    uploadInProgressHeader: 'Upload in progress',
+    uploadInProgressText: 'Uploads that are in progress will be lost if you exit',
+    dismissDialogButton: 'Cancel',
+    cancelUploadsButton: 'Exit',
+    closeWithoutSavingButton: 'Close without saving',
+    okButton: 'OK',
+    loadErrorText: 'Failed to load content',
+    finishButton: 'Finish',
+  },
+};
 </script>
 
 <style lang="less" scoped>
+/deep/ .v-toolbar__extension {
+  padding: 0;
 
-  /deep/ .v-toolbar__extension {
-    padding: 0;
-
-    .v-toolbar__content {
-      border-bottom: 1px solid var(--v-grey-lighten4);
-    }
-  }
-
-  // there is a conflicting style for .row class in common styles
-  // that sets left and right margin to -15px which breaks Vuetify
-  // elements using Vuetify's .row class
-  .row {
-    margin-right: 0;
-    margin-left: 0;
+  .v-toolbar__content {
+    border-bottom: 1px solid var(--v-grey-lighten4);
   }
+}
 
-  /deep/ .v-content__wrap {
-    max-height: calc(100vh - 128px);
-    overflow-y: auto;
-  }
+// there is a conflicting style for .row class in common styles
+// that sets left and right margin to -15px which breaks Vuetify
+// elements using Vuetify's .row class
+.row {
+  margin-right: 0;
+  margin-left: 0;
+}
 
-  .add-wrapper {
-    position: sticky;
-    top: 0;
-    z-index: 5;
-    width: calc(100% + 4px);
-    margin: 0 -3px;
-    margin-top: -4px !important;
-  }
+/deep/ .v-content__wrap {
+  max-height: calc(100vh - 128px);
+  overflow-y: auto;
+}
 
+.add-wrapper {
+  position: sticky;
+  top: 0;
+  z-index: 5;
+  width: calc(100% + 4px);
+  margin: 0 -3px;
+  margin-top: -4px !important;
+}
 </style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
index 58faf53ff0..f086de146d 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
@@ -99,6 +99,10 @@
     },
     computed: {
       ...mapGetters('file', ['getContentNodeFileById', 'getContentNodeFiles']),
+      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeChildren']),
+      node() {
+        return this.getContentNode(this.nodeId);
+      },
       file() {
         return this.getContentNodeFileById(this.nodeId, this.fileId);
       },
@@ -129,7 +133,7 @@
         return this.file.file_format === 'epub';
       },
       htmlPath() {
-        return `/zipcontent/${this.file.checksum}.${this.file.file_format}`;
+        return `/zipcontent/${this.file.checksum}.${this.file.file_format}/${this.node.options && this.node.options.entry || ''}`;
       },
       src() {
         return this.file && this.file.url;
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 12e59b943c..69a67abfbb 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -3,6 +3,7 @@ import JSZip from 'jszip';
 import { FormatPresetsList, FormatPresetsNames } from 'shared/leUtils/FormatPresets';
 import { LicensesList } from 'shared/leUtils/Licenses';
 import LanguagesMap from 'shared/leUtils/Languages';
+import JSZip from 'jszip';
 
 const BLOB_SLICE = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
 const CHUNK_SIZE = 2097152;
@@ -10,10 +11,12 @@ const MEDIA_PRESETS = [
   FormatPresetsNames.AUDIO,
   FormatPresetsNames.HIGH_RES_VIDEO,
   FormatPresetsNames.LOW_RES_VIDEO,
-  FormatPresetsNames.H5P,
+  FormatPresetsNames.QTI,
+  FormatPresetsNames.HTML5_DEPENDENCY,
+  FormatPresetsNames.HTML5_ZIP
 ];
 const VIDEO_PRESETS = [FormatPresetsNames.HIGH_RES_VIDEO, FormatPresetsNames.LOW_RES_VIDEO];
-const H5P_PRESETS = [FormatPresetsNames.H5P];
+const IMS_PRESETS = [FormatPresetsNames.QTI, FormatPresetsNames.HTML5_DEPENDENCY, FormatPresetsNames.HTML5_ZIP]
 
 export function getHash(file) {
   return new Promise((resolve, reject) => {
@@ -44,6 +47,128 @@ export function getHash(file) {
   });
 }
 
+const getLeafNodes = (node) => {
+  if (!node.children || node.children.length === 0) {
+    return [node];
+  }
+  
+  // Recursive case: Traverse all children and collect leaf nodes
+  let leafNodes = [];
+  for (let child of node.children) {
+    const childLeafNodes = getLeafNodes(child);
+    leafNodes = leafNodes.concat(childLeafNodes);
+  }
+  
+  return leafNodes;
+}
+
+export async function extractIMSMetadata(fileInput, metadata){
+  const zip = new JSZip();
+  zip
+    .loadAsync(fileInput)
+    .then(function(zip) {
+      const manifestFile = zip.file("imsmanifest.xml");
+      const metadataFile = zip.file("imsmetadata.xml");
+      if (!manifestFile) {
+        reject(new Error("imsmanifest.xml not found in the zip file."));
+        return;
+      } else if(manifestFile && metadataFile){
+        manifestFile
+        .async("text")
+        .then(content => {
+          // Parse the XML content
+            const parser = new DOMParser();
+            const xmlDoc = parser.parseFromString(content, "application/xml");
+            const data = xmlDoc.getElementsByTagName('organizations')
+            for( let i = 0 ; i < data.length; i++){
+              let orgs = [];
+              let index = 0;
+              for( let j = 0 ; j < data[i].childNodes.length; j++){
+                let org = []
+                if(data[i].childNodes[j].nodeType === 1){
+                  const orgNode = data[i].childNodes[j];
+                  const title = orgNode.getElementsByTagName('title')
+                  org.title = title[0].textContent
+                  const items = orgNode.getElementsByTagName('item');
+                  for(let k = 0; k < items.length; k++){
+                    const file = {};
+                    const item = items[k];
+                    file.title = title[1+k].textContent;
+                    file.identifierref = item.getAttribute('identifierref');
+                    file.resourceHref = xmlDoc.querySelectorAll(`[identifier=${file.identifierref}]`)[0].getAttribute('href')
+                    org[`file${index}`] = file;
+                    index++;
+                  }
+                  orgs[`org${i}`] = org
+                }
+              }
+              metadata.orgs = orgs
+            }
+          })
+        metadataFile
+          .async("text")
+          .then(content=> {
+            const parser = new DOMParser();
+            const xmlDoc = parser.parseFromString(content, "application/xml");
+            metadata.title = xmlDoc.getElementsByTagName('lomes:title').length === 0? undefined : xmlDoc.getElementsByTagName('lomes:title')[0].children[0].textContent;
+            metadata.language = xmlDoc.getElementsByTagName("lomes:idiom").length === 0 ? undefined : xmlDoc.getElementsByTagName("lomes:idiom")[0].children[0].textContent;
+            metadata.description = xmlDoc.getElementsByTagName("lomes:description").length === 0 ? undefined: xmlDoc.getElementsByTagName("lomes:description")[0].children[0].textContent;
+          })
+      } else {
+        manifestFile
+        .async("text")
+        .then(content => {
+          // Parse the XML content
+          const parser = new DOMParser();
+          const xmlDoc = parser.parseFromString(content, "application/xml");
+          metadata.title = xmlDoc.getElementsByTagName('title').length === 0? undefined : xmlDoc.getElementsByTagName('title')[0].textContent;
+          metadata.language = xmlDoc.getElementsByTagName("imsmd:language").length === 0 ? undefined : xmlDoc.getElementsByTagName("imsmd:language")[0].textContent;
+          metadata.description = xmlDoc.getElementsByTagName("imsmd:description").length === 0 ? undefined: xmlDoc.getElementsByTagName("imsmd:description")[0].textContent;
+          const data = xmlDoc.getElementsByTagName('organizations')
+          for( let i = 0 ; i < data.length; i++){
+            let orgs = [];
+            let index = 0;
+            for( let j = 0 ; j < data[i].childNodes.length; j++){
+              let org = []
+              if(data[i].childNodes[j].nodeType === 1){
+                const orgNode = data[i].childNodes[j];
+                const title = orgNode.getElementsByTagName('title')
+                org.title = title[0].textContent
+                const items = orgNode.getElementsByTagName('item');
+                for(let k = 0; k < items.length; k++){
+                  const file = {};
+                  const item = items[k];
+                  file.title = title[1+k].textContent;
+                  file.identifierref = item.getAttribute('identifierref');
+                  file.resourceHref = xmlDoc.querySelectorAll(`[identifier=${file.identifierref}]`)[0].getAttribute('href')
+                  const metadataNodes = orgNode.getElementsByTagName('metadata');
+                  if(metadataNodes && metadataNodes.length != 0){
+                    for( let l = 0 ; l < metadataNodes.length ; l++){
+                      let nodeValue = getLeafNodes(metadataNodes[l]);
+                      file[`${nodeValue[0].nodeName}`] = nodeValue[0].textContent
+                    }
+                  }
+                  org[`file${index}`] = file;
+                  index++;
+                }
+                orgs[`org${i}`] = org
+              }
+            }
+            metadata.orgs = orgs
+          }
+          return metadata
+        })
+        .catch(error => {
+          reject(error); 
+        });
+      }
+    })
+    .catch(error => {
+      reject(error); // Failed to load the zip file
+    });
+  return metadata
+}
+
 const extensionPresetMap = FormatPresetsList.reduce((map, value) => {
   if (value.display) {
     value.allowed_formats.forEach(format => {
@@ -147,7 +272,7 @@ export function extractMetadata(file, preset = null) {
   }
 
   const isH5P = H5P_PRESETS.includes(metadata.preset);
-
+  const isIMSCP = IMS_PRESETS.includes(metadata.preset);
   // Extract additional media metadata
   const isVideo = VIDEO_PRESETS.includes(metadata.preset);
 
@@ -157,6 +282,9 @@ export function extractMetadata(file, preset = null) {
         Object.assign(metadata, data);
       });
       resolve(metadata);
+    } else if (isIMSCP) {
+      extractIMSMetadata(file, metadata)
+      resolve(metadata);
     } else {
       const mediaElement = document.createElement(isVideo ? 'video' : 'audio');
       // Add a listener to read the metadata once it has loaded.

From 90102de2b48288cdee6604b077d7c591a1d58a16 Mon Sep 17 00:00:00 2001
From: Manav Aggarwal <manavagr1108@Manavs-MacBook-Air.local>
Date: Tue, 22 Aug 2023 03:06:09 +0530
Subject: [PATCH 2/4] - Enhance IMS Content Package Import UI

---
 .../channelEdit/components/edit/EditList.vue  |  53 +-
 .../components/edit/EditListItem.vue          |   7 +-
 .../components/edit/EditListItems.vue         |  92 ++
 .../channelEdit/components/edit/EditModal.vue | 843 +++++++++---------
 .../views/files/ContentRenderer.vue           |   6 +-
 .../frontend/shared/vuex/file/utils.js        | 197 ++--
 6 files changed, 641 insertions(+), 557 deletions(-)
 create mode 100644 contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
index dc55fe2485..9648d6b7e8 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
@@ -7,11 +7,11 @@
       class="mb-2 ml-1 mt-0 px-3 py-2"
       :label="$tr('selectAllLabel')"
     />
-    <EditListItem
-      v-for="nodeId in nodeIds"
-      :key="nodeId"
+    <EditListItems
       v-model="selected"
-      :nodeId="nodeId"
+      :nodeId="parentId"
+      :nodes="nodes"
+      :nodeIds="nodeIds"
       @input="trackSelect"
       @removed="handleRemoved"
     />
@@ -22,13 +22,14 @@
 
 <script>
 
-  import EditListItem from './EditListItem';
+  import { mapGetters } from 'vuex';
+  import EditListItems from './EditListItems';
   import Checkbox from 'shared/views/form/Checkbox';
 
   export default {
     name: 'EditList',
     components: {
-      EditListItem,
+      EditListItems,
       Checkbox,
     },
     props: {
@@ -40,14 +41,25 @@
         type: Array,
         default: () => [],
       },
+      parentId: {
+        type: String,
+        require: true,
+        default: null,
+      },
     },
     computed: {
+      ...mapGetters('contentNode', ['getContentNode']),
       selected: {
         get() {
           return this.value;
         },
         set(items) {
-          this.$emit('input', items);
+          if (this.selected.includes(items[0])) {
+            this.selected = [];
+          } else {
+            this.getChildren(items[0]).forEach(item => items.push(item));
+            this.$emit('input', items);
+          }
         },
       },
       selectAll: {
@@ -63,11 +75,34 @@
           }
         },
       },
+      nodes() {
+        const nodes = {};
+        this.nodeIds.forEach(nodeId => {
+          const parentId = this.getContentNode(nodeId).parent;
+          nodes[`${nodeId}`] = this.nodeIds.includes(parentId) ? parentId : null;
+        });
+        return nodes;
+      },
     },
     methods: {
+      ...mapGetters('contentNode', ['deleteContentNode']),
+      getChildren(parent) {
+        const childrens = [];
+        Object.keys(this.nodes).forEach(nodeId => {
+          if (this.nodes[nodeId] === parent) {
+            childrens.push(...this.getChildren(nodeId));
+            childrens.push(nodeId);
+          }
+        });
+        return childrens;
+      },
       handleRemoved(nodeId) {
-        const nodeIds = this.$route.params.detailNodeIds.split(',').filter(id => id !== nodeId);
-
+        const removedNodes = this.getChildren(nodeId);
+        removedNodes.push(nodeId);
+        removedNodes.forEach(nodeId => this.deleteContentNode(nodeId));
+        const nodeIds = this.$route.params.detailNodeIds
+          .split(',')
+          .filter(id => !removedNodes.includes(id));
         this.$router.push({
           name: this.$route.name,
           params: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
index 102ecc1cc7..d663d5f840 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItem.vue
@@ -71,7 +71,7 @@
 
 <script>
 
-  import { mapActions, mapGetters } from 'vuex';
+  import { mapGetters } from 'vuex';
   import { RouteNames } from '../../constants';
   import { fileSizeMixin, fileStatusMixin } from 'shared/mixins';
   import ContentNodeIcon from 'shared/views/ContentNodeIcon';
@@ -166,11 +166,8 @@
       },
     },
     methods: {
-      ...mapActions('contentNode', ['deleteContentNode']),
       removeNode() {
-        this.deleteContentNode(this.nodeId).then(() => {
-          this.$emit('removed', this.nodeId);
-        });
+        this.$emit('removed', this.nodeId);
       },
     },
     $trs: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue
new file mode 100644
index 0000000000..44cac4a2f5
--- /dev/null
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue
@@ -0,0 +1,92 @@
+<template>
+
+  <VList two-line class="pl-3">
+    <EditListItem
+      :key="nodeId"
+      v-model="selected"
+      :nodeId="nodeId"
+      @input="trackSelect"
+      @removed="handleRemoved"
+    />
+    <div v-if="getChildren !== undefined">
+      <EditListItems
+        v-for="childId in getChildren"
+        :key="childId"
+        v-model="selected"
+        :nodeId="childId"
+        :nodes="nodes"
+        :nodeIds="nodeIds"
+        @input="trackSelect"
+        @removed="handleRemoved"
+      />
+    </div>
+  </VList>
+
+</template>
+
+<script>
+
+  import EditListItem from './EditListItem';
+
+  export default {
+    name: 'EditListItems',
+    components: {
+      EditListItem,
+    },
+    props: {
+      value: {
+        type: Array,
+        default: () => [],
+      },
+      nodeIds: {
+        type: Array,
+        default: () => [],
+      },
+      nodeId: {
+        type: String,
+        require: true,
+        default: null,
+      },
+      nodes: {
+        type: Object,
+        default: () => {},
+      },
+    },
+    computed: {
+      selected: {
+        get() {
+          return this.value;
+        },
+        set(items) {
+          this.$emit('input', items);
+        },
+      },
+      getChildren() {
+        const childrens = [];
+        Object.keys(this.nodes).forEach(nodeId => {
+          if (this.nodes[nodeId] === this.nodeId) {
+            childrens.push(nodeId);
+          }
+        });
+        return childrens;
+      },
+    },
+    methods: {
+      handleRemoved(nodeId) {
+        this.$emit('removed', nodeId);
+      },
+      trackSelect(value) {
+        this.$emit('input', value);
+      },
+    },
+  };
+
+</script>
+
+<style lang="less" scoped>
+
+  .v-divider {
+    margin-top: 0;
+  }
+
+</style>
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index 6562538e32..ad48b52820 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -71,7 +71,8 @@
                   <EditList
                     v-model="selected"
                     :nodeIds="nodeIds"
-                    @input="enableValidation(nodeIds);"
+                    :parentId="nodeIds[0]"
+                    @input="enableValidation(nodeIds)"
                   />
                 </div>
               </FileDropzone>
@@ -177,390 +178,358 @@
 
 <script>
 
-import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
-import FileUploadDefault from '../../views/files/FileUploadDefault';
-import { RouteNames, TabNames } from '../../constants';
-import SavingIndicator from './SavingIndicator';
-import EditView from './EditView';
-import EditList from './EditList';
-import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
-import { fileSizeMixin, routerMixin } from 'shared/mixins';
-import FileStorage from 'shared/views/files/FileStorage';
-import MessageDialog from 'shared/views/MessageDialog';
-import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
-import Uploader from 'shared/views/files/Uploader';
-import LoadingText from 'shared/views/LoadingText';
-import FormatPresets from 'shared/leUtils/FormatPresets';
-import OfflineText from 'shared/views/OfflineText';
-import ToolBar from 'shared/views/ToolBar';
-import BottomBar from 'shared/views/BottomBar';
-import FileDropzone from 'shared/views/files/FileDropzone';
-import { isNodeComplete } from 'shared/utils/validation';
-import { DELAYED_VALIDATION } from 'shared/constants';
-import { File } from 'shared/data/resources';
+  import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
+  import FileUploadDefault from '../../views/files/FileUploadDefault';
+  import { RouteNames, TabNames } from '../../constants';
+  import SavingIndicator from './SavingIndicator';
+  import EditView from './EditView';
+  import EditList from './EditList';
+  import { ContentKindLearningActivityDefaults } from 'shared/leUtils/ContentKinds';
+  import { fileSizeMixin, routerMixin } from 'shared/mixins';
+  import FileStorage from 'shared/views/files/FileStorage';
+  import MessageDialog from 'shared/views/MessageDialog';
+  import ResizableNavigationDrawer from 'shared/views/ResizableNavigationDrawer';
+  import Uploader from 'shared/views/files/Uploader';
+  import LoadingText from 'shared/views/LoadingText';
+  import FormatPresets, { FormatPresetsList } from 'shared/leUtils/FormatPresets';
+  import OfflineText from 'shared/views/OfflineText';
+  import ToolBar from 'shared/views/ToolBar';
+  import BottomBar from 'shared/views/BottomBar';
+  import FileDropzone from 'shared/views/files/FileDropzone';
+  import { isNodeComplete } from 'shared/utils/validation';
+  import { DELAYED_VALIDATION, fileErrors } from 'shared/constants';
+  import { File } from 'shared/data/resources';
 
-const CHECK_STORAGE_INTERVAL = 10000;
+  const CHECK_STORAGE_INTERVAL = 10000;
 
-export default {
-  name: 'EditModal',
-  components: {
-    EditList,
-    EditView,
-    ResizableNavigationDrawer,
-    Uploader,
-    FileStorage,
-    FileUploadDefault,
-    LoadingText,
-    MessageDialog,
-    OfflineText,
-    FileDropzone,
-    SavingIndicator,
-    ToolBar,
-    BottomBar,
-  },
-  mixins: [fileSizeMixin, routerMixin],
-  props: {
-    detailNodeIds: {
-      type: String,
-      default: '',
+  export default {
+    name: 'EditModal',
+    components: {
+      EditList,
+      EditView,
+      ResizableNavigationDrawer,
+      Uploader,
+      FileStorage,
+      FileUploadDefault,
+      LoadingText,
+      MessageDialog,
+      OfflineText,
+      FileDropzone,
+      SavingIndicator,
+      ToolBar,
+      BottomBar,
     },
-    tab: {
-      type: String,
-      default: TabNames.DETAILS,
+    mixins: [fileSizeMixin, routerMixin],
+    props: {
+      detailNodeIds: {
+        type: String,
+        default: '',
+      },
+      tab: {
+        type: String,
+        default: TabNames.DETAILS,
+      },
+      // Catch cases where user is navigating back from another view
+      // (e.g. selecting related resources)
+      targetNodeId: {
+        type: String,
+        required: false,
+        default: null,
+      },
     },
-    // Catch cases where user is navigating back from another view
-    // (e.g. selecting related resources)
-    targetNodeId: {
-      type: String,
-      required: false,
-      default: null,
+    data() {
+      return {
+        loading: false,
+        loadError: false,
+        selected: this.nodeIds,
+        promptInvalid: false,
+        promptUploading: false,
+        promptFailed: false,
+        listElevated: false,
+        storagePoll: null,
+      };
     },
-  },
-  data() {
-    return {
-      loading: false,
-      loadError: false,
-      selected: this.nodeIds,
-      promptInvalid: false,
-      promptUploading: false,
-      promptFailed: false,
-      listElevated: false,
-      storagePoll: null,
-    };
-  },
-  computed: {
-    ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
-    ...mapGetters('assessmentItem', ['getAssessmentItems']),
-    ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
-    ...mapGetters('file', ['contentNodesAreUploading', 'getContentNodeFiles']),
-    ...mapState({
+    computed: {
+      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeIsValid']),
+      ...mapGetters('assessmentItem', ['getAssessmentItems']),
+      ...mapGetters('currentChannel', ['currentChannel', 'canEdit']),
+      ...mapGetters('file', ['contentNodesAreUploading', 'getContentNodeFiles']),
+      ...mapState({
         online: state => state.connection.online,
-    }),
-    node() {
-        return this.getContentNode(this.parentId);
-    },
-    multipleNodes() {
-      // Only hide drawer when editing a single item
-      return this.nodeIds.length > 1;
-    },
-    addTopicsMode() {
-      return this.$route.name === RouteNames.ADD_TOPICS;
-    },
-    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 */
-    editMode() {
-      return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
-    },
-    showStorage() {
-      return this.uploadMode || this.editMode;
-    },
-    showDrawer() {
-      return (
-        !this.loading &&
-        (this.multipleNodes || (this.uploadMode && this.nodeIds.length) || this.addTopicsMode)
-      );
-    },
-    showFileUploadDefault() {
-      return this.uploadMode && !this.nodeIds.length;
-    },
-    nodeIds() {
-      return (this.detailNodeIds && this.detailNodeIds.split(',')) || [];
-    },
-    modalTitle() {
-      if (this.createExerciseMode) {
-        return this.$tr('createExerciseHeader');
-      } else if (this.uploadMode) {
-        return this.nodeIds.length ? this.$tr('editFilesHeader') : this.$tr('uploadFilesHeader');
-      } else if (this.addTopicsMode) {
-        return this.$tr('addTopicsHeader');
-      }
-      return this.$tr('editingDetailsHeader');
-    },
-    parentTitle() {
-      const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
-      return node ? node.title : '';
-    },
-    invalidNodes() {
+      }),
+      multipleNodes() {
+        // Only hide drawer when editing a single item
+        return this.nodeIds.length > 1;
+      },
+      addTopicsMode() {
+        return this.$route.name === RouteNames.ADD_TOPICS;
+      },
+      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 */
+      editMode() {
+        return this.$route.name === RouteNames.CONTENTNODE_DETAILS;
+      },
+      showStorage() {
+        return this.uploadMode || this.editMode;
+      },
+      showDrawer() {
+        return (
+          !this.loading &&
+          (this.multipleNodes || (this.uploadMode && this.nodeIds.length) || this.addTopicsMode)
+        );
+      },
+      showFileUploadDefault() {
+        return this.uploadMode && !this.nodeIds.length;
+      },
+      nodeIds() {
+        return (this.detailNodeIds && this.detailNodeIds.split(',')) || [];
+      },
+      modalTitle() {
+        if (this.createExerciseMode) {
+          return this.$tr('createExerciseHeader');
+        } else if (this.uploadMode) {
+          return this.nodeIds.length ? this.$tr('editFilesHeader') : this.$tr('uploadFilesHeader');
+        } else if (this.addTopicsMode) {
+          return this.$tr('addTopicsHeader');
+        }
+        return this.$tr('editingDetailsHeader');
+      },
+      parentTitle() {
+        const node = this.$route.params.nodeId && this.getContentNode(this.$route.params.nodeId);
+        return node ? node.title : '';
+      },
+      invalidNodes() {
         return this.nodeIds.filter(id => !this.getContentNodeIsValid(id));
+      },
     },
-  },
-  beforeRouteEnter(to, from, next) {
-    if (
-      to.name === RouteNames.CONTENTNODE_DETAILS ||
-      to.name === RouteNames.ADD_TOPICS ||
-      to.name === RouteNames.ADD_EXERCISE ||
-      to.name === RouteNames.UPLOAD_FILES
-    ) {
+    beforeRouteEnter(to, from, next) {
+      if (
+        to.name === RouteNames.CONTENTNODE_DETAILS ||
+        to.name === RouteNames.ADD_TOPICS ||
+        to.name === RouteNames.ADD_EXERCISE ||
+        to.name === RouteNames.UPLOAD_FILES
+      ) {
         return next(vm => {
-        // Catch view-only enters before loading data
-        if (!vm.canEdit) {
-          return vm.navigateBack();
-        }
-        vm.loading = true;
+          // Catch view-only enters before loading data
+          if (!vm.canEdit) {
+            return vm.navigateBack();
+          }
+          vm.loading = true;
 
-        let promises;
+          let promises;
 
-        const parentTopicId = to.params.nodeId;
-        const childrenNodesIds =
-          to.params.detailNodeIds !== undefined ? to.params.detailNodeIds.split(',') : [];
-        // remove duplicates - if a topic is being edited,
-        // then parent topic ID is also in children nodes IDs
-        const allNodesIds = [...new Set([...childrenNodesIds, parentTopicId])];
+          const parentTopicId = to.params.nodeId;
+          const childrenNodesIds =
+            to.params.detailNodeIds !== undefined ? to.params.detailNodeIds.split(',') : [];
+          // remove duplicates - if a topic is being edited,
+          // then parent topic ID is also in children nodes IDs
+          const allNodesIds = [...new Set([...childrenNodesIds, parentTopicId])];
 
-        // Nice to have TODO: Refactor EditModal to make each tab
-        // responsible for fetching data that it needs
-        if (childrenNodesIds.length) {
-          promises = [
-            vm.loadContentNodes({ id__in: allNodesIds }),
+          // Nice to have TODO: Refactor EditModal to make each tab
+          // responsible for fetching data that it needs
+          if (childrenNodesIds.length) {
+            promises = [
+              vm.loadContentNodes({ id__in: allNodesIds }),
               ...childrenNodesIds.map(nodeId => vm.loadRelatedResources(nodeId)),
-            // Do not remove - there is a logic that relies heavily
-            // on assessment items and files being properly loaded
-            // (especially marking nodes as (in)complete)
-            vm.loadFiles({ contentnode__in: childrenNodesIds }),
-            vm.loadAssessmentItems({ contentnode__in: childrenNodesIds }),
-          ];
-        } else {
-          // no need to load assessment items or files as topics have none
-          promises = [vm.loadContentNode(parentTopicId)];
-        }
-        return Promise.all(promises)
-          .then(() => {
-            vm.updateTitleForPage();
-            vm.loading = false;
-          })
-          .catch(() => {
-            vm.loading = false;
-            vm.loadError = true;
-          })
-          .then(() => {
-            // self-healing of nodes' validation status
-            // in case we receive incorrect data from backend
-            const validationPromises = [];
+              // Do not remove - there is a logic that relies heavily
+              // on assessment items and files being properly loaded
+              // (especially marking nodes as (in)complete)
+              vm.loadFiles({ contentnode__in: childrenNodesIds }),
+              vm.loadAssessmentItems({ contentnode__in: childrenNodesIds }),
+            ];
+          } else {
+            // no need to load assessment items or files as topics have none
+            promises = [vm.loadContentNode(parentTopicId)];
+          }
+          return Promise.all(promises)
+            .then(() => {
+              vm.updateTitleForPage();
+              vm.loading = false;
+            })
+            .catch(() => {
+              vm.loading = false;
+              vm.loadError = true;
+            })
+            .then(() => {
+              // self-healing of nodes' validation status
+              // in case we receive incorrect data from backend
+              const validationPromises = [];
               allNodesIds.forEach(nodeId => {
-              const node = vm.getContentNode(nodeId);
-              const completeCheck = isNodeComplete({
-                nodeDetails: node,
-                assessmentItems: vm.getAssessmentItems(nodeId),
-                files: vm.getContentNodeFiles(nodeId),
-              });
+                const node = vm.getContentNode(nodeId);
+                const completeCheck = isNodeComplete({
+                  nodeDetails: node,
+                  assessmentItems: vm.getAssessmentItems(nodeId),
+                  files: vm.getContentNodeFiles(nodeId),
+                });
 
-              if (completeCheck !== node.complete) {
-                validationPromises.push(
-                  vm.updateContentNode({ id: nodeId, complete: completeCheck })
-                );
-              }
+                if (completeCheck !== node.complete) {
+                  validationPromises.push(
+                    vm.updateContentNode({ id: nodeId, complete: completeCheck })
+                  );
+                }
+              });
+              return Promise.all(validationPromises);
             });
-            return Promise.all(validationPromises);
-          });
-      });
-    }
-    return next(false);
-  },
-  mounted() {
-    this.hideHTMLScroll(true);
-    this.selected = this.targetNodeId ? [this.targetNodeId] : this.nodeIds;
-    this.storagePoll = setInterval(this.fetchUserStorage, CHECK_STORAGE_INTERVAL);
-  },
-  methods: {
-    ...mapActions(['fetchUserStorage']),
-    ...mapActions('contentNode', [
-      'loadContentNode',
-      'loadContentNodes',
-      'updateContentNode',
-      'loadRelatedResources',
-      'createContentNode',
-    ]),
-    ...mapActions('file', ['loadFiles', 'updateFile']),
-    ...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
-    ...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
-    closeModal() {
-      this.promptUploading = false;
-      this.promptInvalid = false;
-      this.promptFailed = false;
-      clearInterval(this.storagePoll);
-      this.navigateBack();
-    },
-    navigateBack() {
-      this.hideHTMLScroll(false);
-      this.$router.push({
-        name: RouteNames.TREE_VIEW,
-        params: { nodeId: this.$route.params.nodeId },
-      });
-    },
-    hideHTMLScroll(hidden) {
-      document.querySelector('html').style = hidden
-        ? 'overflow-y: hidden !important;'
-        : 'overflow-y: auto !important';
+        });
+      }
+      return next(false);
     },
-    scroll(e) {
-      this.listElevated = e.target.scrollTop > 0;
+    mounted() {
+      this.hideHTMLScroll(true);
+      this.selected = this.targetNodeId ? [this.targetNodeId] : this.nodeIds;
+      this.storagePoll = setInterval(this.fetchUserStorage, CHECK_STORAGE_INTERVAL);
     },
+    methods: {
+      ...mapActions(['fetchUserStorage']),
+      ...mapActions('contentNode', [
+        'loadContentNode',
+        'loadContentNodes',
+        'updateContentNode',
+        'loadRelatedResources',
+        'createContentNode',
+      ]),
+      ...mapActions('file', ['loadFiles', 'updateFile']),
+      ...mapActions('assessmentItem', ['loadAssessmentItems', 'updateAssessmentItems']),
+      ...mapMutations('contentNode', { enableValidation: 'ENABLE_VALIDATION_ON_NODES' }),
+      closeModal() {
+        this.promptUploading = false;
+        this.promptInvalid = false;
+        this.promptFailed = false;
+        clearInterval(this.storagePoll);
+        this.navigateBack();
+      },
+      navigateBack() {
+        this.hideHTMLScroll(false);
+        this.$router.push({
+          name: RouteNames.TREE_VIEW,
+          params: { nodeId: this.$route.params.nodeId },
+        });
+      },
+      hideHTMLScroll(hidden) {
+        document.querySelector('html').style = hidden
+          ? 'overflow-y: hidden !important;'
+          : 'overflow-y: auto !important';
+      },
+      scroll(e) {
+        this.listElevated = e.target.scrollTop > 0;
+      },
 
-    /* Button actions */
-    handleClose() {
-      // X button action
-      this.selected = this.nodeIds;
-      this.$nextTick(() => {
-        this.enableValidation(this.nodeIds);
-        const assessmentItems = this.getAssessmentItems(this.nodeIds);
+      /* Button actions */
+      handleClose() {
+        // X button action
+        this.selected = this.nodeIds;
+        this.$nextTick(() => {
+          this.enableValidation(this.nodeIds);
+          const assessmentItems = this.getAssessmentItems(this.nodeIds);
           assessmentItems.forEach(item =>
-          item.question ? (item[DELAYED_VALIDATION] = false) : ''
-        );
-        this.updateAssessmentItems(assessmentItems);
+            item.question ? (item[DELAYED_VALIDATION] = false) : ''
+          );
+          this.updateAssessmentItems(assessmentItems);
 
-        // reaches into Details Tab to run save of diffTracker
-        // before the validation pop up is executed
-        if (this.$refs.editView) {
-          this.$nextTick(() => {
-            this.$refs.editView.immediateSaveAll().then(() => {
-              // Catch uploads in progress and invalid nodes
-              if (this.invalidNodes.length) {
-                this.selected = [this.invalidNodes[0]];
-                this.promptInvalid = true;
-              } else if (this.contentNodesAreUploading(this.nodeIds)) {
-                this.promptUploading = true;
-              } else {
-                this.closeModal();
-              }
+          // reaches into Details Tab to run save of diffTracker
+          // before the validation pop up is executed
+          if (this.$refs.editView) {
+            this.$nextTick(() => {
+              this.$refs.editView.immediateSaveAll().then(() => {
+                // Catch uploads in progress and invalid nodes
+                if (this.invalidNodes.length) {
+                  this.selected = [this.invalidNodes[0]];
+                  this.promptInvalid = true;
+                } else if (this.contentNodesAreUploading(this.nodeIds)) {
+                  this.promptUploading = true;
+                } else {
+                  this.closeModal();
+                }
+              });
             });
-          });
-        } else {
-          this.closeModal();
-        }
-      });
-    },
+          } else {
+            this.closeModal();
+          }
+        });
+      },
 
-    /* Creation actions */
-    createNode(kind, payload = {}) {
-      this.enableValidation(this.nodeIds);
-      // Default learning activity on upload
-      if (
-        !Object.keys(payload.learning_activities || {}).length &&
-        kind in ContentKindLearningActivityDefaults
-      ) {
-        payload.learning_activities = {
-          [ContentKindLearningActivityDefaults[kind]]: true,
-        };
-      }
-      return this.createContentNode({
-        kind,
-        parent: this.$route.params.nodeId,
-        channel_id: this.currentChannel.id,
-        ...payload,
+      /* Creation actions */
+      createNode(kind, payload = {}, parent = this.$route.params.nodeId) {
+        this.enableValidation(this.nodeIds);
+        // Default learning activity on upload
+        if (
+          !Object.keys(payload.learning_activities || {}).length &&
+          kind in ContentKindLearningActivityDefaults
+        ) {
+          payload.learning_activities = {
+            [ContentKindLearningActivityDefaults[kind]]: true,
+          };
+        }
+        return this.createContentNode({
+          kind,
+          parent: parent,
+          channel_id: this.currentChannel.id,
+          ...payload,
         }).then(newNodeId => {
-        this.$router.push({
-          name: this.$route.name,
-          params: {
-            nodeId: this.$route.params.nodeId,
-            detailNodeIds: this.nodeIds.concat(newNodeId).join(','),
-          },
+          this.$router.push({
+            name: this.$route.name,
+            params: {
+              nodeId: this.$route.params.nodeId,
+              detailNodeIds: this.nodeIds.concat(newNodeId).join(','),
+            },
+          });
+          return newNodeId;
         });
-        return newNodeId;
-      });
-    },
-    createTopic() {
-      this.createNode('topic', {
-        title: '',
+      },
+      createTopic() {
+        this.createNode('topic', {
+          title: '',
         }).then(newNodeId => {
-        this.selected = [newNodeId];
-      });
-    },
-    async uploadResourceNode(file, orgFile) {
-      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,
-        // ...orgFile,
-      }).catch((error) => {
-        let errorType = fileErrors.UPLOAD_FAILED;
-        if (error.response && error.response.status === 412) {
-          errorType = fileErrors.NO_STORAGE;
-        }
-        return Promise.reject(errorType);
-      });
-      return Promise.all([response]);
-    },
-    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('.');
-        }
-        if (file.metadata.orgs === undefined) {
-          this.createNode(
-            FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
-            { title, ...file.metadata }
-          ).then((newNodeId) => {
-            if (index === 0) {
-              this.selected = [newNodeId];
-            }
-            this.updateFile({
-              ...file,
-              contentnode: newNodeId,
+          this.selected = [newNodeId];
+        });
+      },
+      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('.');
+          }
+          if (file.metadata.orgs === undefined) {
+            this.createNode(
+              FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
+              { title, ...file.metadata }
+            ).then(newNodeId => {
+              if (index === 0) {
+                this.selected = [newNodeId];
+              }
+              this.updateFile({
+                ...file,
+                contentnode: newNodeId,
+              });
             });
-          });
-        } else if (file.metadata.orgs) {
-          this.createContentNode({
-            parent: this.$route.params.nodeId,
-            kind: 'topic',
-            ...file.metadata,
-          }).then((newNodeId) => {
-            for (let i = 0; ; i++) {
-              if (file.metadata.orgs[`org${i}`] === undefined) {
-                break;
-              } else {
-                const org = file.metadata.orgs[`org${i}`];
-                this.createContentNode({
-                  parent: newNodeId,
-                  kind: 'topic',
-                  ...org,
-                }).then((id) => {
-                  for (let j = 0; ; j++) {
-                    if (org[`file${j}`] === undefined) {
-                      break;
-                    } else {
-                      const orgFile = org[`file${j}`];
+          } else if (file.metadata.orgs) {
+            this.createNode('topic', file.metadata).then(newNodeId => {
+              Object.values(file.metadata.orgs).forEach(org => {
+                this.createNode('topic', org, newNodeId).then(topicNodeId => {
+                  Object.values(org).forEach(orgFile => {
+                    if (typeof orgFile === 'object') {
                       const extra_fields = {};
                       extra_fields['options'] = { entry: orgFile.resourceHref };
-                      let nodeId;
-                      this.createContentNode({
-                        parent: id,
-                        kind: file.metadata.preset,
-                        title: orgFile.title,
-                        ...extra_fields,
-                      }).then((resourceNodeId) => {
-                        nodeId = resourceNodeId;
+                      extra_fields['title'] = orgFile.title;
+                      let file_kind = null;
+                      FormatPresetsList.forEach(p => {
+                        if (p.id === file.metadata.preset) {
+                          file_kind = p.kind_id;
+                        }
+                      });
+
+                      this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => {
                         return File.uploadUrl({
                           checksum: file.checksum,
                           size: file.file_size,
@@ -568,103 +537,103 @@ export default {
                           name: file.original_filename,
                           file_format: file.file_format,
                           preset: file.metadata.preset,
-                        })
-                          .catch((error) => {
+                        }).then(data => {
+                          const fileObject = {
+                            ...data.file,
+                            loaded: 0,
+                            total: file.size,
+                          };
+                          if (index === 0) {
+                            this.selected = [resourceNodeId];
+                          }
+                          this.updateFile({
+                            ...fileObject,
+                            contentnode: resourceNodeId,
+                          }).catch(error => {
                             let errorType = fileErrors.UPLOAD_FAILED;
                             if (error.response && error.response.status === 412) {
                               errorType = fileErrors.NO_STORAGE;
                             }
                             return Promise.reject(errorType);
-                          })
-                          .then((data) => {
-                            const fileObject = {
-                              ...data.file,
-                              loaded: 0,
-                              total: file.size,
-                            };
-                            if (index === 0) {
-                              this.selected = [nodeId];
-                            }
-                            this.updateFile({
-                              ...fileObject,
-                              contentnode: nodeId,
-                            });
                           });
+                        });
                       });
                     }
-                  }
+                  });
                 });
-              }
-            }
-          });
-        }
-      });
-    },
-    updateTitleForPage() {
-      this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
+              });
+            });
+          }
+        });
+      },
+      updateTitleForPage() {
+        this.updateTabTitle(this.$store.getters.appendChannelName(this.modalTitle));
+      },
+      trackUpload() {
+        this.$analytics.trackAction('file_uploader', 'Add files', {
+          eventLabel: 'Upload file',
+        });
+      },
     },
-    trackUpload() {
-      this.$analytics.trackAction('file_uploader', 'Add files', {
-        eventLabel: 'Upload file',
-      });
+    $trs: {
+      editingDetailsHeader: 'Edit details',
+      uploadFilesHeader: 'Upload files',
+      editFilesHeader: 'Edit files',
+      createExerciseHeader: 'New exercise',
+      addTopicsHeader: 'New folder',
+      invalidNodesFound:
+        '{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}',
+      invalidNodesFoundText:
+        'Incomplete resources will not be published until these errors are resolved',
+      saveAnywaysButton: 'Exit anyway',
+      keepEditingButton: 'Keep editing',
+      saveFailedHeader: 'Save failed',
+      saveFailedText: 'There was a problem saving your content',
+      addTopic: 'Add new folder',
+      uploadButton: 'Upload more',
+      uploadInProgressHeader: 'Upload in progress',
+      uploadInProgressText: 'Uploads that are in progress will be lost if you exit',
+      dismissDialogButton: 'Cancel',
+      cancelUploadsButton: 'Exit',
+      closeWithoutSavingButton: 'Close without saving',
+      okButton: 'OK',
+      loadErrorText: 'Failed to load content',
+      finishButton: 'Finish',
     },
-  },
-  $trs: {
-    editingDetailsHeader: 'Edit details',
-    uploadFilesHeader: 'Upload files',
-    editFilesHeader: 'Edit files',
-    createExerciseHeader: 'New exercise',
-    addTopicsHeader: 'New folder',
-    invalidNodesFound:
-      '{count, plural,\n =1 {# incomplete resource found}\n other {# incomplete resources found}}',
-    invalidNodesFoundText:
-      'Incomplete resources will not be published until these errors are resolved',
-    saveAnywaysButton: 'Exit anyway',
-    keepEditingButton: 'Keep editing',
-    saveFailedHeader: 'Save failed',
-    saveFailedText: 'There was a problem saving your content',
-    addTopic: 'Add new folder',
-    uploadButton: 'Upload more',
-    uploadInProgressHeader: 'Upload in progress',
-    uploadInProgressText: 'Uploads that are in progress will be lost if you exit',
-    dismissDialogButton: 'Cancel',
-    cancelUploadsButton: 'Exit',
-    closeWithoutSavingButton: 'Close without saving',
-    okButton: 'OK',
-    loadErrorText: 'Failed to load content',
-    finishButton: 'Finish',
-  },
-};
+  };
+
 </script>
 
 <style lang="less" scoped>
-/deep/ .v-toolbar__extension {
-  padding: 0;
 
-  .v-toolbar__content {
-    border-bottom: 1px solid var(--v-grey-lighten4);
+  /deep/ .v-toolbar__extension {
+    padding: 0;
+
+    .v-toolbar__content {
+      border-bottom: 1px solid var(--v-grey-lighten4);
+    }
   }
-}
 
-// there is a conflicting style for .row class in common styles
-// that sets left and right margin to -15px which breaks Vuetify
-// elements using Vuetify's .row class
-.row {
-  margin-right: 0;
-  margin-left: 0;
-}
+  // there is a conflicting style for .row class in common styles
+  // that sets left and right margin to -15px which breaks Vuetify
+  // elements using Vuetify's .row class
+  .row {
+    margin-right: 0;
+    margin-left: 0;
+  }
+
+  /deep/ .v-content__wrap {
+    max-height: calc(100vh - 128px);
+    overflow-y: auto;
+  }
 
-/deep/ .v-content__wrap {
-  max-height: calc(100vh - 128px);
-  overflow-y: auto;
-}
+  .add-wrapper {
+    position: sticky;
+    top: 0;
+    z-index: 5;
+    width: calc(100% + 4px);
+    margin: 0 -3px;
+    margin-top: -4px !important;
+  }
 
-.add-wrapper {
-  position: sticky;
-  top: 0;
-  z-index: 5;
-  width: calc(100% + 4px);
-  margin: 0 -3px;
-  margin-top: -4px !important;
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
index f086de146d..56b6c5c703 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/ContentRenderer.vue
@@ -99,7 +99,7 @@
     },
     computed: {
       ...mapGetters('file', ['getContentNodeFileById', 'getContentNodeFiles']),
-      ...mapGetters('contentNode', ['getContentNode', 'getContentNodeChildren']),
+      ...mapGetters('contentNode', ['getContentNode']),
       node() {
         return this.getContentNode(this.nodeId);
       },
@@ -133,7 +133,9 @@
         return this.file.file_format === 'epub';
       },
       htmlPath() {
-        return `/zipcontent/${this.file.checksum}.${this.file.file_format}/${this.node.options && this.node.options.entry || ''}`;
+        return `/zipcontent/${this.file.checksum}.${this.file.file_format}/${(this.node.options &&
+          this.node.options.entry) ||
+          ''}`;
       },
       src() {
         return this.file && this.file.url;
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 69a67abfbb..1049d8805f 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -3,7 +3,6 @@ import JSZip from 'jszip';
 import { FormatPresetsList, FormatPresetsNames } from 'shared/leUtils/FormatPresets';
 import { LicensesList } from 'shared/leUtils/Licenses';
 import LanguagesMap from 'shared/leUtils/Languages';
-import JSZip from 'jszip';
 
 const BLOB_SLICE = File.prototype.slice || File.prototype.mozSlice || File.prototype.webkitSlice;
 const CHUNK_SIZE = 2097152;
@@ -13,10 +12,15 @@ const MEDIA_PRESETS = [
   FormatPresetsNames.LOW_RES_VIDEO,
   FormatPresetsNames.QTI,
   FormatPresetsNames.HTML5_DEPENDENCY,
-  FormatPresetsNames.HTML5_ZIP
+  FormatPresetsNames.HTML5_ZIP,
 ];
 const VIDEO_PRESETS = [FormatPresetsNames.HIGH_RES_VIDEO, FormatPresetsNames.LOW_RES_VIDEO];
-const IMS_PRESETS = [FormatPresetsNames.QTI, FormatPresetsNames.HTML5_DEPENDENCY, FormatPresetsNames.HTML5_ZIP]
+const H5P_PRESETS = [FormatPresetsNames.H5P];
+const IMS_PRESETS = [
+  FormatPresetsNames.QTI,
+  FormatPresetsNames.HTML5_DEPENDENCY,
+  FormatPresetsNames.HTML5_ZIP,
+];
 
 export function getHash(file) {
   return new Promise((resolve, reject) => {
@@ -47,126 +51,109 @@ export function getHash(file) {
   });
 }
 
-const getLeafNodes = (node) => {
+const getLeafNodes = node => {
   if (!node.children || node.children.length === 0) {
     return [node];
   }
-  
+
   // Recursive case: Traverse all children and collect leaf nodes
   let leafNodes = [];
-  for (let child of node.children) {
+  for (const child of node.children) {
     const childLeafNodes = getLeafNodes(child);
     leafNodes = leafNodes.concat(childLeafNodes);
   }
-  
+
   return leafNodes;
+};
+
+function extractManifestFile(data, xmlDoc) {
+  const orgs = {};
+  for (let i = 0; i < data.length; i++) {
+    let index = 0;
+    for (let j = 0; j < data[i].childNodes.length; j++) {
+      const org = {};
+      if (data[i].childNodes[j].nodeType === 1) {
+        const orgNode = data[i].childNodes[j];
+        const title = orgNode.getElementsByTagName('title');
+        org.title = title[0].textContent;
+        const items = orgNode.getElementsByTagName('item');
+        for (let k = 0; k < items.length; k++) {
+          const file = {};
+          const item = items[k];
+          file.title = title[1 + k].textContent;
+          file.identifierref = item.getAttribute('identifierref');
+          file.resourceHref = xmlDoc
+            .querySelectorAll(`[identifier=${file.identifierref}]`)[0]
+            .getAttribute('href');
+          const metadataNodes = orgNode.getElementsByTagName('metadata');
+          if (metadataNodes && metadataNodes.length != 0) {
+            for (let l = 0; l < metadataNodes.length; l++) {
+              const nodeValue = getLeafNodes(metadataNodes[l]);
+              file[`${nodeValue[0].nodeName}`] = nodeValue[0].textContent;
+            }
+          }
+          org[`file${index}`] = file;
+          index++;
+        }
+        orgs[`org${i}`] = org;
+      }
+    }
+  }
+  return orgs;
 }
 
-export async function extractIMSMetadata(fileInput, metadata){
+export async function extractIMSMetadata(fileInput) {
   const zip = new JSZip();
-  zip
+  const metadata = {};
+  return zip
     .loadAsync(fileInput)
     .then(function(zip) {
-      const manifestFile = zip.file("imsmanifest.xml");
-      const metadataFile = zip.file("imsmetadata.xml");
+      const manifestFile = zip.file('imsmanifest.xml');
       if (!manifestFile) {
-        reject(new Error("imsmanifest.xml not found in the zip file."));
-        return;
-      } else if(manifestFile && metadataFile){
-        manifestFile
-        .async("text")
-        .then(content => {
-          // Parse the XML content
-            const parser = new DOMParser();
-            const xmlDoc = parser.parseFromString(content, "application/xml");
-            const data = xmlDoc.getElementsByTagName('organizations')
-            for( let i = 0 ; i < data.length; i++){
-              let orgs = [];
-              let index = 0;
-              for( let j = 0 ; j < data[i].childNodes.length; j++){
-                let org = []
-                if(data[i].childNodes[j].nodeType === 1){
-                  const orgNode = data[i].childNodes[j];
-                  const title = orgNode.getElementsByTagName('title')
-                  org.title = title[0].textContent
-                  const items = orgNode.getElementsByTagName('item');
-                  for(let k = 0; k < items.length; k++){
-                    const file = {};
-                    const item = items[k];
-                    file.title = title[1+k].textContent;
-                    file.identifierref = item.getAttribute('identifierref');
-                    file.resourceHref = xmlDoc.querySelectorAll(`[identifier=${file.identifierref}]`)[0].getAttribute('href')
-                    org[`file${index}`] = file;
-                    index++;
-                  }
-                  orgs[`org${i}`] = org
-                }
-              }
-              metadata.orgs = orgs
-            }
-          })
-        metadataFile
-          .async("text")
-          .then(content=> {
-            const parser = new DOMParser();
-            const xmlDoc = parser.parseFromString(content, "application/xml");
-            metadata.title = xmlDoc.getElementsByTagName('lomes:title').length === 0? undefined : xmlDoc.getElementsByTagName('lomes:title')[0].children[0].textContent;
-            metadata.language = xmlDoc.getElementsByTagName("lomes:idiom").length === 0 ? undefined : xmlDoc.getElementsByTagName("lomes:idiom")[0].children[0].textContent;
-            metadata.description = xmlDoc.getElementsByTagName("lomes:description").length === 0 ? undefined: xmlDoc.getElementsByTagName("lomes:description")[0].children[0].textContent;
-          })
+        throw new Error('imsmanifest.xml not found in the zip file.');
       } else {
-        manifestFile
-        .async("text")
-        .then(content => {
-          // Parse the XML content
+        return manifestFile.async('text');
+      }
+    })
+    .then(manifestFile => {
+      const parser = new DOMParser();
+      const xmlDoc = parser.parseFromString(manifestFile, 'application/xml');
+      const data = xmlDoc.getElementsByTagName('organizations');
+      metadata.orgs = extractManifestFile(data, xmlDoc);
+      const metadataFile = zip.file('imsmetadata.xml');
+      if (metadataFile) {
+        metadataFile.async('text').then(content => {
           const parser = new DOMParser();
-          const xmlDoc = parser.parseFromString(content, "application/xml");
-          metadata.title = xmlDoc.getElementsByTagName('title').length === 0? undefined : xmlDoc.getElementsByTagName('title')[0].textContent;
-          metadata.language = xmlDoc.getElementsByTagName("imsmd:language").length === 0 ? undefined : xmlDoc.getElementsByTagName("imsmd:language")[0].textContent;
-          metadata.description = xmlDoc.getElementsByTagName("imsmd:description").length === 0 ? undefined: xmlDoc.getElementsByTagName("imsmd:description")[0].textContent;
-          const data = xmlDoc.getElementsByTagName('organizations')
-          for( let i = 0 ; i < data.length; i++){
-            let orgs = [];
-            let index = 0;
-            for( let j = 0 ; j < data[i].childNodes.length; j++){
-              let org = []
-              if(data[i].childNodes[j].nodeType === 1){
-                const orgNode = data[i].childNodes[j];
-                const title = orgNode.getElementsByTagName('title')
-                org.title = title[0].textContent
-                const items = orgNode.getElementsByTagName('item');
-                for(let k = 0; k < items.length; k++){
-                  const file = {};
-                  const item = items[k];
-                  file.title = title[1+k].textContent;
-                  file.identifierref = item.getAttribute('identifierref');
-                  file.resourceHref = xmlDoc.querySelectorAll(`[identifier=${file.identifierref}]`)[0].getAttribute('href')
-                  const metadataNodes = orgNode.getElementsByTagName('metadata');
-                  if(metadataNodes && metadataNodes.length != 0){
-                    for( let l = 0 ; l < metadataNodes.length ; l++){
-                      let nodeValue = getLeafNodes(metadataNodes[l]);
-                      file[`${nodeValue[0].nodeName}`] = nodeValue[0].textContent
-                    }
-                  }
-                  org[`file${index}`] = file;
-                  index++;
-                }
-                orgs[`org${i}`] = org
-              }
-            }
-            metadata.orgs = orgs
-          }
-          return metadata
-        })
-        .catch(error => {
-          reject(error); 
+          const xmlDoc = parser.parseFromString(content, 'application/xml');
+          metadata.title =
+            xmlDoc.getElementsByTagName('lomes:title').length === 0
+              ? undefined
+              : xmlDoc.getElementsByTagName('lomes:title')[0].children[0].textContent;
+          metadata.language =
+            xmlDoc.getElementsByTagName('lomes:idiom').length === 0
+              ? undefined
+              : xmlDoc.getElementsByTagName('lomes:idiom')[0].children[0].textContent;
+          metadata.description =
+            xmlDoc.getElementsByTagName('lomes:description').length === 0
+              ? undefined
+              : xmlDoc.getElementsByTagName('lomes:description')[0].children[0].textContent;
         });
+      } else {
+        metadata.title =
+          xmlDoc.getElementsByTagName('title').length === 0
+            ? undefined
+            : xmlDoc.getElementsByTagName('title')[0].textContent;
+        metadata.language =
+          xmlDoc.getElementsByTagName('imsmd:language').length === 0
+            ? undefined
+            : xmlDoc.getElementsByTagName('imsmd:language')[0].textContent;
+        metadata.description =
+          xmlDoc.getElementsByTagName('imsmd:description').length === 0
+            ? undefined
+            : xmlDoc.getElementsByTagName('imsmd:description')[0].textContent;
       }
-    })
-    .catch(error => {
-      reject(error); // Failed to load the zip file
+      return metadata;
     });
-  return metadata
 }
 
 const extensionPresetMap = FormatPresetsList.reduce((map, value) => {
@@ -283,7 +270,9 @@ export function extractMetadata(file, preset = null) {
       });
       resolve(metadata);
     } else if (isIMSCP) {
-      extractIMSMetadata(file, metadata)
+      extractIMSMetadata(file).then(data => {
+        Object.assign(metadata, data);
+      });
       resolve(metadata);
     } else {
       const mediaElement = document.createElement(isVideo ? 'video' : 'audio');

From 606b300d6dec33aabb331ce7a4fffe12538ae258 Mon Sep 17 00:00:00 2001
From: Manav Aggarwal <manavagr1108@Manavs-MacBook-Air.local>
Date: Fri, 1 Sep 2023 01:13:01 +0530
Subject: [PATCH 3/4] - adding code to extract metadata from submanifest file -
 adding test cases for extractIMSMetadata

---
 .../channelEdit/components/edit/EditList.vue  |   7 +-
 .../channelEdit/components/edit/EditModal.vue |  80 +++--
 .../shared/vuex/file/__tests__/module.spec.js | 288 +++++++++++++++++-
 .../frontend/shared/vuex/file/utils.js        | 224 ++++++++------
 4 files changed, 466 insertions(+), 133 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
index 9648d6b7e8..4d334b8d35 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditList.vue
@@ -54,12 +54,7 @@
           return this.value;
         },
         set(items) {
-          if (this.selected.includes(items[0])) {
-            this.selected = [];
-          } else {
-            this.getChildren(items[0]).forEach(item => items.push(item));
-            this.$emit('input', items);
-          }
+          this.$emit('input', items);
         },
       },
       selectAll: {
diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
index ad48b52820..b67bfdc41c 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditModal.vue
@@ -500,7 +500,7 @@
               .slice(0, -1)
               .join('.');
           }
-          if (file.metadata.orgs === undefined) {
+          if (file.metadata.folders === undefined) {
             this.createNode(
               FormatPresets.has(file.preset) && FormatPresets.get(file.preset).kind_id,
               { title, ...file.metadata }
@@ -513,52 +513,50 @@
                 contentnode: newNodeId,
               });
             });
-          } else if (file.metadata.orgs) {
+          } else if (file.metadata.folders) {
             this.createNode('topic', file.metadata).then(newNodeId => {
-              Object.values(file.metadata.orgs).forEach(org => {
+              file.metadata.folders.forEach(org => {
                 this.createNode('topic', org, newNodeId).then(topicNodeId => {
-                  Object.values(org).forEach(orgFile => {
-                    if (typeof orgFile === 'object') {
-                      const extra_fields = {};
-                      extra_fields['options'] = { entry: orgFile.resourceHref };
-                      extra_fields['title'] = orgFile.title;
-                      let file_kind = null;
-                      FormatPresetsList.forEach(p => {
-                        if (p.id === file.metadata.preset) {
-                          file_kind = p.kind_id;
-                        }
-                      });
+                  org.files.forEach(orgFile => {
+                    const extra_fields = {};
+                    extra_fields['options'] = { entry: orgFile.resourceHref };
+                    extra_fields['title'] = orgFile.title;
+                    let file_kind = null;
+                    FormatPresetsList.forEach(p => {
+                      if (p.id === file.metadata.preset) {
+                        file_kind = p.kind_id;
+                      }
+                    });
 
-                      this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => {
-                        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,
-                        }).then(data => {
-                          const fileObject = {
-                            ...data.file,
-                            loaded: 0,
-                            total: file.size,
-                          };
-                          if (index === 0) {
-                            this.selected = [resourceNodeId];
+                    this.createNode(file_kind, extra_fields, topicNodeId).then(resourceNodeId => {
+                      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,
+                      }).then(data => {
+                        const fileObject = {
+                          ...data.file,
+                          loaded: 0,
+                          total: file.size,
+                        };
+                        if (index === 0) {
+                          this.selected = [resourceNodeId];
+                        }
+                        this.updateFile({
+                          ...fileObject,
+                          contentnode: resourceNodeId,
+                        }).catch(error => {
+                          let errorType = fileErrors.UPLOAD_FAILED;
+                          if (error.response && error.response.status === 412) {
+                            errorType = fileErrors.NO_STORAGE;
                           }
-                          this.updateFile({
-                            ...fileObject,
-                            contentnode: resourceNodeId,
-                          }).catch(error => {
-                            let errorType = fileErrors.UPLOAD_FAILED;
-                            if (error.response && error.response.status === 412) {
-                              errorType = fileErrors.NO_STORAGE;
-                            }
-                            return Promise.reject(errorType);
-                          });
+                          return Promise.reject(errorType);
                         });
                       });
-                    }
+                    });
                   });
                 });
               });
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js b/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
index 3f38ceabd8..b1da778cb5 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/__tests__/module.spec.js
@@ -1,5 +1,5 @@
 import JSZip from 'jszip';
-import { getH5PMetadata } from '../utils';
+import { getH5PMetadata, extractIMSMetadata } from '../utils';
 import storeFactory from 'shared/vuex/baseStore';
 import { File, injectVuexStore } from 'shared/data/resources';
 import client from 'shared/client';
@@ -237,5 +237,291 @@ describe('file store', () => {
         });
       });
     });
+    describe('IMS content file extract metadata', () => {
+      it('extractIMSMetadata should check for imsmanifest.xml file', () => {
+        const zip = new JSZip();
+        return zip.generateAsync({ type: 'blob' }).then(async function(IMSBlob) {
+          await expect(extractIMSMetadata(IMSBlob)).rejects.toThrow(
+            'imsmanifest.xml not found in the zip file.'
+          );
+        });
+      });
+      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>
+            <imsmd:lom>
+              <imsmd:general>
+                <imsmd:title>
+                  <imsmd:langstring xml:lang="en">Test File</imsmd:langstring>
+                </imsmd:title>
+                <imsmd:language>en</imsmd:language>
+                <imsmd:description>
+                  <imsmd:langstring xml:lang="en">Example of test file</imsmd:langstring>
+                </imsmd:description>
+              </imsmd:general>
+            </imsmd:lom>
+          </metadata>
+          <organizations>
+            <organization>
+              <title>Folder 1</title>
+              <item identifierref="file1Ref">
+                <title>Test File1</title>
+              </item>
+              <item identifierref="file2Ref">
+                <title>Test File2</title>
+                <organizations>
+                  <organization>
+                    <title>Folder 1</title>
+                    <item identifierref="file1Ref">
+                      <title>Test File1</title>
+                    </item>
+                    <item identifierref="file2Ref">
+                      <title>Test File2</title>
+                    </item>
+                  </organization>
+                  <organization>
+                    <title>Folder 2</title>
+                    <item identifierref="file3Ref">
+                      <title>Test File3</title>
+                    </item>
+                    <item identifierref="file4Ref">
+                      <title>Test File4</title>
+                    </item>
+                  </organization>
+                </organizations>
+              </item>
+            </organization>
+            <organization>
+              <title>Folder 2</title>
+              <item identifierref="file3Ref">
+                <title>Test File3</title>
+              </item>
+              <item identifierref="file4Ref">
+                <title>Test File4</title>
+              </item>
+            </organization>
+          </organizations>
+          <resources>
+            <resource identifier="file1Ref" type="webcontent" href="file1.html">
+            </resource>
+            <resource identifier="file2Ref" type="webcontent" href="file2.html">
+            </resource>
+            <resource identifier="file3Ref" type="webcontent" href="file3.html">
+            </resource>
+            <resource identifier="file4Ref" type="webcontent" href="file4.html">
+            </resource>
+          </resources>
+        </manifest>`;
+
+        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',
+            folders: [
+              {
+                files: [
+                  {
+                    identifierref: 'file1Ref',
+                    resourceHref: 'file1.html',
+                    title: 'Test File1',
+                  },
+                  {
+                    identifierref: 'file2Ref',
+                    resourceHref: 'file2.html',
+                    title: 'Test File2',
+                    folders: [
+                      {
+                        files: [
+                          {
+                            identifierref: 'file1Ref',
+                            resourceHref: 'file1.html',
+                            title: 'Test File1',
+                          },
+                          {
+                            identifierref: 'file2Ref',
+                            resourceHref: 'file2.html',
+                            title: 'Test File2',
+                          },
+                        ],
+                        title: 'Folder 1',
+                      },
+                      {
+                        files: [
+                          {
+                            identifierref: 'file3Ref',
+                            resourceHref: 'file3.html',
+                            title: 'Test File3',
+                          },
+                          {
+                            identifierref: 'file4Ref',
+                            resourceHref: 'file4.html',
+                            title: 'Test File4',
+                          },
+                        ],
+                        title: 'Folder 2',
+                      },
+                    ],
+                  },
+                ],
+                title: 'Folder 1',
+              },
+              {
+                files: [
+                  {
+                    identifierref: 'file3Ref',
+                    resourceHref: 'file3.html',
+                    title: 'Test File3',
+                  },
+                  {
+                    identifierref: 'file4Ref',
+                    resourceHref: 'file4.html',
+                    title: 'Test File4',
+                  },
+                ],
+                title: 'Folder 2',
+              },
+            ],
+            description: 'Example of test file',
+            language: 'en',
+          });
+        });
+      });
+      it('extractIMSMetadata should extract metadata from multiple manifest file', async () => {
+        const manifestContent = `
+        <manifest>
+          <organizations>
+            <organization>
+              <title>Folder 1</title>
+              <item identifierref="file1Ref">
+                <title>Test File1</title>
+              </item>
+              <item identifierref="file2Ref">
+                <title>Test File2</title>
+              </item>
+            </organization>
+          </organizations>
+          <resources>
+            <resource identifier="file1Ref" type="webcontent" href="file/file1.html">
+            </resource>
+            <resource identifier="file2Ref" type="webcontent" href="file/file2.html">
+            </resource>
+          </resources>
+        </manifest>`;
+
+        const subManifestContent = `
+        <manifest>
+          <organizations>
+            <organization>
+              <title>Folder 1</title>
+              <item identifierref="file3Ref">
+                <title>Test File3</title>
+              </item>
+              <item identifierref="file4Ref">
+                <title>Test File4</title>
+              </item>
+            </organization>
+          </organizations>
+          <resources>
+            <resource identifier="file3Ref" type="webcontent" href="file3.html">
+            </resource>
+            <resource identifier="file4Ref" type="webcontent" href="file4.html">
+            </resource>
+          </resources>
+        </manifest>`;
+        const zip = new JSZip();
+        zip.file('imsmanifest.xml', manifestContent);
+        zip.file('file/imsmanifest.xml', subManifestContent);
+
+        await zip.generateAsync({ type: 'blob' }).then(async function(imsBlob) {
+          await expect(extractIMSMetadata(imsBlob)).resolves.toEqual({
+            folders: [
+              {
+                files: [
+                  {
+                    identifierref: 'file1Ref',
+                    resourceHref: 'file/file1.html',
+                    title: 'Test File1',
+                  },
+                  {
+                    identifierref: 'file2Ref',
+                    resourceHref: 'file/file2.html',
+                    title: 'Test File2',
+                  },
+                  {
+                    identifierref: 'file3Ref',
+                    resourceHref: 'file3.html',
+                    title: 'Test File3',
+                  },
+                  {
+                    identifierref: 'file4Ref',
+                    resourceHref: 'file4.html',
+                    title: 'Test File4',
+                  },
+                ],
+                title: 'Folder 1',
+              },
+            ],
+          });
+        });
+      });
+      it('extractIMSMetadata should extract metadata from imsmanifest and imsmetadata files', async () => {
+        const manifestContent = ``;
+
+        const metadataContent = `
+        <manifest>
+          <lomes:lom xmlns:lomes="http://ltsc.ieee.org/xsd/LOM">
+                <lomes:general>
+                    <lomes:title>
+                        <lomes:string language="en">Test File</lomes:string>
+                    </lomes:title>
+                    <lomes:idiom>
+                        <lomes:string language="en">en</lomes:string>
+                    </lomes:idiom>
+                    <lomes:description>
+                        <lomes:string language="en">Example of test file</lomes:string>
+                    </lomes:description>
+                </lomes:general>
+          </lomes:lom>
+        </manifest>`;
+        const zip = new JSZip();
+        zip.file('imsmanifest.xml', manifestContent);
+        zip.file('imsmetadata.xml', metadataContent);
+
+        await zip.generateAsync({ type: 'blob' }).then(async function(imsBlob) {
+          await expect(extractIMSMetadata(imsBlob)).resolves.toEqual({
+            title: 'Test File',
+            description: 'Example of test file',
+            language: 'en',
+          });
+        });
+      });
+      it('extractIMSMetadata should not extract und language', async () => {
+        const manifestContent = `
+        <manifest xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2">
+          <metadata>
+            <imsmd:lom>
+              <imsmd:general>
+                <imsmd:title>
+                  <imsmd:langstring xml:lang="en">Test File</imsmd:langstring>
+                </imsmd:title>
+                <imsmd:language>und</imsmd:language>
+              </imsmd:general>
+            </imsmd:lom>
+          </metadata>
+        </manifest>`;
+        const zip = new JSZip();
+        zip.file('imsmanifest.xml', manifestContent);
+
+        await zip.generateAsync({ type: 'blob' }).then(async function(imsBlob) {
+          await expect(extractIMSMetadata(imsBlob)).resolves.toEqual({
+            title: 'Test File',
+          });
+        });
+      });
+    });
   });
 });
diff --git a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
index 1049d8805f..814cb31409 100644
--- a/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
+++ b/contentcuration/contentcuration/frontend/shared/vuex/file/utils.js
@@ -51,60 +51,147 @@ export function getHash(file) {
   });
 }
 
-const getLeafNodes = node => {
-  if (!node.children || node.children.length === 0) {
-    return [node];
-  }
-
-  // Recursive case: Traverse all children and collect leaf nodes
-  let leafNodes = [];
-  for (const child of node.children) {
-    const childLeafNodes = getLeafNodes(child);
-    leafNodes = leafNodes.concat(childLeafNodes);
-  }
-
-  return leafNodes;
-};
-
-function extractManifestFile(data, xmlDoc) {
-  const orgs = {};
-  for (let i = 0; i < data.length; i++) {
-    let index = 0;
-    for (let j = 0; j < data[i].childNodes.length; j++) {
-      const org = {};
-      if (data[i].childNodes[j].nodeType === 1) {
-        const orgNode = data[i].childNodes[j];
-        const title = orgNode.getElementsByTagName('title');
-        org.title = title[0].textContent;
-        const items = orgNode.getElementsByTagName('item');
-        for (let k = 0; k < items.length; k++) {
-          const file = {};
-          const item = items[k];
-          file.title = title[1 + k].textContent;
-          file.identifierref = item.getAttribute('identifierref');
-          file.resourceHref = xmlDoc
-            .querySelectorAll(`[identifier=${file.identifierref}]`)[0]
-            .getAttribute('href');
-          const metadataNodes = orgNode.getElementsByTagName('metadata');
-          if (metadataNodes && metadataNodes.length != 0) {
-            for (let l = 0; l < metadataNodes.length; l++) {
-              const nodeValue = getLeafNodes(metadataNodes[l]);
-              file[`${nodeValue[0].nodeName}`] = nodeValue[0].textContent;
+async function getFolderMetadata(data, xmlDoc, zip, procssedFiles) {
+  const folders = [];
+  if (data.length && data[0].children && data[0].children.length) {
+    await Promise.all(
+      Object.values(data[0].children).map(async orgNode => {
+        const org = {
+          title: '',
+          files: [],
+        };
+        if (orgNode.nodeType === 1) {
+          const title = orgNode.getElementsByTagName('title');
+          org.title = title[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+          const files = orgNode.getElementsByTagName('item');
+          const immediateChildNodes = [];
+          const childNodes = Object.values(orgNode.children);
+          Object.values(files).forEach(file => {
+            if (childNodes.includes(file)) {
+              immediateChildNodes.push(file);
             }
-          }
-          org[`file${index}`] = file;
-          index++;
+          });
+          await Promise.all(
+            immediateChildNodes.map(async (fileNode, k) => {
+              const file = {};
+              file.title = title[1 + k].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+              file.identifierref = fileNode.getAttribute('identifierref');
+              file.resourceHref = xmlDoc
+                .querySelectorAll(`[identifier=${file.identifierref}]`)[0]
+                .getAttribute('href');
+              if (fileNode.getElementsByTagName('organizations').length) {
+                getFolderMetadata(
+                  fileNode.getElementsByTagName('organizations'),
+                  xmlDoc,
+                  zip,
+                  procssedFiles
+                ).then(data => {
+                  file.folders = data;
+                });
+              }
+              const metadataNodes = orgNode.getElementsByTagName('metadata');
+              if (metadataNodes && metadataNodes.length != 0) {
+                Object.values(metadataNodes).forEach(nodeValue => {
+                  file[`${nodeValue[0].nodeName}`] = nodeValue[0].textContent.replace(
+                    / {2}|\r\n|\n|\r/gm,
+                    ''
+                  );
+                });
+              }
+              org.files.push(file);
+              const manifestPath =
+                file.resourceHref.slice(0, file.resourceHref.lastIndexOf('/') + 1) +
+                'imsmanifest.xml';
+              const subManifestContent = zip.files[manifestPath];
+              if (subManifestContent && !procssedFiles.includes(manifestPath)) {
+                procssedFiles.push(manifestPath);
+                const subManifestFile = await Promise.resolve(subManifestContent.async('text'));
+                const parser = new DOMParser();
+                const xmlDoc = parser.parseFromString(subManifestFile, 'application/xml');
+                const subManifestData = await getFolderMetadata(
+                  xmlDoc.getElementsByTagName('organizations'),
+                  xmlDoc,
+                  zip,
+                  procssedFiles
+                );
+                if (subManifestData.title) {
+                  org.title = subManifestData[0].title;
+                }
+                subManifestData[0].files.map(file => {
+                  org.files.push(file);
+                });
+              }
+            })
+          );
         }
-        orgs[`org${i}`] = org;
-      }
-    }
+        folders.push(org);
+        return org;
+      })
+    );
+    return folders;
   }
-  return orgs;
 }
 
+async function getManifestMetadata(manifestFile, zip, procssedFiles) {
+  const metadata = {};
+  const parser = new DOMParser();
+  const xmlDoc = parser.parseFromString(manifestFile, 'application/xml');
+  const data = xmlDoc.getElementsByTagName('organizations');
+  return await getFolderMetadata(data, xmlDoc, zip, procssedFiles).then(async data => {
+    if (data) {
+      metadata.folders = data;
+    }
+    const metadataFile = zip.file('imsmetadata.xml');
+    if (metadataFile) {
+      procssedFiles.push('imsmetadata.xml');
+      const content = await Promise.resolve(metadataFile.async('text'));
+      const xmlDoc = parser.parseFromString(content, 'application/xml');
+      if (xmlDoc.getElementsByTagName('lomes:title').length) {
+        metadata.title = xmlDoc
+          .getElementsByTagName('lomes:title')[0]
+          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+      if (
+        xmlDoc.getElementsByTagName('lomes:idiom').length &&
+        xmlDoc
+          .getElementsByTagName('lomes:idiom')[0]
+          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '') !== 'und'
+      ) {
+        metadata.language = xmlDoc
+          .getElementsByTagName('lomes:idiom')[0]
+          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+      if (xmlDoc.getElementsByTagName('lomes:description').length) {
+        metadata.description = xmlDoc
+          .getElementsByTagName('lomes:description')[0]
+          .children[0].textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+    } else {
+      if (xmlDoc.getElementsByTagName('imsmd:title').length) {
+        metadata.title = xmlDoc
+          .getElementsByTagName('imsmd:title')[0]
+          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+      if (
+        xmlDoc.getElementsByTagName('imsmd:language').length &&
+        xmlDoc.getElementsByTagName('imsmd:language')[0].textContent !== 'und'
+      ) {
+        metadata.language = xmlDoc
+          .getElementsByTagName('imsmd:language')[0]
+          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+      if (xmlDoc.getElementsByTagName('imsmd:description').length) {
+        metadata.description = xmlDoc
+          .getElementsByTagName('imsmd:description')[0]
+          .textContent.replace(/ {2}|\r\n|\n|\r/gm, '');
+      }
+    }
+    return metadata;
+  });
+}
 export async function extractIMSMetadata(fileInput) {
   const zip = new JSZip();
-  const metadata = {};
+  const procssedFiles = [];
   return zip
     .loadAsync(fileInput)
     .then(function(zip) {
@@ -112,47 +199,14 @@ export async function extractIMSMetadata(fileInput) {
       if (!manifestFile) {
         throw new Error('imsmanifest.xml not found in the zip file.');
       } else {
+        procssedFiles.push('imsmanifest.xml');
         return manifestFile.async('text');
       }
     })
-    .then(manifestFile => {
-      const parser = new DOMParser();
-      const xmlDoc = parser.parseFromString(manifestFile, 'application/xml');
-      const data = xmlDoc.getElementsByTagName('organizations');
-      metadata.orgs = extractManifestFile(data, xmlDoc);
-      const metadataFile = zip.file('imsmetadata.xml');
-      if (metadataFile) {
-        metadataFile.async('text').then(content => {
-          const parser = new DOMParser();
-          const xmlDoc = parser.parseFromString(content, 'application/xml');
-          metadata.title =
-            xmlDoc.getElementsByTagName('lomes:title').length === 0
-              ? undefined
-              : xmlDoc.getElementsByTagName('lomes:title')[0].children[0].textContent;
-          metadata.language =
-            xmlDoc.getElementsByTagName('lomes:idiom').length === 0
-              ? undefined
-              : xmlDoc.getElementsByTagName('lomes:idiom')[0].children[0].textContent;
-          metadata.description =
-            xmlDoc.getElementsByTagName('lomes:description').length === 0
-              ? undefined
-              : xmlDoc.getElementsByTagName('lomes:description')[0].children[0].textContent;
-        });
-      } else {
-        metadata.title =
-          xmlDoc.getElementsByTagName('title').length === 0
-            ? undefined
-            : xmlDoc.getElementsByTagName('title')[0].textContent;
-        metadata.language =
-          xmlDoc.getElementsByTagName('imsmd:language').length === 0
-            ? undefined
-            : xmlDoc.getElementsByTagName('imsmd:language')[0].textContent;
-        metadata.description =
-          xmlDoc.getElementsByTagName('imsmd:description').length === 0
-            ? undefined
-            : xmlDoc.getElementsByTagName('imsmd:description')[0].textContent;
-      }
-      return metadata;
+    .then(async manifestFile => {
+      return await getManifestMetadata(manifestFile, zip, procssedFiles).then(metadata => {
+        return metadata;
+      });
     });
 }
 

From 6c946687613c3f3072294d902a119897c59c22d8 Mon Sep 17 00:00:00 2001
From: Manav Aggarwal <manavagr1108@Manavs-MacBook-Air.local>
Date: Tue, 19 Sep 2023 18:11:50 +0530
Subject: [PATCH 4/4] - changing metadata key names, removing comments,
 replacing replace with trim

---
 .../components/edit/EditListItems.vue         |  2 +-
 .../channelEdit/components/edit/EditModal.vue | 13 ++++----
 .../shared/vuex/file/__tests__/module.spec.js |  4 +--
 .../frontend/shared/vuex/file/utils.js        | 32 ++++++++-----------
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue b/contentcuration/contentcuration/frontend/channelEdit/components/edit/EditListItems.vue
index 44cac4a2f5..fd980dc786 100644
--- 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
index b67bfdc41c..4659e64cce 100644
--- 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
index b1da778cb5..9af92da859 100644
--- 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
index 814cb31409..8f1f3da6f7 100644
--- 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);
     });
 }