Remove obsolete actions from RevisionInfo Revision actions are ignored since change 238972. Change-Id: I83ac457b4b4e68109725f67a40b55bf2585e7f11
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 d6fa6d8..778f79c 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
@@ -391,6 +391,9 @@ @property({type: Object}) _selectedRevision?: RevisionInfo | EditRevisionInfo; + /** + * <gr-change-actions> populates this via two-way data binding. + */ @property({type: Object}) _currentRevisionActions?: ActionNameToActionInfoMap; @@ -1856,14 +1859,6 @@ ) { changeWithEdit.current_revision = edit.commit.commit; this.set('_patchRange.patchNum', EditPatchSetNum); - // Because edits are fibbed as revisions and added to the revisions - // array, and revision actions are always derived from the 'latest' - // patch set, we must copy over actions from the patch set base. - // Context: Issue 7243 - if (changeWithEdit.revisions) { - changeWithEdit.revisions[edit.commit.commit].actions = - changeWithEdit.revisions[edit.base_revision].actions; - } } }
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts index 9520db5..ac4f5ea 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view_test.ts
@@ -1864,7 +1864,7 @@ ...createChangeViewChange(), current_revision: 'foo' as CommitId, revisions: { - foo: {...createRevision(), actions: {cherrypick: {enabled: true}}}, + foo: {...createRevision()}, }, }; let mockChange; @@ -1891,23 +1891,17 @@ assert.equal(mockChange.revisions.bar._number, EditPatchSetNum); assert.equal(mockChange.current_revision, change.current_revision); assert.deepEqual(mockChange.revisions.bar.commit, editCommit); - assert.notOk(mockChange.revisions.bar.actions); edit.base_revision = 'foo'; element._processEdit((mockChange = _.cloneDeep(change)), edit); assert.notDeepEqual(mockChange, change); assert.equal(mockChange.current_revision, 'bar'); - assert.deepEqual( - mockChange.revisions.bar.actions, - mockChange.revisions.foo.actions - ); // If _patchRange.patchNum is defined, do not load edit. element._patchRange.patchNum = 5 as RevisionPatchSetNum; change.current_revision = 'baz' as CommitId; element._processEdit((mockChange = _.cloneDeep(change)), edit); assert.equal(element._patchRange.patchNum, 5 as RevisionPatchSetNum); - assert.notOk(mockChange.revisions.bar.actions); }); test('file-action-tap handling', () => {