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

fix: search temperature_store_size in data_store and server (#705)

Browse Source
This commit is contained in:
Stefan Dej 2022-03-07 20:37:19 +01:00 committed by GitHub
parent 8f96aba9d8
commit 3b34ad547e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/charts/TempChart.vue
View File

@ -199,7 +199,7 @@ export default class TempChart extends Mixins(BaseMixin) {
} }
get maxHistory() { get maxHistory() {
return this.$store.getters['server/getConfig']('server', 'temperature_store_size') ?? 1200 return this.$store.getters['printer/tempHistory/getTemperatureStoreSize']
} }
get series() { get series() {

4
src/store/printer/tempHistory/actions.ts
View File

@ -27,7 +27,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
const now = new Date() const now = new Date()
const allSensors = rootGetters['printer/getAvailableSensors'] ?? [] const allSensors = rootGetters['printer/getAvailableSensors'] ?? []
const maxHistory = rootGetters['server/getConfig']('server', 'temperature_store_size') || 1200 const maxHistory = rootGetters['printer/tempHistory/getTemperatureStoreSize']
if (payload !== undefined) { if (payload !== undefined) {
if ('requestParams' in payload) delete payload.requestParams if ('requestParams' in payload) delete payload.requestParams
@ -267,7 +267,7 @@ export const actions: ActionTree<PrinterTempHistoryState, RootState> = {
await commit('addToSource', { await commit('addToSource', {
data: data, data: data,
maxHistory: rootGetters['server/getConfig']('server', 'temperature_store_size') || 1200, maxHistory: rootGetters['printer/tempHistory/getTemperatureStoreSize'],
}) })
} }

7
src/store/printer/tempHistory/getters.ts
View File

@ -98,4 +98,11 @@ export const getters: GetterTree<PrinterTempHistoryState, RootState> = {
return selected return selected
}, },
getTemperatureStoreSize: (state, getters, rootState, rootGetters) => {
const serverSize = rootGetters['server/getConfig']('server', 'temperature_store_size')
const dataStoreSize = rootGetters['server/getConfig']('data_store', 'temperature_store_size')
return dataStoreSize ?? serverSize ?? 1200
},
} }

4
src/store/server/mutations.ts
View File

@ -63,9 +63,7 @@ export const mutations: MutationTree<ServerState> = {
}, },
setConfig(state, payload) { setConfig(state, payload) {
Object.entries(payload.config).forEach(([key, value]) => { Vue.set(state, 'config', payload)
Vue.set(state.config, key, value)
})
}, },
setConsoleClearedThisSession(state) { setConsoleClearedThisSession(state) {