Label resolved state in comment threads
Unresolved state is only shown when the comment actions (reply/Ack/etc)
are shown AND when the thread is unresolved.
Feature: Issue 5442
Change-Id: I7e0859530198fa17172e9f9efa73a20c7aa03975
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread.html b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread.html
index 7a60317..c446cbd 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread.html
@@ -28,8 +28,7 @@
margin-bottom: 1px;
white-space: normal;
}
- .actions {
- border-top: 1px dotted #bbb;
+ #actions {
padding: .5em .7em;
}
#container {
@@ -38,6 +37,16 @@
#container.unresolved {
background-color: #fcfaa6;
}
+ #commentInfoContainer {
+ border-top: 1px dotted #bbb;
+ display: flex;
+ justify-content: space-between;
+ }
+ #unresolvedLabel {
+ font-family: var(--font-family);
+ margin: auto 0 auto auto;
+ padding: .5em .7em;
+ }
</style>
<div id="container" class$="[[_computeHostClass(_unresolved)]]">
<template id="commentList" is="dom-repeat" items="[[_orderedComments]]"
@@ -54,16 +63,19 @@
on-create-fix-comment="_handleCommentFix"
on-comment-discard="_handleCommentDiscard"></gr-diff-comment>
</template>
- <div class="actions"
+ <div id="commentInfoContainer"
hidden$="[[_hideActions(_showActions, _lastComment)]]">
- <gr-button id="replyBtn" class="action reply"
- on-tap="_handleCommentReply">Reply</gr-button>
- <gr-button id="quoteBtn" class="action quote"
- on-tap="_handleCommentQuote">Quote</gr-button>
- <gr-button id="ackBtn" class="action ack" on-tap="_handleCommentAck">
- Ack</gr-button>
- <gr-button id="doneBtn" class="action done" on-tap="_handleCommentDone">
- Done</gr-button>
+ <div id="actions">
+ <gr-button id="replyBtn" class="action reply"
+ on-tap="_handleCommentReply">Reply</gr-button>
+ <gr-button id="quoteBtn" class="action quote"
+ on-tap="_handleCommentQuote">Quote</gr-button>
+ <gr-button id="ackBtn" class="action ack" on-tap="_handleCommentAck">
+ Ack</gr-button>
+ <gr-button id="doneBtn" class="action done" on-tap="_handleCommentDone">
+ Done</gr-button>
+ </div>
+ <span id="unresolvedLabel" hidden$="[[!_unresolved]]">Unresolved</span>
</div>
</div>
<gr-rest-api-interface id="restAPI"></gr-rest-api-interface>
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
index e0ae9ff..efe8843 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment-thread/gr-diff-comment-thread_test.html
@@ -548,5 +548,12 @@
element.addOrEditDraft(1);
assert.equal(element.comments.length, 2);
});
+
+ test('unresolved label', function() {
+ element._unresolved = false;
+ assert.isTrue(element.$.unresolvedLabel.hasAttribute('hidden'));
+ element._unresolved = true;
+ assert.isFalse(element.$.unresolvedLabel.hasAttribute('hidden'));
+ });
});
</script>
