Skip to content

Commit 5cb0a38

Browse files
committed
refactor: renamed some state prop names
Signed-off-by: Pedro Lamas <[email protected]>
1 parent b727628 commit 5cb0a38

File tree

7 files changed

+13
-17
lines changed

7 files changed

+13
-17
lines changed

src/components/widgets/job-queue/JobQueueCard.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<template #menu>
1111
<app-btn-collapse-group :collapsed="menuCollapsed">
1212
<app-btn
13-
v-if="['ready','loading','starting'].includes(queueStatus)"
13+
v-if="['ready','loading','starting'].includes(queueState)"
1414
small
1515
class="me-1 my-1"
1616
@click="handlePause"
@@ -24,7 +24,7 @@
2424
<span>{{ $t('app.general.btn.pause') }}</span>
2525
</app-btn>
2626
<app-btn
27-
v-else-if="queueStatus === 'paused'"
27+
v-else-if="queueState === 'paused'"
2828
small
2929
class="my-1"
3030
:class="{
@@ -82,8 +82,8 @@ export default class JobQueueCard extends Vue {
8282
@Prop({ type: Boolean })
8383
readonly fullscreen?: boolean
8484
85-
get queueStatus (): QueueState {
86-
return this.$store.state.jobQueue.queue_state
85+
get queueState (): QueueState {
86+
return this.$store.state.jobQueue.queueState
8787
}
8888
8989
handlePause () {

src/store/jobQueue/actions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const actions: ActionTree<JobQueueState, RootState> = {
1515

1616
async updateJobsMetadata ({ state, rootState }) {
1717
const pathFilenames = new Set(
18-
state.queued_jobs
18+
state.queuedJobs
1919
.map(job => job.filename)
2020
)
2121

src/store/jobQueue/getters.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import getFilePaths from '@/util/get-file-paths'
55

66
export const getters: GetterTree<JobQueueState, RootState> = {
77
getQueuedJobsWithFiles: (state, getters, rootState, rootGetters) => {
8-
return state.queued_jobs.map((job): QueuedJobWithAppFile => {
8+
return state.queuedJobs.map((job): QueuedJobWithAppFile => {
99
const { rootPath, filename } = getFilePaths(job.filename, 'gcodes')
1010

1111
return {
@@ -14,8 +14,4 @@ export const getters: GetterTree<JobQueueState, RootState> = {
1414
}
1515
})
1616
},
17-
18-
getQueuedJob: (state) => (jobId: string) => {
19-
return state.queued_jobs.findIndex(job => job.job_id === jobId)
20-
}
2117
}

src/store/jobQueue/mutations.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ export const mutations: MutationTree<JobQueueState> = {
88
},
99

1010
setQueueState (state, payload: QueueState) {
11-
state.queue_state = payload
11+
state.queueState = payload
1212
},
1313

1414
setQueuedJobs (state, payload: QueuedJob[]) {
15-
state.queued_jobs = payload || []
15+
state.queuedJobs = payload || []
1616
}
1717
}

src/store/jobQueue/state.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { JobQueueState } from './types'
22

33
export const defaultState = (): JobQueueState => {
44
return {
5-
queue_state: 'paused',
6-
queued_jobs: []
5+
queueState: 'paused',
6+
queuedJobs: []
77
}
88
}
99

src/store/jobQueue/types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { AppFile, AppFileWithMeta } from '@/store/files/types'
22

33
export interface JobQueueState {
4-
queue_state: QueueState;
5-
queued_jobs: QueuedJob[];
4+
queueState: QueueState;
5+
queuedJobs: QueuedJob[];
66
}
77

88
export interface QueuedJob {

src/views/Jobs.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default class Configuration extends Mixins(StateMixin) {
3434
}
3535
3636
get hasQueuedJobs () {
37-
return this.supportsJobQueue && this.$store.state.jobQueue.queued_jobs.length > 0
37+
return this.supportsJobQueue && this.$store.state.jobQueue.queuedJobs.length > 0
3838
}
3939
}
4040
</script>

0 commit comments

Comments
 (0)