adapt-authoring-content 3.2.1 → 3.2.3

package/lib/ContentModule.js

@@ -2,7 +2,7 @@ import { AbstractApiModule } from 'adapt-authoring-api'
 import { Hook, stringifyValues } from 'adapt-authoring-core'
 import { createObjectId, parseObjectId } from 'adapt-authoring-mongodb'
 import { ObjectId } from 'mongodb'
-import { ContentTree, buildAssetUsagePipeline, computeSortOrderOps, contentTypeToSchemaName, extractAssetIds, formatFriendlyId, parseMaxSeq } from './utils.js'
+import { ContentTree, buildAssetUsagePipeline, computeSortOrderOps, contentTypeToSchemaName, extractAssetIds, fieldsToProjection, formatFriendlyId, parseMaxSeq } from './utils.js'
 /**
  * Module which handles course content
  * @memberof content
@@ -571,6 +571,8 @@ class ContentModule extends AbstractApiModule {
     if (originalDoc._courseId?.toString() !== payloads[0]._courseId?.toString()) {
       await this.updateEnabledPlugins(payloads[0])
     }
+    // place the clone at its requested _sortOrder and renumber siblings (no-op for course/config)
+    await this.updateSortOrder(payloads[0], payloads[0])
 
     return payloads[0]
   }
@@ -683,10 +685,28 @@ class ContentModule extends AbstractApiModule {
       if (ifModifiedSince && lastModified <= ifModifiedSince) {
         return res.status(304).end()
       }
+      const treeFields = [
+        '_id',
+        '_parentId',
+        '_courseId',
+        '_type',
+        '_sortOrder',
+        'title',
+        'displayTitle',
+        '_friendlyId',
+        '_component',
+        '_layout',
+        '_menu',
+        '_theme',
+        '_enabledPlugins',
+        '_colorLabel',
+        'heroImage',
+        'updatedAt'
+      ]
       const items = await this.find(
         { _courseId },
         { validate: false },
-        { projection: { _id: 1, _parentId: 1, _courseId: 1, _type: 1, _sortOrder: 1, title: 1, displayTitle: 1, _friendlyId: 1, _component: 1, _layout: 1, _menu: 1, _theme: 1, _enabledPlugins: 1, _colorLabel: 1, updatedAt: 1 } }
+        { projection: fieldsToProjection(treeFields) }
       )
       const tree = new ContentTree(items)
       res.set('Last-Modified', lastModified.toUTCString())

package/lib/utils/fieldsToProjection.js

@@ -0,0 +1,10 @@
+/**
+ * Builds a MongoDB inclusion projection from a list of field names, mapping
+ * each to `1` (e.g. `['_id', 'title']` -> `{ _id: 1, title: 1 }`). Lets a
+ * handler declare its projected fields as a readable one-per-line array.
+ * @param {Array<string>} fields Field names to include
+ * @return {Object} Inclusion projection
+ */
+export default function fieldsToProjection (fields) {
+  return Object.fromEntries((fields ?? []).map(field => [field, 1]))
+}

package/lib/utils.js

@@ -3,5 +3,6 @@ export { default as buildAssetUsagePipeline } from './utils/buildAssetUsagePipel
 export { default as computeSortOrderOps } from './utils/computeSortOrderOps.js'
 export { extractAssetIds } from './utils/extractAssetIds.js'
 export { default as contentTypeToSchemaName } from './utils/contentTypeToSchemaName.js'
+export { default as fieldsToProjection } from './utils/fieldsToProjection.js'
 export { default as formatFriendlyId } from './utils/formatFriendlyId.js'
 export { default as parseMaxSeq } from './utils/parseMaxSeq.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-content",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "description": "Module for managing Adapt content",
   "homepage": "https://github.com/adapt-security/adapt-authoring-content",
   "license": "GPL-3.0",

package/tests/ContentModule.spec.js

@@ -384,6 +384,7 @@ describe('ContentModule', () => {
         }),
         getSchema: mock.fn(async () => ({})),
         updateEnabledPlugins: mock.fn(async () => {}),
+        updateSortOrder: mock.fn(async () => {}),
         preCloneHook: { invoke: mock.fn(async () => {}) },
         preInsertHook: { invoke: mock.fn(async () => {}) },
         postInsertHook: { invoke: mock.fn(async () => {}) },
@@ -460,6 +461,25 @@ describe('ContentModule', () => {
       assert.equal(result._type, 'course')
     })
 
+    it('should renumber siblings for the cloned root so it lands at its _sortOrder', async () => {
+      const { inst } = createCloneInstance()
+
+      const items = [
+        { _id: COURSE_OID, _type: 'course', _courseId: COURSE_OID },
+        { _id: PAGE_OID, _type: 'page', _parentId: COURSE_OID, _courseId: COURSE_OID }
+      ]
+      const tree = new ContentTree(items)
+      const parent = { _id: COURSE_OID, _type: 'course', _courseId: COURSE_OID }
+      const result = await ContentModule.prototype.clone.call(inst, USER_OID, PAGE_OID, COURSE_OID, { _sortOrder: 1 }, { tree, parent })
+
+      assert.equal(inst.updateSortOrder.mock.callCount(), 1)
+      const [item, updateData] = inst.updateSortOrder.mock.calls[0].arguments
+      // called with the root payload (truthy updateData triggers the splice/renumber path)
+      assert.equal(item, result)
+      assert.ok(updateData)
+      assert.equal(item._sortOrder, 1)
+    })
+
     it('should remap parent IDs correctly', async () => {
       const { inst, mongodb } = createCloneInstance()
 

package/tests/utils-fieldsToProjection.spec.js

@@ -0,0 +1,22 @@
+import { describe, it } from 'node:test'
+import assert from 'node:assert/strict'
+import fieldsToProjection from '../lib/utils/fieldsToProjection.js'
+
+describe('fieldsToProjection', () => {
+  it('maps each field name to 1', () => {
+    assert.deepEqual(fieldsToProjection(['_id', 'title']), { _id: 1, title: 1 })
+  })
+
+  it('returns an empty projection for an empty array', () => {
+    assert.deepEqual(fieldsToProjection([]), {})
+  })
+
+  it('treats a missing argument as empty', () => {
+    assert.deepEqual(fieldsToProjection(), {})
+    assert.deepEqual(fieldsToProjection(undefined), {})
+  })
+
+  it('collapses duplicate field names to a single key', () => {
+    assert.deepEqual(fieldsToProjection(['_id', '_id', 'title']), { _id: 1, title: 1 })
+  })
+})