Merge "Revert "Show info message on WIP changes about reviewer notifications""
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 3ff0780..11406b4 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
@@ -606,13 +606,13 @@
.patchsetLevelContainer.unresolved {
background-color: var(--unresolved-comment-background-color);
}
- .infoMessage {
+ .privateVisiblityInfo {
display: flex;
justify-content: center;
background-color: var(--info-background);
padding: var(--spacing-s) 0;
}
- .infoMessage gr-icon {
+ .privateVisiblityInfo gr-icon {
margin-right: var(--spacing-m);
color: var(--info-foreground);
}
@@ -802,7 +802,6 @@
</gr-endpoint-decorator>
${this.renderCCList()} ${this.renderReviewConfirmation()}
${this.renderPrivateVisiblityInfo()}
- ${this.renderNotificationForWipChangesInfo()}
</section>
<section class="labelsContainer">${this.renderLabels()}</section>
<section class="newReplyDialog textareaContainer">
@@ -912,7 +911,7 @@
];
if (!this.change?.is_private || !addedAccounts.length) return nothing;
return html`
- <div class="infoMessage">
+ <div class="privateVisiblityInfo">
<gr-icon icon="info"></gr-icon>
<div>
Adding a reviewer/CC will make this private change visible to them
@@ -921,20 +920,6 @@
`;
}
- private renderNotificationForWipChangesInfo() {
- const addedAccounts = [
- ...(this.reviewersList?.additions() ?? []),
- ...(this.ccsList?.additions() ?? []),
- ];
- if (!this.change?.work_in_progress || !addedAccounts.length) return nothing;
- return html`
- <div class="infoMessage">
- <gr-icon icon="info"></gr-icon>
- <div>Reviewers will not be notified for WIP changes</div>
- </div>
- `;
- }
-
private renderLabels() {
if (!this.change || !this.account || !this.permittedLabels) return;
return html`
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.ts
index 8582fd8..52ea252 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog_test.ts
@@ -432,7 +432,7 @@
</gr-button>
</div>
</dialog>
- <div class="infoMessage">
+ <div class="privateVisiblityInfo">
<gr-icon icon="info">
</gr-icon>
<div>
@@ -444,123 +444,6 @@
);
});
- test('renders wip change info when reviewer is added', async () => {
- element.change!.work_in_progress = true;
- element.requestUpdate();
- await element.updateComplete;
- const peopleContainer = queryAndAssert<HTMLDivElement>(
- element,
- '.peopleContainer'
- );
-
- // Info is rendered only if reviewer is added
- assert.dom.equal(
- peopleContainer,
- `
- <section class="peopleContainer">
- <gr-endpoint-decorator name="reply-reviewers">
- <gr-endpoint-param name="change"> </gr-endpoint-param>
- <gr-endpoint-param name="reviewers"> </gr-endpoint-param>
- <div class="peopleList">
- <div class="peopleListLabel">Reviewers</div>
- <gr-account-list id="reviewers"> </gr-account-list>
- <gr-endpoint-slot name="right"> </gr-endpoint-slot>
- </div>
- <gr-endpoint-slot name="below"> </gr-endpoint-slot>
- </gr-endpoint-decorator>
- <div class="peopleList">
- <div class="peopleListLabel">CC</div>
- <gr-account-list allow-any-input="" id="ccs"> </gr-account-list>
- </div>
- <dialog
- tabindex="-1"
- id="reviewerConfirmationModal"
- >
- <div class="reviewerConfirmation">
- Group
- <span class="groupName"> </span>
- has
- <span class="groupSize"> </span>
- members.
- <br />
- Are you sure you want to add them all?
- </div>
- <div class="reviewerConfirmationButtons">
- <gr-button aria-disabled="false" role="button" tabindex="0">
- Yes
- </gr-button>
- <gr-button aria-disabled="false" role="button" tabindex="0">
- No
- </gr-button>
- </div>
- </dialog>
- </section>
- `
- );
-
- const account = createAccountWithId(22);
- element.reviewersList!.accounts = [];
- element.reviewersList!.addAccountItem({account, count: 1});
- element.reviewersList!.dispatchEvent(
- new CustomEvent('account-added', {
- detail: {account},
- })
- );
- element.requestUpdate();
- await element.updateComplete;
-
- assert.dom.equal(
- peopleContainer,
- `
- <section class="peopleContainer">
- <gr-endpoint-decorator name="reply-reviewers">
- <gr-endpoint-param name="change"> </gr-endpoint-param>
- <gr-endpoint-param name="reviewers"> </gr-endpoint-param>
- <div class="peopleList">
- <div class="peopleListLabel">Reviewers</div>
- <gr-account-list id="reviewers"> </gr-account-list>
- <gr-endpoint-slot name="right"> </gr-endpoint-slot>
- </div>
- <gr-endpoint-slot name="below"> </gr-endpoint-slot>
- </gr-endpoint-decorator>
- <div class="peopleList">
- <div class="peopleListLabel">CC</div>
- <gr-account-list allow-any-input="" id="ccs"> </gr-account-list>
- </div>
- <dialog
- tabindex="-1"
- id="reviewerConfirmationModal"
- >
- <div class="reviewerConfirmation">
- Group
- <span class="groupName"> </span>
- has
- <span class="groupSize"> </span>
- members.
- <br />
- Are you sure you want to add them all?
- </div>
- <div class="reviewerConfirmationButtons">
- <gr-button aria-disabled="false" role="button" tabindex="0">
- Yes
- </gr-button>
- <gr-button aria-disabled="false" role="button" tabindex="0">
- No
- </gr-button>
- </div>
- </dialog>
- <div class="infoMessage">
- <gr-icon icon="info">
- </gr-icon>
- <div>
- Reviewers will not be notified for WIP changes
- </div>
- </div>
- </section>
- `
- );
- });
-
test('default to publishing draft comments with reply', async () => {
// Async tick is needed because iron-selector content is distributed and
// distributed content requires an observer to be set up.