From c420060e26f05a03f84b72ce404d7ecbad7ba9f8 Mon Sep 17 00:00:00 2001
From: sanjayk03-dev <imsanjay003@gmail.com>
Date: Thu, 4 Apr 2024 11:50:52 +0530
Subject: [PATCH] updating macros to auto refresh, sorting all gcodes

---
 src/js/control-view.js | 8 ++++----
 src/js/macros.js       | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/js/control-view.js b/src/js/control-view.js
index 880ea6e..c142f4c 100644
--- a/src/js/control-view.js
+++ b/src/js/control-view.js
@@ -216,13 +216,13 @@ module.exports = {
       if (this.state.folder == "Unorganized files") {
         files = this.config.gcode_list.filter(item => item.type == "file" && this.state.files.includes(item.name));
         files = files.map(item => item.name);
-        return files;
+        return files.sort();
       }
       files = this.config.gcode_list
         .find(item => item.name == this.state.folder)
         .files.filter(item => this.state.files.includes(item.file_name))
         .map(item => item.file_name);
-      return files;
+      return files.sort();
     },
     gcode_folders: function () {
       let folders = [];
@@ -231,7 +231,7 @@ module.exports = {
           folders.push(item.name);
         }
       }
-      return folders;
+      return folders.sort();
     },
   },
 
@@ -463,7 +463,7 @@ module.exports = {
       };
 
       xhr.onerror = function () {
-        console.error("Network error during file upload");
+        alert("Upload failed.");
       };
 
       xhr.upload.onprogress = function (event) {
diff --git a/src/js/macros.js b/src/js/macros.js
index e129a84..a5854d4 100644
--- a/src/js/macros.js
+++ b/src/js/macros.js
@@ -47,7 +47,10 @@ module.exports = {
       return this.tab > 8;
     },
     macros_gcode_list: function () {
-      return this.config.macros_list.map(el => el.file_name).sort();
+      return this.config.macros_list
+        .filter(item => this.state.files.includes(item.file_name))
+        .map(item => item.file_name)
+        .sort();
     },
     macros_list: function () {
       return this.config.macros.map(item => item.name);