refactor: moved wait and analysis stores to pinia

package.json

@@ -45,6 +45,7 @@
     "md5": "^2.3.0",
     "monaco-editor": "^0.56.0",
     "panzoom": "^9.4.4",
+    "pinia": "^2.3.1",
     "qr-scanner": "^1.4.2",
     "qrcode.vue": "^1.7.0",
     "semver": "^7.8.5",

src/App.vue

@@ -101,6 +101,7 @@ import FileSystemUploadDialog from '@/components/widgets/filesystem/FileSystemUp
 import SpoolSelectionDialog from '@/components/widgets/spoolman/SpoolSelectionDialog.vue'
 import type { FlashMessage } from '@/types'
 import { getFilesFromDataTransfer, hasFilesInDataTransfer } from '@/util/file-system-entry'
+import { useWaitStore } from '@/stores/wait'
 import type { ThemeConfig } from '@/store/config/types'
 import ActionCommandPromptDialog from '@/components/common/ActionCommandPromptDialog.vue'
 import KeyboardShortcutsDialog from '@/components/common/KeyboardShortcutsDialog.vue'
@@ -433,11 +434,11 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
 
           const wait = `${this.$waits.onFileSystem}/${pathWithRoot}/`
 
-          this.$typedDispatch('wait/addWait', wait)
+          useWaitStore().addWait(wait)
 
           await this.uploadFiles(files, path, root, false)
 
-          this.$typedDispatch('wait/removeWait', wait)
+          useWaitStore().removeWait(wait)
         }
       }
     }

src/api/socketActions.ts

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import { Globals, Waits } from '@/globals'
 import type { NotifyOptions } from '@/plugins/socketClient'
 import { consola } from 'consola'
+import { useAnalysisStore } from '@/stores/analysis'
 
 const baseEmit = async <T = unknown>(method: string, options: NotifyOptions): Promise<T> => {
   if (!Vue.$socket) {
@@ -921,10 +922,13 @@ export const SocketActions = {
   serverAnalysisStatus (options?: NotifyOptions) {
     return baseEmit<Moonraker.Analysis.StatusResponse>(
       'server.analysis.status', {
-        dispatch: 'analysis/onAnalysisStatus',
         ...options
       }
-    )
+    ).then((result) => {
+      useAnalysisStore().onAnalysisStatus(result)
+
+      return result
+    })
   },
 
   serverAnalysisEstimate (filename: string, estimator_config?: string, options?: NotifyOptions) {
@@ -944,15 +948,20 @@ export const SocketActions = {
     return baseEmit<Moonraker.Analysis.ProcessResponse>(
       'server.analysis.process', {
         wait: `${Waits.onFileSystem}/gcodes/${filename}`,
-        dispatch: 'analysis/onAnalysisProcess',
         ...options,
         params: {
           filename,
           estimator_config,
           force
         }
       }
-    )
+    ).then((result) => {
+      if (!result.bypassed) {
+        SocketActions.serverFilesMetadata(filename)
+      }
+
+      return result
+    })
   },
 
   accessInfo (options?: NotifyOptions) {

src/components/widgets/filesystem/FileSystem.vue

@@ -159,6 +159,7 @@ import { getFilesFromDataTransfer, hasFilesInDataTransfer } from '@/util/file-sy
 import { getFileDataTransferDataFromDataTransfer, hasFileDataTransferTypeInDataTransfer, setFileDataTransferDataInDataTransfer } from '@/util/file-data-transfer'
 import { consola } from 'consola'
 import type { DataTableHeader } from 'vuetify'
+import { useWaitStore } from '@/stores/wait'
 import type { KlipperSaveAndRestartAction } from '@/store/config/types'
 
 /**
@@ -1142,11 +1143,11 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
   async handleUpload (files: FileList | File[] | FileWithPath[], print: boolean) {
     const wait = `${this.$waits.onFileSystem}/${this.currentPath}/`
 
-    this.$typedDispatch('wait/addWait', wait)
+    useWaitStore().addWait(wait)
 
     await this.uploadFiles(files, this.visiblePath, this.currentRoot, print)
 
-    this.$typedDispatch('wait/removeWait', wait)
+    useWaitStore().removeWait(wait)
   }
 
   handleAddDir (name: string) {

src/main.ts

@@ -10,6 +10,7 @@ import Vue from 'vue'
 import i18n from '@/plugins/i18n'
 import router from './router'
 import store from './store'
+import pinia from './stores/pinia'
 
 // 3rd party.
 import vuetify from './plugins/vuetify'
@@ -58,6 +59,7 @@ new Vue({
   i18n,
   router,
   store,
+  pinia,
   vuetify,
   render: (h) => h(App)
 }).$mount('#app')

src/mixins/state.ts

@@ -3,6 +3,7 @@ import { SocketActions } from '@/api/socketActions'
 import { Component } from 'vue-property-decorator'
 import type { Macro } from '@/store/macros/types'
 import type { PrinterStatus } from '@/store/printer/types'
+import { useWaitStore } from '@/stores/wait'
 
 @Component
 export default class StateMixin extends Vue {
@@ -92,21 +93,21 @@ export default class StateMixin extends Vue {
    * Supports a single string or a list of.
    */
   hasWait (wait: string | string[]): boolean {
-    return this.$typedGetters['wait/hasWait'](wait)
+    return useWaitStore().hasWait(wait)
   }
 
   /**
    * Indicates if we have any waits.
    */
   get hasWaits (): boolean {
-    return this.$typedGetters['wait/hasWaits']
+    return useWaitStore().hasWaits
   }
 
   /**
    * Indicates if we have any waits prefixed by.
    */
   hasWaitsBy (prefix: string): boolean {
-    return this.$typedGetters['wait/hasWaitsBy'](prefix)
+    return useWaitStore().hasWaitsBy(prefix)
   }
 
   /**

src/plugins/socketClient.ts

@@ -2,6 +2,7 @@ import type _Vue from 'vue'
 import { consola } from 'consola'
 import { camelCase, mergeWith } from 'lodash-es'
 import type { TypedStore } from '@/store'
+import { useWaitStore } from '@/stores/wait'
 
 const LOG_PREFIX = '[WEBSOCKET]'
 
@@ -82,7 +83,7 @@ export class WebSocketClient {
 
           // Remove a wait if defined.
           if (request?.wait?.length) {
-            this.store.typedCommit('wait/setRemoveWait', request.wait)
+            useWaitStore().removeWait(request.wait)
           }
 
           if ('error' in socketResponse) { // Is it in error?
@@ -244,7 +245,7 @@ export class WebSocketClient {
           }
 
           if (wait) {
-            this.store.typedDispatch('wait/addWait', wait)
+            useWaitStore().addWait(wait)
           }
 
           this.requests.set(id, request)

src/store/config/actions.ts

@@ -8,6 +8,7 @@ import { Waits } from '@/globals'
 import type { FileFilterType } from '../files/types'
 import { TinyColor } from '@ctrl/tinycolor'
 import dbKey from '@/util/db-key'
+import { useWaitStore } from '../../stores/wait'
 
 export const actions = {
   /**
@@ -58,7 +59,7 @@ export const actions = {
     // vuetify.framework.lang.current = state.uiSettings.general.locale
 
     // Add the wait.
-    dispatch('wait/addWait', Waits.onLoadLanguage, { root: true })
+    useWaitStore().addWait(Waits.onLoadLanguage)
 
     // Grab the browsers starting locale.
     const startingLocale = getStartingLocale()
@@ -78,7 +79,7 @@ export const actions = {
         server: true
       })
     }
-    dispatch('wait/removeWait', Waits.onLoadLanguage, { root: true })
+    useWaitStore().removeWait(Waits.onLoadLanguage)
   },
 
   /**