Fix “Old Patchset” being displayed on current edits
Release-Notes: Fix “Old Patchset” being displayed on current edits
Change-Id: I882fd5049d59d18a2db0c2f956eb225bd7ae44a7
(cherry picked from commit 944f02a389e5e8e5d7e979772a827d70bf2bbce9)
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
index a15a575..18ce3d1 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts
@@ -13,7 +13,7 @@
import {
EditPreferencesInfo,
Base64FileContent,
- PatchSetNumber,
+ RevisionPatchSetNum,
} from '../../../types/common';
import {ParsedChangeInfo} from '../../../types/types';
import {HttpMethod, NotifyType} from '../../../constants/constants';
@@ -81,7 +81,7 @@
@state() private editPrefs?: EditPreferencesInfo;
// private but used in test
- @state() latestPatchsetNumber?: PatchSetNumber;
+ @state() latestPatchsetNumber?: RevisionPatchSetNum;
private readonly restApiService = getAppContext().restApiService;
@@ -122,7 +122,7 @@
);
subscribe(
this,
- () => this.getChangeModel().latestPatchNum$,
+ () => this.getChangeModel().latestPatchNumWithEdit$,
x => (this.latestPatchsetNumber = x)
);
this.shortcuts.addLocal({key: 's', modifiers: [Modifier.CTRL_KEY]}, () =>
diff --git a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.ts b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.ts
index 52581ed..390cfad 100644
--- a/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.ts
+++ b/polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.ts
@@ -18,7 +18,6 @@
import {
EDIT,
NumericChangeId,
- PatchSetNumber,
RevisionPatchSetNum,
} from '../../../types/common';
import {
@@ -49,9 +48,9 @@
navigateStub = sinon.stub(element, 'viewEditInChangeView');
element.viewState = {
...createEditViewState(),
- patchNum: 1 as PatchSetNumber,
+ patchNum: 1 as RevisionPatchSetNum,
};
- element.latestPatchsetNumber = 1 as PatchSetNumber;
+ element.latestPatchsetNumber = 1 as RevisionPatchSetNum;
await element.updateComplete;
});