diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js index cf31b345c..99a0745c2 100644 --- a/ui/.eslintrc.js +++ b/ui/.eslintrc.js @@ -37,7 +37,8 @@ module.exports = { ], 'ember/classic-decorator-hooks': 'error', 'ember/classic-decorator-no-classic-methods': 'error', - 'ember/no-jquery': 'error', + 'ember/no-get': 'off', + 'ember/no-mixins': 'off', }, overrides: [ // node files @@ -60,13 +61,9 @@ module.exports = { node: true, }, plugins: ['node'], - rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { - // add your custom rules and overrides for node files here - - // this can be removed once the following is fixed - // https://github.com/mysticatea/eslint-plugin-node/issues/77 + rules: { 'node/no-unpublished-require': 'off' - }), + }, }, { files: [ diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js index a2f977aee..9250f72b2 100644 --- a/ui/app/adapters/application.js +++ b/ui/app/adapters/application.js @@ -1,6 +1,6 @@ import { inject as service } from '@ember/service'; -import { computed, get } from '@ember/object'; -import RESTAdapter from 'ember-data/adapters/rest'; +import { computed } from '@ember/object'; +import RESTAdapter from '@ember-data/adapter/rest'; import codesForError from '../utils/codes-for-error'; import removeRecord from '../utils/remove-record'; import { default as NoLeaderError, NO_LEADER } from '../utils/no-leader-error'; @@ -92,7 +92,7 @@ export default class ApplicationAdapter extends RESTAdapter { urlForFindRecord(id, modelName) { let path; let url = []; - let host = get(this, 'host'); + let host = this.host; let prefix = this.urlPrefix(); if (modelName) { diff --git a/ui/app/app.js b/ui/app/app.js index d8e2088b6..71dd798ec 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -1,7 +1,7 @@ import Application from '@ember/application'; import Resolver from 'ember-resolver'; import loadInitializers from 'ember-load-initializers'; -import config from './config/environment'; +import config from 'nomad-ui/config/environment'; export default class App extends Application { modulePrefix = config.modulePrefix; diff --git a/ui/app/components/agent-monitor.js b/ui/app/components/agent-monitor.js index 79188ed09..fe596e220 100644 --- a/ui/app/components/agent-monitor.js +++ b/ui/app/components/agent-monitor.js @@ -23,7 +23,7 @@ export default class AgentMonitor extends Component { isStreaming = true; logger = null; - @computed('level', 'client.id', 'server.id') + @computed('client.id', 'level', 'server.{id,region}') get monitorParams() { assert( 'Provide a client OR a server to AgentMonitor, not both.', diff --git a/ui/app/components/das/dismissed.hbs b/ui/app/components/das/dismissed.hbs index ff2ffbaf3..c13da68a8 100644 --- a/ui/app/components/das/dismissed.hbs +++ b/ui/app/components/das/dismissed.hbs @@ -15,7 +15,7 @@ data-test-understood class='button is-info' type='button' - {{@on 'click' this.understoodClicked}} + {{on 'click' this.understoodClicked}} >Understood