diff --git a/src/components/panels/MoonrakerFailedPluginsPanel.vue b/src/components/panels/MoonrakerFailedComponentsPanel.vue similarity index 79% rename from src/components/panels/MoonrakerFailedPluginsPanel.vue rename to src/components/panels/MoonrakerFailedComponentsPanel.vue index fbe0f025..7847f6bd 100644 --- a/src/components/panels/MoonrakerFailedPluginsPanel.vue +++ b/src/components/panels/MoonrakerFailedComponentsPanel.vue @@ -4,17 +4,17 @@ - Moonraker Failed Plugins + Moonraker Failed Components -

An error was detected while loading the moonraker plugins. Please check the logfile and fix the issue.

+

An error was detected while loading the moonraker components. Please check the logfile and fix the issue.

Following plugin has an error:

    -
  • {{ plugin }}
  • +
  • {{ component }}
@@ -35,7 +35,7 @@ }), computed: { ...mapState({ - failedPlugins: state => state.server.failed_plugins, + failedComponents: state => state.server.failed_components, hostname: state => state.socket.hostname, port: state => state.socket.port, }), diff --git a/src/components/panels/index.js b/src/components/panels/index.js index 3206ecbe..51ab44c1 100644 --- a/src/components/panels/index.js +++ b/src/components/panels/index.js @@ -3,7 +3,7 @@ import Vue from 'vue' import StatusPanel from './StatusPanel.vue' import KlippyStatePanel from './KlippyStatePanel.vue' import MinSettingsPanel from './MinSettingsPanel.vue' -import MoonrakerFailedPluginsPanel from './MoonrakerFailedPluginsPanel.vue' +import MoonrakerFailedComponentsPanel from './MoonrakerFailedComponentsPanel.vue' import ToolsPanel from './ToolsPanel.vue' import ControlPanel from "./ControlPanel"; import ZOffsetPanel from "./ZOffsetPanel"; @@ -16,7 +16,7 @@ import PowerControlPanel from "./PowerControlPanel.vue"; Vue.component('status-panel', StatusPanel); Vue.component('klippy-state-panel', KlippyStatePanel); Vue.component('min-settings-panel', MinSettingsPanel); -Vue.component('moonraker-failed-plugins-panel', MoonrakerFailedPluginsPanel); +Vue.component('moonraker-failed-components-panel', MoonrakerFailedComponentsPanel); Vue.component('tools-panel', ToolsPanel); Vue.component('control-panel', ControlPanel); Vue.component('zoffset-panel', ZOffsetPanel); diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 3f3ca335..8c45dd93 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -2,7 +2,7 @@ - + @@ -31,7 +31,7 @@ socket_connected: state => state.socket.isConnected, klippy_connected: state => state.server.klippy_connected, klippy_state: state => state.server.klippy_state, - moonrakerFailedPlugins: state => state.server.failed_plugins, + moonrakerFailedComponents: state => state.server.failed_components, showDashboardWebcam: state => state.gui.dashboard.boolWebcam, showDashboardConsole: state => state.gui.dashboard.boolConsole, diff --git a/src/pages/settings/machine.vue b/src/pages/settings/machine.vue index f94f5f43..4d96abc4 100644 --- a/src/pages/settings/machine.vue +++ b/src/pages/settings/machine.vue @@ -34,7 +34,7 @@ }), updateManager:{ get() { - return this.$store.state.server.plugins.includes('update_manager') + return this.$store.state.server.components.includes('update_manager') } } }, diff --git a/src/store/printer/actions.js b/src/store/printer/actions.js index 97afd0c3..d973c1fc 100644 --- a/src/store/printer/actions.js +++ b/src/store/printer/actions.js @@ -8,9 +8,6 @@ export default { init() { Vue.prototype.$socket.sendObj('printer.info', {}, 'printer/getInfo') - - // only available with klipper is ready - //Vue.prototype.$socket.sendObj('server.files.get_directory', { path: 'gcodes' }, 'files/getDirectory') }, getInfo({ commit }, payload) { diff --git a/src/store/printer/mutations.js b/src/store/printer/mutations.js index 4658729c..aac87f3e 100644 --- a/src/store/printer/mutations.js +++ b/src/store/printer/mutations.js @@ -16,7 +16,7 @@ export default { } this.dispatch('socket/clearLoadings', null, { root: true }) - if (this.state.server.plugins.includes("update_manager")) + if (this.state.server.components.includes("update_manager")) Vue.prototype.$socket.sendObj('machine.update.status', { refresh: false }, 'server/updateManager/getStatus') }, diff --git a/src/store/server/actions.js b/src/store/server/actions.js index 9a6b7442..5257c35d 100644 --- a/src/store/server/actions.js +++ b/src/store/server/actions.js @@ -47,11 +47,11 @@ export default { }, getInfo({ commit, state, rootState }, payload) { - if (state.plugins.length === 0) { - if (payload.plugins.includes("power") !== false) + if (state.components.length === 0) { + if (payload.components.includes("power") !== false) Vue.prototype.$socket.sendObj('machine.device_power.devices', {}, 'server/power/getDevices') - if (payload.plugins.includes("update_manager") !== false) + if (payload.components.includes("update_manager") !== false) Vue.prototype.$socket.sendObj('machine.update.status', {}, 'server/updateManager/getStatus') } diff --git a/src/store/server/index.js b/src/store/server/index.js index d3ce878e..fe774464 100644 --- a/src/store/server/index.js +++ b/src/store/server/index.js @@ -12,8 +12,8 @@ export function getDefaultState() { klippy_connected: false, klippy_state: "", klippy_message: "", - plugins: [], - failed_plugins: [], + components: [], + failed_components: [], registered_directories: [], events: [], config: {},