Merge "gr-related-changes-list: Use change-model for patchNum"
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
index dc99055..f68ba8b 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.ts
@@ -1208,7 +1208,6 @@
() => html`
<gr-reply-dialog
id="replyDialog"
- .patchNum=${computeLatestPatchNum(this.allPatchSets)}
.permittedLabels=${this.change?.permitted_labels}
.projectConfig=${this.projectConfig}
.canBeStarted=${this.canStartReview()}
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.ts b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.ts
index 25e3e51..3a88eaf 100644
--- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.ts
+++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog-it_test.ts
@@ -16,7 +16,7 @@
import {
AccountId,
NumericChangeId,
- PatchSetNum,
+ PatchSetNumber,
Timestamp,
} from '../../../types/common';
import {createChange} from '../../../test/test-data-generators';
@@ -27,7 +27,7 @@
suite('gr-reply-dialog-it tests', () => {
let element: GrReplyDialog;
let changeNum: NumericChangeId;
- let patchNum: PatchSetNum;
+ let latestPatchNum: PatchSetNumber;
const setupElement = (element: GrReplyDialog) => {
element.change = {
@@ -55,7 +55,7 @@
},
},
};
- element.patchNum = patchNum;
+ element.latestPatchNum = latestPatchNum;
element.permittedLabels = {
'Code-Review': ['-1', ' 0', '+1'],
Verified: ['-1', ' 0', '+1'],
@@ -64,7 +64,7 @@
setup(async () => {
changeNum = 42 as NumericChangeId;
- patchNum = 1 as PatchSetNum;
+ latestPatchNum = 1 as PatchSetNumber;
stubRestApi('getAccount').returns(
Promise.resolve({
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 a2ffcb8..d899771 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
@@ -54,7 +54,6 @@
isReviewerAccountSuggestion,
isReviewerGroupSuggestion,
ParsedJSON,
- PatchSetNum,
ReviewerInput,
ReviewInput,
ReviewResult,
@@ -187,9 +186,6 @@
@property({type: Object})
change?: ParsedChangeInfo | ChangeInfo;
- @property({type: String})
- patchNum?: PatchSetNum;
-
@property({type: Boolean})
canBeStarted = false;
@@ -220,6 +216,8 @@
@query('#reviewerConfirmationModal')
reviewerConfirmationModal?: HTMLDialogElement;
+ @state() latestPatchNum?: PatchSetNumber;
+
@state() serverConfig?: ServerInfo;
@state()
@@ -361,8 +359,6 @@
private readonly getUserModel = resolve(this, userModelToken);
- private latestPatchNum?: PatchSetNumber;
-
storeTask?: DelayedTask;
private isLoggedIn = false;
@@ -1172,7 +1168,7 @@
this.knownLatestState === LatestPatchState.CHECKING,
() => html`
<span id="checkingStatusLabel">
- Checking whether patch ${this.patchNum} is latest...
+ Checking whether patch ${this.latestPatchNum} is latest...
</span>
`
)}
@@ -1868,10 +1864,10 @@
saveReview(review: ReviewInput, errFn?: ErrorCallback) {
assertIsDefined(this.change, 'change');
- assertIsDefined(this.patchNum, 'patchNum');
+ assertIsDefined(this.latestPatchNum, 'latestPatchNum');
return this.restApiService.saveChangeReview(
this.change._number,
- this.patchNum,
+ this.latestPatchNum,
review,
errFn
);
@@ -2027,7 +2023,7 @@
}
computePatchSetWarning() {
- let str = `Patch ${this.patchNum} is not latest.`;
+ let str = `Patch ${this.latestPatchNum} is not latest.`;
if (this.labelsChanged) {
str += ' Voting may have no effect.';
}
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 5bf6464..22dd4b5 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
@@ -39,7 +39,7 @@
GroupId,
GroupName,
NumericChangeId,
- PatchSetNum,
+ PatchSetNumber,
ReviewerInput,
ReviewInput,
ReviewResult,
@@ -89,7 +89,7 @@
suite('gr-reply-dialog tests', () => {
let element: GrReplyDialog;
let changeNum: NumericChangeId;
- let patchNum: PatchSetNum;
+ let latestPatchNum: PatchSetNumber;
let commentsModel: CommentsModel;
let lastId = 1;
@@ -105,7 +105,7 @@
setup(async () => {
changeNum = 42 as NumericChangeId;
- patchNum = 1 as PatchSetNum;
+ latestPatchNum = 1 as PatchSetNumber;
stubRestApi('getChange').returns(Promise.resolve({...createChange()}));
stubRestApi('getChangeSuggestedReviewers').returns(Promise.resolve([]));
@@ -143,7 +143,7 @@
},
},
};
- element.patchNum = patchNum;
+ element.latestPatchNum = latestPatchNum;
element.permittedLabels = {
'Code-Review': ['-1', ' 0', '+1'],
Verified: ['-1', ' 0', '+1'],
