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

fix: allow null as spool id response from spoolman (#1611)

Browse Source
This commit is contained in:
Stefan Dej 2023-10-18 20:23:36 +02:00 committed by GitHub
parent 5cd5aa42a4
commit f35252ec8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/dialogs/SpoolmanEjectSpoolDialog.vue
View File

@ -48,7 +48,7 @@ export default class SpoolmanEjectSpoolDialog extends Mixins(BaseMixin) {
} }
removeSpool() { removeSpool() {
this.$store.dispatch('server/spoolman/setActiveSpool', 0) this.$store.dispatch('server/spoolman/setActiveSpool', null)
this.close() this.close()
} }
} }

11
src/store/server/spoolman/actions.ts
View File

@ -47,8 +47,8 @@ export const actions: ActionTree<ServerSpoolmanState, RootState> = {
commit('setActiveSpoolId', payload.spool_id) commit('setActiveSpoolId', payload.spool_id)
dispatch('socket/removeInitModule', 'server/spoolman/getActiveSpoolId', { root: true }) dispatch('socket/removeInitModule', 'server/spoolman/getActiveSpoolId', { root: true })
// also set active spool to null, if spool_id is 0 // also set active spool to null, if spool_id is 0 or null
if (payload.spool_id === 0) { if ([null, 0].includes(payload.spool_id)) {
commit('setActiveSpool', null) commit('setActiveSpool', null)
return return
} }
@ -112,9 +112,10 @@ export const actions: ActionTree<ServerSpoolmanState, RootState> = {
}, },
setActiveSpool(_, id: number | null) { setActiveSpool(_, id: number | null) {
Vue.$socket.emit('server.spoolman.post_spool_id', { const params: { spool_id?: number } = {}
spool_id: id, if (id !== null) params['spool_id'] = id
})
Vue.$socket.emit('server.spoolman.post_spool_id', params)
}, },
refreshActiveSpool({ state }) { refreshActiveSpool({ state }) {