CreatBot/CreatBotMainsail
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename moonraker plugins in components (update for 1dc920019c)

Browse Source 
Signed-off-by: Stefan Dej <meteyou@gmail.com>
This commit is contained in:
Stefan Dej 2021-03-19 10:17:55 +01:00
parent 4119955399
commit 31d898c6ef
8 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/panels/MoonrakerFailedPluginsPanel.vue → src/components/panels/MoonrakerFailedComponentsPanel.vue
View File

@ -4,17 +4,17 @@
<v-toolbar flat dense color="orange darken-2">
<v-toolbar-title>
<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>
</v-toolbar-title>
</v-toolbar>
<v-card-text class="px-0 pt-0 pb-2 content">
<v-layout wrap class=" text-center">
<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>
<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>
</v-flex>
</v-layout>
@ -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,
}),

4
src/components/panels/index.js
View File

@ -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);

4
src/pages/Dashboard.vue
View File

@ -2,7 +2,7 @@
<v-row>
<v-col class="col-sm-12 col-md-5">
<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>
<status-panel v-if="klippy_state === 'ready'"></status-panel>
<webcam-panel class="mt-6" v-if="showDashboardWebcam"></webcam-panel>
@ -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,

2
src/pages/settings/machine.vue
View File

@ -34,7 +34,7 @@
}),
updateManager:{
get() {
return this.$store.state.server.plugins.includes('update_manager')
return this.$store.state.server.components.includes('update_manager')
}
}
},

3
src/store/printer/actions.js
View File

@ -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) {

2
src/store/printer/mutations.js
View File

@ -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')
},

6
src/store/server/actions.js
View File

@ -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')
}

4
src/store/server/index.js
View File

@ -12,8 +12,8 @@ export function getDefaultState() {
klippy_connected: false,
klippy_state: "",
klippy_message: "",
plugins: [],
failed_plugins: [],
components: [],
failed_components: [],
registered_directories: [],
events: [],
config: {},