adapt-authoring-adaptframework 1.8.0 → 1.8.2

package/lib/AdaptFrameworkImport.js

@@ -79,7 +79,7 @@ class AdaptFrameworkImport {
   constructor ({ importPath, userId, language, assetFolders, tags, isDryRun, importContent = true, importPlugins = true, migrateContent = true, updatePlugins = false, removeSource = true }) {
     const e = App.instance.errors.INVALID_PARAMS
     if (!importPath) throw e.setData({ params: ['importPath'] })
-    if (!userId) throw e.INVALID_PARAMS.setData({ params: ['userId'] })
+    if (!userId) throw e.setData({ params: ['userId'] })
     /**
      * Reference to the package.json data
      * @type {Object}
@@ -109,7 +109,7 @@ class AdaptFrameworkImport {
      * List of tags to apply to the course
      * @type {Array<String>}
      */
-    this.tags = tags
+    this.tags = tags ?? []
     /**
      * Path to the import course folder
      * @type {String}
@@ -307,7 +307,8 @@ class AdaptFrameworkImport {
     this.coursePath = courseDirs[0]
     try {
       await this.loadContentFile(`${this.coursePath}/config.json`)
-      this.langPath = `${this.coursePath}/${this.language ?? this.contentJson.config._defaultLanguage}`
+      this.language = this.language ?? this.contentJson.config._defaultLanguage
+      this.langPath = `${this.coursePath}/${this.language}`
       await fs.readdir(this.langPath)
     } catch (e) {
       this.framework.log('error', e)

package/lib/AdaptFrameworkUtils.js

@@ -1,8 +1,6 @@
 import AdaptCli from 'adapt-cli'
 import { App } from 'adapt-authoring-core'
 import bytes from 'bytes'
-import FrameworkBuild from './AdaptFrameworkBuild.js'
-import FrameworkImport from './AdaptFrameworkImport.js'
 import fs from 'fs/promises'
 /* eslint-disable import/no-named-default */import { default as fsSync } from 'fs'
 import path from 'upath'
@@ -239,15 +237,15 @@ class AdaptFrameworkUtils {
    * @return {Promise}
    */
   static async postHandler (req, res, next) {
-    const startTime = Date.now()
     const framework = await App.instance.waitForModule('adaptframework')
+    const startTime = Date.now()
     const action = AdaptFrameworkUtils.inferBuildAction(req)
     const courseId = req.params.id
     const userId = req.auth.user._id.toString()
 
     AdaptFrameworkUtils.log('info', `running ${action} for course '${courseId}' initiated by ${userId}`)
     try {
-      const { isPreview, buildData } = await FrameworkBuild.run({ action, courseId, userId })
+      const { isPreview, buildData } = await framework.buildCourse({ action, courseId, userId })
       const duration = Math.round((Date.now() - startTime) / 10) / 100
       AdaptFrameworkUtils.log('info', `finished ${action} for course '${courseId}' in ${duration} seconds`)
       const urlRoot = isPreview ? framework.rootRouter.url : framework.apiRouter.url
@@ -270,13 +268,14 @@ class AdaptFrameworkUtils {
    */
   static async importHandler (req, res, next) {
     try {
+      const framework = await App.instance.waitForModule('adaptframework')
       let importPath = req.body.importPath
       if (req.get('Content-Type').indexOf('multipart/form-data') === 0) {
         await AdaptFrameworkUtils.handleImportFile(req, res)
         const [course] = req.fileUpload.files.course
         importPath = course.filepath
       }
-      const importer = await FrameworkImport.run({
+      const importer = await framework.importCourse({
         importPath,
         userId: req.auth.user._id.toString(),
         isDryRun: AdaptFrameworkUtils.toBoolean(req.body.dryRun),

package/package.json

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