Skip to content
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

Revert the live filterBy changes in Ember Data beta.1 #3654

Merged
merged 2 commits into from
Aug 14, 2015
Merged

Revert the live filterBy changes in Ember Data beta.1 #3654

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
e5e8b3c
[BUGFIX beta] Revert "Implement filterBy on DS.ManyArray"
bmac Aug 14, 2015
ec69e94
[BUGFIX beta] Revert "Add `RecordArray#filterBy` which contains a liv…
bmac Aug 14, 2015
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
33 changes: 0 additions & 33 deletions packages/ember-data/lib/system/many-array.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@module ember-data
*/
import { PromiseArray } from "ember-data/system/promise-proxies";
import FilteredSubset from "ember-data/system/record-arrays/filtered-subset";

var get = Ember.get;
var set = Ember.set;
Expand Down Expand Up @@ -278,37 +277,5 @@ export default Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
this.pushObject(record);

return record;
},

/**
Get a filtered subset of the underlying `ManyArray`.
The subset updates when a record would match or mismatch the
specified filter parameters.

Example

```javascript
var post = store.peekRecord('post', 1)
// All the comments that are deleted locally but not yet saved to the server.
var deletedComments = post.get('comments').filterBy('isDeleted');
```

@method filterBy
@param {String} key property path
@param {*} value optional

*/
filterBy: function(key, value) {
// only pass value to the arguments if it is present; this mimics the same
// behavior for `filterBy`: http://git.io/vIurH
var filterByArgs = [key];
if (arguments.length === 2) {
filterByArgs.push(value);
}

return FilteredSubset.create({
filterByArgs,
recordArray: this
});
}
});
15 changes: 0 additions & 15 deletions packages/ember-data/lib/system/record-arrays/filtered-subset.js
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions packages/ember-data/lib/system/record-arrays/record-array.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import { PromiseArray } from "ember-data/system/promise-proxies";
import SnapshotRecordArray from "ember-data/system/snapshot-record-array";
import FilteredSubset from "ember-data/system/record-arrays/filtered-subset";

var get = Ember.get;
var set = Ember.set;
Expand Down Expand Up @@ -97,44 +96,6 @@ export default Ember.ArrayProxy.extend(Ember.Evented, {
return internalModel && internalModel.getRecord();
},

/**
Get a filtered subset of the underlying `RecordArray`.
The subset updates when a record would match or mismatch the
specified filter parameters.

Example

```javascript
var allToms = store.all('person').filterBy('name', 'Tom');

allToms.get('length'); // 0, since no toms yet in store

var tom = store.push('person', { id: 1, name: 'Tom' });
allToms.get('length'); // Tom is added

tom.set('name', 'Thomas');
allToms.get('length'); // 0, since no more records with name === 'Tom'
```

@method filterBy
@param {String} key property path
@param {*} value optional

*/
filterBy: function(key, value) {
// only pass value to the arguments if it is present; this mimics the same
// behavior for `filterBy`: http://git.io/vIurH
var filterByArgs = [key];
if (arguments.length === 2) {
filterByArgs.push(value);
}

return FilteredSubset.create({
filterByArgs,
recordArray: this
});
},

/**
Used to get the latest version of all of the records in this array
from the adapter.
Expand Down
72 changes: 0 additions & 72 deletions packages/ember-data/tests/integration/relationships/has-many-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,75 +2340,3 @@ test("metadata should be reset between requests", function() {
});
});
});


test("filterBy - returns a filtered subset", function () {
var chapter, page;
run(function() {
env.store.push({
data: {
type: 'chapter',
id: '1',
relationships: {
pages: {
data: [
{ type: 'page', id: '2' },
{ type: 'page', id: '3' }
]
}
}
},
included: [{
type: 'page',
id: '2'
}, {
type: 'page',
id: '3'
}]
});
chapter = env.store.peekRecord('chapter', 1);
page = env.store.peekRecord('page', 2);
});
run(function() {
page.deleteRecord();
});
run(function() {
equal(chapter.get('pages').filterBy('isDeleted').get('length'), 1, "Can filter by deleted records");
});
});


test("filterBy - returns a filtered subset", function () {
var chapter;
run(function() {
env.store.push({
data: {
type: 'chapter',
id: '1',
relationships: {
pages: {
data: [
{ type: 'page', id: '2' },
{ type: 'page', id: '3' }
]
}
}
},
included: [{
type: 'page',
id: '2'
}, {
type: 'page',
id: '3'
}]
});
chapter = env.store.peekRecord('chapter', 1);
});
run(function() {
env.store.peekRecord('page', 2).deleteRecord();
var deletedChapters = chapter.get('pages').filterBy('isDeleted');
equal(deletedChapters.get('length'), 1);
env.store.peekRecord('page', 3).deleteRecord();
equal(deletedChapters.get('length'), 2);
});
});
115 changes: 0 additions & 115 deletions packages/ember-data/tests/unit/record-array-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,118 +456,3 @@ test("a record array should return a promise when updating", function() {
});
ok(promise.then && typeof promise.then === "function", "#update returns a promise");
});

test('filterBy - returns a filtered subset', function() {
var store = createStore({
person: Person
});

run(function() {
store.push({ data: [{
id: '1',
type: 'person',
attributes: {
name: "Tom"
}
}, {
id: '2',
type: 'person',
attributes: {
name: "Yehuda"
}
}, {
id: '2',
type: 'person',
attributes: {
name: "Yehuda"
}
}] });
});

var all = store.peekAll('person');
var toms = all.filterBy('name', 'Tom');
equal(toms.get('length'), 1);
deepEqual(toms.getEach('id'), ['1']);

// a new record is added if filter matches
run(function() {
store.push({ data: { type: 'person', id: '4', attributes: { name: "Tom" } } });
});
equal(toms.get('length'), 2);
deepEqual(toms.getEach('id'), ['1', '4']);

// a new record is not added if filter doesn't match
run(function() {
store.push({ data: { type: 'person', id: '5', attributes: { name: "Igor" } } });
});
equal(toms.get('length'), 2);
deepEqual(toms.getEach('id'), ['1', '4']);

// changing the filtered value remvoves the record from the list
run(function() {
// we are using a private method here to get the record immediatly
store.recordForId('person', '1').set('name', "Thomas");
});
equal(toms.get('length'), 1);
deepEqual(toms.getEach('id'), ['4']);

// change value back to original
run(function() {
store.recordForId('person', '1').set('name', "Tom");
});
equal(toms.get('length'), 2);
deepEqual(toms.getEach('id'), ['1', '4']);
});

test('filterBy - value is optional', function() {
var store = createStore({
person: Person
});

run(function() {
store.push({ data: [{
id: '1',
type: 'person',
attributes: {
name: "Tom"
}
}, {
id: '2',
type: 'person'
}] });
});

var all = store.peekAll('person');
var allWithNames = all.filterBy('name');
equal(allWithNames.get('length'), 1);
deepEqual(allWithNames.getEach('id'), ['1']);

// a new record is added if filter matches
run(function() {
store.push({ data: { type: 'person', id: '3', attributes: { name: "Igor" } } });
});
equal(allWithNames.get('length'), 2);
deepEqual(allWithNames.getEach('id'), ['1', '3']);

// a new record is not added if filter doesn't match
run(function() {
store.push({ data: { type: 'person', id: '4' } });
});
equal(allWithNames.get('length'), 2);
deepEqual(allWithNames.getEach('id'), ['1', '3']);

// changing the filtered value remvoves the record from the list
run(function() {
// we are using a private method here to get the record immediatly
store.recordForId('person', '1').set('name', null);
});
equal(allWithNames.get('length'), 1);
deepEqual(allWithNames.getEach('id'), ['3']);

// change value back to original
run(function() {
store.recordForId('person', '1').set('name', "Tom");
});
equal(allWithNames.get('length'), 2);
deepEqual(allWithNames.getEach('id'), ['1', '3']);
});