From 2ccbd2510ca834f923135eb553ef17c6a04d4128 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Mon, 22 Jan 2024 17:20:47 +0530 Subject: [PATCH] union of gcode list, updating while upload --- src/js/control-view.js | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index 483566a..dab6ddf 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -203,9 +203,9 @@ module.exports = { return Math.min(1, p); }, gcodeFiles: function () { - console.log(this.state.files); - console.log(this.config.macrosList); - const files=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)); + const filesWithNoMacros=this.state.files.filter(item => !this.config.macrosList.some(compareItem => compareItem.gcode_file_name == item)); + const unionSet = new Set([...filesWithNoMacros, ...this.config.gcodeList]); + const files = [...unionSet]; console.log(files); return files; } @@ -353,7 +353,7 @@ module.exports = { utils.clickFileInput("gcode-file-input"); }, - upload: function(e) { + upload: async function(e) { const files = e.target.files || e.dataTransfer.files; if (!files.length) { return; @@ -373,7 +373,21 @@ module.exports = { return; } - if(this.config.macrosList.some(obj => obj.gcode_file_name == files.name)){ + if(!this.config.gcodeList.some(item=> item == file.name)){ + console.log('new gcode file'); + this.config.gcodeList.push(file.name); + try { + await api.put("config/save", this.config); + this.$dispatch("update"); + } catch (error) { + console.error("Restore Failed: ", error); + alert("Restore failed"); + } + }else{ + console.log('Already exists'); + } + + if(this.config.macrosList.some(obj => obj.gcode_file_name == file.name)){ console.log("It is a macros, remove it from macrosList") // this.config.gcodeList.push(file.name); }