commit fe6059f00e7a30b57c5cf477d646ab4043c030d2
author Paladox none <thomasmulhall410@yahoo.com> Tue Feb 21 11:19:15 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 21 11:19:15 2023 +0000
tree 42ad267e38a58b0a4b24c93e959159e147937190
parent 878a763b0b0ee22f840ca96191f7a6e6a8bf04c2
parent 22540fd3dac0c4f897dea18d8c8c606361b36b67

Merge changes I8d678fa7,I882fd504

* changes:
  Make a viewState a state in gr-editor-view
  Fix “Old Patchset” being displayed on current edits

polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view.ts

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 acc4c9e..12b19c7 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';
@@ -26,7 +26,7 @@
 import {Modifier} from '../../../utils/dom-util';
 import {sharedStyles} from '../../../styles/shared-styles';
 import {LitElement, PropertyValues, html, css, nothing} from 'lit';
-import {customElement, property, state} from 'lit/decorators.js';
+import {customElement, state} from 'lit/decorators.js';
 import {subscribe} from '../../lit/subscription-controller';
 import {resolve} from '../../../models/dependency';
 import {changeModelToken} from '../../../models/change/change-model';
@@ -63,8 +63,7 @@
    * @event show-alert
    */
 
-  @property({type: Object})
-  viewState?: ChangeViewState;
+  @state() viewState?: ChangeViewState;
 
   // private but used in test
   @state() change?: ParsedChangeInfo;
@@ -87,7 +86,7 @@
   @state() private editPrefs?: EditPreferencesInfo;
 
   // private but used in test
-  @state() latestPatchsetNumber?: PatchSetNumber;
+  @state() latestPatchsetNumber?: RevisionPatchSetNum;
 
   private readonly restApiService = getAppContext().restApiService;
 
@@ -130,7 +129,7 @@
     );
     subscribe(
       this,
-      () => this.getChangeModel().latestPatchNum$,
+      () => this.getChangeModel().latestPatchNumWithEdit$,
       x => (this.latestPatchsetNumber = x)
     );
     this.shortcuts.addLocal({key: 's', modifiers: [Modifier.CTRL_KEY]}, () =>

polygerrit-ui/app/elements/edit/gr-editor-view/gr-editor-view_test.ts

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 1a4879d..242ddea 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
@@ -17,7 +17,6 @@
 import {
   EDIT,
   NumericChangeId,
-  PatchSetNumber,
   RevisionPatchSetNum,
 } from '../../../types/common';
 import {
@@ -51,9 +50,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;
     storageService = testResolver(storageServiceToken);
   });