Skip to content

INT-1552 allow building of open bounded range queries #417

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 24, 2016
Merged

INT-1552 allow building of open bounded range queries #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cbb0ab
allow building of open bounded range queries
Jun 23, 2016
95f2525
fix bug where slow bound crossing didn’t work
Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/app/minicharts/d3fns/many.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ var minicharts_d3fns_many = function() {

function brushed() {
var bars = d3.selectAll(options.view.queryAll('rect.selectable'));
var numSelected = options.view.queryAll('rect.selectable.selected').length;
// var numSelected = options.view.queryAll('rect.selectable.selected').length;
var s = brush.extent();

bars.classed('selected', function(d) {
Expand All @@ -83,14 +83,16 @@ var minicharts_d3fns_many = function() {
if (!options.view) {
return;
}
if (numSelected !== options.view.queryAll('rect.selectable.selected').length) {
// number of selected items has changed, trigger querybuilder event
var evt = {
type: 'drag',
source: 'many'
};
options.view.trigger('querybuilder', evt);
}
var openLeft = d3.mouse(this)[0] <= 0;
var openRight = d3.mouse(this)[0] >= width;
// number of selected items has changed, trigger querybuilder event
var evt = {
type: 'drag',
source: 'many',
openLeft: openLeft,
openRight: openRight
};
options.view.trigger('querybuilder', evt);
}

function brushend() {
Expand All @@ -104,9 +106,13 @@ var minicharts_d3fns_many = function() {
if (!options.view) {
return;
}
var openLeft = d3.mouse(this)[0] <= 0;
var openRight = d3.mouse(this)[0] >= width;
var evt = {
type: 'drag',
source: 'many'
source: 'many',
openLeft: openLeft,
openRight: openRight
};
options.view.trigger('querybuilder', evt);
}
Expand Down
19 changes: 18 additions & 1 deletion src/app/minicharts/querybuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var app = require('ampersand-app');
var LeafValue = require('mongodb-language-model').LeafValue;
var LeafClause = require('mongodb-language-model').LeafClause;
var ListOperator = require('mongodb-language-model').ListOperator;
var ValueOperator = require('mongodb-language-model').ValueOperator;
var GeoOperator = require('mongodb-language-model').GeoOperator;
var Range = require('mongodb-language-model').helpers.Range;
var metrics = require('mongodb-js-metrics')();
Expand Down Expand Up @@ -287,6 +288,23 @@ module.exports = {
throw new Error('message.selected should never be longer than 2 elements here!');
}

var q;
// in case one of the bounds is open
if (message.data.openLeft) {
message.upperOp = message.dx > 0 ? '$lt' : '$lte';
q = {};
q[message.upperOp] = message.selected[1];
message.value = new ValueOperator(q, {parse: true});
return message;
}

// in case one of the bounds is open
if (message.data.openRight) {
message.lowerOp = '$gte';
message.value = new ValueOperator({$gte: message.selected[0]}, {parse: true});
return message;
}

// at this point we definitely have 2 selected values to build a range
message.lowerOp = '$gte';
message.upperOp = message.dx > 0 ? '$lt' : '$lte';
Expand Down Expand Up @@ -324,7 +342,6 @@ module.exports = {
return message;
},


/**
* update the UI after a distinct query and mark appropriate elements with .select class.
*
Expand Down