fix: store macro names casing as-is (#1683)

pedrolamas · web-flow · commit ed6bd1805d90 · 2025-05-26T10:57:03.000+01:00
Signed-off-by: Pedro Lamas &lt;pedrolamas@gmail.com&gt;
diff --git a/src/components/settings/macros/MacroCategorySettings.vue b/src/components/settings/macros/MacroCategorySettings.vue
@@ -144,8 +144,14 @@ export default class MacroCategorySettings extends Vue {
   }
 
   get macros () {
+    if (!this.search) {
+      return this.macrosForCategory
+    }
+
+    const search = this.search.toLowerCase()
+
     return this.macrosForCategory
-      .filter((macro: Macro) => !this.search ? true : macro.name.includes(this.search.toLowerCase()))
+      .filter(macro => macro.name.toLowerCase().includes(search))
   }
 
   set macros (macros: Macro[]) {
diff --git a/src/components/widgets/spoolman/SpoolSelectionDialog.vue b/src/components/widgets/spoolman/SpoolSelectionDialog.vue
@@ -3,7 +3,7 @@
     v-model="open"
     scrollable
     :max-width="$vuetify.breakpoint.mdAndDown ? '90vw' : '75vw'"
-    :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro })"
+    :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro?.toUpperCase() })"
     title-shadow
   >
     <template #menu>
diff --git a/src/components/widgets/spoolman/SpoolmanCard.vue b/src/components/widgets/spoolman/SpoolmanCard.vue
@@ -255,7 +255,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
 
     return macros
       .filter((macro): macro is MacroWithSpoolId => macro.variables != null && 'spool_id' in macro.variables)
-      .sort((a, b) => a.name.localeCompare(b.name))
+      .sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()))
   }
 
   get remainingFilamentUnit (): SpoolmanRemainingFilamentUnit {
diff --git a/src/components/widgets/toolhead/ToolheadCard.vue b/src/components/widgets/toolhead/ToolheadCard.vue
@@ -249,7 +249,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
 
       tools.push({
         name: loadFilamentMacro.name.toUpperCase(),
-        label: loadFilamentMacro.name === 'm701' ? 'M701 (Load Filament)' : undefined,
+        label: loadFilamentMacro.name.toLowerCase() === 'm701' ? 'M701 (Load Filament)' : undefined,
         icon: '$loadFilament',
         disabled: !(ignoreMinExtrudeTemp || this.extruderReady)
       })
@@ -262,7 +262,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
 
       tools.push({
         name: unloadFilamentMacro.name.toUpperCase(),
-        label: unloadFilamentMacro.name === 'm702' ? 'M702 (Unload Filament)' : undefined,
+        label: unloadFilamentMacro.name.toLowerCase() === 'm702' ? 'M702 (Unload Filament)' : undefined,
         icon: '$unloadFilament',
         disabled: !(ignoreMinExtrudeTemp || this.extruderReady)
       })
@@ -273,7 +273,7 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
     if (cleanNozzleMacro) {
       tools.push({
         name: cleanNozzleMacro.name.toUpperCase(),
-        label: cleanNozzleMacro.name === 'g12' ? 'G12 (Clean the Nozzle)' : undefined,
+        label: cleanNozzleMacro.name.toLowerCase() === 'g12' ? 'G12 (Clean the Nozzle)' : undefined,
         icon: '$cleanNozzle'
       })
     }
diff --git a/src/store/macros/getters.ts b/src/store/macros/getters.ts
@@ -21,16 +21,17 @@ export const getters = {
     const macros = Object.keys(rootState.printer.printer)
       .filter(key => key.startsWith('gcode_macro '))
       .map(key => {
+        const name = key.split(' ', 2)[1]
         const lowerCaseKey = key.toLowerCase()
-        const name = lowerCaseKey.split(' ', 2)[1]
+        const lowerCaseName = name.toLowerCase()
         const config = rootState.printer.printer.configfile.settings[lowerCaseKey]
-        const stored = state.stored.find(macro => macro.name === name)
+        const stored = state.stored.find(macro => macro.name.toLowerCase() === lowerCaseName)
         const variables = rootState.printer.printer[key]
 
         const macro: Macro = {
           ...MACRO_DEFAULTS,
-          name,
           ...stored,
+          name,
           variables,
           config
         }
@@ -57,7 +58,7 @@ export const getters = {
 
     for (const name of names) {
       const lowerCaseName = name.toLowerCase()
-      const macro = macros.find(macro => macro.name === lowerCaseName)
+      const macro = macros.find(macro => macro.name.toLowerCase() === lowerCaseName)
 
       if (macro) {
         return macro
@@ -108,7 +109,7 @@ export const getters = {
           return a.order - b.order
         }
 
-        return a.name.localeCompare(b.name)
+        return a.name.toLowerCase().localeCompare(b.name.toLowerCase())
       })
   },
 
diff --git a/src/store/macros/mutations.ts b/src/store/macros/mutations.ts
@@ -33,18 +33,22 @@ export const mutations = {
 
   // Updates a singular macro
   setUpdateMacro (state, macro: Macro) {
-    const m = sanitizeMacroForStorage({ ...macro })
-    const i = state.stored.findIndex(m => m.name === macro.name)
+    const lowerCaseName = macro.name.toLowerCase()
+    const i = state.stored.findIndex(m => m.name.toLowerCase() === lowerCaseName)
+    const processed = sanitizeMacroForStorage({
+      ...macro
+    })
     if (i < 0) {
-      state.stored.push(m)
+      state.stored.push(processed)
     } else {
-      Vue.set(state.stored, i, m)
+      Vue.set(state.stored, i, processed)
     }
   },
 
   setUpdateAllVisible (state, payload: { macros: Macro[]; visible: boolean }) {
     payload.macros.forEach((macro: Macro) => {
-      const i = state.stored.findIndex(m => m.name === macro.name)
+      const lowerCaseName = macro.name.toLowerCase()
+      const i = state.stored.findIndex(m => m.name.toLowerCase() === lowerCaseName)
       const processed = sanitizeMacroForStorage({
         ...macro,
         visible: payload.visible

Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,14 @@ export default class MacroCategorySettings extends Vue {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`get macros () {`
	`147`	`+ if (!this.search) {`
	`148`	`+ return this.macrosForCategory`
	`149`	`+ }`
	`150`	`+`
	`151`	`+ const search = this.search.toLowerCase()`
	`152`	`+`
`147`	`153`	`return this.macrosForCategory`
`148`		`- .filter((macro: Macro) => !this.search ? true : macro.name.includes(this.search.toLowerCase()))`
	`154`	`+ .filter(macro => macro.name.toLowerCase().includes(search))`
`149`	`155`	`}`
`150`	`156`
`151`	`157`	`set macros (macros: Macro[]) {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`v-model="open"`
`4`	`4`	`scrollable`
`5`	`5`	`:max-width="$vuetify.breakpoint.mdAndDown ? '90vw' : '75vw'"`
`6`		`- :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro })"`
	`6`	`+ :title="$tc('app.spoolman.title.spool_selection', targetMacro ? 2 : 1, { macro: targetMacro?.toUpperCase() })"`
`7`	`7`	`title-shadow`
`8`	`8`	`>`
`9`	`9`	`<template #menu>`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {`
`255`	`255`
`256`	`256`	`return macros`
`257`	`257`	`.filter((macro): macro is MacroWithSpoolId => macro.variables != null && 'spool_id' in macro.variables)`
`258`		`- .sort((a, b) => a.name.localeCompare(b.name))`
	`258`	`+ .sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()))`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`get remainingFilamentUnit (): SpoolmanRemainingFilamentUnit {`