refactor: typing improvements

pedrolamas · pedrolamas · commit e0bb1c916008 · 2025-02-28T12:07:34.000Z
Signed-off-by: Pedro Lamas &lt;pedrolamas@gmail.com&gt;
diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue
@@ -827,7 +827,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
     }
   }
 
-  async handleViewThumbnail (file: AppFileWithMeta) {
+  async handleViewThumbnail (file: AppFile) {
     const thumb = this.getThumb(file, this.currentRoot, file.path, true)
 
     if (thumb) {
diff --git a/src/mixins/files.ts b/src/mixins/files.ts
@@ -1,4 +1,4 @@
-import type { AppFile, FileUpload, AppFileThumbnail, MoonrakerFileMeta, FileDownload } from '@/store/files/types'
+import type { AppFile, FileUpload, AppFileThumbnail, FileDownload } from '@/store/files/types'
 import Vue from 'vue'
 import { Component } from 'vue-property-decorator'
 import type { AxiosRequestConfig, AxiosProgressEvent } from 'axios'
@@ -20,15 +20,15 @@ export default class FilesMixin extends Vue {
     return currentUser?.username === '_TRUSTED_USER_'
   }
 
-  getThumbUrl (meta: MoonrakerFileMeta, root: string, path: string, large: boolean, date?: number) {
-    const thumb = this.getThumb(meta, root, path, large, date)
+  getThumbUrl (file: AppFile, root: string, path: string, large: boolean, date?: number) {
+    const thumb = this.getThumb(file, root, path, large, date)
 
     return thumb?.url ?? ''
   }
 
-  getThumb (meta: MoonrakerFileMeta, root: string, path: string, large = true, date?: number): AppFileThumbnail | undefined {
-    if (meta.thumbnails?.length) {
-      const thumb = meta.thumbnails.reduce((a, b) => (a.size > b.size) === large ? a : b)
+  getThumb (file: AppFile, root: string, path: string, large = true, date?: number): AppFileThumbnail | undefined {
+    if (file.thumbnails?.length) {
+      const thumb = file.thumbnails.reduce((a, b) => (a.size > b.size) === large ? a : b)
 
       if (thumb.relative_path) {
         const filepath = path ? `${root}/${path}` : root
diff --git a/src/store/files/getters.ts b/src/store/files/getters.ts
@@ -1,5 +1,5 @@
 import type { GetterTree } from 'vuex'
-import type { AppDirectory, AppFile, AppFileWithMeta, FileBrowserEntry, FilesState, RootProperties } from './types'
+import type { AppDirectory, AppFile, AppFileWithMeta, FileBrowserEntry, FilesState, MoonrakerFileMeta, RootProperties } from './types'
 import type { RootState } from '../types'
 import type { HistoryItem } from '../history/types'
 import { SupportedImageFormats, SupportedMarkdownFormats, SupportedVideoFormats } from '@/globals'
@@ -49,30 +49,22 @@ export const getters: GetterTree<FilesState, RootState> = {
         : undefined
 
       for (const file of pathContent.files) {
-        const history: HistoryItem | undefined = (
-          'job_id' in file &&
-          file.job_id &&
-          rootState.history.jobs.find(job => job.job_id === file.job_id)
-        ) || undefined
+        const metadata: Partial<MoonrakerFileMeta> & Pick<AppFileWithMeta, 'history'> = {}
 
-        const extensionIndex = file.filename.lastIndexOf('.')
-        const extension = extensionIndex > -1 ? file.filename.substring(extensionIndex) : ''
+        if ('job_id' in file && file.job_id) {
+          const history: HistoryItem | undefined = rootState.history.jobs.find(job => job.job_id === file.job_id)
 
-        const item: AppFile | AppFileWithMeta = {
-          ...file,
-          type: 'file',
-          name: file.filename,
-          extension,
-          path: pathNoRoot,
-          modified: new Date(file.modified).getTime(),
-          history
+          metadata.history = history
         }
 
-        if (timelapseThumbnailFiles && item.extension !== '.jpg') {
-          const expectedThumbnailFile = `${item.filename.slice(0, -item.extension.length)}.jpg`
+        const extensionIndex = file.filename.lastIndexOf('.')
+        const extension = extensionIndex > -1 ? file.filename.substring(extensionIndex) : ''
+
+        if (timelapseThumbnailFiles && extension !== '.jpg') {
+          const expectedThumbnailFile = `${file.filename.slice(0, -extension.length)}.jpg`
 
           if (timelapseThumbnailFiles.has(expectedThumbnailFile)) {
-            item.thumbnails = [
+            metadata.thumbnails = [
               {
                 // we have no data regarding the thumbnail other than it's URL, but setting it is mandatory...
                 height: 0,
@@ -84,6 +76,16 @@ export const getters: GetterTree<FilesState, RootState> = {
           }
         }
 
+        const item: AppFile | AppFileWithMeta = {
+          ...file,
+          ...metadata,
+          type: 'file',
+          name: file.filename,
+          extension,
+          path: pathNoRoot,
+          modified: new Date(file.modified).getTime()
+        }
+
         items.push(item)
       }
 
@@ -181,11 +183,13 @@ export const getters: GetterTree<FilesState, RootState> = {
     const file = pathContent?.files.find(file => file.filename === filename)
 
     if (file) {
-      const history: HistoryItem | undefined = (
-        'job_id' in file &&
-        file.job_id &&
-        rootState.history.jobs.find(job => job.job_id === file.job_id)
-      ) || undefined
+      const metadata: Partial<MoonrakerFileMeta> & Pick<AppFileWithMeta, 'history'> = {}
+
+      if ('job_id' in file && file.job_id) {
+        const history: HistoryItem | undefined = rootState.history.jobs.find(job => job.job_id === file.job_id)
+
+        metadata.history = history
+      }
 
       const [, ...restOfPath] = path.split('/')
       const pathNoRoot = restOfPath.join('/')
@@ -195,12 +199,12 @@ export const getters: GetterTree<FilesState, RootState> = {
 
       const item: AppFile | AppFileWithMeta = {
         ...file,
+        ...metadata,
         type: 'file',
         name: file.filename,
         extension,
         path: pathNoRoot,
-        modified: new Date(file.modified).getDate(),
-        history
+        modified: new Date(file.modified).getDate()
       }
 
       return item
diff --git a/src/store/files/types.ts b/src/store/files/types.ts
@@ -51,7 +51,7 @@ export interface MoonrakerDir {
   permissions?: MoonrakerFilePermissions;
 }
 
-export interface AppFile extends MoonrakerFile {
+export interface AppFile extends MoonrakerFile, Pick<MoonrakerFileWithMeta, 'thumbnails'> {
   type: 'file';
   name: string;
   extension: string;
diff --git a/src/store/printer/types.ts b/src/store/printer/types.ts
@@ -133,6 +133,8 @@ export interface KlipperPrinterState extends KlipperPrinterStateBaseType {
 
   [key: `servo ${string}`]: KlipperPrinterServoState;
 
+  skew_correction?: KlipperPrinterSkewCorrectionState;
+
   stepper_enable?: KlipperPrinterStepperEnableState;
 
   [key: `${'aht10' | 'bme280' | 'htu21d' | 'sht3x' | 'lm75' | 'temperature_host' | 'temperature_combined'} ${string}`]: KlipperPrinterTemperatureSensor2State;
@@ -458,6 +460,10 @@ export interface KlipperPrinterServoState {
   value: number;
 }
 
+export interface KlipperPrinterSkewCorrectionState {
+  current_profile_name: string;
+}
+
 export interface KlipperPrinterStepperEnableState {
   steppers: Record<string, boolean>;
 }

Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM`
`827`	`827`	`}`
`828`	`828`	`}`
`829`	`829`
`830`		`- async handleViewThumbnail (file: AppFileWithMeta) {`
	`830`	`+ async handleViewThumbnail (file: AppFile) {`
`831`	`831`	`const thumb = this.getThumb(file, this.currentRoot, file.path, true)`
`832`	`832`
`833`	`833`	`if (thumb) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ export interface MoonrakerDir {`
`51`	`51`	`permissions?: MoonrakerFilePermissions;`
`52`	`52`	`}`
`53`	`53`
`54`		`-export interface AppFile extends MoonrakerFile {`
	`54`	`+export interface AppFile extends MoonrakerFile, Pick<MoonrakerFileWithMeta, 'thumbnails'> {`
`55`	`55`	`type: 'file';`
`56`	`56`	`name: string;`
`57`	`57`	`extension: string;`