adapt-authoring-adaptframework 1.7.0 → 1.8.0

package/lib/AdaptFrameworkBuild.js

@@ -19,9 +19,7 @@ class AdaptFrameworkBuild {
    * @return {Promise} Resolves to this AdaptFrameworkBuild instance
    */
   static async run (options) {
-    const instance = new AdaptFrameworkBuild(options)
-    await instance.build()
-    return instance
+    return new AdaptFrameworkBuild(options).build()
   }
 
   /**
@@ -229,6 +227,8 @@ class AdaptFrameworkBuild {
     await this.postBuildHook.invoke(this)
 
     this.buildData = await this.recordBuildAttempt()
+
+    return this
   }
 
   /**

package/lib/AdaptFrameworkImport.js

@@ -166,6 +166,11 @@ class AdaptFrameworkImport {
       info: [],
       warn: []
     }
+    /**
+     * Summary information for the import run
+     * @type {AdaptFrameworkImportSummary}
+     */
+    this.summary = undefined
     /**
      * User-defined settings related to what is included with the import
      * @type {Object}
@@ -249,7 +254,7 @@ class AdaptFrameworkImport {
         [this.prepare],
         [this.loadAssetData],
         [this.loadPluginData],
-        [() => this.preImportHook.invoke(this), true],
+        [() => this.preImportHook.invoke(this)],
         [this.importTags, importContent],
         [this.importCourseAssets, importContent],
         [this.importCoursePlugins, isDryRun && importPlugins],
@@ -257,7 +262,8 @@ class AdaptFrameworkImport {
         [this.loadCourseData, isDryRun && importContent],
         [this.migrateCourseData, !isDryRun && importContent],
         [this.loadCourseData, !isDryRun && importContent],
-        [this.importCourseData, !isDryRun && importContent]
+        [this.importCourseData, !isDryRun && importContent],
+        [this.generateSummary]
       ]
       for (const [func, test] of tasks) {
         if (test === true || test === undefined) await func.call(this)
@@ -793,6 +799,15 @@ class AdaptFrameworkImport {
     })
   }
 
+  /**
+   * Performs necessary clean-up tasks
+   * @param {Error|Boolean} error If param is truthy, extra error-related clean-up tasks are performed
+   * @return {Promise}
+   */
+  async generateSummary () {
+    this.summary = await FWUtils.getImportSummary(this)
+  }
+
   /**
    * Performs necessary clean-up tasks
    * @param {Error|Boolean} error If param is truthy, extra error-related clean-up tasks are performed

package/lib/AdaptFrameworkModule.js

@@ -308,9 +308,10 @@ class AdaptFrameworkModule extends AbstractModule {
    * @return {AdaptFrameworkBuild}
    */
   async buildCourse (options) {
-    const builder = AdaptFrameworkBuild.run(options)
+    const builder = new AdaptFrameworkBuild(options)
     builder.preBuildHook.tap(() => this.preBuildHook.invoke(builder))
     builder.postBuildHook.tap(() => this.postBuildHook.invoke(builder))
+    return builder.build()
   }
 
   /**
@@ -319,10 +320,10 @@ class AdaptFrameworkModule extends AbstractModule {
    * @return {AdaptFrameworkImportSummary}
    */
   async importCourse (options) {
-    const importer = await AdaptFrameworkImport.run(options)
+    const importer = new AdaptFrameworkImport(options)
     importer.preImportHook.tap(() => this.preImportHook.invoke(importer))
     importer.postImportHook.tap(() => this.postImportHook.invoke(importer))
-    return await FWUtils.getImportSummary(importer)
+    return importer.import()
   }
 }
 

package/lib/AdaptFrameworkUtils.js

@@ -287,8 +287,7 @@ class AdaptFrameworkUtils {
         migrateContent: AdaptFrameworkUtils.toBoolean(req.body.migrateContent),
         updatePlugins: AdaptFrameworkUtils.toBoolean(req.body.updatePlugins)
       })
-      const summary = await AdaptFrameworkUtils.getImportSummary(importer)
-      res.json(summary)
+      res.json(importer.summary)
     } catch (e) {
       return next(App.instance.errors.FW_IMPORT_FAILED.setData({ error: e }))
     }

package/package.json

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