Merge branch 'develop'

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

Author: pedrolamas

.devcontainer/devcontainer.json

@@ -19,12 +19,13 @@
         "esbenp.prettier-vscode",
         "lukas-tr.materialdesignicons-intellisense",
         "ms-azuretools.vscode-docker",
+        "orta.vscode-twoslash-queries",
         "redhat.vscode-yaml",
         "vue.volar"
       ],
       "settings": {
         "editor.codeActionsOnSave": {
-          "source.fixAll.eslint": true
+          "source.fixAll.eslint": "explicit"
         },
         "i18n-ally.localesPaths": [
           "src/locales"

.vscode/extensions.json

@@ -7,6 +7,7 @@
     "esbenp.prettier-vscode",
     "lukas-tr.materialdesignicons-intellisense",
     "ms-azuretools.vscode-docker",
+    "orta.vscode-twoslash-queries",
     "redhat.vscode-yaml",
     "vue.volar"
   ]

env.d.ts

@@ -3,6 +3,7 @@
 /// <reference types="vuetify" />
 /// <reference types="vue-meta" />
 /// <reference types="vite-plugin-pwa/client" />
+/// <reference types="./tsreset" />
 
 declare module '*.yaml' {
   const data: unknown
@@ -26,13 +27,3 @@ interface ImportMetaEnv {
 interface ImportMeta {
   readonly env: ImportMetaEnv
 }
-
-interface String {
-  toLowerCase<T extends string>(this: T): Lowercase<T>
-
-  toUpperCase<T extends string>(this: T): Uppercase<T>
-
-  startsWith<T extends string, T2 extends string>(this: T, searchString: T2, position?: number): this is `${T2}${string}`
-
-  endWith<T extends string, T2 extends string>(this: T, searchString: T2, position?: number): this is `${string}${T2}`
-}

package-lock.json

@@ -80,7 +80,7 @@
     "@types/jsdom": "^21.1.7",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "@types/semver": "^7.5.8",
     "@types/sortablejs": "^1.15.8",
     "@vitejs/plugin-vue2": "^2.3.3",
@@ -95,13 +95,13 @@
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
     "neostandard": "^0.12.1",
-    "rollup": "^4.34.6",
+    "rollup": "^4.34.8",
     "sass": "~1.32.13",
     "skott": "^0.35.4",
     "standard-version": "^9.5.0",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.24.0",
-    "unplugin-vue-components": "^28.0.0",
+    "typescript-eslint": "^8.24.1",
+    "unplugin-vue-components": "^28.2.0",
     "vite": "^6.1.0",
     "vite-plugin-checker": "^0.8.0",
     "vite-plugin-monaco-editor-esm": "^2.0.2",
@@ -110,7 +110,7 @@
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
     "vue-template-compiler": "^2.7.16",
-    "vue-tsc": "^2.2.0",
+    "vue-tsc": "^2.2.2",
     "workbox-build": "^7.3.0",
     "workbox-core": "^7.3.0",
     "workbox-precaching": "^7.3.0",

package.json

@@ -54,7 +54,7 @@
             (socketConnected && apiConnected) &&
               (!klippyReady || hasWarnings) &&
               !inLayout &&
-              $route.path !== '/login'
+              $route.name !== 'login'
           "
         >
           <v-col>
@@ -374,6 +374,8 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
 
   handleDragOver (event: DragEvent) {
     if (
+      this.socketConnected &&
+      this.authenticated &&
       this.fileDropRoot &&
       event.dataTransfer &&
       hasFilesInDataTransfer(event.dataTransfer)

src/App.vue

@@ -573,23 +573,27 @@ export const SocketActions = {
    * Expects the full path including root.
    * Optionally pass the just the filename and path.
    */
-  async serverFilesMetadata (filepath: string) {
+  async serverFilesMetadata (filename: string) {
+    const wait = `${Waits.onFileSystem}/gcodes/${filename}`
     baseEmit(
       'server.files.metadata', {
         dispatch: 'files/onFileMetaData',
+        wait,
         params: {
-          filename: filepath
+          filename
         }
       }
     )
   },
 
-  async serverFilesMetascan (filepath: string) {
+  async serverFilesMetascan (filename: string) {
+    const wait = `${Waits.onFileSystem}/gcodes/${filename}`
     baseEmit(
       'server.files.metascan', {
         dispatch: 'files/onFileMetaData',
+        wait,
         params: {
-          filename: filepath
+          filename
         }
       }
     )
@@ -689,7 +693,7 @@ export const SocketActions = {
   },
 
   async serverFilesDeleteFile (path: string) {
-    const wait = `${Waits.onFileSystem}/${path}/`
+    const wait = `${Waits.onFileSystem}/${path}`
     baseEmit(
       'server.files.delete_file', {
         dispatch: 'void',
@@ -780,6 +784,43 @@ export const SocketActions = {
     )
   },
 
+  async serverAnalysisStatus () {
+    baseEmit(
+      'server.analysis.status', {
+        dispatch: 'analysis/onAnalysisStatus'
+      }
+    )
+  },
+
+  async serverAnalysisEstimate (filename: string, estimator_config?: string) {
+    const wait = `${Waits.onFileSystem}/gcodes/${filename}`
+    baseEmit(
+      'server.analysis.estimate', {
+        params: {
+          filename,
+          estimator_config
+        },
+        wait,
+        dispatch: 'void'
+      }
+    )
+  },
+
+  async serverAnalysisProcess (filename: string, estimator_config?: string, force?: boolean) {
+    const wait = `${Waits.onFileSystem}/gcodes/${filename}`
+    baseEmit(
+      'server.analysis.process', {
+        params: {
+          filename,
+          estimator_config,
+          force
+        },
+        wait,
+        dispatch: 'analysis/onAnalysisProcess'
+      }
+    )
+  },
+
   async serverSpoolmanGetSpoolId () {
     baseEmit(
       'server.spoolman.get_spool_id', {

src/api/socketActions.ts

@@ -329,23 +329,20 @@ export default class AppBar extends Mixins(StateMixin, ServicesMixin, FilesMixin
   }
 
   get isDashboard () {
-    return this.$route.path === '/'
+    return this.$route.name === 'home'
   }
 
   handleResetLayout () {
-    const pathLayouts: Record<string, string> = {
-      '/diagnostics': 'diagnostics'
-    }
-
-    const pathLayout = pathLayouts[this.$route.path]
-    let layoutDefaultState
-    if (pathLayout) {
-      // reset to default init state
-      layoutDefaultState = defaultState().layouts[pathLayout]
-    } else {
-      // reset dashboard to default layout
-      layoutDefaultState = this.$store.getters['layout/getLayout']('dashboard')
-    }
+    const pathLayouts = [
+      'diagnostics'
+    ]
+
+    const pathLayout = pathLayouts.includes(this.$route.name ?? '')
+      ? this.$route.name
+      : undefined
+    const layoutDefaultState = pathLayout
+      ? defaultState().layouts[pathLayout]
+      : this.$store.getters['layout/getLayout']('dashboard')
 
     const toReset = pathLayout ?? this.$store.getters['layout/getSpecificLayoutName']
 

src/components/layout/AppBar.vue

@@ -77,7 +77,7 @@ export default class AppNavItem extends Mixins(StateMixin, BrowserMixin) {
     if (
       shortcut === this.accelerator &&
       !eventTargetIsContentEditable(event) &&
-      this.$router.currentRoute.name !== this.to
+      this.$route.name !== this.to
     ) {
       event.preventDefault()
 

src/components/ui/AppNavItem.vue

@@ -40,7 +40,7 @@ export default class DeviceCamera extends Mixins(CameraMixin) {
     this.updateStatus('disconnected')
 
     try {
-      const stream = this.cameraVideo.srcObject as MediaStream
+      const stream = this.cameraVideo.srcObject as MediaStream | null
 
       if (stream) {
         for (const track of stream.getTracks()) {