-
Notifications
You must be signed in to change notification settings - Fork 8.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Do not perform unnecessary round-trip to ES. #7960
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -293,14 +293,25 @@ uiModules | |
|
||
function transferVisState(fromVis, toVis, stage) { | ||
return function () { | ||
|
||
//verify this before we copy the "new" state | ||
const isAggregationsChanged = !fromVis.aggs.jsonDataEquals(toVis.aggs); | ||
|
||
const view = fromVis.getEnabledState(); | ||
const full = fromVis.getState(); | ||
toVis.setState(view); | ||
editableVis.dirty = false; | ||
$state.vis = full; | ||
$state.save(); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
if (stage) $scope.fetch(); | ||
/** | ||
* Only fetch (full ES round trip), if the play-button has been pressed (ie. 'stage' variable) and if there | ||
* has been changes in the Data-tab. | ||
*/ | ||
if (stage && isAggregationsChanged) { | ||
$scope.fetch(); | ||
} else { | ||
$state.save(); | ||
} | ||
}; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,6 +47,23 @@ export default function AggConfigsFactory(Private) { | |
} | ||
} | ||
|
||
/** | ||
* Data-by-data comparison of this Aggregation | ||
* Ignores the non-array indexes | ||
* @param aggConfigs an AggConfigs instance | ||
*/ | ||
AggConfigs.prototype.jsonDataEquals = function (aggConfigs) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we add a test for this? |
||
if (aggConfigs.length !== this.length) { | ||
return false; | ||
} | ||
for (let i = 0; i < this.length; i += 1) { | ||
if (!_.isEqual(aggConfigs[i].toJSON(), this[i].toJSON())) { | ||
return false; | ||
} | ||
} | ||
return true; | ||
}; | ||
|
||
AggConfigs.prototype.toDsl = function () { | ||
let dslTopLvl = {}; | ||
let dslLvlCursor; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this function is invoked with the angular-binding in
sidebar.html
(cf.stageEditableVis
)