refactor: spoolman socket actions

Signed-off-by: Pedro Lamas <[email protected]>
fluidd-core · Oct 2, 2023 · 0ee1748 · 0ee1748
1 parent 2cee275
commit 0ee1748
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/src/api/socketActions.ts b/src/api/socketActions.ts
@@ -704,13 +704,24 @@ export const SocketActions = {
     )
   },
 
-  async spoolmanState () {
+  async serverSpoolmanGetSpoolId () {
     baseEmit(
       'server.spoolman.get_spool_id', {
         dispatch: 'spoolman/onActiveSpool'
       }
     )
+  },
+
+  async serverSpoolmanPostSpoolId (spoolId: number | undefined) {
+    baseEmit(
+      'server.spoolman.post_spool_id', {
+        params: { spool_id: spoolId },
+        dispatch: 'spoolman/onActiveSpool'
+      }
+    )
+  },
 
+  async serverSpoolmanProxyGetAvailableSpools () {
     baseEmit(
       'server.spoolman.proxy', {
         params: {
@@ -720,14 +731,5 @@ export const SocketActions = {
         dispatch: 'spoolman/onAvailableSpools'
       }
     )
-  },
-
-  async spoolmanSetSpool (spoolId: number | undefined) {
-    baseEmit(
-      'server.spoolman.post_spool_id', {
-        params: { spool_id: spoolId },
-        dispatch: 'spoolman/onActiveSpool'
-      }
-    )
   }
 }
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -429,7 +429,7 @@ export default class SpoolSelectionDialog extends Mixins(StateMixin, BrowserMixi
       }
     }
 
-    await SocketActions.spoolmanSetSpool(this.selectedSpool ?? undefined)
+    await SocketActions.serverSpoolmanPostSpoolId(this.selectedSpool ?? undefined)
     if (this.filename) {
       await SocketActions.printerPrintStart(this.filename)
 

diff --git a/src/store/spoolman/actions.ts b/src/store/spoolman/actions.ts
@@ -15,7 +15,8 @@ export const actions: ActionTree<SpoolmanState, RootState> = {
    * Make a socket request to init the spoolman component.
    */
   async init () {
-    SocketActions.spoolmanState()
+    SocketActions.serverSpoolmanGetSpoolId()
+    SocketActions.serverSpoolmanProxyGetAvailableSpools()
   },
 
   async onActiveSpool ({ commit }, payload) {
@@ -24,9 +25,5 @@ export const actions: ActionTree<SpoolmanState, RootState> = {
 
   async onAvailableSpools ({ commit }, payload) {
     commit('setAvailableSpools', [...payload])
-  },
-
-  async notifyActiveSpoolSet ({ commit }, payload) {
-    commit('setActiveSpool', payload.spool_id)
   }
 }