rename moonraker plugins in components (update for 1dc920019c
)
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
parent
4119955399
commit
31d898c6ef
@ -4,17 +4,17 @@
|
|||||||
<v-toolbar flat dense color="orange darken-2">
|
<v-toolbar flat dense color="orange darken-2">
|
||||||
<v-toolbar-title>
|
<v-toolbar-title>
|
||||||
<span class="subheading">
|
<span class="subheading">
|
||||||
<v-icon class="mdi mdi-alert-circle" left></v-icon>Moonraker Failed Plugins
|
<v-icon class="mdi mdi-alert-circle" left></v-icon>Moonraker Failed Components
|
||||||
</span>
|
</span>
|
||||||
</v-toolbar-title>
|
</v-toolbar-title>
|
||||||
</v-toolbar>
|
</v-toolbar>
|
||||||
<v-card-text class="px-0 pt-0 pb-2 content">
|
<v-card-text class="px-0 pt-0 pb-2 content">
|
||||||
<v-layout wrap class=" text-center">
|
<v-layout wrap class=" text-center">
|
||||||
<v-flex col class="text-left">
|
<v-flex col class="text-left">
|
||||||
<p class="orange--text">An error was detected while loading the moonraker plugins. Please check the logfile and fix the issue.</p>
|
<p class="orange--text">An error was detected while loading the moonraker components. Please check the logfile and fix the issue.</p>
|
||||||
<p class="mb-2 orange--text">Following plugin has an error:</p>
|
<p class="mb-2 orange--text">Following plugin has an error:</p>
|
||||||
<ul class="mt-0 pt-0">
|
<ul class="mt-0 pt-0">
|
||||||
<li v-for="plugin in failedPlugins" v-bind:key="plugin" class="orange--text"><code>{{ plugin }}</code></li>
|
<li v-for="component in failedComponents" v-bind:key="component" class="orange--text"><code>{{ component }}</code></li>
|
||||||
</ul>
|
</ul>
|
||||||
</v-flex>
|
</v-flex>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
@ -35,7 +35,7 @@
|
|||||||
}),
|
}),
|
||||||
computed: {
|
computed: {
|
||||||
...mapState({
|
...mapState({
|
||||||
failedPlugins: state => state.server.failed_plugins,
|
failedComponents: state => state.server.failed_components,
|
||||||
hostname: state => state.socket.hostname,
|
hostname: state => state.socket.hostname,
|
||||||
port: state => state.socket.port,
|
port: state => state.socket.port,
|
||||||
}),
|
}),
|
@ -3,7 +3,7 @@ import Vue from 'vue'
|
|||||||
import StatusPanel from './StatusPanel.vue'
|
import StatusPanel from './StatusPanel.vue'
|
||||||
import KlippyStatePanel from './KlippyStatePanel.vue'
|
import KlippyStatePanel from './KlippyStatePanel.vue'
|
||||||
import MinSettingsPanel from './MinSettingsPanel.vue'
|
import MinSettingsPanel from './MinSettingsPanel.vue'
|
||||||
import MoonrakerFailedPluginsPanel from './MoonrakerFailedPluginsPanel.vue'
|
import MoonrakerFailedComponentsPanel from './MoonrakerFailedComponentsPanel.vue'
|
||||||
import ToolsPanel from './ToolsPanel.vue'
|
import ToolsPanel from './ToolsPanel.vue'
|
||||||
import ControlPanel from "./ControlPanel";
|
import ControlPanel from "./ControlPanel";
|
||||||
import ZOffsetPanel from "./ZOffsetPanel";
|
import ZOffsetPanel from "./ZOffsetPanel";
|
||||||
@ -16,7 +16,7 @@ import PowerControlPanel from "./PowerControlPanel.vue";
|
|||||||
Vue.component('status-panel', StatusPanel);
|
Vue.component('status-panel', StatusPanel);
|
||||||
Vue.component('klippy-state-panel', KlippyStatePanel);
|
Vue.component('klippy-state-panel', KlippyStatePanel);
|
||||||
Vue.component('min-settings-panel', MinSettingsPanel);
|
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('tools-panel', ToolsPanel);
|
||||||
Vue.component('control-panel', ControlPanel);
|
Vue.component('control-panel', ControlPanel);
|
||||||
Vue.component('zoffset-panel', ZOffsetPanel);
|
Vue.component('zoffset-panel', ZOffsetPanel);
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<v-row>
|
<v-row>
|
||||||
<v-col class="col-sm-12 col-md-5">
|
<v-col class="col-sm-12 col-md-5">
|
||||||
<min-settings-panel v-if="klippy_state === 'ready' && existsPrinterConfig"></min-settings-panel>
|
<min-settings-panel v-if="klippy_state === 'ready' && existsPrinterConfig"></min-settings-panel>
|
||||||
<moonraker-failed-plugins-panel v-if="moonrakerFailedPlugins.length"></moonraker-failed-plugins-panel>
|
<moonraker-failed-components-panel v-if="moonrakerFailedComponents.length"></moonraker-failed-components-panel>
|
||||||
<klippy-state-panel v-if="socket_connected && klippy_state !== 'ready'"></klippy-state-panel>
|
<klippy-state-panel v-if="socket_connected && klippy_state !== 'ready'"></klippy-state-panel>
|
||||||
<status-panel v-if="klippy_state === 'ready'"></status-panel>
|
<status-panel v-if="klippy_state === 'ready'"></status-panel>
|
||||||
<webcam-panel class="mt-6" v-if="showDashboardWebcam"></webcam-panel>
|
<webcam-panel class="mt-6" v-if="showDashboardWebcam"></webcam-panel>
|
||||||
@ -31,7 +31,7 @@
|
|||||||
socket_connected: state => state.socket.isConnected,
|
socket_connected: state => state.socket.isConnected,
|
||||||
klippy_connected: state => state.server.klippy_connected,
|
klippy_connected: state => state.server.klippy_connected,
|
||||||
klippy_state: state => state.server.klippy_state,
|
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,
|
showDashboardWebcam: state => state.gui.dashboard.boolWebcam,
|
||||||
showDashboardConsole: state => state.gui.dashboard.boolConsole,
|
showDashboardConsole: state => state.gui.dashboard.boolConsole,
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
}),
|
}),
|
||||||
updateManager:{
|
updateManager:{
|
||||||
get() {
|
get() {
|
||||||
return this.$store.state.server.plugins.includes('update_manager')
|
return this.$store.state.server.components.includes('update_manager')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -8,9 +8,6 @@ export default {
|
|||||||
|
|
||||||
init() {
|
init() {
|
||||||
Vue.prototype.$socket.sendObj('printer.info', {}, 'printer/getInfo')
|
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) {
|
getInfo({ commit }, payload) {
|
||||||
|
@ -16,7 +16,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.dispatch('socket/clearLoadings', null, { root: true })
|
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')
|
Vue.prototype.$socket.sendObj('machine.update.status', { refresh: false }, 'server/updateManager/getStatus')
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -47,11 +47,11 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
getInfo({ commit, state, rootState }, payload) {
|
getInfo({ commit, state, rootState }, payload) {
|
||||||
if (state.plugins.length === 0) {
|
if (state.components.length === 0) {
|
||||||
if (payload.plugins.includes("power") !== false)
|
if (payload.components.includes("power") !== false)
|
||||||
Vue.prototype.$socket.sendObj('machine.device_power.devices', {}, 'server/power/getDevices')
|
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')
|
Vue.prototype.$socket.sendObj('machine.update.status', {}, 'server/updateManager/getStatus')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@ export function getDefaultState() {
|
|||||||
klippy_connected: false,
|
klippy_connected: false,
|
||||||
klippy_state: "",
|
klippy_state: "",
|
||||||
klippy_message: "",
|
klippy_message: "",
|
||||||
plugins: [],
|
components: [],
|
||||||
failed_plugins: [],
|
failed_components: [],
|
||||||
registered_directories: [],
|
registered_directories: [],
|
||||||
events: [],
|
events: [],
|
||||||
config: {},
|
config: {},
|
||||||
|
Loading…
x
Reference in New Issue
Block a user