From 55b1a19bf17e2b1f1b7ab40a1aa53f1224257771 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Wed, 25 Sep 2024 14:55:56 +0800 Subject: [PATCH] ran linter --- addon/services/current-user.js | 44 +++++++++-------- addon/services/fetch.js | 86 +++++++++++++++++++--------------- addon/services/universe.js | 4 ++ 3 files changed, 73 insertions(+), 61 deletions(-) diff --git a/addon/services/current-user.js b/addon/services/current-user.js index 804c02b..b0b3d58 100644 --- a/addon/services/current-user.js +++ b/addon/services/current-user.js @@ -33,31 +33,31 @@ export default class CurrentUserService extends Service.extend(Evented) { @alias('user.company_uuid') companyId; @alias('user.company_name') companyName; - @computed('id') get optionsPrefix() { + @computed('id') get optionsPrefix () { return `${this.id}:`; } - get latitude() { + get latitude () { return this.whois('latitude'); } - get longitude() { + get longitude () { return this.whois('longitude'); } - get currency() { + get currency () { return this.whois('currency.code'); } - get city() { + get city () { return this.whois('city'); } - get country() { + get country () { return this.whois('country_code'); } - async load() { + async load () { if (this.session.isAuthenticated) { const user = await this.store.findRecord('user', 'me'); this.set('user', user); @@ -75,7 +75,7 @@ export default class CurrentUserService extends Service.extend(Evented) { return null; } - async promiseUser(options = {}) { + async promiseUser (options = {}) { const NoUserAuthenticatedError = new Error('Failed to authenticate user.'); if (!this.session.isAuthenticated) { throw NoUserAuthenticatedError; @@ -88,8 +88,6 @@ export default class CurrentUserService extends Service.extend(Evented) { this.set('user', user); this.trigger('user.loaded', user); - console.log(user); - // Set permissions this.permissions = this.getUserPermissions(user); @@ -121,13 +119,13 @@ export default class CurrentUserService extends Service.extend(Evented) { } } - async loadPreferences() { + async loadPreferences () { await this.loadLocale(); await this.loadWhois(); await this.loadOrganizations(); } - async loadLocale() { + async loadLocale () { try { const { locale } = await this.fetch.get('users/locale'); this.setLocale(locale); @@ -138,7 +136,7 @@ export default class CurrentUserService extends Service.extend(Evented) { } } - async loadOrganizations() { + async loadOrganizations () { try { const organizations = await this.fetch.get('auth/organizations', {}, { normalizeToEmberData: true, normalizeModelType: 'company' }); this.setOption('organizations', organizations); @@ -150,7 +148,7 @@ export default class CurrentUserService extends Service.extend(Evented) { } } - async loadWhois() { + async loadWhois () { this.fetch.shouldResetCache(); try { @@ -171,12 +169,12 @@ export default class CurrentUserService extends Service.extend(Evented) { } } - getCompany() { + getCompany () { this.company = this.store.peekRecord('company', this.user.company_uuid); return this.company; } - getUserPermissions(user) { + getUserPermissions (user) { const permissions = []; // get direct applied permissions @@ -213,11 +211,11 @@ export default class CurrentUserService extends Service.extend(Evented) { return permissions; } - whois(key) { + whois (key) { return this.getWhoisProperty(key); } - setLocale(locale) { + setLocale (locale) { this.setOption('locale', locale); this.intl.setLocale(locale); this.locale = locale; @@ -225,7 +223,7 @@ export default class CurrentUserService extends Service.extend(Evented) { return this; } - setOption(key, value) { + setOption (key, value) { key = `${this.optionsPrefix}${dasherize(key)}`; this.options.set(key, value); @@ -233,14 +231,14 @@ export default class CurrentUserService extends Service.extend(Evented) { return this; } - getOption(key, defaultValue = null) { + getOption (key, defaultValue = null) { key = `${this.optionsPrefix}${dasherize(key)}`; const value = this.options.get(key); return value !== undefined ? value : defaultValue; } - getWhoisProperty(prop) { + getWhoisProperty (prop) { const whois = this.getOption('whois'); if (!whois || typeof whois !== 'object') { @@ -250,11 +248,11 @@ export default class CurrentUserService extends Service.extend(Evented) { return get(whois, prop); } - hasOption(key) { + hasOption (key) { return this.getOption(key) !== undefined; } - filledOption(key) { + filledOption (key) { return !isBlank(this.getOption(key)); } } diff --git a/addon/services/fetch.js b/addon/services/fetch.js index 0e0ee84..572176b 100644 --- a/addon/services/fetch.js +++ b/addon/services/fetch.js @@ -27,7 +27,7 @@ export default class FetchService extends Service { * Creates an instance of FetchService. * @memberof FetchService */ - constructor() { + constructor () { super(...arguments); this.headers = this.getHeaders(); @@ -61,7 +61,7 @@ export default class FetchService extends Service { * * @return {Object} */ - getHeaders() { + getHeaders () { const headers = {}; const isAuthenticated = this.session.isAuthenticated; const userId = this.session.data.authenticated.user; @@ -92,7 +92,7 @@ export default class FetchService extends Service { * @return {FetchService} * @memberof FetchService */ - refreshHeaders() { + refreshHeaders () { this.headers = this.getHeaders(); return this; @@ -105,7 +105,7 @@ export default class FetchService extends Service { * @return {FetchService} * @memberof FetchService */ - setNamespace(namespace) { + setNamespace (namespace) { this.namespace = namespace; return this; @@ -118,7 +118,7 @@ export default class FetchService extends Service { * @return {FetchService} * @memberof FetchService */ - setHost(host) { + setHost (host) { this.host = host; return this; @@ -174,7 +174,7 @@ export default class FetchService extends Service { * * @return {Model} An ember model */ - normalizeModel(payload, modelType = null) { + normalizeModel (payload, modelType = null) { if (modelType === null) { const modelTypeKeys = Object.keys(payload); modelType = modelTypeKeys.length ? modelTypeKeys.firstObject : false; @@ -187,11 +187,11 @@ export default class FetchService extends Service { const type = dasherize(singularize(modelType)); if (isArray(payload)) { - return payload.map((instance) => this.store.push(this.store.normalize(type, instance))); + return payload.map(instance => this.store.push(this.store.normalize(type, instance))); } if (isArray(payload[modelType])) { - return payload[modelType].map((instance) => this.store.push(this.store.normalize(type, instance))); + return payload[modelType].map(instance => this.store.push(this.store.normalize(type, instance))); } if (!isBlank(payload) && isBlank(payload[modelType])) { @@ -209,7 +209,7 @@ export default class FetchService extends Service { * * @return {Model} An ember model */ - jsonToModel(attributes = {}, modelType) { + jsonToModel (attributes = {}, modelType) { if (typeof attributes === 'string') { attributes = JSON.parse(attributes); } @@ -228,7 +228,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - async parseJSON(response) { + async parseJSON (response) { try { const compressedHeader = await response.headers.get('x-compressed-json'); let json; @@ -265,7 +265,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - request(path, method = 'GET', data = {}, options = {}) { + request (path, method = 'GET', data = {}, options = {}) { const headers = Object.assign(this.getHeaders(), options.headers ?? {}); const host = options.host ?? this.host; const namespace = options.namespace ?? this.namespace; @@ -280,7 +280,7 @@ export default class FetchService extends Service { ...data, }) .then(this.parseJSON) - .then((response) => { + .then(response => { if (response.ok) { if (options.normalizeToEmberData) { const normalized = this.normalizeModel(response.json, options.normalizeModelType); @@ -334,7 +334,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - get(path, query = {}, options = {}) { + get (path, query = {}, options = {}) { // handle if want to request from cache if (options.fromCache === true) { return this.cachedGet(...arguments); @@ -355,13 +355,13 @@ export default class FetchService extends Service { * * @return {Promise} */ - cachedGet(path, query = {}, options = {}) { + cachedGet (path, query = {}, options = {}) { const pathKey = dasherize(path); const pathKeyVersion = new Date().toISOString(); const request = () => { delete options.fromCache; - return this.get(path, query, options).then((response) => { + return this.get(path, query, options).then(response => { // cache the response this.localCache.set(pathKey, response); this.localCache.set(`${pathKey}-version`, pathKeyVersion); @@ -373,7 +373,7 @@ export default class FetchService extends Service { // check to see if in storage already if (this.localCache.get(pathKey)) { - return new Promise((resolve) => { + return new Promise(resolve => { // get cached data const data = this.localCache.get(pathKey); @@ -409,14 +409,24 @@ export default class FetchService extends Service { return request(); } - flushRequestCache(path) { + /** + * Flushes the local cache for a specific path by setting its value and version to undefined. + * + * @param {string} path - The path for which the cache should be flushed. + */ + flushRequestCache (path) { const pathKey = dasherize(path); this.localCache.set(pathKey, undefined); this.localCache.set(`${pathKey}-version`, undefined); } - shouldResetCache() { + /** + * Determines whether the cache should be reset by comparing the current version + * of the console with the cached version. If they differ, the cache is cleared + * and the new version is saved. + */ + shouldResetCache () { const consoleVersion = this.localCache.get('console-version'); if (!consoleVersion || consoleVersion !== config.APP.version) { @@ -434,7 +444,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - post(path, data = {}, options = {}) { + post (path, data = {}, options = {}) { return this.request(path, 'POST', { body: JSON.stringify(data) }, options); } @@ -447,7 +457,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - put(path, data = {}, options = {}) { + put (path, data = {}, options = {}) { return this.request(path, 'PUT', { body: JSON.stringify(data) }, options); } @@ -460,7 +470,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - delete(path, data = {}, options = {}) { + delete (path, data = {}, options = {}) { return this.request(path, 'DELETE', { body: JSON.stringify(data) }, options); } @@ -472,7 +482,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - patch(path, data = {}, options = {}) { + patch (path, data = {}, options = {}) { return this.request(path, 'PATCH', { body: JSON.stringify(data) }, options); } @@ -485,9 +495,9 @@ export default class FetchService extends Service { * * @return {Promise} */ - upload(path, files = [], options = {}) { + upload (path, files = [], options = {}) { const body = new FormData(); - files.forEach((file) => { + files.forEach(file => { body.append('file', file); }); return this.request(path, 'POST', { body }, options); @@ -502,12 +512,12 @@ export default class FetchService extends Service { * @param {String} profile * @param {String} version */ - routing(coordinates, query = {}, options = {}) { + routing (coordinates, query = {}, options = {}) { let service = options?.service ?? 'trip'; let profile = options?.profile ?? 'driving'; let version = options?.version ?? 'v1'; let host = options?.host ?? `https://${options?.subdomain ?? 'routing'}.fleetbase.io`; - let route = coordinates.map((coords) => coords.join(',')).join(';'); + let route = coordinates.map(coords => coords.join(',')).join(';'); let params = !isEmptyObject(query) ? new URLSearchParams(query).toString() : ''; let path = `${host}/${service}/${version}/${profile}/${route}`; let url = `${path}${params ? '?' + params : ''}`; @@ -555,8 +565,8 @@ export default class FetchService extends Service { withCredentials: true, headers, }) - .then((response) => response.json()) - .catch((error) => { + .then(response => response.json()) + .catch(error => { this.notifications.serverError(error, 'File upload failed.'); if (typeof errorCallback === 'function') { @@ -598,7 +608,7 @@ export default class FetchService extends Service { * * @return {Promise} */ - download(path, query = {}, options = {}) { + download (path, query = {}, options = {}) { const headers = Object.assign(this.getHeaders(), options.headers ?? {}); const method = options.method ?? 'GET'; const credentials = options.credentials ?? this.credentials; @@ -619,7 +629,7 @@ export default class FetchService extends Service { return new Promise((resolve, reject) => { return fetch(`${baseUrl}/${path}${params}`, fetchOptions) - .then((response) => { + .then(response => { options.fileName = this.getFilenameFromResponse(response, options.fileName); options.mimeType = this.getMimeTypeFromResponse(response, options.mimeType); @@ -629,15 +639,15 @@ export default class FetchService extends Service { return response; }) - .then((response) => response.blob()) - .then((blob) => resolve(download(blob, options.fileName, options.mimeType))) - .catch((error) => { + .then(response => response.blob()) + .then(blob => resolve(download(blob, options.fileName, options.mimeType))) + .catch(error => { reject(error); }); }); } - getFilenameFromResponse(response, defaultFilename = null) { + getFilenameFromResponse (response, defaultFilename = null) { const contentDisposition = response.headers.get('content-disposition'); let fileName = defaultFilename; @@ -655,7 +665,7 @@ export default class FetchService extends Service { return fileName; } - getMimeTypeFromResponse(response, defaultMimeType = null) { + getMimeTypeFromResponse (response, defaultMimeType = null) { const contentType = response.headers.get('content-type'); let mimeType = defaultMimeType; @@ -670,10 +680,10 @@ export default class FetchService extends Service { return mimeType; } - fetchOrderConfigurations(params = {}) { + fetchOrderConfigurations (params = {}) { return new Promise((resolve, reject) => { this.request('fleet-ops/order-configs/get-installed', params) - .then((configs) => { + .then(configs => { const serialized = []; for (let i = 0; i < configs.length; i++) { @@ -686,7 +696,7 @@ export default class FetchService extends Service { resolve(serialized); }) - .catch((error) => { + .catch(error => { reject(error); }); }); diff --git a/addon/services/universe.js b/addon/services/universe.js index ca3cb8f..e9f71a2 100644 --- a/addon/services/universe.js +++ b/addon/services/universe.js @@ -777,9 +777,11 @@ export default class UniverseService extends Service.extend(Evented) { */ registerMenuPanel(registryName, title, items = [], options = {}) { const internalRegistryName = this.createInternalRegistryName(registryName); + const intl = this._getOption(options, 'intl', null); const open = this._getOption(options, 'open', true); const slug = this._getOption(options, 'slug', dasherize(title)); const menuPanel = { + intl, title, open, items: items.map(({ title, route, ...options }) => { @@ -1321,6 +1323,7 @@ export default class UniverseService extends Service.extend(Evented) { * @returns {Object} A new menu item object */ _createMenuItem(title, route, options = {}) { + const intl = this._getOption(options, 'intl', null); const priority = this._getOption(options, 'priority', 9); const icon = this._getOption(options, 'icon', 'circle-dot'); const items = this._getOption(options, 'items'); @@ -1360,6 +1363,7 @@ export default class UniverseService extends Service.extend(Evented) { // @todo: create menu item class const menuItem = { id, + intl, title, text: title, route,