Merge main

server/commands/documentCreator.js

@@ -60,7 +60,7 @@ export default async function documentCreator({
   });
 
   if (publish) {
-    await document.publish();
+    await document.publish(user.id);
 
     await Event.create({
       name: "documents.publish",

server/commands/documentMover.js

@@ -6,7 +6,7 @@ export default async function documentMover({
   user,
   document,
   collectionId,
-  parentDocumentId,
+  parentDocumentId = null, // convert undefined to null so parentId comparison treats them as equal
   index,
   ip,
 }: {
@@ -42,12 +42,24 @@ export default async function documentMover({
         transaction,
         paranoid: false,
       });
-      const documentJson = await collection.removeDocumentInStructure(
-        document,
-        {
-          save: false,
-        }
-      );
+      const [
+        documentJson,
+        fromIndex,
+      ] = await collection.removeDocumentInStructure(document, {
+        save: false,
+      });
+
+      // if we're reordering from within the same parent
+      // the original and destination collection are the same,
+      // so when the initial item is removed above, the list will reduce by 1.
+      // We need to compensate for this when reordering
+      const toIndex =
+        index !== undefined &&
+        document.parentDocumentId === parentDocumentId &&
+        document.collectionId === collectionId &&
+        fromIndex < index
+          ? index - 1
+          : index;
 
       // if the collection is the same then it will get saved below, this
       // line prevents a pointless intermediate save from occurring.
@@ -62,7 +74,7 @@ export default async function documentMover({
       const newCollection: Collection = collectionChanged
         ? await Collection.findByPk(collectionId, { transaction })
         : collection;
-      await newCollection.addDocumentToStructure(document, index, {
+      await newCollection.addDocumentToStructure(document, toIndex, {
         documentJson,
       });
       result.collections.push(collection);

server/commands/documentMover.test.js

@@ -28,7 +28,7 @@ describe("documentMover", () => {
       parentDocumentId: document.id,
       collectionId: collection.id,
       teamId: collection.teamId,
-      userId: collection.creatorId,
+      userId: collection.createdById,
       title: "Child document",
       text: "content",
     });
@@ -59,7 +59,7 @@ describe("documentMover", () => {
       parentDocumentId: document.id,
       collectionId: collection.id,
       teamId: collection.teamId,
-      userId: collection.creatorId,
+      userId: collection.createdById,
       title: "Child document",
       text: "content",
     });