opendev/gerrit
Code Issues Proposed changes
c0bb61320c
gerrit/polygerrit-ui/app/elements/diff/gr-diff-comment-thread-group/gr-diff-comment-thread-group_test.html

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

261 lines
7.4 KiB
HTML
Raw Normal View History

Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
<!DOCTYPE html>
<!--
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>gr-diff-comment-thread-group</title>
<script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script>
<script src="../../../bower_components/web-component-tester/browser.js"></script>
Add polygerrit-ui/app/test/common-test-setup.html This is a partial roll-forward of c/106190 This replaces all loads of iron-test-helpers with a load of a file that wraps it, and adds that file to test files that do not currently load iron-test-helpers. A future CL will also install polymer-resin via common-test-helpers.html. I tested by running $ WCT_ARGS="-l chrome" ./polygerrit-ui/app/run_test.sh Change-Id: Ifb3cd2c8db13d724f57e56e7e78045470d103a43
2017-06-02 13:08:19 -04:00
<link rel="import" href="../../../test/common-test-setup.html"/>
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
<script src="../../../scripts/util.js"></script>
<link rel="import" href="gr-diff-comment-thread-group.html">
Collection of prospective test flake fixes Potentially related: https://github.com/Polymer/web-component-tester/issues/505 Bug: Issue 5792 Change-Id: I9ab6e8e40d9811dd52906335426764c052907609
2017-03-28 17:02:44 -07:00
<script>void(0);</script>
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
<test-fixture id="basic">
<template>
<gr-diff-comment-thread-group></gr-diff-comment-thread-group>
</template>
</test-fixture>
<script>
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
suite('gr-diff-comment-thread-group tests', () => {
let element;
let sandbox;
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
setup(() => {
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
sandbox = sinon.sandbox.create();
stub('gr-rest-api-interface', {
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
getLoggedIn() { return Promise.resolve(false); },
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
});
element = fixture('basic');
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
teardown(() => {
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
sandbox.restore();
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('_getThreadGroups', () => {
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
element.patchForNewThreads = 3;
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
const comments = [
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
{
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-23 15:00:20.396000000',
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
__commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
}, {
id: 'jacks_reply',
message: 'i like you, too',
updated: '2015-12-24 15:00:20.396000000',
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
__commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
},
];
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
let expectedThreadGroups = [
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
{
start_datetime: '2015-12-23 15:00:20.396000000',
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
comments: [{
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-23 15:00:20.396000000',
__commentSide: 'left',
}, {
id: 'jacks_reply',
message: 'i like you, too',
updated: '2015-12-24 15:00:20.396000000',
__commentSide: 'left',
}],
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
locationRange: 'line-left',
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
patchNum: 3,
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
},
];
assert.deepEqual(element._getThreadGroups(comments),
expectedThreadGroups);
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
// Patch num should get inherited from comment rather
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
comments.push({
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
id: 'betsys_confession',
message: 'i like you, jack',
updated: '2015-12-24 15:00:10.396000000',
range: {
start_line: 1,
start_character: 1,
end_line: 1,
end_character: 2,
},
__commentSide: 'left',
});
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
expectedThreadGroups = [
{
start_datetime: '2015-12-23 15:00:20.396000000',
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
comments: [{
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-23 15:00:20.396000000',
__commentSide: 'left',
}, {
id: 'jacks_reply',
message: 'i like you, too',
updated: '2015-12-24 15:00:20.396000000',
__commentSide: 'left',
}],
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
patchNum: 3,
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
locationRange: 'line-left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
},
{
start_datetime: '2015-12-24 15:00:10.396000000',
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
comments: [{
id: 'betsys_confession',
message: 'i like you, jack',
updated: '2015-12-24 15:00:10.396000000',
range: {
start_line: 1,
start_character: 1,
end_line: 1,
end_character: 2,
},
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
__commentSide: 'left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
}],
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
patchNum: 3,
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
locationRange: 'range-1-1-1-2-left',
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
},
];
assert.deepEqual(element._getThreadGroups(comments),
expectedThreadGroups);
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('_sortByDate', () => {
let threadGroups = [
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
{
start_datetime: '2015-12-23 15:00:20.396000000',
comments: [],
locationRange: 'line',
},
{
start_datetime: '2015-12-22 15:00:10.396000000',
comments: [],
locationRange: 'range-1-1-1-2',
},
];
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
let expectedResult = [
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
{
start_datetime: '2015-12-22 15:00:10.396000000',
comments: [],
locationRange: 'range-1-1-1-2',
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
}, {
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
start_datetime: '2015-12-23 15:00:20.396000000',
comments: [],
locationRange: 'line',
},
];
assert.deepEqual(element._sortByDate(threadGroups), expectedResult);
Move reply buttons to comment thread Move all buttons that generate a reply of some sort (done, ack, reply, quote) to the comment thread instead of the comment [1]. When there is a draft for a particular comment thread, all reply buttons are hidden [2]. For example, if you click reply, you cannot click done on the same thread, unless you remove the draft. Each thread can have up to 1 draft. It's also worth noting that if a thread has a draft, and the user clicks on the line or 'c' at the same range, the existing draft will switch to 'editing' form. [1] With the exception of "please fix" for robot comments. [2] In this case, The please fix button will be disabled when other reply buttons are hidden. Feature: Issue 5410 Change-Id: Id847ee0cba0d0ce4e5b6476f58141866d41ffdad
2017-02-09 16:07:32 -08:00
// When a comment doesn't have a date, the one without the date should be
// last.
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
threadGroups = [
Move reply buttons to comment thread Move all buttons that generate a reply of some sort (done, ack, reply, quote) to the comment thread instead of the comment [1]. When there is a draft for a particular comment thread, all reply buttons are hidden [2]. For example, if you click reply, you cannot click done on the same thread, unless you remove the draft. Each thread can have up to 1 draft. It's also worth noting that if a thread has a draft, and the user clicks on the line or 'c' at the same range, the existing draft will switch to 'editing' form. [1] With the exception of "please fix" for robot comments. [2] In this case, The please fix button will be disabled when other reply buttons are hidden. Feature: Issue 5410 Change-Id: Id847ee0cba0d0ce4e5b6476f58141866d41ffdad
2017-02-09 16:07:32 -08:00
{
start_datetime: '2015-12-23 15:00:20.396000000',
comments: [],
locationRange: 'line',
},
{
comments: [],
locationRange: 'range-1-1-1-2',
},
];
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
expectedResult = [
Move reply buttons to comment thread Move all buttons that generate a reply of some sort (done, ack, reply, quote) to the comment thread instead of the comment [1]. When there is a draft for a particular comment thread, all reply buttons are hidden [2]. For example, if you click reply, you cannot click done on the same thread, unless you remove the draft. Each thread can have up to 1 draft. It's also worth noting that if a thread has a draft, and the user clicks on the line or 'c' at the same range, the existing draft will switch to 'editing' form. [1] With the exception of "please fix" for robot comments. [2] In this case, The please fix button will be disabled when other reply buttons are hidden. Feature: Issue 5410 Change-Id: Id847ee0cba0d0ce4e5b6476f58141866d41ffdad
2017-02-09 16:07:32 -08:00
{
start_datetime: '2015-12-23 15:00:20.396000000',
comments: [],
locationRange: 'line',
},
{
comments: [],
locationRange: 'range-1-1-1-2',
},
];
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
assert.deepEqual(element._sortByDate(threadGroups), expectedResult);
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('_calculateLocationRange', () => {
const comment = {__commentSide: 'left'};
const range = {
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
start_line: 1,
start_character: 2,
end_line: 3,
end_character: 4,
};
Don't merge threads on same line left/right Goes along with c/95273/. Adds commentSide attribute to comments to see which side of the diff view they belong on. This is also used as part of the locationRange for the gr-diff-comment-thread-group, so that two thread groups can be on the same line or range for the unified group ( one for the right, one for the left). Note: there is already a 'side' attribute on the gr-diff-comment, which is confusing. This side actually references 'PARENT' or 'REVISION', to identify whether the comment belongs to the parent or any revision. On diffs where two revisions are compared to each other, this cannot be used to determine left/right. However, because 'side' is part of the CommentInfo entity[1], it is difficult to change the name and make more sense out of that. [1] https://gerrit-review.googlesource.com/Documentation/rest-api-changes.html#comment-info Bug: Issue 5114 Change-Id: I5cc4c17d4bb134e31e5cc07ff9b08ed349488c97
2017-01-30 12:03:13 -08:00
assert.equal(
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
element._calculateLocationRange(range, comment),
'range-1-2-3-4-left');
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('thread groups are updated when comments change', () => {
const commentsChangedStub = sandbox.stub(element, '_commentsChanged');
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
element.comments = [];
element.comments.push({
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-23 15:00:20.396000000',
});
assert(commentsChangedStub.called);
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('addNewThread', () => {
const locationRange = 'range-1-2-3-4';
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
element._threads = [{locationRange: 'line'}];
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
element.addNewThread(locationRange);
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
assert(element._threads.length, 2);
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('_getPatchNum', () => {
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
element.patchForNewThreads = 3;
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
const comment = {
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
id: 'sallys_confession',
message: 'i like you, jack',
updated: '2015-12-23 15:00:20.396000000',
};
assert.equal(element._getPatchNum(comment), 3);
comment.patchNum = 4;
assert.equal(element._getPatchNum(comment), 4);
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
});
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
test('removeThread', () => {
const locationRange = 'range-1-2-3-4';
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
element._threads = [
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
{locationRange: 'range-1-2-3-4', comments: []},
ES6ify /gr-diff-comment-thread-group/* Bug: Issue 6179 Change-Id: I2f25f8aeae703c3a3ee7b22103902773065d845c
2017-05-16 14:01:18 -07:00
{locationRange: 'line', comments: []},
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
];
flushAsynchronousOperations();
element.removeThread(locationRange);
flushAsynchronousOperations();
Fix corner case where storage gets duplicated for patchsets Previously, there was an issue where if you create a draft comment in side by side view and switch to unified view, the comment thinks it's in the later patch set rather than the earlier one and a second copy gets added to local storage with the later patchset as a component of the key. This was because the the thread group assumed all threads inside of it had the same patch number. This change fixes that, so in the event that a user switches from side by side to unified, the patch number will get taken from the comment rather than the thread group. Bug: Issue 5493 Change-Id: I7f00997bcb2e6f1001a5d58ac206acf5af3367d2
2017-02-09 07:34:23 -08:00
assert(element._threads.length, 1);
Allow multiple threads per line, with different ranges - Add concept of diff comment thread groups, which are all of the threads at a particular line number. - The thread group is responsible for breaking up comments into threads based on the range of the comment. - Thread groups are ordered by the updated time of the first comment in the group. - Thread groups are given a key, based on comment range, which is used to determine what thread group a new comment should go in (or if it needs a new one). Feature: Issue 5292 Change-Id: If544e8bb879262de3ce5397e86124837b66ada04
2017-01-27 15:33:08 -08:00
});
});
</script>
Copy Permalink