Merge branch 'develop'

Signed-off-by: Pedro Lamas <[email protected]>

Author: pedrolamas

package-lock.json

@@ -26,7 +26,7 @@
     "test": "npm run test:unit",
     "test:unit": "vitest --environment jsdom --config ./vitest.config.ts",
     "type-check": "vue-tsc --build --noEmit",
-    "circular-check": "skott --displayMode=file-tree --showCircularDependencies --tsconfig=./tsconfig.app.json",
+    "circular-check": "skott --displayMode=file-tree --showCircularDependencies --no-trackTypeOnlyDependencies --tsconfig=./tsconfig.app.json",
     "theme:convert": "cd tools; node convertTheme.mjs"
   },
   "main": "index.js",
@@ -36,7 +36,7 @@
     "@fontsource/roboto": "^5.2.5",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.8.1",
+    "axios": "^1.8.3",
     "consola": "^3.4.0",
     "dompurify": "^3.2.4",
     "echarts": "^5.6.0",
@@ -80,33 +80,33 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^22.13.9",
+    "@types/node": "^22.13.10",
     "@types/semver": "^7.5.8",
     "@types/sortablejs": "^1.15.8",
     "@vitejs/plugin-vue2": "^2.3.3",
-    "@vue/eslint-config-typescript": "^14.4.0",
+    "@vue/eslint-config-typescript": "^14.5.0",
     "@vue/test-utils": "^1.3.6",
     "@vue/tsconfig": "~0.1.3",
-    "eslint": "^9.21.0",
+    "eslint": "^9.22.0",
     "eslint-plugin-regexp": "^2.7.0",
     "eslint-plugin-vue": "^9.32.0",
     "husky": "^9.1.7",
     "jsdom": "^26.0.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
     "neostandard": "^0.12.1",
-    "rollup": "^4.34.9",
+    "rollup": "^4.35.0",
     "sass": "~1.32.13",
     "skott": "^0.35.4",
     "standard-version": "^9.5.0",
     "typescript": "^5.8.2",
-    "typescript-eslint": "^8.26.0",
+    "typescript-eslint": "^8.26.1",
     "unplugin-vue-components": "^28.4.1",
-    "vite": "^6.2.0",
+    "vite": "^6.2.1",
     "vite-plugin-checker": "^0.9.0",
     "vite-plugin-monaco-editor-esm": "^2.0.2",
     "vite-plugin-pwa": "^0.21.1",
-    "vitest": "^3.0.7",
+    "vitest": "^3.0.8",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
     "vue-template-compiler": "^2.7.16",

package.json

@@ -78,15 +78,17 @@
             (!socketConnected && authenticated)"
       />
 
-      <file-system-download-dialog />
-      <file-system-upload-dialog />
-      <updating-dialog />
-      <spool-selection-dialog />
-      <action-command-prompt-dialog />
-      <keyboard-shortcuts-dialog />
-      <manual-probe-dialog />
-      <bed-screws-adjust-dialog />
-      <screws-tilt-adjust-dialog />
+      <template v-if="socketConnected">
+        <file-system-download-dialog />
+        <file-system-upload-dialog />
+        <updating-dialog />
+        <spool-selection-dialog />
+        <action-command-prompt-dialog />
+        <keyboard-shortcuts-dialog />
+        <manual-probe-dialog />
+        <bed-screws-adjust-dialog />
+        <screws-tilt-adjust-dialog />
+      </template>
     </v-main>
 
     <app-footer />
@@ -145,7 +147,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   }
 
   get theme (): ThemeConfig {
-    return this.$store.state.config.uiSettings.theme
+    return this.$typedState.config.uiSettings.theme
   }
 
   get showBackgroundLogo () {
@@ -167,28 +169,28 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   // Our app is in a loading state when the socket isn't quite ready, or
   // our translations are loading.
   get updating (): boolean {
-    return this.$store.state.version.busy
+    return this.$typedState.version.busy
   }
 
   get inLayout (): boolean {
-    return (this.$store.state.config.layoutMode)
+    return (this.$typedState.config.layoutMode)
   }
 
   get columnCount (): number {
-    return this.$store.state.config.containerColumnCount
+    return this.$typedState.config.containerColumnCount
   }
 
   get fileDropRoot () {
     return this.$route.meta?.fileDropRoot
   }
 
   get progress (): number {
-    const progress: number = this.$store.getters['printer/getPrintProgress']
+    const progress: number = this.$typedGetters['printer/getPrintProgress']
     return Math.floor(progress * 100)
   }
 
   get pageTitle () {
-    const instanceName: string = this.$store.state.config.uiSettings.general.instanceName || ''
+    const instanceName: string = this.$typedState.config.uiSettings.general.instanceName || ''
     const pageName = this.$t(`app.general.title.${this.$route.name}`)
 
     if (this.printerPrinting) {
@@ -274,7 +276,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   }
 
   get customStyleSheet (): string | undefined {
-    return this.$store.getters['config/getCustomThemeFile']('custom', ['.css'])
+    return this.$typedGetters['config/getCustomThemeFile']('custom', ['.css'])
   }
 
   @Watch('customStyleSheet')
@@ -303,7 +305,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   }
 
   get customBackgroundImage (): string | undefined {
-    return this.$store.getters['config/getCustomThemeFile']('background', ['.png', '.jpg', '.jpeg', '.gif'])
+    return this.$typedGetters['config/getCustomThemeFile']('background', ['.png', '.jpg', '.jpeg', '.gif'])
   }
 
   @Watch('customBackgroundImage')
@@ -323,7 +325,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
   }
 
   get enableKeyboardShortcuts (): boolean {
-    return this.$store.state.config.uiSettings.general.enableKeyboardShortcuts
+    return this.$typedState.config.uiSettings.general.enableKeyboardShortcuts
   }
 
   mounted () {
@@ -416,18 +418,18 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
         const files = await getFilesFromDataTransfer(event.dataTransfer)
 
         if (files) {
-          const pathWithRoot: string = this.$store.getters['files/getCurrentPathByRoot'](root)
+          const pathWithRoot: string = this.$typedGetters['files/getCurrentPathByRoot'](root)
           const path = pathWithRoot === root
             ? ''
             : pathWithRoot.substring(root.length + 1)
 
           const wait = `${this.$waits.onFileSystem}/${pathWithRoot}/`
 
-          this.$store.dispatch('wait/addWait', wait)
+          this.$typedDispatch('wait/addWait', wait)
 
           await this.uploadFiles(files, path, root, false)
 
-          this.$store.dispatch('wait/removeWait', wait)
+          this.$typedDispatch('wait/removeWait', wait)
         }
       }
     }