refactor: Vuex state factory export

src/components/layout/AppBar.vue

@@ -242,7 +242,7 @@ import UserPasswordDialog from '@/components/settings/auth/UserPasswordDialog.vu
 import PendingChangesDialog from '@/components/settings/PendingChangesDialog.vue'
 import AppSaveConfigAndRestartBtn from './AppSaveConfigAndRestartBtn.vue'
 import AppUploadAndPrintBtn from './AppUploadAndPrintBtn.vue'
-import { defaultState } from '@/store/layout/state'
+import { createState } from '@/store/layout/state'
 import StateMixin from '@/mixins/state'
 import ServicesMixin from '@/mixins/services'
 import FilesMixin from '@/mixins/files'
@@ -404,7 +404,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
       ? this.$route.name
       : undefined
     const layoutDefaultState = pathLayout
-      ? defaultState().layouts[pathLayout]
+      ? createState().layouts[pathLayout]
       : this.$typedGetters['layout/getLayout']('dashboard')!
 
     const toReset = pathLayout ?? this.$typedGetters['layout/getSpecificLayoutName']
@@ -437,7 +437,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
   handleResetDefaultLayout () {
     this.$typedDispatch('layout/onLayoutChange', {
       name: 'dashboard',
-      value: defaultState().layouts.dashboard
+      value: createState().layouts.dashboard
     })
   }
 

src/components/settings/FileEditorSettings.vue

@@ -85,7 +85,7 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import type { KlipperSaveAndRestartAction, RestoreViewState } from '@/store/config/types'
 
 @Component({})
@@ -195,7 +195,7 @@ export default class FileEditorSettings extends Mixins(StateMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.editor',
-      value: defaultState().uiSettings.editor,
+      value: createState().uiSettings.editor,
       server: true
     })
   }

src/components/settings/GcodePreviewSettings.vue

@@ -196,7 +196,7 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({
   components: {}
@@ -365,7 +365,7 @@ export default class GcodePreviewSettings extends Vue {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.gcodePreview',
-      value: defaultState().uiSettings.gcodePreview,
+      value: createState().uiSettings.gcodePreview,
       server: true
     })
   }

src/components/settings/MmuSettings.vue

@@ -110,7 +110,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import StateMixin from '@/mixins/state'
 import MmuMixin from '@/mixins/mmu'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({
   components: {}
@@ -215,7 +215,7 @@ export default class MmuSettings extends Mixins(StateMixin, MmuMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.mmu',
-      value: defaultState().uiSettings.mmu,
+      value: createState().uiSettings.mmu,
       server: true
     })
   }

src/components/settings/SpoolmanSettings.vue

@@ -127,7 +127,7 @@
 
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import StateMixin from '@/mixins/state'
 import type { SpoolmanRemainingFilamentUnit } from '@/store/config/types'
 
@@ -281,7 +281,7 @@ export default class SpoolmanSettings extends Mixins(StateMixin) {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.spoolman',
-      value: defaultState().uiSettings.spoolman,
+      value: createState().uiSettings.spoolman,
       server: true
     })
   }

src/components/settings/ToolheadSettings.vue

@@ -392,7 +392,7 @@
 
 <script lang="ts">
 import { Component, Ref, Mixins } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 import type { VCombobox } from 'vuetify/lib'
 import ToolheadMixin from '@/mixins/toolhead'
 import type { GeneralConfig, ToolheadControlStyle } from '@/store/config/types'
@@ -729,7 +729,7 @@ export default class ToolHeadSettings extends Mixins(ToolheadMixin) {
     const { instanceName, chartVisible, chartSmoothingWindow, hideTempWaits }: GeneralConfig = this.$typedState.config.uiSettings.general
 
     const value: GeneralConfig = {
-      ...defaultState().uiSettings.general,
+      ...createState().uiSettings.general,
       instanceName,
       chartVisible,
       chartSmoothingWindow,

src/components/settings/WarningsSettings.vue

@@ -50,7 +50,7 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { defaultState } from '@/store/config/state'
+import { createState } from '@/store/config/state'
 
 @Component({})
 export default class WarningsSettings extends Vue {
@@ -81,7 +81,7 @@ export default class WarningsSettings extends Vue {
   handleReset () {
     this.$typedDispatch('config/saveByPath', {
       path: 'uiSettings.warnings',
-      value: defaultState().uiSettings.warnings,
+      value: createState().uiSettings.warnings,
       server: true
     })
   }

src/components/widgets/diagnostics/config/MetricsConfigStep.vue

@@ -159,7 +159,7 @@
 import { Component, Vue, Prop } from 'vue-property-decorator'
 import type { DiagnosticsCardConfig } from '@/store/diagnostics/types'
 import MetricsCollectorConfig from './MetricsCollectorConfig.vue'
-import { defaultState } from '@/store/layout/state'
+import { createDiagnosticsCardState } from '@/store/layout/state'
 
 @Component({
   components: {
@@ -180,8 +180,7 @@ export default class MetricsConfigStep extends Vue {
   ]
 
   addMetric (axis: number) {
-    const defaultCard = defaultState().layouts.diagnostics.container1[0] as DiagnosticsCardConfig
-    const defaultMetric = defaultCard.axes[0].metrics[0]
+    const defaultMetric = createDiagnosticsCardState().axes[0].metrics[0]
 
     this.config.axes[axis].metrics.push(defaultMetric)
   }

src/store/afc/index.ts

@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AfcState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const afc = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations

src/store/afc/mutations.ts

@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { AfcDialogState, AfcState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setDialogState (state, payload: AfcDialogState) {

src/store/afc/state.ts

@@ -1,11 +1,9 @@
 import type { AfcState } from './types'
 
-export const defaultState = (): AfcState => {
+export const createState = (): AfcState => {
   return {
     dialog: {
       show: false
     }
   }
 }
-
-export const state = defaultState()

src/store/analysis/index.ts

@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AnalysisState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const analysis = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations

src/store/analysis/mutations.ts

@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
 import type { AnalysisState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setAnalysisStatus (state, payload: Moonraker.Analysis.StatusResponse) {

src/store/analysis/state.ts

@@ -1,9 +1,7 @@
 import type { AnalysisState } from './types'
 
-export const defaultState = (): AnalysisState => {
+export const createState = (): AnalysisState => {
   return {
     status: null
   }
 }
-
-export const state = defaultState()

src/store/announcements/index.ts

@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AnnouncementsState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const announcements = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations

src/store/announcements/mutations.ts

@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { AnnouncementsState } from './types'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setAnnouncementsList (state, payload: Moonraker.Announcements.ListResponse) {

src/store/announcements/state.ts

@@ -1,10 +1,8 @@
 import type { AnnouncementsState } from './types'
 
-export const defaultState = (): AnnouncementsState => {
+export const createState = (): AnnouncementsState => {
   return {
     entries: [],
     feeds: []
   }
 }
-
-export const state = defaultState()

src/store/auth/index.ts

@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { AuthState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const auth = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations

src/store/auth/mutations.ts

@@ -1,13 +1,13 @@
 import type { MutationTree } from 'vuex'
-import { defaultState } from './state'
+import { createState } from './state'
 import type { AppUser, AuthState } from './types'
 
 export const mutations = {
   /**
    * Reset state
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setCurrentUser (state, user: AppUser | null) {

src/store/auth/state.ts

@@ -1,11 +1,9 @@
 import type { AuthState } from './types'
 
-export const defaultState = (): AuthState => {
+export const createState = (): AuthState => {
   return {
     currentUser: null,
     users: [],
     apiKey: ''
   }
 }
-
-export const state = defaultState()

src/store/charts/index.ts

@@ -1,16 +1,14 @@
 import type { Module } from 'vuex'
-import { state } from './state'
+import { createState } from './state'
 import { getters } from './getters'
 import { actions } from './actions'
 import { mutations } from './mutations'
 import type { ChartState } from './types'
 import type { RootState } from '../types'
 
-const namespaced = true
-
 export const charts = {
-  namespaced,
-  state,
+  namespaced: true,
+  state: createState,
   getters,
   actions,
   mutations

src/store/charts/mutations.ts

@@ -3,7 +3,7 @@ import type { MutationTree } from 'vuex'
 import { appendChartSamples, createChartBuffer, resizeChartBuffer } from '@/util/chart-buffer'
 import { Globals } from '@/globals'
 import type { ChartBucket, ChartBuffer, ChartEntriesPayload, ChartEntryPayload, ChartsDbDocument, ChartSelectedLegends, ChartState } from './types'
-import { defaultState } from './state'
+import { createState } from './state'
 
 const resolveBuffer = (state: ChartState, payload: ChartBucket): ChartBuffer => {
   switch (payload.bucket) {
@@ -37,11 +37,11 @@ export const mutations = {
    * Reset our store
    */
   setReset (state) {
-    Object.assign(state, defaultState())
+    Object.assign(state, createState())
   },
 
   setResetChartStore (state) {
-    const { thermal, ready } = defaultState()
+    const { thermal, ready } = createState()
 
     Object.assign(state, {
       thermal,