Merge branch 'main' into avm99963-monorail

Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266

GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/static_src/elements/chdir/mr-comment-table/mr-comment-table.js b/static_src/elements/chdir/mr-comment-table/mr-comment-table.js
index a6d0f19..5fe2e2e 100644
--- a/static_src/elements/chdir/mr-comment-table/mr-comment-table.js
+++ b/static_src/elements/chdir/mr-comment-table/mr-comment-table.js
@@ -1,11 +1,11 @@
-// Copyright 2019 The Chromium Authors. All rights reserved.
+// Copyright 2019 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import {LitElement, html, css} from 'lit-element';
 import 'elements/framework/mr-comment-content/mr-comment-content.js';
 import 'elements/chops/chops-timestamp/chops-timestamp.js';
-
+import {generateProjectIssueURL} from 'shared/helpers.js';
 /**
  * `<mr-comment-table>`
  *
@@ -51,6 +51,7 @@
   /** @override */
   render() {
     const comments = this._displayedComments(this.selectedDate, this.comments);
+    const params = {'id': comments.localId};
     // TODO(zhangtiff): render deltas for comment changes.
     return html`
       <table cellspacing="0" cellpadding="0">
@@ -77,7 +78,7 @@
                 ></mr-comment-content>
               </td>
               <td class="no-wrap">
-                <a href="/p/${comment.projectName}/issues/detail?id=${comment.localId}">
+                <a href="${generateProjectIssueURL(comment.projectName, '/detail', params)}">
                   Issue ${comment.localId}
                 </a>
               </td>