From f854770806844fb3b87a507eefeddff193520ac6 Mon Sep 17 00:00:00 2001
From: Calixte Denizet <calixte.denizet@gmail.com>
Date: Fri, 26 Sep 2025 10:10:43 +0200
Subject: [PATCH] [Editor] Show the comments in the sidebar in the
 chronological order, newest to oldest (bug 1990762)

---
 test/integration/comment_spec.mjs | 51 +++++++++++++++++++++++++++++++
 web/comment_manager.js            | 12 ++++++++
 2 files changed, 63 insertions(+)

diff --git a/test/integration/comment_spec.mjs b/test/integration/comment_spec.mjs
index b732b015c..bb4657a12 100644
--- a/test/integration/comment_spec.mjs
+++ b/test/integration/comment_spec.mjs
@@ -33,6 +33,14 @@ const switchToHighlight = switchToEditor.bind(null, "Highlight");
 const switchToStamp = switchToEditor.bind(null, "Stamp");
 const switchToComment = switchToEditor.bind(null, "Comment");
 
+const highlightSpan = async (page, pageIndex, text) => {
+  const rect = await getSpanRectFromText(page, pageIndex, text);
+  const x = rect.x + rect.width / 2;
+  const y = rect.y + rect.height / 2;
+  await page.mouse.click(x, y, { count: 2, delay: 100 });
+  await page.waitForSelector(getEditorSelector(0));
+};
+
 describe("Comment", () => {
   describe("Comment edit dialog must be visible in ltr", () => {
     let pages;
@@ -417,5 +425,48 @@ describe("Comment", () => {
         })
       );
     });
+
+    it("must check that comments are in chronological order", async () => {
+      await Promise.all(
+        pages.map(async ([browserName, page]) => {
+          await switchToComment(page);
+
+          const checkDates = async () => {
+            const dates = await page.evaluate(() =>
+              Array.from(
+                document.querySelectorAll(
+                  `#editorCommentParamsToolbar ul > li > time`
+                )
+              ).map(time => new Date(time.getAttribute("datetime")))
+            );
+            for (let i = 0; i < dates.length - 1; i++) {
+              expect(dates[i])
+                .withContext(`In ${browserName}`)
+                .toBeGreaterThanOrEqual(dates[i + 1]);
+            }
+          };
+          await checkDates();
+
+          // Add an highlight with a comment and check the order again.
+          await switchToHighlight(page);
+          await highlightSpan(page, 1, "Languages");
+          const editorSelector = getEditorSelector(9);
+          await page.waitForSelector(editorSelector);
+          const commentButtonSelector = `${editorSelector} button.comment`;
+          await waitAndClick(page, commentButtonSelector);
+
+          const textInputSelector = "#commentManagerTextInput";
+          await page.waitForSelector(textInputSelector, {
+            visible: true,
+          });
+          await page.type(textInputSelector, "Hello world!");
+          await page.click("#commentManagerSaveButton");
+          await waitForSerialized(page, 1);
+
+          await switchToComment(page);
+          await checkDates();
+        })
+      );
+    });
   });
 });
diff --git a/web/comment_manager.js b/web/comment_manager.js
index 128b57936..991830c6c 100644
--- a/web/comment_manager.js
+++ b/web/comment_manager.js
@@ -612,6 +612,18 @@ class CommentSidebar {
   }
 
   #sortComments(a, b) {
+    const dateA = PDFDateString.toDateObject(
+      a.modificationDate || a.creationDate
+    );
+    const dateB = PDFDateString.toDateObject(
+      b.modificationDate || b.creationDate
+    );
+    if (dateA !== dateB) {
+      if (dateA !== null && dateB !== null) {
+        return dateB - dateA;
+      }
+      return dateA !== null ? -1 : 1;
+    }
     if (a.pageIndex !== b.pageIndex) {
       return a.pageIndex - b.pageIndex;
     }