adapt-authoring-adaptframework 1.9.6 → 1.9.8

package/lib/AdaptFrameworkImport.js

@@ -446,7 +446,15 @@ class AdaptFrameworkImport {
    * @return {Promise}
    */
   async loadContentFile (filePath) {
-    const contents = await FWUtils.readJson(filePath)
+    let contents
+    try {
+      contents = await FWUtils.readJson(filePath)
+    } catch (e) {
+      if (e.constructor.name === 'SyntaxError') {
+        throw App.instance.errors.FILE_SYNTAX_ERROR.setData({ path: filePath.replace(this.path, ''), message: e.message })
+      }
+      throw e
+    }
     if (contents._type === 'course') {
       this.contentJson.course = contents
       return
@@ -679,19 +687,26 @@ class AdaptFrameworkImport {
    * @return {Promise}
    */
   async importCourseData () {
+    const stringifyError = e => {
+      return e?.data?.schemaName ? `${e.data.schemaName} ${e.data.data._id} ${e.data.errors}` : App.instance.lang.translate(undefined, e)
+    }
     /**
      * Note: the execution order is important here
      * - config requires course to exist
      * - Defaults cannot be applied until the config exists
      * - Everything else requires course + config to exist
      */
-    const course = await this.importContentObject({ ...this.contentJson.course, tags: this.tags })
-    /*  config  */ await this.importContentObject(this.contentJson.config)
-    // we need to run an update with the same data to make sure all extension schema settings are applied
-    await this.importContentObject({ ...this.contentJson.course, _id: course._id }, { isUpdate: true })
-
+    try {
+      const course = await this.importContentObject({ ...this.contentJson.course, tags: this.tags })
+      /*  config  */ await this.importContentObject(this.contentJson.config)
+      // we need to run an update with the same data to make sure all extension schema settings are applied
+      await this.importContentObject({ ...this.contentJson.course, _id: course._id }, { isUpdate: true })
+    } catch (e) {
+      throw App.instance.errors.FW_IMPORT_CONTENT_FAILED.setData({ errors: stringifyError(e) })
+    }
     const { sorted, hierarchy } = await this.getSortedData()
     const errors = []
+
     for (const ids of sorted) {
       for (const _id of ids) {
         try {
@@ -701,10 +716,7 @@ class AdaptFrameworkImport {
             ...itemJson // note that JSON sort order will override the deduced one
           })
         } catch (e) {
-          errors.push(e?.data?.schemaName
-            ? `${e.data.schemaName} ${_id} ${e.data.errors}`
-            : App.instance.lang.translate(undefined, e)
-          )
+          errors.push(stringifyError(e))
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-adaptframework",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",