Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(console): add the ability to clear the console #672

Merged
merged 7 commits into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/components/panels/MiniconsolePanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
card-class="miniconsole-panel"
:hide-buttons-on-collapse="true">
<template #buttons>
<v-btn icon tile @click="clearConsole"><v-icon small>mdi-trash-can</v-icon></v-btn>
<command-help-modal :in-toolbar="true" @onCommand="gcode = $event"></command-help-modal>

<v-menu
:offset-y="true"
:close-on-content-click="false"
Expand Down Expand Up @@ -151,6 +151,10 @@ export default class MiniconsolePanel extends Mixins(BaseMixin) {
}
}

clearConsole() {
this.$store.dispatch('gui/console/clear')
}

get hideWaitTemperatures(): boolean {
return this.$store.state.gui.console.hideWaitTemperatures
}
Expand Down
7 changes: 7 additions & 0 deletions src/pages/Console.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
</v-col>

<v-col class="col-auto d-flex align-center">
<v-btn class="mr-3 px-2 minwidth-0" color="lightgray" @click="clearConsole">
<v-icon>mdi-trash-can</v-icon>
</v-btn>
<command-help-modal @onCommand="gcode = $event"></command-help-modal>
<v-menu
offset-y
Expand Down Expand Up @@ -148,6 +151,10 @@ export default class PageConsole extends Mixins(BaseMixin) {
this.$store.dispatch('gui/saveSetting', { name: 'console.hideWaitTemperatures', value: newVal })
}

clearConsole() {
this.$store.dispatch('gui/console/clear')
}

get hideTlCommands(): boolean {
return this.$store.state.gui.console.hideWaitTemperatures
}
Expand Down
16 changes: 16 additions & 0 deletions src/store/gui/console/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,22 @@ export const actions: ActionTree<GuiConsoleState, RootState> = {
commit('reset')
},

clear({ commit }) {
const cleared_since = new Date().valueOf()
Vue.$socket.emit('server.database.post_item', {
namespace: 'mainsail',
key: 'console.cleared_since',
value: cleared_since,
})

commit('clear', {
cleared_since,
})

commit('server/clearGcodeStore', {}, { root: true })
commit('server/setConsoleClearedThisSession', {}, { root: true })
},

saveSetting({ dispatch }, payload) {
dispatch(
'gui/saveSetting',
Expand Down
4 changes: 4 additions & 0 deletions src/store/gui/console/getters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,8 @@ export const getters: GetterTree<GuiConsoleState, any> = {

return output
},

getConsoleClearedSince: (state, getters, rootState) => {
return state.cleared_since
},
}
4 changes: 4 additions & 0 deletions src/store/gui/console/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ export const mutations: MutationTree<GuiConsoleState> = {
Object.assign(state, getDefaultState())
},

clear(state, payload) {
Vue.set(state, 'cleared_since', payload.cleared_since)
},

filterStore(state, payload) {
Vue.set(state.consolefilters, payload.id, payload.values)
},
Expand Down
1 change: 1 addition & 0 deletions src/store/gui/console/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export interface GuiConsoleState {
cleared_since?: number
hideWaitTemperatures: boolean
hideTlCommands: boolean
direction: 'table' | 'shell'
Expand Down
18 changes: 18 additions & 0 deletions src/store/server/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,24 @@ export const actions: ActionTree<ServerState, RootState> = {
}
})

const cleared_since = rootGetters['gui/console/getConsoleClearedSince']

events = events.filter((event) => {
if (!cleared_since) {
return true
}

if (event.time && event.time * 1000 < cleared_since) {
return false
}

if (event.date && new Date(event.date).valueOf() < cleared_since) {
return false
}

return true
})

commit('setGcodeStore', events)
},

Expand Down
2 changes: 1 addition & 1 deletion src/store/server/getters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const getters: GetterTree<ServerState, any> = {
(reverse = true, limit = 500) => {
const events = [...state.events].slice(limit * -1) ?? []

if (events.length < 20) {
if (events.length < 20 && !state.console_cleared_this_session) {
const date = events.length ? events[0].date : new Date()
let message = ''

Expand Down
4 changes: 4 additions & 0 deletions src/store/server/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ export const mutations: MutationTree<ServerState> = {
})
},

setConsoleClearedThisSession(state) {
Vue.set(state, 'console_cleared_this_session', true)
},

clearGcodeStore(state) {
Vue.set(state, 'events', [])
},
Expand Down
3 changes: 3 additions & 0 deletions src/store/server/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export interface ServerState {
websocket_count: number
moonraker_version: string

console_cleared_this_session?: boolean

power?: ServerPowerState
updateManager?: ServerUpdateMangerState
history?: ServerHistoryState
Expand All @@ -48,6 +50,7 @@ export interface ServerState {

export interface ServerStateEvent {
date: Date
time?: number
formatTime: string
type: string
message: string
Expand Down