adapt-authoring-adaptframework 2.0.2 → 2.0.4

package/lib/AdaptFrameworkBuild.js

@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import { App, Hook, ensureDir, writeJson } from 'adapt-authoring-core'
+import { parse as parseObjectId } from 'adapt-authoring-mongodb'
 import { createWriteStream } from 'fs'
 import AdaptCli from 'adapt-cli'
 import { log, logDir, logMemory, copyFrameworkSource } from './utils.js'
@@ -254,10 +255,10 @@ class AdaptFrameworkBuild {
    * @return {Promise}
    */
   async loadAssetData () {
-    const [assets, courseassets, mongodb, tags] = await App.instance.waitForModule('assets', 'courseassets', 'mongodb', 'tags')
+    const [assets, courseassets, tags] = await App.instance.waitForModule('assets', 'courseassets', 'tags')
 
     const caRecs = await courseassets.find({ courseId: this.courseId })
-    const uniqueAssetIds = new Set(caRecs.map(c => mongodb.ObjectId.parse(c.assetId)))
+    const uniqueAssetIds = new Set(caRecs.map(c => parseObjectId(c.assetId)))
     const usedAssets = await assets.find({ _id: { $in: [...uniqueAssetIds] } })
 
     const usedTagIds = new Set(usedAssets.reduce((m, a) => [...m, ...(a.tags ?? [])], []))

package/lib/AdaptFrameworkImport.js

@@ -1,4 +1,5 @@
 import { App, Hook, spawn, readJson, writeJson } from 'adapt-authoring-core'
+import { parse as parseObjectId } from 'adapt-authoring-mongodb'
 import fs from 'fs/promises'
 import { glob } from 'glob'
 import octopus from 'adapt-octopus'
@@ -660,40 +661,41 @@ class AdaptFrameworkImport {
         throw App.instance.errors.FW_IMPORT_MISSING_PLUGINS
           .setData({ plugins: pluginsToInstall.join(', ') })
       }
-      const errors = []
-      await Promise.all([...pluginsToInstall, ...pluginsToUpdate].map(async p => {
+      const allPlugins = [...pluginsToInstall, ...pluginsToUpdate]
+      // pre-process: store update metadata and fix missing targetAttributes
+      for (const p of allPlugins) {
+        const isUpdate = pluginsToUpdate.includes(p)
+        if (isUpdate && this.installedPlugins[p]) {
+          this.updatedContentPlugins[p] = this.installedPlugins[p]
+        }
+        const pluginBowerPath = path.join(this.usedContentPlugins[p].path, 'bower.json')
+        const bowerJson = await readJson(pluginBowerPath)
+        if (!bowerJson.targetAttribute) {
+          bowerJson.targetAttribute = `_${bowerJson.component || bowerJson.extension || bowerJson.menu || bowerJson.theme}`
+          await writeJson(pluginBowerPath, bowerJson)
+        }
+        this.statusReport.info.push({ code: 'INSTALL_PLUGIN', data: { name: p, version: bowerJson.version } })
+      }
+      if (!this.settings.isDryRun) {
         try {
-          // Store original plugin metadata for updates before overwriting
-          const isUpdate = pluginsToUpdate.includes(p)
-          if (isUpdate && this.installedPlugins[p]) {
-            this.updatedContentPlugins[p] = this.installedPlugins[p]
-          }
-          // try and infer a targetAttribute if there isn't one
-          const pluginBowerPath = path.join(this.usedContentPlugins[p].path, 'bower.json')
-          const bowerJson = await readJson(pluginBowerPath)
-          if (!bowerJson.targetAttribute) {
-            bowerJson.targetAttribute = `_${bowerJson.component || bowerJson.extension || bowerJson.menu || bowerJson.theme}`
-            await writeJson(pluginBowerPath, bowerJson)
-          }
-          if (!this.settings.isDryRun) {
-            const [pluginData] = await this.contentplugin.installPlugins([[p, this.usedContentPlugins[p].path]], { strict: true })
-            if (!isUpdate) {
-              this.newContentPlugins[p] = pluginData
+          const installed = await this.contentplugin.installPlugins(
+            allPlugins.map(p => [p, this.usedContentPlugins[p].path]),
+            { strict: true }
+          )
+          installed.forEach(pluginData => {
+            if (!pluginsToUpdate.includes(pluginData.name)) {
+              this.newContentPlugins[pluginData.name] = pluginData
             }
-          }
-          this.statusReport.info.push({ code: 'INSTALL_PLUGIN', data: { name: p, version: bowerJson.version } })
+          })
         } catch (e) {
-          if (e.code === 'EEXIST') {
-            log('warn', 'PLUGIN_ALREADY_EXISTS', p)
-          } else {
-            log('error', 'PLUGIN_IMPORT_FAILED', p, e)
-            errors.push({ plugin: p, error: e.data?.errors?.[0] ?? e })
-          }
+          const errors = e.data?.errors?.map(err => ({
+            plugin: err.data?.name ?? 'unknown',
+            error: err.data?.errors?.[0] ?? err
+          })) ?? [{ plugin: 'unknown', error: e }]
+          errors.forEach(err => log('error', 'PLUGIN_IMPORT_FAILED', err.plugin, err.error))
+          throw App.instance.errors.FW_IMPORT_PLUGINS_FAILED
+            .setData({ errors: errors.map(e => App.instance.lang.translate(undefined, e)).join(', ') })
         }
-      }))
-      if (errors.length) {
-        throw App.instance.errors.FW_IMPORT_PLUGINS_FAILED
-          .setData({ errors: errors.map(e => App.instance.lang.translate(undefined, e)).join(', ') })
       }
     }
     this.componentNameMap = Object.values({ ...this.installedPlugins, ...this.newContentPlugins }).reduce((m, v) => {
@@ -877,8 +879,7 @@ class AdaptFrameworkImport {
         }
         let _courseId
         try {
-          const { ObjectId } = await App.instance.waitForModule('mongodb')
-          _courseId = ObjectId.parse(this.idMap[this.contentJson.course._id])
+          _courseId = parseObjectId(this.idMap[this.contentJson.course._id])
         } catch (e) {}
         if (_courseId) {
           tasks.push(

package/package.json

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