Skip to content

Commit e41b9dc

Browse files
Remove mapBy and filterBy (#2600)
1 parent be0c5f2 commit e41b9dc

File tree

3 files changed

+31
-27
lines changed

3 files changed

+31
-27
lines changed

app/components/object-inspector.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class ObjectInspector extends Component {
2626
if (nested.length === 0) {
2727
return '';
2828
}
29-
return `.${nested.mapBy('property').join('.')}`;
29+
return `.${nested.map((item) => item.property).join('.')}`;
3030
}
3131

3232
get isNested() {

app/libs/resizable-columns.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default class {
8181
let saved = this.storage.getItem(this.getStorageKey());
8282
if (saved && saved.columnVisibility) {
8383
let savedIds = keys(saved.columnVisibility).sort();
84-
let schemaIds = this.columnSchema.mapBy('id').sort();
84+
let schemaIds = this.columnSchema.map((col) => col.id).sort();
8585
if (!compareArrays(savedIds, schemaIds)) {
8686
// Clear saved items
8787
this.storage.removeItem(this.getStorageKey());
@@ -221,7 +221,7 @@ export default class {
221221
let diff = this.tableWidth - totalWidth;
222222
while (diff > 0) {
223223
columns
224-
.filterBy('visible')
224+
.filter((col) => col.visible)
225225
.sortBy('width')
226226
.forEach((column) => {
227227
if (diff > 0) {

tests/unit/resizable-columns-test.js

+28-24
Original file line numberDiff line numberDiff line change
@@ -188,53 +188,57 @@ module('Unit | Lib | ResizableColumns', function (hooks) {
188188
resizableColumns.build();
189189

190190
assert.deepEqual(
191-
resizableColumns.columns.filterBy('visible').mapBy('id'),
191+
resizableColumns.columns
192+
.filter((col) => col.visible)
193+
.map((col) => col.id),
192194
['1', '2'],
193195
'shows/hides according to schema',
194196
);
195-
assert.deepEqual(resizableColumns.getColumnVisibility().mapBy('visible'), [
196-
true,
197-
true,
198-
false,
199-
]);
197+
assert.deepEqual(
198+
resizableColumns.getColumnVisibility().map((col) => col.visible),
199+
[true, true, false],
200+
);
200201

201202
resizableColumns.toggleVisibility('3');
202203
assert.deepEqual(
203-
resizableColumns.columns.filterBy('visible').mapBy('id'),
204+
resizableColumns.columns
205+
.filter((col) => col.visible)
206+
.map((col) => col.id),
204207
['1', '2', '3'],
205208
'toggles the third column correctly',
206209
);
207-
assert.deepEqual(resizableColumns.getColumnVisibility().mapBy('visible'), [
208-
true,
209-
true,
210-
true,
211-
]);
210+
assert.deepEqual(
211+
resizableColumns.getColumnVisibility().map((col) => col.visible),
212+
[true, true, true],
213+
);
212214

213215
resizableColumns.toggleVisibility('1');
214216
assert.deepEqual(
215-
resizableColumns.columns.filterBy('visible').mapBy('id'),
217+
resizableColumns.columns
218+
.filter((col) => col.visible)
219+
.map((col) => col.id),
216220
['2', '3'],
217221
'toggles the first column correctly',
218222
);
219-
assert.deepEqual(resizableColumns.getColumnVisibility().mapBy('visible'), [
220-
false,
221-
true,
222-
true,
223-
]);
223+
assert.deepEqual(
224+
resizableColumns.getColumnVisibility().map((col) => col.visible),
225+
[false, true, true],
226+
);
224227

225228
// Confirm correct caching
226229
resizableColumns = new ResizableColumns(this.options);
227230
resizableColumns.build();
228231
assert.deepEqual(
229-
resizableColumns.columns.filterBy('visible').mapBy('id'),
232+
resizableColumns.columns
233+
.filter((col) => col.visible)
234+
.map((col) => col.id),
230235
['2', '3'],
231236
'caching overrides schema visibility settings',
232237
);
233-
assert.deepEqual(resizableColumns.getColumnVisibility().mapBy('visible'), [
234-
false,
235-
true,
236-
true,
237-
]);
238+
assert.deepEqual(
239+
resizableColumns.getColumnVisibility().map((col) => col.visible),
240+
[false, true, true],
241+
);
238242
});
239243

240244
test("resets cache correctly if schema doesn't match cache", function (assert) {

0 commit comments

Comments
 (0)