| commit | 89bb56a50a6be73094a1b737cd01ae0f5a1333ed | [log] [tgz] |
|---|---|---|
| author | Ben Rohlfs <brohlfs@google.com> | Tue Feb 16 13:42:52 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 16 13:42:52 2021 +0000 |
| tree | 9fca07c51bb5480499cbd29b2a6c39d99e8056c0 | |
| parent | 2c4983f952d3abf4adf92860d8f119ed243a4508 [diff] | |
| parent | 0673f4484b8616649fd63c5e826b88df54ad2a7b [diff] |
Merge "Add resolved text to comment"
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts index cb64001..6ee82c9 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts +++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread.ts
@@ -326,6 +326,10 @@ return this.restApiService.getLoggedIn(); } + _getUnresolvedLabel(unresolved?: boolean) { + return unresolved ? 'Unresolved' : 'Resolved'; + } + @observe('comments.*') _commentsChanged() { this._orderedComments = sortComments(this.comments);
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts index ba541be..1a89a79 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts +++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_html.ts
@@ -132,7 +132,7 @@ id="commentInfoContainer" hidden$="[[_hideActions(_showActions, _lastComment)]]" > - <span id="unresolvedLabel" hidden$="[[!unresolved]]">Unresolved</span> + <span id="unresolvedLabel">[[_getUnresolvedLabel(unresolved)]]</span> <div id="actions"> <gr-button id="replyBtn"
diff --git a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts index e1c6bff..f2df89d 100644 --- a/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts +++ b/polygerrit-ui/app/elements/shared/gr-comment-thread/gr-comment-thread_test.ts
@@ -836,7 +836,7 @@ element.unresolved = false; const label = element.shadowRoot?.querySelector('#unresolvedLabel'); assert.isOk(label); - assert.isTrue(label!.hasAttribute('hidden')); + assert.isFalse(label!.hasAttribute('hidden')); element.unresolved = true; assert.isFalse(label!.hasAttribute('hidden')); });