refactor(MacroSettings): pass copy of macro

pedrolamas · pedrolamas · commit 085fc3bf7b44 · 2025-03-03T11:19:49.000Z
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
@@ -182,8 +182,10 @@ export default class MacroCategorySettings extends Vue {
   }
 
   handleSettingsDialog (macro: Macro) {
-    this.dialogState.macro = macro
-    this.dialogState.open = true
+    this.dialogState = {
+      open: true,
+      macro: { ...macro }
+    }
   }
 
   handleAllOn () {
diff --git a/src/components/settings/macros/MacroSettingsDialog.vue b/src/components/settings/macros/MacroSettingsDialog.vue
@@ -1,18 +1,15 @@
 <template>
   <app-dialog
-    v-if="newMacro"
     v-model="open"
-    :title="newMacro.name.toUpperCase()"
-    :sub-title="newMacro.config.description"
+    :title="macro.name.toUpperCase()"
+    :sub-title="macro.config.description"
     max-width="480"
     @save="handleSave"
   >
     <v-card-text class="pa-0">
-      <app-setting
-        :title="$t('app.general.label.alias')"
-      >
+      <app-setting :title="$t('app.general.label.alias')">
         <v-text-field
-          v-model="newMacro.alias"
+          v-model="macro.alias"
           dense
           filled
           hide-details
@@ -21,11 +18,9 @@
 
       <v-divider />
 
-      <app-setting
-        :title="$t('app.general.label.category')"
-      >
+      <app-setting :title="$t('app.general.label.category')">
         <v-select
-          v-model="newMacro.categoryId"
+          v-model="macro.categoryId"
           :items="categories"
           hide-details
           dense
@@ -37,9 +32,7 @@
 
       <v-divider />
 
-      <app-setting
-        :title="$t('app.general.label.color')"
-      >
+      <app-setting :title="$t('app.general.label.color')">
         <app-btn
           outlined
           small
@@ -57,26 +50,9 @@
 
       <v-divider />
 
-      <!-- <app-setting
-          title="Assign to"
-        >
-          <v-select
-            :items="['Console', 'Tool', 'Bed mesh controls']"
-            v-model="assign"
-            clearable
-            hide-details
-            dense
-            filled
-          ></v-select>
-        </app-setting>
-
-        <v-divider /> -->
-
-      <app-setting
-        :title="$t('app.general.label.disabled_while_printing')"
-      >
+      <app-setting :title="$t('app.general.label.disabled_while_printing')">
         <v-switch
-          v-model="newMacro.disabledWhilePrinting"
+          v-model="macro.disabledWhilePrinting"
           class="mt-0 pt-0"
           color="primary"
           hide-details
@@ -89,7 +65,7 @@
         :title="$t('app.general.label.visible')"
       >
         <v-switch
-          v-model="newMacro.visible"
+          v-model="macro.visible"
           class="mt-0 pt-0"
           color="primary"
           hide-details
@@ -111,37 +87,27 @@ export default class MacroMoveDialog extends Vue {
   @Prop({ type: Object, required: true })
   readonly macro!: Macro
 
-  assign = null
-  newMacro: Macro | null = null
-
-  mounted () {
-    this.newMacro = { ...this.macro }
-  }
-
   get categories () {
     // Grabs all categories and filters by the currently defined one.
     const categories: MacroCategory[] = [...this.$store.getters['macros/getCategories']]
     categories.unshift({ name: this.$t('app.general.label.uncategorized').toString(), id: '0' })
     return categories
   }
 
-  get color () {
-    if (this.newMacro && this.newMacro.color !== '') {
-      return this.newMacro.color
-    }
-    return this.$vuetify.theme.currentTheme.secondary?.toString()
+  get color (): string | undefined {
+    return this.macro.color || this.$vuetify.theme.currentTheme.secondary?.toString()
   }
 
   set color (value: string | undefined) {
-    if (this.newMacro) this.newMacro.color = value
+    this.macro.color = value
   }
 
   handleResetColor () {
-    if (this.newMacro) this.newMacro.color = ''
+    this.macro.color = undefined
   }
 
   handleSave () {
-    this.$store.dispatch('macros/saveMacro', this.newMacro)
+    this.$store.dispatch('macros/saveMacro', this.macro)
     this.open = false
   }
 }
diff --git a/src/components/widgets/macros/MacroBtn.vue b/src/components/widgets/macros/MacroBtn.vue
@@ -123,7 +123,7 @@ export default class MacroBtn extends Mixins(StateMixin) {
   }
 
   get borderStyle () {
-    if (this.macro && this.macro.color !== '') {
+    if (this.macro?.color) {
       return `border-color: ${this.macro.color} !important; border-left: solid 4px ${this.macro.color} !important;`
     }
     return ''

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,10 @@ export default class MacroCategorySettings extends Vue {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`handleSettingsDialog (macro: Macro) {`
`185`		`- this.dialogState.macro = macro`
`186`		`- this.dialogState.open = true`
	`185`	`+ this.dialogState = {`
	`186`	`+ open: true,`
	`187`	`+ macro: { ...macro }`
	`188`	`+ }`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`handleAllOn () {`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ export default class MacroBtn extends Mixins(StateMixin) {`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`get borderStyle () {`
`126`		`- if (this.macro && this.macro.color !== '') {`
	`126`	`+ if (this.macro?.color) {`
`127`	`127`	return `border-color: ${this.macro.color} !important; border-left: solid 4px ${this.macro.color} !important;`
`128`	`128`	`}`
`129`	`129`	`return ''`