Implement gr-dropdown-list in patch range select
This also moves the change reloading logic back to the change view,
where it gets updated patch ranges via a two-way data binding.
Change-Id: Ib09ad1a176ba96bac77a513d344226df029aef7b
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
index ee12e34..c4746f2 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.js
@@ -63,6 +63,22 @@
},
_patchRange: Object,
+ // These are kept as separate properties from the patchRange so that the
+ // observer can be aware of the previous value. In order to view sub
+ // property changes for _patchRange, a complex observer must be used, and
+ // that only displays the new value.
+ //
+ // If a previous value did not exist, the change is not reloaded with the
+ // new patches. This is just the initial setting from the change view vs.
+ // an update coming from the two way data binding.
+ _patchNum: {
+ type: String,
+ observer: '_patchOrBaseChanged',
+ },
+ _basePatchNum: {
+ type: String,
+ observer: '_patchOrBaseChanged',
+ },
/**
* @type {{
* subject: string,
@@ -124,7 +140,6 @@
type: Boolean,
computed: '_computeEditLoaded(_patchRange.*)',
},
-
_isBlameSupported: {
type: Boolean,
value: false,
@@ -134,6 +149,10 @@
type: Boolean,
value: false,
},
+ _allPatchSets: {
+ type: Array,
+ computed: 'computeAllPatchSets(_change, _change.revisions.*)',
+ },
},
behaviors: [
@@ -147,6 +166,7 @@
'_getProjectConfig(_change.project)',
'_getFiles(_changeNum, _patchRange.*)',
'_setReviewedObserver(_loggedIn, params.*)',
+ '_patchRangeChanged(_patchRange.*)',
],
keyBindings: {
@@ -563,6 +583,17 @@
this.$.cursor.initialLineNumber = params.lineNum;
},
+ _patchRangeChanged() {
+ this._basePatchNum = this._patchRange.basePatchNum;
+ this._patchNum = this._patchRange.patchNum;
+ },
+
+ _patchOrBaseChanged(patchNew, patchOld) {
+ if (!patchOld) { return; }
+
+ this._handlePatchChange(this._basePatchNum, this._patchNum);
+ },
+
_pathChanged(path) {
if (path) {
this.fire('title-change',
@@ -593,12 +624,6 @@
return patchStr;
},
- _computeAvailablePatches(revs) {
- return this.sortRevisions(Object.values(revs)).map(e => {
- return {num: e._number};
- });
- },
-
/**
* When the latest patch of the change is selected (and there is no base
* patch) then the patch range need not appear in the URL. Return a patch
@@ -675,11 +700,9 @@
this.$.dropdown.open();
},
- _handlePatchChange(e) {
- const rightPatch = e.detail.rightPatch;
- const leftPatch = e.detail.leftPatch;
+ _handlePatchChange(basePatchNum, patchNum) {
Gerrit.Nav.navigateToDiff(
- this._change, this._path, rightPatch, leftPatch);
+ this._change, this._path, patchNum, basePatchNum);
},
_handlePrefsTap(e) {
