diff options
author | David Ostrovsky <david.ostrovsky@gmail.com> | 2020-11-24 22:01:39 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-24 22:01:39 +0000 |
commit | 6bc2968730080e9f195c7dffee70af59cf581260 (patch) | |
tree | de47049d18b60da1671dc7f1e2fcd68fd42a5678 | |
parent | 928f83d065ca0cf48e95978f074d10e4c2978d20 (diff) | |
parent | 5d6ca055210944851312d935aa405a38282229a6 (diff) |
Merge changes from topic "warning-submitting" into stable-3.0
* changes:
Use strict equality
Add a warning if submitting a change with an open change edit
3 files changed, 36 insertions, 1 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.html b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.html index 1036b7fbcc..b9c32ed570 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.html +++ b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.html @@ -53,6 +53,11 @@ limitations under the License. <template is="dom-if" if="[[change.is_private]]"> <p><strong>Heads Up!</strong> Submitting this private change will also make it public.</p> </template> + <template is="dom-if" if="[[_computeHasChangeEdit(change)]]"> + <iron-icon icon="gr-icons:error" class="warningBeforeSubmit"></iron-icon> + Your unpublished edit will not be submitted. Did you + forget to click <b>PUBLISH</b>? + </template> <gr-endpoint-param name="change" value="[[change]]"></gr-endpoint-param> <gr-endpoint-param name="action" value="[[action]]"></gr-endpoint-param> </gr-endpoint-decorator> diff --git a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.js b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.js index 93d38df33d..282b394b50 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.js +++ b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog.js @@ -54,6 +54,11 @@ this.$.dialog.resetFocus(); }, + _computeHasChangeEdit(change) { + return !!change.revisions && + Object.values(change.revisions).some(rev => rev._number === 'edit'); + }, + _handleConfirmTap(e) { e.preventDefault(); this.dispatchEvent(new CustomEvent('confirm', {bubbles: false})); diff --git a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html index 86c15f6a6e..dd61d1c1c9 100644 --- a/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html +++ b/polygerrit-ui/app/elements/change/gr-confirm-submit-dialog/gr-confirm-submit-dialog_test.html @@ -50,7 +50,10 @@ limitations under the License. test('display', () => { element.action = {label: 'my-label'}; - element.change = {subject: 'my-subject'}; + element.change = { + subject: 'my-subject', + revisions: {}, + }; flushAsynchronousOperations(); const header = element.$$('.header'); assert.equal(header.textContent.trim(), 'my-label'); @@ -59,5 +62,27 @@ limitations under the License. assert.notEqual(message.textContent.length, 0); assert.notEqual(message.textContent.indexOf('my-subject'), -1); }); + + test('_computeHasChangeEdit', () => { + const change = { + revisions: { + d442ff05d6c4f2a3af0eeca1f67374b39f9dc3d8: { + _number: 'edit', + }, + }, + unresolved_comment_count: 0, + }; + + assert.equal(element._computeHasChangeEdit(change), true); + + const change2 = { + revisions: { + d442ff05d6c4f2a3af0eeca1f67374b39f9dc3d8: { + _number: 2, + }, + }, + }; + assert.equal(element._computeHasChangeEdit(change2), false); + }); }); </script> |