Update placeholder string in Revert dialog
We don't allow creating a revert until a reason is specified and
block the operation in the UI hence clarify in the placeholder
that it's not an optional thing.
Release-Notes: skip
Google-bug-id: b/343552361
Change-Id: Ib17fa991e18e2df8f8f1ef2b9c9b231cf30b585f
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
index ae254be..a26d37f8f 100644
--- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions_test.ts
@@ -1670,7 +1670,7 @@
let expectedMsg =
'Revert submission 199 0' +
'\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>' +
'\n\n' +
'Reverted changes: /q/submissionid:199+0\n';
assert.equal(confirmRevertDialog.message, expectedMsg);
@@ -1683,7 +1683,7 @@
expectedMsg =
'Revert "random commit message"\n\nThis reverts ' +
'commit 2000.\n\nReason' +
- ' for revert: <INSERT REASONING HERE>\n';
+ ' for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(confirmRevertDialog.message, expectedMsg);
});
@@ -1733,13 +1733,13 @@
const revertSubmissionMsg =
'Revert submission 199 0' +
'\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>' +
'\n\n' +
'Reverted changes: /q/submissionid:199+0\n';
const singleChangeMsg =
'Revert "random commit message"\n\nThis reverts ' +
'commit 2000.\n\nReason' +
- ' for revert: <INSERT REASONING HERE>\n';
+ ' for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(confirmRevertDialog.message, revertSubmissionMsg);
const newRevertMsg = revertSubmissionMsg + 'random';
const newSingleChangeMsg = singleChangeMsg + 'random';
@@ -1833,7 +1833,7 @@
const msg =
'Revert "random commit message"\n\n' +
'This reverts commit 2000.\n\nReason ' +
- 'for revert: <INSERT REASONING HERE>\n';
+ 'for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(confirmRevertDialog.message, msg);
let editedMsg = msg + 'hello';
confirmRevertDialog.message += 'hello';
@@ -1852,10 +1852,10 @@
// Contains generic template reason so doesn't submit
assert.isFalse(fireActionStub.called);
confirmRevertDialog.message = confirmRevertDialog.message.replace(
- '<INSERT REASONING HERE>',
+ '<MUST SPECIFY REASON HERE>',
''
);
- editedMsg = editedMsg.replace('<INSERT REASONING HERE>', '');
+ editedMsg = editedMsg.replace('<MUST SPECIFY REASON HERE>', '');
confirmButton.click();
await element.updateComplete;
assert.equal(fireActionStub.getCall(0).args[0], '/revert');
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.ts b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.ts
index 761bd78..59ba256 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog.ts
@@ -27,7 +27,7 @@
import {parseCommitMessageString} from '../../../utils/commit-message-formatter-util';
const ERR_COMMIT_NOT_FOUND = 'Unable to find the commit hash of this change.';
-const INSERT_REASON_STRING = '<INSERT REASONING HERE>';
+const SPECIFY_REASON_STRING = '<MUST SPECIFY REASON HERE>';
// TODO(dhruvsri): clean up repeated definitions after moving to js modules
export enum RevertType {
@@ -259,7 +259,7 @@
let message =
`${revertTitle}\n\n${revertCommitText}\n\n` +
- `Reason for revert: ${INSERT_REASON_STRING}\n`;
+ `Reason for revert: ${SPECIFY_REASON_STRING}\n`;
if (footers.length > 0) {
message += '\n' + footers.join('\n'); // Empty line before the footers begin
@@ -298,8 +298,7 @@
const message =
`Revert submission ${change.submission_id}` +
'\n\n' +
- 'Reason for revert: <INSERT ' +
- 'REASONING HERE>\n\n' +
+ `Reason for revert: ${SPECIFY_REASON_STRING}\n\n` +
'Reverted changes: ' +
createSearchUrl({query: `submissionid:${change.submission_id}`}) +
'\n';
@@ -339,7 +338,7 @@
e.stopPropagation();
if (
this.message === this.originalRevertMessages[this.revertType] ||
- this.message.includes(INSERT_REASON_STRING)
+ this.message.includes(SPECIFY_REASON_STRING)
) {
this.showErrorMessage = true;
return;
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.ts b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.ts
index 2647b1b..1e5a194 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-confirm-revert-dialog/gr-confirm-revert-dialog_test.ts
@@ -67,7 +67,7 @@
const expected =
'Revert "one line commit"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -81,7 +81,7 @@
const expected =
'Revert "many lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -95,7 +95,7 @@
const expected =
'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n\n' +
'Issue: 1234567';
assert.equal(element.message, expected);
});
@@ -110,7 +110,7 @@
const expected =
'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -124,7 +124,7 @@
const expected =
'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n\n' +
'Bug: 1234567';
assert.equal(element.message, expected);
});
@@ -139,7 +139,7 @@
const expected =
'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -153,7 +153,7 @@
const expected =
'Revert "much lines"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n\n' +
'Bug: Issue 42';
assert.equal(element.message, expected);
});
@@ -168,7 +168,7 @@
const expected =
'Revert^2 "one line commit"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -182,7 +182,7 @@
const expected =
'Revert^3 "one line commit"\n\n' +
'This reverts commit abcd123.\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n';
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n';
assert.equal(element.message, expected);
});
@@ -199,7 +199,7 @@
const expected =
'Revert submission 5545\n\n' +
- 'Reason for revert: <INSERT REASONING HERE>\n\n' +
+ 'Reason for revert: <MUST SPECIFY REASON HERE>\n\n' +
'Reverted changes: /q/submissionid:5545\n';
assert.equal(element.message, expected);
});
