Skip to content

Commit debecbb

Browse files
authored
refactor: Vuex state factory export (#1952)
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
1 parent 4b30985 commit debecbb

91 files changed

Lines changed: 233 additions & 338 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/components/layout/AppBar.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ import UserPasswordDialog from '@/components/settings/auth/UserPasswordDialog.vu
242242
import PendingChangesDialog from '@/components/settings/PendingChangesDialog.vue'
243243
import AppSaveConfigAndRestartBtn from './AppSaveConfigAndRestartBtn.vue'
244244
import AppUploadAndPrintBtn from './AppUploadAndPrintBtn.vue'
245-
import { defaultState } from '@/store/layout/state'
245+
import { createState } from '@/store/layout/state'
246246
import StateMixin from '@/mixins/state'
247247
import ServicesMixin from '@/mixins/services'
248248
import FilesMixin from '@/mixins/files'
@@ -404,7 +404,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
404404
? this.$route.name
405405
: undefined
406406
const layoutDefaultState = pathLayout
407-
? defaultState().layouts[pathLayout]
407+
? createState().layouts[pathLayout]
408408
: this.$typedGetters['layout/getLayout']('dashboard')!
409409
410410
const toReset = pathLayout ?? this.$typedGetters['layout/getSpecificLayoutName']
@@ -437,7 +437,7 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
437437
handleResetDefaultLayout () {
438438
this.$typedDispatch('layout/onLayoutChange', {
439439
name: 'dashboard',
440-
value: defaultState().layouts.dashboard
440+
value: createState().layouts.dashboard
441441
})
442442
}
443443

src/components/settings/FileEditorSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<script lang="ts">
8686
import { Component, Mixins } from 'vue-property-decorator'
8787
import StateMixin from '@/mixins/state'
88-
import { defaultState } from '@/store/config/state'
88+
import { createState } from '@/store/config/state'
8989
import type { KlipperSaveAndRestartAction, RestoreViewState } from '@/store/config/types'
9090
9191
@Component({})
@@ -195,7 +195,7 @@ export default class FileEditorSettings extends Mixins(StateMixin) {
195195
handleReset () {
196196
this.$typedDispatch('config/saveByPath', {
197197
path: 'uiSettings.editor',
198-
value: defaultState().uiSettings.editor,
198+
value: createState().uiSettings.editor,
199199
server: true
200200
})
201201
}

src/components/settings/GcodePreviewSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196

197197
<script lang="ts">
198198
import { Component, Vue } from 'vue-property-decorator'
199-
import { defaultState } from '@/store/config/state'
199+
import { createState } from '@/store/config/state'
200200
201201
@Component({
202202
components: {}
@@ -365,7 +365,7 @@ export default class GcodePreviewSettings extends Vue {
365365
handleReset () {
366366
this.$typedDispatch('config/saveByPath', {
367367
path: 'uiSettings.gcodePreview',
368-
value: defaultState().uiSettings.gcodePreview,
368+
value: createState().uiSettings.gcodePreview,
369369
server: true
370370
})
371371
}

src/components/settings/MmuSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
import { Component, Mixins } from 'vue-property-decorator'
111111
import StateMixin from '@/mixins/state'
112112
import MmuMixin from '@/mixins/mmu'
113-
import { defaultState } from '@/store/config/state'
113+
import { createState } from '@/store/config/state'
114114
115115
@Component({
116116
components: {}
@@ -215,7 +215,7 @@ export default class MmuSettings extends Mixins(StateMixin, MmuMixin) {
215215
handleReset () {
216216
this.$typedDispatch('config/saveByPath', {
217217
path: 'uiSettings.mmu',
218-
value: defaultState().uiSettings.mmu,
218+
value: createState().uiSettings.mmu,
219219
server: true
220220
})
221221
}

src/components/settings/SpoolmanSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127

128128
<script lang="ts">
129129
import { Component, Mixins } from 'vue-property-decorator'
130-
import { defaultState } from '@/store/config/state'
130+
import { createState } from '@/store/config/state'
131131
import StateMixin from '@/mixins/state'
132132
import type { SpoolmanRemainingFilamentUnit } from '@/store/config/types'
133133
@@ -281,7 +281,7 @@ export default class SpoolmanSettings extends Mixins(StateMixin) {
281281
handleReset () {
282282
this.$typedDispatch('config/saveByPath', {
283283
path: 'uiSettings.spoolman',
284-
value: defaultState().uiSettings.spoolman,
284+
value: createState().uiSettings.spoolman,
285285
server: true
286286
})
287287
}

src/components/settings/ToolheadSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392

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

src/components/settings/WarningsSettings.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<script lang="ts">
5252
import { Component, Vue } from 'vue-property-decorator'
53-
import { defaultState } from '@/store/config/state'
53+
import { createState } from '@/store/config/state'
5454
5555
@Component({})
5656
export default class WarningsSettings extends Vue {
@@ -81,7 +81,7 @@ export default class WarningsSettings extends Vue {
8181
handleReset () {
8282
this.$typedDispatch('config/saveByPath', {
8383
path: 'uiSettings.warnings',
84-
value: defaultState().uiSettings.warnings,
84+
value: createState().uiSettings.warnings,
8585
server: true
8686
})
8787
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
import { Component, Vue, Prop } from 'vue-property-decorator'
160160
import type { DiagnosticsCardConfig } from '@/store/diagnostics/types'
161161
import MetricsCollectorConfig from './MetricsCollectorConfig.vue'
162-
import { defaultState } from '@/store/layout/state'
162+
import { createDiagnosticsCardState } from '@/store/layout/state'
163163
164164
@Component({
165165
components: {
@@ -180,8 +180,7 @@ export default class MetricsConfigStep extends Vue {
180180
]
181181
182182
addMetric (axis: number) {
183-
const defaultCard = defaultState().layouts.diagnostics.container1[0] as DiagnosticsCardConfig
184-
const defaultMetric = defaultCard.axes[0].metrics[0]
183+
const defaultMetric = createDiagnosticsCardState().axes[0].metrics[0]
185184
186185
this.config.axes[axis].metrics.push(defaultMetric)
187186
}

src/store/afc/index.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import type { Module } from 'vuex'
2-
import { state } from './state'
2+
import { createState } from './state'
33
import { getters } from './getters'
44
import { actions } from './actions'
55
import { mutations } from './mutations'
66
import type { AfcState } from './types'
77
import type { RootState } from '../types'
88

9-
const namespaced = true
10-
119
export const afc = {
12-
namespaced,
13-
state,
10+
namespaced: true,
11+
state: createState,
1412
getters,
1513
actions,
1614
mutations

src/store/afc/mutations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import type { MutationTree } from 'vuex'
22
import type { AfcDialogState, AfcState } from './types'
3-
import { defaultState } from './state'
3+
import { createState } from './state'
44

55
export const mutations = {
66
/**
77
* Reset state
88
*/
99
setReset (state) {
10-
Object.assign(state, defaultState())
10+
Object.assign(state, createState())
1111
},
1212

1313
setDialogState (state, payload: AfcDialogState) {

0 commit comments

Comments
 (0)