From 04b2a6609300122295da738ccd4a466858329af6 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Fri, 12 Jan 2024 01:24:01 +0530
Subject: [PATCH] trying file name and removed default name in config

---
 src/js/macros.js                   | 17 +++++++++--------
 src/resources/config-template.json |  5 -----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/js/macros.js b/src/js/macros.js
index d30756c..43e52d8 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -77,8 +77,16 @@ module.exports = {
       });
     },
     saveMacros: async function () {
+      var macrosName = document.getElementById(
+        `macros-name-${this.tab-1}`
+      ).value;
+      var macrosColor = document.getElementById(
+        `macros-color-${this.tab-1}`
+      ).value;
+
       if(this.state.selected =='default'){
         const file = this.newGcode[this.tab-1];
+        file.name = macrosName;
         SvelteComponents.showDialog("Upload", {
           file,
           onComplete: () => {
@@ -87,20 +95,13 @@ module.exports = {
           },
         });
       }
-      var macrosName = document.getElementById(
-        `macros-name-${this.tab-1}`
-      ).value;
-      var macrosColor = document.getElementById(
-        `macros-color-${this.tab-1}`
-      ).value;
 
       console.log(this.tab-1);
-      console.log(macrosColor, macrosName);
 
       this.config.macros[this.tab-1].name = macrosName;
       console.log(this.config.macros[this.tab-1].name);
       this.config.macros[this.tab-1].color = macrosColor;
-      this.config.macros[this.tab-1].gcode_file_name = this.state.selected;
+      this.config.macros[this.tab-1].gcode_file_name = file.name;
       this.config.macros[this.tab-1].gcode_file_time =
         this.state.selected_time;
       console.log(this.config.macros);
diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index 7f9d5bb..56f780a 100644
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -638,11 +638,6 @@
       }
     ],
     "template": {
-      "name": {
-        "type": "enum",
-        "values": ["FireLaser", "Home", "Perk", "Spindle Warmup", "Spindle ON", "Spindle OFF","Vacuum ON","Vacuum OFF"],
-        "default": " "
-      },
       "color": {
         "type": "text",
         "default": "#e6e6e6"