Merge "Convert comment counts to comment thread counts around the UI" into stable-3.3
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
index 7b34263..909f0d5 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.ts
@@ -43,7 +43,6 @@
ReviewerState,
SpecialFilePath,
} from '../../../constants/constants';
-import {KnownExperimentId} from '../../../services/flags/flags';
import {fetchChangeUpdates} from '../../../utils/patch-set-util';
import {KeyboardShortcutMixin} from '../../../mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin';
import {accountKey, removeServiceUsers} from '../../../utils/account-util';
@@ -380,8 +379,6 @@
};
}
- _isPatchsetCommentsExperimentEnabled = false;
-
constructor() {
super();
this.filterReviewerSuggestion = this._filterReviewerSuggestionGenerator(
@@ -421,9 +418,6 @@
/** @override */
ready() {
super.ready();
- this._isPatchsetCommentsExperimentEnabled = this.flagsService.isEnabled(
- KnownExperimentId.PATCHSET_COMMENTS
- );
this.$.jsAPI.addElement(TargetElement.REPLY_DIALOG, this);
}
@@ -686,17 +680,13 @@
}
if (this.draft) {
- if (this._isPatchsetCommentsExperimentEnabled) {
- const comment: CommentInput = {
- message: this.draft,
- unresolved: !this._isResolvedPatchsetLevelComment,
- };
- reviewInput.comments = {
- [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [comment],
- };
- } else {
- reviewInput.message = this.draft;
- }
+ const comment: CommentInput = {
+ message: this.draft,
+ unresolved: !this._isResolvedPatchsetLevelComment,
+ };
+ reviewInput.comments = {
+ [SpecialFilePath.PATCHSET_LEVEL_COMMENTS]: [comment],
+ };
}
const accountAdditions = new Map<AccountId | EmailAddress, boolean>();
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
index c56a5c9..58adc60 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_html.ts
@@ -303,16 +303,14 @@
</gr-endpoint-decorator>
</section>
<section class="previewContainer">
- <template is="dom-if" if="[[_isPatchsetCommentsExperimentEnabled]]">
- <label>
- <input
- id="resolvedPatchsetLevelCommentCheckbox"
- type="checkbox"
- checked="{{_isResolvedPatchsetLevelComment::change}}"
- />
- Resolved
- </label>
- </template>
+ <label>
+ <input
+ id="resolvedPatchsetLevelCommentCheckbox"
+ type="checkbox"
+ checked="{{_isResolvedPatchsetLevelComment::change}}"
+ />
+ Resolved
+ </label>
<label class="preview-formatting">
<input type="checkbox" checked="{{_previewFormatting::change}}" />
Preview formatting
diff --git a/polygerrit-ui/app/services/flags/flags.ts b/polygerrit-ui/app/services/flags/flags.ts
index 047e9e0..57ad74ed8 100644
--- a/polygerrit-ui/app/services/flags/flags.ts
+++ b/polygerrit-ui/app/services/flags/flags.ts
@@ -24,7 +24,5 @@
* @desc Experiment ids used in Gerrit.
*/
export enum KnownExperimentId {
- PATCHSET_COMMENTS = 'UiFeature__patchset_comments',
- PATCHSET_CHOICE_FOR_COMMENT_LINKS = 'UiFeature__patchset_choice_for_comment_links',
NEW_CONTEXT_CONTROLS = 'UiFeature__new_context_controls',
}
