knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update filtereditor to use from/to instead of start/stop

Browse Source
This commit is contained in:
kielni
2013-10-29 12:17:58 -07:00
parent 56ac25611e
commit 03c3afbb51
4 changed files with 12 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
test/backend.memory.test.js
View File

@@ -99,20 +99,6 @@ test('filters', function () {
deepEqual(_.pluck(out.hits, 'country'), ['UK','UK','UK']);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'date', start: '2011-01-01', stop: '2011-05-01'});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 3);
deepEqual(_.pluck(out.hits, 'date'), ['2011-01-01','2011-02-03','2011-04-05']);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'z', start: '0', stop: '10'});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 3);
deepEqual(_.pluck(out.hits, 'z'), [3,6,9]);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'date', from: '2011-01-01', to: '2011-05-01'});
data.query(query.toJSON()).then(function(out) {
@@ -126,42 +112,25 @@ test('filters', function () {
equal(out.total, 3);
deepEqual(_.pluck(out.hits, 'z'), [3,6,9]);
});
});
test('filters with nulls', function () {
var data = _wrapData();
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'z', start: '', stop: null});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 6);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'z', from: '', to: null});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 6);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', start: '', stop: '3'});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 3);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', from: '', to: '3'});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 3);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', start: '3', stop: ''});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 4);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', from: '3', to: ''});
data.query(query.toJSON()).then(function(out) {
@@ -169,11 +138,6 @@ test('filters with nulls', function () {
});
data.records[5].country = '';
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'country', start: '', stop: 'Z'});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 5);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'country', from: '', to: 'Z'});
@@ -181,12 +145,6 @@ test('filters with nulls', function () {
equal(out.total, 5);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', start: '', stop: ''});
data.query(query.toJSON()).then(function(out) {
equal(out.total, 6);
});
query = new recline.Model.Query();
query.addFilter({type: 'range', field: 'x', from: '', to: ''});
data.query(query.toJSON()).then(function(out) {
@@ -350,14 +308,14 @@ test('filters', function () {
});
dataset = makeBackendDataset();
dataset.queryState.addFilter({type: 'range', field: 'date', start: '2011-01-01', stop: '2011-05-01'});
dataset.queryState.addFilter({type: 'range', field: 'date', from: '2011-01-01', to: '2011-05-01'});
dataset.query().then(function() {
equal(dataset.records.length, 3);
deepEqual(dataset.records.pluck('date'), ['2011-01-01','2011-02-03','2011-04-05']);
});
dataset = makeBackendDataset();
dataset.queryState.addFilter({type: 'range', field: 'z', start: '0', stop: '10'});
dataset.queryState.addFilter({type: 'range', field: 'z', from: '0', to: '10'});
dataset.query().then(function() {
equal(dataset.records.length, 3);
deepEqual(dataset.records.pluck('z'), [3,6,9]);

2
test/widget.filtereditor.test.js
View File

@@ -41,7 +41,7 @@ test('basics', function () {
$editForm.find('.filter-range input').last().val('4');
$editForm.submit();
equal(dataset.queryState.attributes.filters[0].term, 'UK');
equal(dataset.queryState.attributes.filters[1].start, 2);
equal(dataset.queryState.attributes.filters[1].from, 2);
equal(dataset.records.length, 2);
// now remove filter