fix: console now properly maintains history

fluidd-core · Oct 19, 2020 · 2334c3f · 2334c3f
1 parent b5ce691
commit 2334c3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/store/socket/actions.ts b/src/store/socket/actions.ts
@@ -355,10 +355,7 @@ export const actions: ActionTree<SocketState, RootState> = {
   async removeWait ({ commit }, wait) {
     commit('removeWait', wait)
   },
-  async addConsoleEntry ({ commit, state }, payload) {
-    if (state.console.length >= Globals.CONSOLE_HISTORY_RETENTION) {
-      commit('removeConsoleFirstEntry')
-    }
+  async addConsoleEntry ({ commit }, payload) {
     commit('addConsoleEntry', payload.replace(/(?:\r\n|\r|\n)/g, '<br>'))
   },
   async addMacro ({ commit, rootState }, macro) {

diff --git a/src/store/socket/mutations.ts b/src/store/socket/mutations.ts
@@ -2,8 +2,8 @@ import Vue from 'vue'
 import { MutationTree } from 'vuex'
 import { get } from 'lodash-es'
 import { SocketState, ChartDataSet, Macro } from './types'
-import { state, getDefaultState } from './index'
-import { chartConfiguration } from '@/globals'
+import { getDefaultState } from './index'
+import { Globals, chartConfiguration } from '@/globals'
 
 export const mutations: MutationTree<SocketState> = {
   resetState (state) {
@@ -79,11 +79,12 @@ export const mutations: MutationTree<SocketState> = {
     }
   },
   addConsoleEntry (state, payload) {
+    while (state.console.length >= Globals.CONSOLE_HISTORY_RETENTION) {
+      state.console.pop()
+    }
+
     state.console.unshift(payload)
   },
-  removeConsoleFirstEntry () {
-    state.console.shift()
-  },
   addMacro (state, macro: Macro) {
     Vue.set(state.macros, macro.name, macro)
   },