refactor: deprecate-array-prototype-extensions - sortBy()

Author: bpetetot

admin/app/components/badges/capped-tubes-criterion.gjs

@@ -1,13 +1,11 @@
 import Component from '@glimmer/component';
+import sortBy from 'lodash/sortBy';
 
 import Area from '../common/tubes-details/area';
 
 export default class CappedTubesCriterion extends Component {
   get areasForView() {
-    return this.args.targetProfile
-      .hasMany('areas')
-      .value()
-      .sortBy('code')
+    return sortBy(this.args.targetProfile.hasMany('areas').value(), 'code')
       .map((area) => ({
         area,
         competences: this._buildCompetencesViewModel(area.hasMany('competences').value()),
@@ -21,8 +19,7 @@ export default class CappedTubesCriterion extends Component {
   }
 
   _buildCompetencesViewModel(competences) {
-    return competences
-      .sortBy('index')
+    return sortBy(competences, 'index')
       .map((competence) => ({
         competence,
         thematics: this._buildThematicsViewModel(competence.hasMany('thematics').value()),
@@ -35,8 +32,7 @@ export default class CappedTubesCriterion extends Component {
   }
 
   _buildThematicsViewModel(thematics) {
-    return thematics
-      .sortBy('index')
+    return sortBy(thematics, 'index')
       .map((thematic) => ({
         thematic,
         tubes: this._buildTubesViewModel(thematic.hasMany('tubes').value()),
@@ -50,8 +46,7 @@ export default class CappedTubesCriterion extends Component {
   }
 
   _buildTubesViewModel(tubes) {
-    return tubes
-      .sortBy('practicalName')
+    return sortBy(tubes, 'practicalName')
       .map((tube) => ({
         tube,
         cappedTube: this.args.criterion.cappedTubes.find(({ tubeId }) => tubeId === tube.id),

admin/app/components/certification-centers/information-edit.gjs

@@ -11,6 +11,7 @@ import { tracked } from '@glimmer/tracking';
 import pick from 'ember-composable-helpers/helpers/pick';
 import { t } from 'ember-intl';
 import set from 'ember-set-helper/helpers/set';
+import sortBy from 'lodash/sortBy';
 
 import contains from '../../helpers/contains.js';
 import { types } from '../../models/certification-center';
@@ -31,7 +32,7 @@ export default class InformationEdit extends Component {
   }
 
   get availableHabilitations() {
-    return this.args.availableHabilitations?.sortBy('id');
+    return sortBy(this.args.availableHabilitations, 'id');
   }
 
   @action

admin/app/components/certification-centers/information-view.gjs

@@ -4,6 +4,7 @@ import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 import ENV from 'pix-admin/config/environment';
 
 import HabilitationTag from './habilitation-tag';
@@ -20,7 +21,7 @@ export default class InformationView extends Component {
   }
 
   get availableHabilitations() {
-    const habilitations = this.args.availableHabilitations?.sortBy('id') || [];
+    const habilitations = sortBy(this.args.availableHabilitations, 'id');
     return habilitations.map((habilitation) => {
       const isHabilitated = this.habilitations.includes(habilitation);
       const label = habilitation.label;

admin/app/components/certification-centers/invitations.gjs

@@ -6,12 +6,13 @@ import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import dayjsFormat from 'ember-dayjs/helpers/dayjs-format';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 export default class CertificationCenterInvitations extends Component {
   @service intl;
 
   get sortedCertificationCenterInvitations() {
-    return this.args.certificationCenterInvitations.sortBy('updatedAt').reverse();
+    return sortBy(this.args.certificationCenterInvitations, 'updatedAt').reverse();
   }
 
   <template>

admin/app/components/complementary-certifications/list.gjs

@@ -3,10 +3,11 @@ import PixTableColumn from '@1024pix/pix-ui/components/pix-table-column';
 import { LinkTo } from '@ember/routing';
 import Component from '@glimmer/component';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 export default class List extends Component {
   get sortedComplementaryCertifications() {
-    return this.args.complementaryCertifications.sortBy('label');
+    return sortBy(this.args.complementaryCertifications, 'label');
   }
 
   <template>

admin/app/components/organizations/invitations.gjs

@@ -6,13 +6,14 @@ import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import dayjsFormat from 'ember-dayjs/helpers/dayjs-format';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 export default class OrganizationInvitations extends Component {
   @service accessControl;
   @service intl;
 
   get sortedInvitations() {
-    return this.args.invitations.sortBy('updatedAt').reverse();
+    return sortBy(this.args.invitations, 'updatedAt').reverse();
   }
 
   <template>

admin/app/components/sessions/certifications/list.gjs

@@ -4,11 +4,15 @@ import PixTableColumn from '@1024pix/pix-ui/components/pix-table-column';
 import { LinkTo } from '@ember/routing';
 import Component from '@glimmer/component';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 import CertificationStatus from './status';
 export default class CertificationsHeader extends Component {
   get sortedCertificationJurySummaries() {
-    return this.args.juryCertificationSummaries.sortBy('numberOfCertificationIssueReportsWithRequiredAction').reverse();
+    return sortBy(
+      this.args.juryCertificationSummaries,
+      'numberOfCertificationIssueReportsWithRequiredAction',
+    ).reverse();
   }
 
   <template>

admin/app/components/target-profiles/badge-form/capped-tubes-criterion.gjs

@@ -6,6 +6,7 @@ import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 import Areas from '../../common/tubes-selection/areas';
 
@@ -22,7 +23,7 @@ export default class CappedTubesCriterion extends Component {
   }
 
   get areas() {
-    return this.areasList.sortBy('code');
+    return sortBy(this.areasList, 'code');
   }
 
   @action

admin/app/components/trainings/trigger/details.gjs

@@ -1,6 +1,7 @@
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
+import sortBy from 'lodash/sortBy';
 
 import Area from '../../common/tubes-details/area';
 
@@ -17,7 +18,7 @@ export default class Details extends Component {
   }
 
   get areasList() {
-    return this.areas.sortBy('code').map((area) => this.buildAreaViewModel(area));
+    return sortBy(this.areas, 'code').map((area) => this.buildAreaViewModel(area));
   }
 
   buildAreaViewModel(area) {

admin/app/components/users/certification-centers/memberships.gjs

@@ -6,7 +6,9 @@ import MembershipItem from './membership-item';
 
 export default class Memberships extends Component {
   get orderedCertificationCenterMemberships() {
-    return this.args.certificationCenterMemberships.sortBy('certificationCenter.name');
+    return [...this.args.certificationCenterMemberships].sort((a, b) =>
+      a.certificationCenter?.get('name')?.localeCompare(b.certificationCenter?.get('name')),
+    );
   }
 
   <template>

admin/app/components/users/user-organization-memberships.gjs

@@ -4,14 +4,15 @@ import { LinkTo } from '@ember/routing';
 import { service } from '@ember/service';
 import Component from '@glimmer/component';
 import { t } from 'ember-intl';
+import sortBy from 'lodash/sortBy';
 
 import ActionsOnUsersRoleInOrganization from '../actions-on-users-role-in-organization';
 
 export default class UserOrganizationMemberships extends Component {
   @service accessControl;
 
   get orderedOrganizationMemberships() {
-    return this.args.organizationMemberships.sortBy('organizationName');
+    return sortBy(this.args.organizationMemberships, 'organizationName');
   }
 
   <template>

admin/app/controllers/authenticated/target-profiles/target-profile/details.js

@@ -1,43 +1,36 @@
 import Controller from '@ember/controller';
+import sortBy from 'lodash/sortBy';
 
 export default class TargetProfileDetailsController extends Controller {
   get areas() {
-    return this.model.areas.sortBy('frameworkId', 'code').map((area) => this.buildAreaViewModel(area));
+    return sortBy(this.model.areas, ['frameworkId', 'code']).map((area) => this.buildAreaViewModel(area));
   }
 
   buildAreaViewModel(area) {
     return {
       title: `${area.code} · ${area.title}`,
       color: area.color,
-      competences: area
-        .hasMany('competences')
-        .value()
-        .sortBy('index')
-        .map((competence) => this.buildCompetenceViewModel(competence)),
+      competences: sortBy(area.hasMany('competences').value(), 'index').map((competence) =>
+        this.buildCompetenceViewModel(competence),
+      ),
     };
   }
 
   buildCompetenceViewModel(competence) {
     return {
       id: competence.id,
       title: `${competence.index} ${competence.name}`,
-      thematics: competence
-        .hasMany('thematics')
-        .value()
-        .sortBy('index')
-        .map((thematic) => this.buildThematicViewModel(thematic)),
+      thematics: sortBy(competence.hasMany('thematics').value(), 'index').map((thematic) =>
+        this.buildThematicViewModel(thematic),
+      ),
     };
   }
 
   buildThematicViewModel(thematic) {
     return {
       name: thematic.name,
       nbTubes: thematic.hasMany('tubes').value().length,
-      tubes: thematic
-        .hasMany('tubes')
-        .value()
-        .sortBy('practicalTitle')
-        .map((tube) => this.buildTubeViewModel(tube)),
+      tubes: sortBy(thematic.hasMany('tubes').value(), 'practicalTitle').map((tube) => this.buildTubeViewModel(tube)),
     };
   }
 
@@ -48,11 +41,7 @@ export default class TargetProfileDetailsController extends Controller {
       level: tube.level,
       mobile: tube.mobile,
       tablet: tube.tablet,
-      skills: tube
-        .hasMany('skills')
-        .value()
-        .sortBy('difficulty')
-        .map((skill) => this.buildSkillViewModel(skill)),
+      skills: sortBy(tube.hasMany('skills').value(), 'difficulty').map((skill) => this.buildSkillViewModel(skill)),
     };
   }
 

admin/app/models/area.js

@@ -1,4 +1,5 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import sortBy from 'lodash/sortBy';
 
 export default class Area extends Model {
   @attr() title;
@@ -9,6 +10,6 @@ export default class Area extends Model {
   @hasMany('competence', { async: true, inverse: null }) competences;
 
   get sortedCompetences() {
-    return this.hasMany('competences').value().sortBy('index');
+    return sortBy(this.hasMany('competences').value(), 'index');
   }
 }

admin/app/models/competence.js

@@ -1,4 +1,5 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import sortBy from 'lodash/sortBy';
 
 export default class Competence extends Model {
   @attr() name;
@@ -7,6 +8,6 @@ export default class Competence extends Model {
   @hasMany('thematic', { async: true, inverse: null }) thematics;
 
   get sortedThematics() {
-    return this.hasMany('thematics').value().sortBy('index');
+    return sortBy(this.hasMany('thematics').value(), 'index');
   }
 }

admin/app/models/training.js

@@ -1,4 +1,5 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import sortBy from 'lodash/sortBy';
 
 import formatList from '../utils/format-select-options';
 
@@ -54,6 +55,6 @@ export default class Training extends Model {
   }
 
   get sortedTargetProfileSummaries() {
-    return this.hasMany('targetProfileSummaries').value().sortBy('id');
+    return sortBy(this.hasMany('targetProfileSummaries').value(), 'id');
   }
 }

admin/tests/integration/components/certification-centers/information-view-test.gjs

@@ -1,5 +1,4 @@
 import { render } from '@1024pix/ember-testing-library';
-import ArrayProxy from '@ember/array/proxy';
 import { t } from 'ember-intl/test-support';
 import InformationView from 'pix-admin/components/certification-centers/information-view';
 import { module, test } from 'qunit';
@@ -18,7 +17,7 @@ module('Integration | Component | certification-centers/information-view', funct
       label: 'Pix+Droit',
     });
     const cleaHabilitation = store.createRecord('complementary-certification', { id: 1, key: 'CLEA', label: 'Cléa' });
-    const availableHabilitations = ArrayProxy.create({ content: [pixDroitHabilitation, cleaHabilitation] });
+    const availableHabilitations = [pixDroitHabilitation, cleaHabilitation];
 
     const certificationCenter = store.createRecord('certification-center', {
       name: 'Centre SCO',