Skip to content

Commit bcc3386

Browse files
committed
refactor: deprecate-array-prototype-extensions - findBy()
1 parent 45dc7ab commit bcc3386

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

admin/app/components/organizations/information-section-view.gjs

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ export default class OrganizationInformationSection extends Component {
4343
get identityProviderName() {
4444
const GARIdentityProvider = { code: 'GAR', organizationName: 'GAR' };
4545
const allIdentityProviderList = [...this.oidcIdentityProviders.list, GARIdentityProvider];
46-
const identityProvider = allIdentityProviderList.findBy(
47-
'code',
48-
this.args.organization.identityProviderForCampaigns,
46+
const identityProvider = allIdentityProviderList.find(
47+
(identityProvider) => identityProvider.code === this.args.organization.identityProviderForCampaigns,
4948
);
5049
const identityProviderName = identityProvider?.organizationName;
5150
return identityProviderName ?? 'Aucun';

admin/app/controllers/authenticated/organizations/get/team.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export default class GetTeamController extends Controller {
4545
const emailInLowerCase = email.toLowerCase();
4646
const matchingUsers = await this.store.query('user', { filter: { email: emailInLowerCase } });
4747
// GET /users?filter[email] makes an approximative request ("LIKE %email%") and not a strict request
48-
return matchingUsers.findBy('email', emailInLowerCase);
48+
return matchingUsers.find((user) => user.email === emailInLowerCase);
4949
}
5050

5151
@action

admin/app/controllers/authenticated/users/get/authentication-methods.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ export default class UserAuthenticationMethodsController extends Controller {
2525

2626
@action
2727
async reassignAuthenticationMethod({ targetUserId, identityProvider }) {
28-
const authenticationMethod = this.model.authenticationMethods.findBy('identityProvider', identityProvider);
29-
const oidcIdentityProvider = this.oidcIdentityProviders.list.findBy('code', identityProvider);
28+
const authenticationMethod = this.model.authenticationMethods.find(
29+
(authenticationMethod) => authenticationMethod.identityProvider === identityProvider,
30+
);
31+
const oidcIdentityProvider = this.oidcIdentityProviders.list.find(
32+
(oidcIdentityProvider) => oidcIdentityProvider.code === identityProvider,
33+
);
34+
3035
const reassignedAuthenticationMethodLabel = oidcIdentityProvider
3136
? oidcIdentityProvider.organizationName
3237
: 'Médiacentre';

admin/app/models/organization.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export default class Organization extends Model {
6363

6464
async hasMember(userId) {
6565
const memberships = await this.organizationMemberships;
66-
return !!memberships.findBy('user.id', userId);
66+
return memberships.some((membership) => membership.user?.id === userId);
6767
}
6868

6969
get archivedFormattedDate() {

admin/app/models/training.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ export default class Training extends Model {
4545

4646
get prerequisiteTrigger() {
4747
const trainingTriggers = this.hasMany('trainingTriggers').value() || [];
48-
return trainingTriggers.findBy('type', 'prerequisite');
48+
return trainingTriggers.find((trigger) => trigger.type === 'prerequisite');
4949
}
5050

5151
get goalTrigger() {
5252
const trainingTriggers = this.hasMany('trainingTriggers').value() || [];
53-
return trainingTriggers.findBy('type', 'goal');
53+
return trainingTriggers.find((trigger) => trigger.type === 'goal');
5454
}
5555

5656
get sortedTargetProfileSummaries() {

0 commit comments

Comments
 (0)