Merge branch 'develop' of github.com:fluidd-core/fluidd into my_develop

Signed-off-by: vajonam <[email protected]>

Author: vajonam

src/components/widgets/toolhead/ToolheadControlCross.vue

@@ -196,59 +196,60 @@ type Axis = 'X' | 'Y' | 'Z'
 
 @Component({})
 export default class ToolheadControlCross extends Mixins(StateMixin, ToolheadMixin) {
-  moveLength = ''
-  fab = false
+  moveLength: number | null = null
 
-  get forceMove () {
-    return this.$store.state.config.uiSettings.toolhead.forceMove
+  get forceMove (): boolean {
+    return this.$store.state.config.uiSettings.toolhead.forceMove as boolean
   }
 
-  get canHomeXY () {
-    const hasRoundBed = this.$store.getters['printer/getHasRoundBed'] as boolean
+  get hasRoundBed (): boolean {
+    return this.$store.getters['printer/getHasRoundBed'] as boolean
+  }
 
-    return !hasRoundBed
+  get canHomeXY (): boolean {
+    return !this.hasRoundBed
   }
 
-  get toolheadMoveDistances () {
-    const distances = this.$store.state.config.uiSettings.general.toolheadMoveDistances
+  get toolheadMoveDistances (): number[] {
+    const distances = this.$store.state.config.uiSettings.general.toolheadMoveDistances as number[]
+
     if (distances.includes(this.toolheadMoveLength)) {
       return distances
     }
 
     // safety for when no valid move length is present
-    return [this.toolheadMoveLength, ...distances].sort((a, b) => a - b)
+    return [this.toolheadMoveLength, ...distances]
+      .sort((a, b) => a - b)
   }
 
-  get toolheadMoveLength () {
-    return (this.moveLength === '')
-      ? this.$store.state.config.uiSettings.general.defaultToolheadMoveLength
-      : this.moveLength
+  get toolheadMoveLength (): number {
+    return this.moveLength ?? this.$store.state.config.uiSettings.general.defaultToolheadMoveLength as number
   }
 
-  set toolheadMoveLength (val: string) {
+  set toolheadMoveLength (val: number) {
     this.moveLength = val
   }
 
-  axisButtonColor (axisHomed: boolean) {
+  axisButtonColor (axisHomed: boolean): string | undefined {
     if (this.forceMove) return 'error'
 
     return axisHomed ? 'primary' : undefined
   }
 
-  axisButtonDisabled (axisHomed: boolean, axisMultipleSteppers: boolean) {
+  axisButtonDisabled (axisHomed: boolean, axisMultipleSteppers: boolean): boolean {
     return !this.klippyReady || (!axisHomed && !(this.forceMove && !axisMultipleSteppers))
   }
 
   /**
    * Send a move gcode script.
    */
-  sendMoveGcode (axis: Axis, distance: string, negative = false) {
+  sendMoveGcode (axis: Axis, distance: number, negative = false) {
     const rate = axis === 'Z'
       ? this.$store.state.config.uiSettings.general.defaultToolheadZSpeed
       : this.$store.state.config.uiSettings.general.defaultToolheadXYSpeed
     const inverted = this.$store.state.config.uiSettings.general.axis[axis.toLowerCase()].inverted || false
     distance = negative !== inverted
-      ? '-' + distance
+      ? -distance
       : distance
 
     if (this.forceMove) {

src/mixins/browser.ts

@@ -1,14 +1,18 @@
+import isUserAgentDataMobileSupported from '@/util/is-user-agent-data-mobile-supported'
 import { Vue, Component } from 'vue-property-decorator'
 
 @Component
 export default class BrowserMixin extends Vue {
-  get isMobileViewport () {
+  get isMobileViewport (): boolean {
     return this.$vuetify.breakpoint.mobile
   }
 
-  get isMobileUserAgent () {
-    const mobileUARegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i
+  get isMobileUserAgent (): boolean {
+    if (isUserAgentDataMobileSupported(navigator)) {
+      return navigator.userAgentData.mobile
+    }
 
-    return (navigator as any).userAgentData?.mobile ?? mobileUARegex.test(navigator.userAgent)
+    return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i
+      .test(navigator.userAgent)
   }
 }

src/mixins/camera.ts

@@ -22,8 +22,8 @@ export default class CameraMixin extends Vue {
     this.checkPlayback()
   }
 
-  get apiUrl () {
-    return this.$store.state.config.apiUrl
+  get apiUrl (): string {
+    return this.$store.state.config.apiUrl as string
   }
 
   get cameraStyle () {
@@ -32,7 +32,7 @@ export default class CameraMixin extends Vue {
     }
   }
 
-  createTransform () {
+  createTransform (): string {
     const element = this.streamingElement
     const { rotation, flipX, flipY } = this.camera
     const transformsArray: string[] = []

src/mixins/files.ts

@@ -7,11 +7,11 @@ import type { FileWithPath } from '@/types'
 
 @Component
 export default class FilesMixin extends Vue {
-  get apiUrl () {
-    return this.$store.state.config.apiUrl
+  get apiUrl (): string {
+    return this.$store.state.config.apiUrl as string
   }
 
-  get isTrustedUser () {
+  get isTrustedUser (): boolean {
     const forceLogins = this.$store.getters['server/getConfig'].authorization.force_logins
 
     return forceLogins === false || this.$store.getters['auth/getCurrentUser']?.username === '_TRUSTED_USER_'

src/mixins/services.ts

@@ -4,8 +4,8 @@ import { Component } from 'vue-property-decorator'
 
 @Component
 export default class ServicesMixin extends Vue {
-  get moonrakerServiceName () {
-    return this.$store.state.server.system_info?.instance_ids?.moonraker || 'moonraker'
+  get moonrakerServiceName (): string {
+    return this.$store.state.server.system_info?.instance_ids?.moonraker as string || 'moonraker'
   }
 
   /**

src/mixins/state.ts

@@ -1,50 +1,51 @@
 import Vue from 'vue'
 import { SocketActions } from '@/api/socketActions'
 import { Component } from 'vue-property-decorator'
+import type { ServerInfo } from '@/store/server/types'
 
 @Component
 export default class StateMixin extends Vue {
-  get authenticated () {
-    const auth = this.$store.getters['auth/getAuthenticated']
-    return auth
+  get authenticated (): boolean {
+    return this.$store.getters['auth/getAuthenticated'] as boolean
   }
 
-  get socketConnected () {
-    return this.$store.getters['socket/getConnectionState']
+  get socketConnected (): boolean {
+    return this.$store.getters['socket/getConnectionState'] as boolean
   }
 
-  get apiConnected () {
-    return this.$store.getters['socket/getApiConnected']
+  get apiConnected (): boolean {
+    return this.$store.getters['socket/getApiConnected'] as boolean
   }
 
-  get socketConnecting () {
-    return this.$store.getters['socket/getConnectingState']
+  get socketConnecting (): boolean {
+    return this.$store.getters['socket/getConnectingState'] as boolean
   }
 
-  get klippyReady () {
-    return this.$store.getters['printer/getklippyReady']
+  get klippyReady (): boolean {
+    return this.$store.getters['printer/getklippyReady'] as boolean
   }
 
-  get klippyConnected () {
-    const server = this.$store.getters['server/getInfo']
+  get klippyConnected (): boolean {
+    const server = this.$store.getters['server/getInfo'] as ServerInfo
+
     return server.klippy_connected
   }
 
-  get hasWarnings () {
-    return this.$store.getters['printer/getHasWarnings']
+  get hasWarnings (): boolean {
+    return this.$store.getters['printer/getHasWarnings'] as boolean
   }
 
-  get klippyState () {
-    return this.$store.getters['printer/getKlippyState']
+  get klippyState (): string {
+    return this.$store.getters['printer/getKlippyState'] as string
   }
 
-  get klippyStateMessage () {
-    return this.$store.getters['printer/getKlippyStateMessage']
+  get klippyStateMessage (): string {
+    return this.$store.getters['printer/getKlippyStateMessage'] as string
   }
 
   // Return the printer state
-  get printerState () {
-    return this.$store.getters['printer/getPrinterState']
+  get printerState (): string {
+    return this.$store.getters['printer/getPrinterState'] as string
   }
 
   // Returns a boolean indicating if the printer is busy.
@@ -59,15 +60,15 @@ export default class StateMixin extends Vue {
   }
 
   // Returns a boolean indicating if the printer is paused.
-  get printerPaused () {
+  get printerPaused (): boolean {
     return this.printerState.toLowerCase() === 'paused'
   }
 
   /**
    * Returns a boolean indicating of the printer is printing.
    * (versus busy in some other way...)
    */
-  get printerPrinting () {
+  get printerPrinting (): boolean {
     return this.printerState.toLowerCase() === 'printing'
   }
 

src/store/printer/state.ts

@@ -121,9 +121,6 @@ export const defaultState = (): PrinterState => {
         accepted_screws: 0
       },
       screws_tilt_adjust: {},
-      fan: {
-        speed: 0
-      },
       webhooks: {
         state: '',
         state_message: ''

src/util/is-user-agent-data-mobile-supported.ts

@@ -0,0 +1,15 @@
+type NavigatorWithUserAgentDataMobile = Navigator & {
+  userAgentData: {
+    mobile: boolean
+  }
+}
+
+const isUserAgentDataMobileSupported = (navigator: Navigator): navigator is NavigatorWithUserAgentDataMobile => {
+  return (
+    navigator.userAgentData != null &&
+    'mobile' in navigator.userAgentData &&
+    typeof navigator.userAgentData.mobile === 'boolean'
+  )
+}
+
+export default isUserAgentDataMobileSupported

src/views/Dashboard.vue

@@ -150,6 +150,14 @@ export default class Dashboard extends Mixins(StateMixin) {
     return this.$store.getters['macros/getVisibleMacros'].length > 0
   }
 
+  get hasOutputs () {
+    return (
+      this.$store.getters['printer/getAllFans'].length > 0 ||
+      this.$store.getters['printer/getPins'].length > 0 ||
+      this.$store.getters['printer/getAllLeds'].length > 0
+    )
+  }
+
   get inLayout (): boolean {
     return (this.$store.state.config.layoutMode)
   }
@@ -203,6 +211,7 @@ export default class Dashboard extends Mixins(StateMixin) {
     if (this.inLayout) return false
     if (item.id === 'camera-card' && !this.hasCameras) return true
     if (item.id === 'macros-card' && !this.hasMacros) return true
+    if (item.id === 'outputs-card' && !this.hasOutputs) return true
     if (item.id === 'printer-status-card' && !this.klippyReady) return true
     if (item.id === 'job-queue-card' && !this.supportsJobQueue) return true
     if (item.id === 'retract-card' && !this.firmwareRetractionEnabled) return true