Merge branch 'develop' into develop

Author: TomW1605

src/components/widgets/filesystem/setupMonaco.ts

@@ -10,6 +10,7 @@ import themeDark from '@/monaco/theme/editor.dark.theme.json'
 import themeLight from '@/monaco/theme/editor.light.theme.json'
 
 import { MonacoLanguageImports } from '@/dynamicImports'
+import type { KlippyApp } from '@/store/printer/types'
 
 type ReduceState<T> = {
   current?: T,
@@ -99,7 +100,7 @@ async function setupMonaco () {
 
   monaco.editor.registerCommand('fluidd_open_docs', (_, service: CodeLensSupportedService, hash: string) => {
     const serviceKey = service.replace(/-/g, '_')
-    const klippyApp = app.$store.getters['printer/getKlippyApp']
+    const klippyApp = app.$store.getters['printer/getKlippyApp'] as KlippyApp
 
     const url = app.$t(`app.file_system.url.${serviceKey}_config`, {
       hash,

src/components/widgets/macros/MacroBtn.vue

@@ -90,6 +90,7 @@ import StateMixin from '@/mixins/state'
 import type { Macro } from '@/store/macros/types'
 import gcodeMacroParams from '@/util/gcode-macro-params'
 import { gcodeCommandBuilder, isBasicGcodeCommand, getParamNameForRawGcodeCommand } from '@/util/gcode-helpers'
+import type { KlippyApp } from '@/store/printer/types'
 
 type MacroParameter = {
   value: string | number
@@ -140,8 +141,8 @@ export default class MacroBtn extends Mixins(StateMixin) {
     return ''
   }
 
-  get klippyApp () {
-    return this.$store.getters['printer/getKlippyApp']
+  get klippyApp (): KlippyApp {
+    return this.$store.getters['printer/getKlippyApp'] as KlippyApp
   }
 
   get supportsPythonGcodeMacros () {

src/globals.ts

@@ -186,7 +186,6 @@ export const Globals = Object.freeze({
   LOCAL_CARDSTATE_STORAGE_KEY: 'cardState', // collapsed or not
   LOCAL_CARDLAYOUT_STORAGE_KEY: 'cardLayout2', // Specific layout / enabled / disabled
   LOCAL_INSTANCES_STORAGE_KEY: 'appInstances',
-  KLIPPER_MIN_VERSION: 'v0.11.0-257',
   MOONRAKER_MIN_VERSION: 'v0.8.0-309',
   MOONRAKER_DB: {
     fluidd: {
@@ -233,13 +232,16 @@ export const Globals = Object.freeze({
   SUPPORTED_SERVICES: {
     klipper: {
       klipper: {
-        domain: 'https://www.klipper3d.org'
+        domain: 'https://www.klipper3d.org',
+        minVersion: 'v0.11.0-257'
       },
       kalico: {
-        domain: 'https://docs.kalico.gg'
+        domain: 'https://docs.kalico.gg',
+        minVersion: 'v0.11.0-257'
       },
       'danger-klipper': {
-        domain: 'https://dangerklipper.io'
+        domain: 'https://dangerklipper.io',
+        minVersion: 'v0.11.0-257'
       }
     }
   },

src/store/helpers.ts

@@ -3,6 +3,7 @@ import type { RootState } from './types'
 import { SocketActions } from '@/api/socketActions'
 import type { AppPushNotification } from './notifications/types'
 import i18n from '@/plugins/i18n'
+import type { KlippyApp } from './printer/types'
 
 export const handleTrinamicDriversChange = (payload: any, state: RootState, dispatch: Dispatch, getters: any) => {
   for (const item in payload) {
@@ -15,7 +16,7 @@ export const handleTrinamicDriversChange = (payload: any, state: RootState, disp
     ) {
       const name = nameFromSplit ?? item
 
-      const klippyApp = getters.getKlippyApp
+      const klippyApp = getters.getKlippyApp as KlippyApp
 
       const notification: AppPushNotification = {
         id: `${item}-otpw`,

src/store/printer/actions.ts

@@ -1,5 +1,5 @@
 import type { ActionTree } from 'vuex'
-import type { PrinterState } from './types'
+import type { KlippyApp, PrinterState } from './types'
 import type { RootState } from '../types'
 import { handlePrintStateChange, handleCurrentFileChange, handleExcludeObjectChange, handleTrinamicDriversChange } from '../helpers'
 import { handleAddChartEntry, handleSystemStatsChange, handleMcuStatsChange } from '../chart_helpers'
@@ -37,22 +37,24 @@ export const actions: ActionTree<PrinterState, RootState> = {
     commit('setForceMoveEnabled', payload)
   },
 
-  async checkKlipperMinVersion ({ state, dispatch }) {
+  async checkKlipperMinVersion ({ state, rootGetters, dispatch }) {
     const klipperVersion = state.info.software_version ?? '?'
 
     const fullKlipperVersion = klipperVersion.includes('-')
       ? klipperVersion
       : `${klipperVersion}-0`
 
+    const klippyApp = rootGetters['printer/getKlippyApp'] as KlippyApp
+
     if (
       valid(klipperVersion) &&
-      valid(Globals.KLIPPER_MIN_VERSION) &&
-      !gte(fullKlipperVersion, Globals.KLIPPER_MIN_VERSION)
+      valid(klippyApp.minVersion) &&
+      !gte(fullKlipperVersion, klippyApp.minVersion)
     ) {
       dispatch('notifications/pushNotification', {
         id: `old-klipper-${klipperVersion}`,
         title: 'Klipper',
-        description: i18n.t('app.version.label.old_component_version', { name: 'Klipper', version: Globals.KLIPPER_MIN_VERSION }),
+        description: i18n.t('app.version.label.old_component_version', { name: 'Klipper', version: klippyApp.minVersion }),
         to: '/settings#versions',
         btnText: i18n.t('app.version.btn.view_versions'),
         type: 'warning',

src/store/printer/getters.ts

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import type { GetterTree } from 'vuex'
 import type { RootState } from '../types'
-import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, Probe, ExtruderStepper, Extruder, ExtruderConfig, ProbeName, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews, BedSize, GcodeCommands, TimeEstimates, BeaconState } from './types'
+import type { PrinterState, Heater, Fan, Led, OutputPin, Sensor, RunoutSensor, KnownExtruder, MCU, Endstop, Probe, ExtruderStepper, Extruder, ExtruderConfig, ProbeName, Stepper, ScrewsTiltAdjustScrew, ScrewsTiltAdjust, BedScrews, BedSize, GcodeCommands, TimeEstimates, BeaconState, KlippyApp } from './types'
 import { get } from 'lodash-es'
 import getKlipperType from '@/util/get-klipper-type'
 import i18n from '@/plugins/i18n'
@@ -58,7 +58,7 @@ export const getters: GetterTree<PrinterState, RootState> = {
     return 'Unknown'
   },
 
-  getKlippyApp: (state) => {
+  getKlippyApp: (state): KlippyApp => {
     const app = state.info.app?.toLowerCase()
 
     const klippyApp = app && isKeyOf(app, Globals.SUPPORTED_SERVICES.klipper)

src/store/printer/types.ts

@@ -1,3 +1,5 @@
+import type { Globals } from '@/globals'
+
 export interface PrinterState {
   info: PrinterInfo;
   manualProbeDialogOpen: boolean;
@@ -296,3 +298,9 @@ export interface BeaconModel {
   name: string;
   active: boolean;
 }
+
+export interface KlippyApp {
+  name: keyof typeof Globals.SUPPORTED_SERVICES.klipper;
+  domain: string;
+  minVersion: string;
+}