ep_comments_page 11.0.28 → 11.0.29

package/locales/en.json

@@ -14,6 +14,8 @@
   "ep_comments_page.comments_template.suggested_change_from" : "Suggested change from \"{{changeFrom}}\" to \"{{changeTo}}\"",
   "ep_comments_page.comments_template.suggested_change_from_label" : "Suggested change from",
   "ep_comments_page.comments_template.suggest_change_from" : "Suggest change from \"{{changeFrom}}\" to",
+  "ep_comments_page.comments_template.suggest_change_from_label" : "Suggest change from",
+  "ep_comments_page.comments_template.suggest_change_to_label" : "to",
   "ep_comments_page.comments_template.to" : "To",
   "ep_comments_page.comments_template.include_suggestion" : "Include suggested change",
   "ep_comments_page.comments_template.comment.value" : "Comment",

package/locales/ko.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"Dr1t jg",
+			"Tensama0415",
 			"Ykhwong",
 			"그냥기여자",
 			"아라"
@@ -20,6 +21,7 @@
 	"ep_comments_page.comments_template.accept_change.value": "변경 수락",
 	"ep_comments_page.comments_template.revert_change.value": "변경사항 되돌리기",
 	"ep_comments_page.comments_template.suggested_change_from": "\"{{changeFrom}}\"에서 \"{{changeTo}}\"(으)로 변경 제안됨",
+	"ep_comments_page.comments_template.suggested_change_from_label": "다음으로부터 변경 제안됨:",
 	"ep_comments_page.comments_template.suggest_change_from": "\"{{changeFrom}}\"에서 다음으로 변경할 것으로 제안:",
 	"ep_comments_page.comments_template.to": "도착지",
 	"ep_comments_page.comments_template.include_suggestion": "제안된 변경사항 포함",

package/package.json

@@ -1,7 +1,7 @@
 {
   "description": "Adds comments on sidebar and link it to the text.  For no-skin use ep_page_view.",
   "name": "ep_comments_page",
-  "version": "11.0.28",
+  "version": "11.0.29",
   "author": {
     "name": "Nicolas Lescop",
     "email": "limplementeur@gmail.com"

package/static/css/comment.css

@@ -56,6 +56,10 @@ input.error, textarea.error {
 .comment-actions-wrapper {
   float: right;
 }
+.comment-actions-wrapper .comment-edit,
+.comment-actions-wrapper .comment-delete {
+  display: inline;
+}
 
 /* COMMENT COMPACTED (Visible on right side) */
 .sidebar-comment:not(.full-display) .full-display-content {
@@ -127,6 +131,16 @@ input.error, textarea.error {
   font-weight: bold;
   margin: 5px 0;
 }
+.suggestion-create .from-value {
+  display: block;
+  opacity: .8;
+  font-style: italic;
+  margin: 5px 0;
+}
+.suggestion-create .from-value:before,
+.suggestion-create .from-value:after {
+  content: '"';
+}
 .approve-suggestion-btn, .revert-suggestion-btn {
   display: block;
   margin-bottom: 10px;

package/static/js/index.js

@@ -12,6 +12,11 @@ const commentIcons = require('ep_comments_page/static/js/commentIcons');
 const commentL10n = require('ep_comments_page/static/js/commentL10n');
 const events = require('ep_comments_page/static/js/copyPasteEvents');
 const moment = require('ep_comments_page/static/js/moment-with-locales.min');
+// Expose the moment instance on the chrome window so frontend tests (which
+// no longer have `window.require` available in the Playwright bundle) can
+// share locale state with the plugin. Harmless in production — a single
+// read-only reference to the already-loaded module.
+if (typeof window !== 'undefined') window.__epcpMoment = moment;
 const newComment = require('ep_comments_page/static/js/newComment');
 const padcookie = require('ep_etherpad-lite/static/js/pad_cookie').padcookie;
 const preCommentMark = require('ep_comments_page/static/js/preCommentMark');

package/static/tests/backend/specs/l10n.js

@@ -56,5 +56,43 @@ describe(__filename, function () {
         // The template references the new label key.
         assert(template.includes(`data-l10n-id="${labelKey}"`),
             `comments.html should reference ${labelKey} for the suggestion display label`);
+
+        // The display-suggestion block must surface the actual changeFrom /
+        // changeTo values to the user. Hiding both spans (as the original
+        // #273 fix accidentally left them) leaves "Suggested change from"
+        // followed by nothing — the user can no longer see what the
+        // suggestion is.
+        const display = template.match(/<script id="display-suggestion"[\s\S]*?<\/script>/);
+        assert(display, 'display-suggestion template must exist');
+        assert(!/class="hidden from-value"/.test(display[0]),
+            '.from-value in display-suggestion must be visible');
+        assert(!/class="hidden to-value"/.test(display[0]),
+            '.to-value in display-suggestion must be visible');
+      });
+
+  it('new-comment form label does not use a key with unresolved placeholders',
+      function () {
+        // The new-comment template previously used `suggest_change_from`
+        // whose English value contains "{{changeFrom}}". The data-l10n-args
+        // attribute relied on jquery.tmpl substituting the selected text into
+        // valid JSON, which broke whenever the selection contained quotes or
+        // backslashes. The replacement label key must not require args.
+        const fromLabel = 'ep_comments_page.comments_template.suggest_change_from_label';
+        const toLabel = 'ep_comments_page.comments_template.suggest_change_to_label';
+        for (const key of [fromLabel, toLabel]) {
+          assert(Object.prototype.hasOwnProperty.call(en, key),
+              `expected ${key} in en.json`);
+          assert(!/\{\{/.test(en[key]),
+              `${key} must not contain {{placeholders}}; got: ${en[key]}`);
+        }
+        assert(template.includes(`data-l10n-id="${fromLabel}"`),
+            `comments.html should reference ${fromLabel} for the new-comment label`);
+        assert(template.includes(`data-l10n-id="${toLabel}"`),
+            `comments.html should reference ${toLabel} for the new-comment label`);
+
+        // The placeholder-laden key must not be referenced from the template.
+        const placeholderKey = 'ep_comments_page.comments_template.suggest_change_from';
+        assert(!template.includes(`data-l10n-id="${placeholderKey}"`),
+            'comments.html must not reference the placeholder-laden suggest_change_from key');
       });
 });

package/static/tests/frontend-new/helper/comments.ts

@@ -16,6 +16,23 @@ export const reopenCommentsPad = async (page: Page, padId: string): Promise<void
   await waitForCommentsInit(page);
 };
 
+// Reopen the same pad as a fresh user so a new authorId is allocated. Used
+// by the delete/edit "other user" specs which assert that one user cannot
+// modify another user's comment. Plain reopenCommentsPad reuses the same
+// session cookies (token / express_sid), so Etherpad keeps the original
+// authorId and the auth-check on delete/edit short-circuits to success.
+export const reopenCommentsPadAsFreshUser = async (
+  page: Page, padId: string,
+): Promise<void> => {
+  await page.context().clearCookies();
+  await page.evaluate(() => {
+    try { window.localStorage.clear(); } catch {}
+    try { window.sessionStorage.clear(); } catch {}
+  }).catch(() => {});
+  await goToPad(page, padId);
+  await waitForCommentsInit(page);
+};
+
 export const waitForCommentsInit = async (page: Page): Promise<void> => {
   await expect.poll(async () => page.evaluate(async () => {
     const w = window as any;
@@ -86,7 +103,10 @@ export const fillCommentForm = async (
   const field = page.locator('textarea.comment-content');
   await field.fill(commentText);
   if (suggestion !== undefined) {
-    await page.locator('#newComment .suggestion-checkbox').first().click();
+    // Click the label (not the input): the adjacent <label> intercepts pointer
+    // events on the small native checkbox in some browsers, so click the label
+    // — which is also how a user toggles the checkbox in the UI.
+    await page.locator('#newComment .label-suggestion-checkbox').first().click();
     await page.locator('textarea.to-value').fill(suggestion);
   }
 };
@@ -153,20 +173,46 @@ export const addReplyToLine = async (
 
   if (await commentIconsEnabled(page)) {
     await o.locator(`#commentIcons #icon-${commentId}`).first().click();
+  } else {
+    // Reply form is inside .full-display-content which is display:none on
+    // the sidebar comment until it gets the .full-display class. Hover the
+    // sidebar comment to trigger commentBoxes.highlightComment, which sets
+    // it; otherwise locator.fill() times out on a hidden input.
+    await o.locator(`#${commentId}`).first().hover();
+    await expect.poll(async () =>
+      o.locator(`#${commentId}.full-display`).count()).toBeGreaterThan(0);
   }
 
-  await o.locator('.comment-content').first().fill(replyText);
+  // Scope to the reply form's input — the new-comment popup may also
+  // have a `.comment-content` element open at this point.
+  const replyForm = o.locator(`#${commentId} form.new-comment`).first();
+  await replyForm.locator('.comment-content').fill(replyText);
   if (withSuggestion) {
-    await o.locator('.suggestion-checkbox').first().click();
+    await replyForm.locator('.label-suggestion-checkbox').first().click();
     if (suggestionText !== undefined) {
-      await o.locator('textarea.to-value').first().fill(suggestionText);
+      await replyForm.locator('textarea.to-value').first().fill(suggestionText);
     }
   }
-  await o.locator("form.new-comment input[type='submit']").first().click();
+  await replyForm.locator("input[type='submit']").first().click();
   await expect.poll(async () => o.locator('.sidebar-comment-reply').count())
       .toBe(existing + 1);
 };
 
+// Expand a sidebar comment so its .full-display-content (containing
+// .comment-edit / .comment-delete / reply form) is visible. The plugin
+// only adds .full-display on mouseover, so any test that touches those
+// children after a fresh page load needs to call this first.
+export const expandSidebarComment = async (
+  page: Page,
+  commentId: string,
+): Promise<void> => {
+  const o = await getPadOuter(page);
+  await expect.poll(async () => o.locator(`#${commentId}`).count()).toBeGreaterThan(0);
+  await o.locator(`#${commentId}`).first().hover();
+  await expect.poll(async () =>
+    o.locator(`#${commentId}.full-display`).count()).toBeGreaterThan(0);
+};
+
 // Open Etherpad settings, toggle Show Comments to desired state, close settings.
 export const chooseToShowComments = async (
   page: Page, shouldShow: boolean,

package/static/tests/frontend-new/specs/commentDelete.spec.ts

@@ -0,0 +1,71 @@
+import {expect, test} from '@playwright/test';
+import {getPadBody, getPadOuter}
+    from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
+import {
+  addCommentToLine,
+  addReplyToLine,
+  aNewCommentsPad,
+  enlargeScreen,
+  expandSidebarComment,
+  reopenCommentsPadAsFreshUser,
+  setPadLines,
+  waitForCommentOnLine,
+} from '../helper/comments';
+
+const textOfComment = 'original comment';
+const textOfReply = 'original reply';
+const FIRST_LINE = 0;
+
+test.describe('ep_comments_page - Comment Delete', () => {
+  let padId: string;
+
+  test.beforeEach(async ({page}) => {
+    test.setTimeout(60_000);
+    padId = await aNewCommentsPad(page);
+    await enlargeScreen(page);
+    await setPadLines(page, ['something', ' anything']);
+    await addCommentToLine(page, FIRST_LINE, textOfComment);
+    await addReplyToLine(page, FIRST_LINE, textOfReply);
+  });
+
+  test.describe('when user presses the delete button on a comment', () => {
+    test('should delete comment', async ({page}) => {
+      const outer = await getPadOuter(page);
+      const inner = await getPadBody(page);
+      await outer.locator('.comment-delete').first().click();
+      await expect.poll(async () => inner.locator('.comment').count()).toBe(0);
+    });
+  });
+
+  test.describe('when viewing another user\'s comment', () => {
+    test('the delete action is hidden so the comment cannot be removed',
+        async ({page}) => {
+          // The plugin enforces "only the author can delete" at the UI
+          // layer: insertComment() in static/js/index.js adds a `hidden`
+          // class to .comment-actions-wrapper whenever
+          // comment.author !== clientVars.userId. Re-open with cleared
+          // cookies / storage so Etherpad allocates a new authorId, then
+          // assert the delete button is unreachable.
+          await page.waitForTimeout(500);
+          await reopenCommentsPadAsFreshUser(page, padId);
+          await enlargeScreen(page);
+
+          const outer = await getPadOuter(page);
+          const inner = await getPadBody(page);
+          const commentId = await waitForCommentOnLine(page, FIRST_LINE);
+          await expandSidebarComment(page, commentId);
+
+          // The actions wrapper for this comment carries the `hidden`
+          // class, so its child .comment-delete is not visible.
+          const wrapper = outer.locator(
+              `#${commentId} .comment-actions-wrapper`).first();
+          await expect.poll(async () => wrapper.evaluate(
+              (el) => el.classList.contains('hidden'))).toBe(true);
+          expect(await outer.locator(`#${commentId} .comment-delete`).first()
+              .isVisible()).toBe(false);
+
+          // Comment is still intact in the editor.
+          expect(await inner.locator('.comment').count()).toBeGreaterThan(0);
+        });
+  });
+});

package/static/tests/frontend-new/{parked → specs}/commentEdit.spec.ts

@@ -6,8 +6,11 @@ import {
   addReplyToLine,
   aNewCommentsPad,
   enlargeScreen,
+  expandSidebarComment,
   reopenCommentsPad,
+  reopenCommentsPadAsFreshUser,
   setPadLines,
+  waitForCommentOnLine,
 } from '../helper/comments';
 
 const textOfComment = 'original comment';
@@ -88,26 +91,32 @@ test.describe('ep_comments_page - Comment Edit', () => {
       {timeout: 20_000}).toBe(updatedText);
     });
 
-    test('new user tries editing should not update the comment text', async ({page}) => {
-      const updatedText2 = 'this comment was edited again';
-      await page.waitForTimeout(500);
-      // Reopen as a "new" user (fresh page load).
-      await reopenCommentsPad(page, padId);
-      const outer = await getPadOuter(page);
-      await expect.poll(async () =>
-        outer.locator('#comments .comment-edit').count()).toBeGreaterThan(0);
+    test('a new user cannot reach the edit action for another user\'s comment',
+        async ({page}) => {
+          await page.waitForTimeout(500);
+          // Reopen with cleared cookies / storage so Etherpad allocates a
+          // new authorId.
+          await reopenCommentsPadAsFreshUser(page, padId);
+          await enlargeScreen(page);
+          const outer = await getPadOuter(page);
+          const inner = await getPadBody(page);
+          const commentId = await waitForCommentOnLine(page, FIRST_LINE);
+          await expandSidebarComment(page, commentId);
 
-      await outer.locator('.comment-edit').first().click();
-      await outer.locator('.comment-edit-form .comment-edit-text').first()
-          .evaluate((el, t) => { (el as HTMLElement).innerText = t; }, updatedText2);
-      await outer.locator('.comment-edit-form .comment-edit-submit').first().click();
+          // The plugin hides the entire .comment-actions-wrapper for
+          // non-authors at insertComment() time (see static/js/index.js),
+          // so the edit button is unreachable from the UI. Assert the
+          // wrapper carries `hidden` and the edit glyph is invisible.
+          const wrapper = outer.locator(
+              `#${commentId} .comment-actions-wrapper`).first();
+          await expect.poll(async () => wrapper.evaluate(
+              (el) => el.classList.contains('hidden'))).toBe(true);
+          expect(await outer.locator(`#${commentId} .comment-edit`).first()
+              .isVisible()).toBe(false);
 
-      // Error gritter is shown.
-      await expect.poll(async () =>
-        page.locator('#gritter-container .error').count()).toBeGreaterThan(0);
-      // Comment text is not the new text.
-      const got = (await outer.locator('.comment-text').first().textContent())?.trim();
-      expect(got).not.toBe(updatedText2);
-    });
+          // Comment text in the inner pad is still the original.
+          expect((await inner.locator('.comment').first().textContent())?.trim())
+              .not.toBe('');
+        });
   });
 });

package/static/tests/frontend-new/{parked → specs}/commentReply.spec.ts

@@ -20,7 +20,7 @@ const createReply = async (page: import('@playwright/test').Page, withSuggestion
   }
   await outer.locator('.comment-content').first().fill('My reply');
   if (withSuggestion) {
-    await outer.locator('.suggestion-checkbox').first().click();
+    await outer.locator('.label-suggestion-checkbox').first().click();
     await outer.locator('textarea.to-value').first().fill('My suggestion');
   }
   await outer.locator("form.new-comment input[type='submit']").first().click();
@@ -40,7 +40,7 @@ test.describe('ep_comments_page - Comment Reply', () => {
     await page.locator('.addComment').first().click();
     await page.locator('textarea.comment-content').fill('My comment');
     const outer = await getPadOuter(page);
-    await outer.locator('.suggestion-checkbox').first().click();
+    await outer.locator('.label-suggestion-checkbox').first().click();
     await outer.locator('textarea.to-value').first().fill('Change to this suggestion');
     await page.locator('.comment-buttons input[type=submit]').first().click();
     await waitForCommentOnLine(page, 0);

package/static/tests/frontend-new/{parked → specs}/commentSuggestion.spec.ts

@@ -29,7 +29,7 @@ const openCommentFormWithSuggestion = async (
   await page.locator('.addComment').first().click();
   await expect.poll(async () =>
     page.locator('#newComment.popup-show .suggestion-checkbox').count()).toBeGreaterThan(0);
-  await page.locator('#newComment.popup-show .suggestion-checkbox').first().click();
+  await page.locator('#newComment.popup-show .label-suggestion-checkbox').first().click();
 };
 
 test.describe('ep_comments_page - Comment Suggestion', () => {
@@ -83,11 +83,15 @@ test.describe('ep_comments_page - Comment Suggestion', () => {
     await expect.poll(async () =>
       outer.locator('.comment-container .full-display-content:visible').count())
         .toBeGreaterThan(0);
+    // The suggested ("to") text now lives in its own .to-value span, not
+    // inside the localized label — the placeholder-laden key was retired
+    // (see #379). Assert the value round-trips into that span (special
+    // chars and all) instead of substring-matching the label.
     await expect.poll(async () => {
-      const t = await outer.locator('.comment-container .comment-title-wrapper .from-label')
+      const t = await outer.locator('.comment-container .comment-title-wrapper .to-value')
           .first().textContent();
-      return t && t.includes(suggestedText);
-    }).toBe(true);
+      return (t || '').trim();
+    }).toBe(suggestedText);
 
     await outer.locator('.approve-suggestion-btn:visible').first().click();
     await expect.poll(async () =>

package/static/tests/frontend-new/{parked → specs}/comment_l10n.spec.ts

@@ -21,7 +21,7 @@ test.describe('ep_comments_page - l10n', () => {
     await inner.locator('div').first().click({clickCount: 3});
     await page.locator('.addComment').first().click();
     await page.locator('textarea.comment-content').fill('My comment');
-    await page.locator('#newComment .suggestion-checkbox').first().click();
+    await page.locator('#newComment .label-suggestion-checkbox').first().click();
     await page.locator('textarea.to-value').fill(suggestedText);
     await page.locator('.comment-buttons input[type=submit]').first().click();
     await waitForCommentOnLine(page, 0);
@@ -45,8 +45,23 @@ test.describe('ep_comments_page - l10n', () => {
     await changeLanguageTo(page, 'pt-br');
     const outer = await getPadOuter(page);
     const commentId = await getCommentIdOfLine(page, 0);
-    const text = await outer.locator(`#${commentId} .from-label`).first().textContent();
-    expect(text).toBe(`Alteração sugerida de "${commentedText}" para "${suggestedText}"`);
+    // The display-suggestion block now renders four sibling spans
+    // (from-label / from-value / to-label / to-value) instead of a single
+    // string with {{changeFrom}} / {{changeTo}} placeholders, so the
+    // assertion covers the assembled text rather than a single key.
+    //
+    // Until translatewiki syncs `suggested_change_from_label` and
+    // `suggest_change_to_label` for non-English locales, those labels fall
+    // back to English even when the page locale is pt-br (tracked in
+    // ether/ep_comments_page#379). The values themselves do not depend on
+    // locale, so we still assert they round-trip into the rendered DOM.
+    const block = outer.locator(`#${commentId} .suggestion-display`).first();
+    expect((await block.locator('.from-label').first().textContent() || '').trim())
+        .not.toBe('');
+    expect((await block.locator('.from-value').first().textContent() || '').trim())
+        .toBe(commentedText);
+    expect((await block.locator('.to-value').first().textContent() || '').trim())
+        .toBe(suggestedText);
   });
 
   test("localizes 'new comment' form when Etherpad language is changed", async ({page}) => {

package/static/tests/frontend-new/{parked → specs}/comment_settings.spec.ts

@@ -35,7 +35,7 @@ test.describe('ep_comments_page - Comment settings', () => {
           await inner.locator('div').first().click({clickCount: 3});
           await page.locator('.addComment').first().click();
           await page.locator('textarea.comment-content').fill('My comment');
-          await outer.locator('.suggestion-checkbox').first().click();
+          await outer.locator('.label-suggestion-checkbox').first().click();
           await outer.locator('textarea.to-value').first().fill('Change to this suggestion');
           await page.locator('.comment-buttons input[type=submit]').first().click();
           // After creating the comment, click Add Comment again — sidebar must remain hidden.

package/static/tests/frontend-new/{parked → specs}/preCommentMark.spec.ts

@@ -101,7 +101,7 @@ test.describe('ep_comments_page - Pre-comment text mark', () => {
       if (!(await highlightSelectedTextEnabled(page))) return;
       const outer = await getPadOuter(page);
       await page.locator('textarea.comment-content').fill('My comment');
-      await outer.locator('.suggestion-checkbox').first().click();
+      await outer.locator('.label-suggestion-checkbox').first().click();
       await outer.locator('textarea.to-value').first().fill('Change to this suggestion');
       await page.locator('.comment-buttons input[type=submit]').first().click();
       await waitForCommentOnLine(page, 0);

package/static/tests/frontend-new/{parked → specs}/timeFormat.spec.ts

@@ -10,15 +10,21 @@ const months = (n: number) => 4 * weeks(n);
 const years = (n: number) => 12 * months(n);
 
 // Evaluate `moment(<offsetMs from now>).fromNow()` inside the chrome window.
-// We initialise moment lazily on first call and set its 'ss' threshold to 0 to
-// match the legacy spec's `moment.relativeTimeThreshold('ss', 0)`.
+// We initialise moment lazily on first call and set its 'ss' threshold to 0
+// to match the legacy spec's `moment.relativeTimeThreshold('ss', 0)`.
+//
+// The plugin attaches its CommonJS-required moment instance to
+// window.__epcpMoment for tests (see static/js/index.js). The legacy spec
+// called `window.require(...)` directly, but the Playwright bundle no
+// longer exposes `require` on the chrome window, so we read the
+// plugin-published handle instead — sharing one instance keeps locale
+// changes from changeLanguageTo() observable in the tests.
 const initMoment = async (page: import('@playwright/test').Page) => {
+  await expect.poll(async () =>
+    page.evaluate(() => Boolean((window as any).__epcpMoment)),
+  {timeout: 10_000}).toBe(true);
   await page.evaluate(() => {
-    const w = window as any;
-    if (w.__epcpMoment) return;
-    w.__epcpMoment = w.require(
-        'ep_comments_page/static/js/moment-with-locales.min');
-    w.__epcpMoment.relativeTimeThreshold('ss', 0);
+    (window as any).__epcpMoment.relativeTimeThreshold('ss', 0);
   });
 };
 

package/templates/comments.html

@@ -27,8 +27,9 @@
                 <label for="suggestion-checkbox-${commentId}" class="label-suggestion-checkbox" data-l10n-id="ep_comments_page.comments_template.include_suggestion">Include suggested change</label>
             </p>
             <div class="suggestion suggestion-create">
-                <span class="from-label" data-l10n-id="ep_comments_page.comments_template.suggest_change_from"  data-l10n-args='{"changeFrom": "${changeFrom}"}'>Suggest Change From</span>
-                <span class="hidden from-value">${changeFrom}</span>
+                <span class="from-label" data-l10n-id="ep_comments_page.comments_template.suggest_change_from_label">Suggest change from</span>
+                <span class="from-value">${changeFrom}</span>
+                <span class="to-label" data-l10n-id="ep_comments_page.comments_template.suggest_change_to_label">to</span>
                 <textarea class="to-value"></textarea>
             </div>
 
@@ -98,8 +99,9 @@
     <form class="comment-changeTo-form suggestion-display">
         <div>
             <span class="from-label" data-l10n-id="ep_comments_page.comments_template.suggested_change_from_label">Suggested change from</span>
-            <span class="hidden from-value">${changeFrom}</span>
-            <span class="hidden to-value">${changeTo}</span>
+            <span class="from-value">${changeFrom}</span>
+            <span class="to-label" data-l10n-id="ep_comments_page.comments_template.suggest_change_to_label">to</span>
+            <span class="to-value">${changeTo}</span>
         </div>
         <!-- Approve/revert button -->
         <input type="Submit" class="btn btn-primary approve-suggestion-btn acl-write" value="Accept Change" data-l10n-id="ep_comments_page.comments_template.accept_change.value">

package/static/tests/frontend-new/parked/commentDelete.spec.ts

@@ -1,57 +0,0 @@
-import {expect, test} from '@playwright/test';
-import {getPadBody, getPadOuter}
-    from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
-import {
-  addCommentToLine,
-  addReplyToLine,
-  aNewCommentsPad,
-  enlargeScreen,
-  reopenCommentsPad,
-  setPadLines,
-} from '../helper/comments';
-
-const textOfComment = 'original comment';
-const textOfReply = 'original reply';
-const FIRST_LINE = 0;
-
-test.describe('ep_comments_page - Comment Delete', () => {
-  let padId: string;
-
-  test.beforeEach(async ({page}) => {
-    test.setTimeout(60_000);
-    padId = await aNewCommentsPad(page);
-    await enlargeScreen(page);
-    await setPadLines(page, ['something', ' anything']);
-    await addCommentToLine(page, FIRST_LINE, textOfComment);
-    await addReplyToLine(page, FIRST_LINE, textOfReply);
-  });
-
-  test.describe('when user presses the delete button on a comment', () => {
-    test('should delete comment', async ({page}) => {
-      const outer = await getPadOuter(page);
-      const inner = await getPadBody(page);
-      await outer.locator('.comment-delete').first().click();
-      await expect.poll(async () => inner.locator('.comment').count()).toBe(0);
-    });
-  });
-
-  test.describe('when user presses the delete button on other users comment', () => {
-    test('should not delete comment', async ({page}) => {
-      // Reload as a fresh user — re-opens the same pad and waits for plugin init.
-      await page.waitForTimeout(500);
-      await reopenCommentsPad(page, padId);
-
-      const outer = await getPadOuter(page);
-      const inner = await getPadBody(page);
-      await expect.poll(async () => outer.locator('.comment-delete').count())
-          .toBeGreaterThan(0);
-      await outer.locator('.comment-delete').first().click();
-
-      // Error gritter shown.
-      await expect.poll(async () =>
-        page.locator('#gritter-container .error').count()).toBeGreaterThan(0);
-      // Comment was not deleted.
-      expect(await inner.locator('.comment').count()).toBeGreaterThan(0);
-    });
-  });
-});

package/static/tests/frontend-new/specs/smoke.spec.ts

@@ -1,32 +0,0 @@
-import {expect, test} from '@playwright/test';
-import {getPadBody, goToNewPad} from 'ep_etherpad-lite/tests/frontend-new/helper/padHelper';
-
-// The faithful 1:1 port of the legacy mocha specs (11 spec files /
-// ~100 test() blocks) lives in ../parked/, outside the playwright
-// glob. The most recent reliable run had 150 passing / 93 failing /
-// 27 skipped — most failures are real per-test bugs that need
-// individual investigation, and several lean on legacy patterns
-// (chrome$/window globals) that don't carry over cleanly. Keep the
-// port for modernization but don't block the release pipeline on it.
-
-test.beforeEach(async ({page}) => {
-  await goToNewPad(page);
-});
-
-test.describe('ep_comments_page', () => {
-  test('pad loads with plugin installed', async ({page}) => {
-    const padBody = await getPadBody(page);
-    await expect(padBody).toBeVisible();
-  });
-
-  test('plugin singleton is exposed on pad.plugins after init', async ({page}) => {
-    // Plugin's postAceInit assigns pad.plugins.ep_comments_page once
-    // its init() promise resolves. Confirms the load path doesn't
-    // throw and the singleton API the rest of the plugin (and its
-    // sister ep_comments_page_admin etc.) relies on is reachable.
-    await expect.poll(async () => page.evaluate(() => {
-      const w = window as any;
-      return !!(w.pad && w.pad.plugins && w.pad.plugins.ep_comments_page);
-    }), {timeout: 15_000}).toBe(true);
-  });
-});