adapt-authoring-adaptframework 3.1.0 → 3.1.1

package/lib/AdaptFrameworkImport.js

@@ -169,6 +169,11 @@ class AdaptFrameworkImport {
      * @type {Array<String>}
      */
     this.newTagIds = []
+    /**
+     * Array of asset IDs newly created during import for rollback. Excludes assets de-duplicated to existing records.
+     * @type {Array<String>}
+     */
+    this.newAssetIds = []
     /**
      * Contains non-fatal infomation messages regarding import status which can be return as response data. Fatal errors are thrown in the usual way.
      * @type {Object}
@@ -595,7 +600,9 @@ class AdaptFrameworkImport {
         })
         // store the asset _id so we can map it to the old path later
         const resolved = path.relative(`${this.coursePath}/..`, filepath)
-        this.assetMap[resolved] = asset._id.toString()
+        const assetId = asset._id.toString()
+        this.assetMap[resolved] = assetId
+        this.newAssetIds.push(assetId)
       } catch (e) {
         if (e.code === 'DUPLICATE_ASSET') {
           const resolved = path.relative(`${this.coursePath}/..`, filepath)
@@ -902,9 +909,9 @@ class AdaptFrameworkImport {
     if (Object.keys(this.updatedContentPlugins).length) {
       tasks.push(this.restoreUpdatedPlugins())
     }
-    // Delete imported assets
-    if (this.assets) {
-      tasks.push(...Object.values(this.assetMap).map(id =>
+    // Delete newly created assets (skip de-duplicated assets which point to pre-existing records)
+    if (this.assets && this.newAssetIds.length) {
+      tasks.push(...this.newAssetIds.map(id =>
         this.assets.delete({ _id: id })
           .catch(e => log('warn', `failed to delete asset '${id}'`, e))
       ))

package/package.json

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

package/tests/AdaptFrameworkImport.spec.js

@@ -404,6 +404,7 @@ describe('AdaptFrameworkImport', () => {
         newContentPlugins: {},
         updatedContentPlugins: {},
         assetMap: {},
+        newAssetIds: [],
         newTagIds: [],
         contentJson: { course: {} },
         idMap: {},
@@ -438,12 +439,29 @@ describe('AdaptFrameworkImport', () => {
         assetMap: {
           'course/en/assets/logo.png': 'a1',
           'course/en/assets/bg.jpg': 'a2'
-        }
+        },
+        newAssetIds: ['a1', 'a2']
       })
       await rollback.call(ctx)
       assert.deepEqual(deleted.sort(), ['a1', 'a2'])
     })
 
+    it('should not delete de-duplicated assets that point to pre-existing records', async () => {
+      const deleted = []
+      const ctx = makeRollbackCtx({
+        assets: {
+          delete: async ({ _id }) => deleted.push(_id)
+        },
+        assetMap: {
+          'course/en/assets/new.png': 'a1',
+          'course/en/assets/existing.png': 'a2-existing'
+        },
+        newAssetIds: ['a1']
+      })
+      await rollback.call(ctx)
+      assert.deepEqual(deleted, ['a1'])
+    })
+
     it('should delete course content on rollback', async () => {
       const contentDeleted = []
       const ctx = makeRollbackCtx({
@@ -499,7 +517,8 @@ describe('AdaptFrameworkImport', () => {
           'path/a.png': 'a1',
           'path/b.png': 'a2',
           'path/c.png': 'a3'
-        }
+        },
+        newAssetIds: ['a1', 'a2', 'a3']
       })
       await rollback.call(ctx)
       assert.deepEqual(deleted.sort(), ['a2', 'a3'])