diff --git a/.eslintrc b/.eslintrc index 1d491e6b0d..9bbb9f7668 100644 --- a/.eslintrc +++ b/.eslintrc @@ -77,15 +77,21 @@ "rules": { // plugin:vue "vue/html-indent": ["warn", 4], - - // plugin:vue - style rules + + // plugin:vue - style rules "vue/max-attributes-per-line": "off", "vue/attribute-hyphenation": "off", "vue/singleline-html-element-content-newline": "off", "vue/component-definition-name-casing": "off", // plugin:promise - "promise/always-return": "off" // common Vue.js pattern + "promise/always-return": "off", // common Vue.js pattern + + // Frontend runs through webpack, not Node — Node-based resolution rules + // do not understand webpack aliases (@/) or .vue file resolution + "import/no-unresolved": "off", + "n/no-missing-import": "off", + "n/no-missing-require": "off" } }, diff --git a/frontend/src/components/DevicesBrowser.vue b/frontend/src/components/DevicesBrowser.vue index a1ed2e354e..756c276d56 100644 --- a/frontend/src/components/DevicesBrowser.vue +++ b/frontend/src/components/DevicesBrowser.vue @@ -385,6 +385,8 @@ import DevicesStatusBar from './charts/DeviceStatusBar.vue' import AddDeviceToGroupDialog from './dialogs/device-group-management/AddDeviceToGroupDialog.vue' import RemoveDeviceFromGroupDialog from './dialogs/device-group-management/RemoveDeviceFromGroupDialog.vue' +import { useUxDialogStore } from '@/stores/ux-dialog.js' + const POLL_TIME = 10000 export default { @@ -459,8 +461,8 @@ export default { computed: { ...mapState('account', ['team', 'teamMembership']), ...mapState('ux/tours', ['tours']), - ...mapState('ux/dialog', ['dialog']), ...mapGetters('account', ['featuresCheck']), + dialog () { return useUxDialogStore().dialog }, columns () { const columns = [ { label: 'Remote Instance', key: 'name', sortable: !this.moreThanOnePage, component: { is: markRaw(DeviceLink) } }, diff --git a/frontend/src/components/dialogs/device-group-management/AddDeviceToGroupDialog.vue b/frontend/src/components/dialogs/device-group-management/AddDeviceToGroupDialog.vue index d43b69f55b..d3c354a4ca 100644 --- a/frontend/src/components/dialogs/device-group-management/AddDeviceToGroupDialog.vue +++ b/frontend/src/components/dialogs/device-group-management/AddDeviceToGroupDialog.vue @@ -79,9 +79,9 @@