Skip to content

Commit 9b16428

Browse files
authored
Merge pull request #8432 from jrjohnson/remove-get
Remove Get
2 parents 9767a0d + 21df119 commit 9b16428

File tree

5 files changed

+5
-9
lines changed

5 files changed

+5
-9
lines changed

packages/ilios-common/addon/authenticators/ilios-jwt.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { get } from '@ember/object';
21
import { service } from '@ember/service';
32
import Base from 'ember-simple-auth/authenticators/base';
43
import jwtDecode from 'ilios-common/utils/jwt-decode';
@@ -28,8 +27,7 @@ export default class IliosJWT extends Base {
2827

2928
async restore(data) {
3029
const now = DateTime.now().toUnixInteger();
31-
const jwt = get(data, 'jwt');
32-
let exp = get(data, 'exp');
30+
let { jwt, exp } = data;
3331

3432
if (!exp) {
3533
// Fetch the expiration time from the token data since `exp` wasn't included in the data object that was passed in.

packages/ilios-common/addon/serializers/learning-material.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import IliosSerializer from './ilios';
2-
import { get } from '@ember/object';
32

43
export default class LearningMaterialSerializer extends IliosSerializer {
54
serialize(snapshot, options) {
65
const json = super.serialize(snapshot, options);
76
//When POSTing new file learningMaterials we need to include the file hash
8-
const fileHash = get(snapshot.record, 'fileHash');
7+
const fileHash = snapshot.record?.fileHash;
98
if (fileHash) {
109
json.data.attributes.fileHash = fileHash;
1110
}

packages/ilios-common/addon/services/current-user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default class CurrentUserService extends Service {
2121
}
2222
const obj = jwtDecode(this.session.data.authenticated.jwt);
2323

24-
return get(obj, 'user_id');
24+
return obj?.user_id;
2525
}
2626

2727
async getModel() {

packages/ilios-common/addon/utils/as-array.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// taken from Ember Composable Helpers (https://github.com/DockYard/ember-composable-helpers), then modified.
2-
import EmberObject, { get } from '@ember/object';
2+
import EmberObject from '@ember/object';
33

44
function isIterable(value) {
55
return Symbol.iterator in Object(value);
@@ -55,7 +55,7 @@ function _asArray(maybeArray) {
5555
}
5656
if (typeof maybeArray === 'object') {
5757
if (isPromiseProxyLike(maybeArray)) {
58-
const content = get(maybeArray, 'content');
58+
const { content } = maybeArray;
5959
if (typeof content !== 'object' || content === null) {
6060
throw new Error('Unknown content type in array-like object [ilios-common]');
6161
}

packages/ilios-common/eslint.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ export default [
5151
reportUnusedDisableDirectives: 'error',
5252
},
5353
rules: {
54-
'ember/no-get': 'off',
5554
'no-duplicate-imports': 'error',
5655
},
5756
},

0 commit comments

Comments
 (0)