muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix in gcode_files, upload, delete_all

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-09 01:36:02 +05:30
parent f4ff58a1d9
commit be775405ff
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/js/control-view.js
View File

@@ -209,22 +209,22 @@ module.exports = {
return Math.min(1, p);
},
gcode_files: function () {
let files = [];
if (!this.state.folder || this.state.folder == "") {
return files;
return [];
}
if (this.state.folder == "default") {
files = this.state.gcode_list
const files = this.state.gcode_list
.filter(item => item.type == "file")
.map(item => item.name)
.sort();
return files;
}
files = this.state.gcode_list
.find(item => item.name == this.state.folder)
.files.map(item => item.file_name)
.sort();
return files;
const folder = this.state.gcode_list.find(item => item.name == this.state.folder);
if (folder) {
return folder.files.map(item => item.file_name).sort();
} else {
return [];
}
},
gcode_folders: function () {
let folders = [];
@@ -449,8 +449,10 @@ module.exports = {
const folder_to_add = this.config.gcode_list.find(
item => item.type == "folder" && item.name == this.state.folder,
);
if (!folder_to_add.files.find(item => item.file_name == file.name)) {
folder_to_add.files.push({ file_name: file.name });
}
}
this.save_config(this.config);
SvelteComponents.showDialog("Upload", {
@@ -487,6 +489,7 @@ module.exports = {
if (folder_name != "") {
if (this.state.gcode_list.find(item => item.type == "folder" && item.name == folder_name)) {
alert("Folder with the same name already exists!");
return;
} else {
this.config.gcode_list = [...this.state.gcode_list];
this.config.gcode_list.push({
@@ -545,7 +548,9 @@ module.exports = {
const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName);
if (folder) {
if (!folder.files.map(item => item.file_name).includes(file.name)) {
folder.files.push({ file_name: file.name });
}
} else {
this.config.gcode_list.push({
name: folderName,
@@ -606,7 +611,11 @@ module.exports = {
if (this.state.folder == "default") {
this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file");
} else {
this.config.gcode_list.find(item => item.type == "folder" && item.name == this.state.folder).files = [];
this.config.gcode_list
.filter(item => item.type == "folder")
.forEach(item => {
item.files = [];
});
}
this.save_config(this.config);
this.deleteGCode = false;