cleanup filterBy & mapBy prototype extensions (#2602)

patricklx · web-flow · commit 4fe04246d2d8 · 2024-10-25T13:21:39.000-04:00
diff --git a/app/components/object-inspector/sort-properties.js b/app/components/object-inspector/sort-properties.js
@@ -7,7 +7,10 @@ export default class SortProperties extends Component {
   @computed('args.properties')
   get isArray() {
     const props = A(this.args.properties || []);
-    return props.findBy('name', 'length') && props.findBy('name', '0');
+    return (
+      props.find((x) => x.name === 'length') &&
+      props.find((x) => x.name === '0')
+    );
   }
 
   /**
@@ -21,7 +24,7 @@ export default class SortProperties extends Component {
     // limit arrays
     let props = A(this.sorted);
     if (this.isArray) {
-      const item = props.findBy('name', 'length');
+      const item = props.find((x) => x.name === 'length');
       props.removeObject(item);
       props.splice(0, 0, item);
     }
diff --git a/app/controllers/application.js b/app/controllers/application.js
@@ -173,7 +173,7 @@ export default class ApplicationController extends Controller {
   @action
   droppedObject(objectId) {
     let mixinStack = this.mixinStack;
-    let obj = mixinStack.findBy('objectId', objectId);
+    let obj = mixinStack.find((x) => x.objectId === objectId);
     if (obj) {
       let index = mixinStack.indexOf(obj);
       let objectsToRemove = [];
diff --git a/app/libs/resizable-columns.js b/app/libs/resizable-columns.js
@@ -165,7 +165,7 @@ export default class {
     if (saved.columnVisibility && !isNone(saved.columnVisibility[id])) {
       return saved.columnVisibility[id];
     }
-    return this.columnSchema.findBy('id', id).visible;
+    return this.columnSchema.find((x) => x.id === id).visible;
   }
 
   /**
@@ -221,8 +221,8 @@ export default class {
       let diff = this.tableWidth - totalWidth;
       while (diff > 0) {
         columns
-          .filter((col) => col.visible)
-          .sortBy('width')
+          .filter((col) => !!col.visible)
+          .sort((a, b) => a.width - b.width)
           .forEach((column) => {
             if (diff > 0) {
               column.width++;
@@ -245,7 +245,7 @@ export default class {
    * @param {Number} width The column's new width
    */
   updateColumnWidth(id, width) {
-    let column = this._columns.findBy('id', id);
+    let column = this._columns.find((x) => x.id === id);
     let previousWidth = column.width;
     column.width = width;
     let last = this._columns[this._columns.length - 1];
@@ -265,7 +265,7 @@ export default class {
    * @param {String} id
    */
   toggleVisibility(id) {
-    let column = this._columnVisibility.findBy('id', id);
+    let column = this._columnVisibility.find((x) => x.id === id);
     column.visible = !column.visible;
     if (!this._columnVisibility.isAny('visible')) {
       // If this column was the last visible column
diff --git a/app/models/promise.js b/app/models/promise.js
@@ -52,9 +52,7 @@ export default class Promise extends EmberObject {
   @not('isSettled')
   isPending;
 
-  get children() {
-    return [];
-  }
+  children = [];
 
   @computed('isPending', 'children.@each.pendingBranch')
   get pendingBranch() {
@@ -76,7 +74,7 @@ export default class Promise extends EmberObject {
       return true;
     }
     for (let i = 0; i < this.get('children.length'); i++) {
-      if (this.children.objectAt(i).get(cp)) {
+      if (this.children.at(i).get(cp)) {
         return true;
       }
     }
@@ -204,7 +202,7 @@ export default class Promise extends EmberObject {
   _allChildren() {
     let children = [...this.children];
     children.forEach((item) => {
-      children = [...children, item._allChildren()];
+      children = [...children, ...item._allChildren()];
     });
     return children;
   }
diff --git a/app/routes/application.js b/app/routes/application.js
@@ -76,10 +76,10 @@ export default class ApplicationRoute extends Route {
 
   updateProperty(options) {
     if (this.get('controller.mixinDetails.mixins')) {
-      const detail = this.get('controller.mixinDetails.mixins').objectAt(
+      const detail = this.get('controller.mixinDetails.mixins').at(
         options.mixinIndex,
       );
-      let property = detail.properties.findBy('name', options.property);
+      let property = detail.properties.find((x) => x.name === options.property);
       if (!property) return;
       set(property, 'value', options.value);
       if (options.dependentKeys) {
diff --git a/app/routes/deprecations.js b/app/routes/deprecations.js
@@ -41,7 +41,7 @@ export default class DeprecationsRoute extends TabRoute {
     let { deprecations } = this.controller;
 
     message.deprecations.forEach((item) => {
-      let record = deprecations.findBy('id', item.id);
+      let record = deprecations.find((x) => x.id === item.id);
       if (record) {
         setProperties(record, item);
       } else {
diff --git a/app/routes/model-type.js b/app/routes/model-type.js
@@ -7,9 +7,8 @@ export default class ModelTypeRoute extends Route {
 
   model(params) {
     return new Promise((resolve) => {
-      const type = this.modelFor('model-types').findBy(
-        'name',
-        decodeURIComponent(params.type_id),
+      const type = this.modelFor('model-types').find(
+        (x) => x.name === decodeURIComponent(params.type_id),
       );
       if (type) {
         resolve(type);
diff --git a/app/routes/model-types.js b/app/routes/model-types.js
@@ -37,9 +37,8 @@ export default class ModelTypesRoute extends TabRoute {
   updateModelTypes(message) {
     let route = this;
     message.modelTypes.forEach(function (modelType) {
-      const currentType = route.currentModel.findBy(
-        'objectId',
-        modelType.objectId,
+      const currentType = route.currentModel.find(
+        (x) => x.objectId === modelType.objectId,
       );
       set(currentType, 'count', modelType.count);
     });
diff --git a/app/routes/records.js b/app/routes/records.js
@@ -43,7 +43,9 @@ export default class RecordsRoute extends TabRoute {
 
   updateRecords(message) {
     message.records.forEach((record) => {
-      let currentRecord = this.currentModel.findBy('objectId', record.objectId);
+      let currentRecord = this.currentModel.find(
+        (x) => x.objectId === record.objectId,
+      );
       if (currentRecord) {
         set(currentRecord, 'columnValues', record.columnValues);
         set(currentRecord, 'filterValues', record.filterValues);
diff --git a/ember_debug/object-inspector.js b/ember_debug/object-inspector.js
@@ -1304,7 +1304,7 @@ function calculateCP(object, item, errorsForObject) {
   delete errorsForObject[property];
   try {
     if (object instanceof ArrayProxy && property == parseInt(property)) {
-      return object.objectAt(property);
+      return object.at(property);
     }
     return item.isGetter || property.includes?.('.')
       ? object[property]
diff --git a/tests/ember_debug/container-debug-test.js b/tests/ember_debug/container-debug-test.js
@@ -35,8 +35,8 @@ module('Ember Debug - Container', function (hooks) {
 
     assert.strictEqual(name, 'container:types');
     let types = emberA(message.types);
-    assert.ok(types.findBy('name', 'controller'));
-    assert.ok(types.findBy('name', 'route'));
+    assert.ok(types.find((x) => x.name === 'controller'));
+    assert.ok(types.find((x) => x.name === 'route'));
   });
 
   skip('#getInstances', async function t(assert) {
@@ -49,7 +49,7 @@ module('Ember Debug - Container', function (hooks) {
 
     assert.strictEqual(name, 'container:instances');
     let instances = emberA(message.instances);
-    assert.ok(instances.findBy('name', 'simple'));
+    assert.ok(instances.find((x) => x.name === 'simple'));
   });
 
   skip('#getInstances on a non existing type', async function t(assert) {
diff --git a/tests/ember_debug/promise-debug-test.js b/tests/ember_debug/promise-debug-test.js
@@ -56,9 +56,9 @@ module('Ember Debug - Promise Debug', function (hooks) {
 
     let promises = emberA(message.promises);
 
-    promise1 = promises.findBy('label', 'Promise1');
-    child1 = promises.findBy('label', 'Child1');
-    promise2 = promises.findBy('label', 'Promise2');
+    promise1 = promises.find((x) => x.label === 'Promise1');
+    child1 = promises.find((x) => x.label === 'Child1');
+    promise2 = promises.find((x) => x.label === 'Promise2');
 
     assert.strictEqual(promise1.label, 'Promise1');
     assert.strictEqual(promise1.state, 'fulfilled');
@@ -86,7 +86,7 @@ module('Ember Debug - Promise Debug', function (hooks) {
     later(function () {
       assert.strictEqual(name, 'promise:promisesUpdated');
       let promises = emberA(message.promises);
-      let promise = promises.findBy('label', 'Promise1');
+      let promise = promises.find((x) => x.label === 'Promise1');
       assert.ok(!!promise);
       if (promise) {
         assert.strictEqual(promise.label, 'Promise1');

Original file line number	Diff line number	Diff line change
`@@ -1304,7 +1304,7 @@ function calculateCP(object, item, errorsForObject) {`
`1304`	`1304`	`delete errorsForObject[property];`
`1305`	`1305`	`try {`
`1306`	`1306`	`if (object instanceof ArrayProxy && property == parseInt(property)) {`
`1307`		`- return object.objectAt(property);`
	`1307`	`+ return object.at(property);`
`1308`	`1308`	`}`
`1309`	`1309`	`return item.isGetter \|\| property.includes?.('.')`
`1310`	`1310`	`? object[property]`