adapt-authoring-adaptframework 1.9.7 → 1.9.9

package/lib/AdaptFrameworkImport.js

@@ -604,9 +604,7 @@ class AdaptFrameworkImport {
     const pluginsToInstall = []
     const pluginsToUpdate = []
 
-    if (!this.settings.updatePlugins) {
-      this.statusReport.warn.push({ code: 'MANAGED_PLUGIN_UPDATE_DISABLED' })
-    }
+    let managedPluginUpdateBlocked = false
     Object.keys(this.usedContentPlugins).forEach(p => {
       const installedP = this.installedPlugins[p]
       let { version: importVersion } = this.usedContentPlugins[p]
@@ -628,6 +626,7 @@ class AdaptFrameworkImport {
         return
       }
       if (!this.settings.updatePlugins) {
+        if (!isLocalInstall && semver.gt(importVersion, installedVersion)) managedPluginUpdateBlocked = true
         return
       }
       if (semver.eq(importVersion, installedVersion)) {
@@ -641,6 +640,9 @@ class AdaptFrameworkImport {
       }
       pluginsToUpdate.push(p)
     })
+    if (managedPluginUpdateBlocked) {
+      this.statusReport.warn.push({ code: 'MANAGED_PLUGIN_UPDATE_DISABLED' })
+    }
     if (pluginsToInstall.length) {
       if (!this.settings.importPlugins) {
         if (this.settings.isDryRun) return this.statusReport.error.push({ code: 'MISSING_PLUGINS', data: pluginsToInstall })
@@ -687,19 +689,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 {
@@ -709,10 +718,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.7",
+  "version": "1.9.9",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",