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

bug fix in control_view

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-10 02:49:56 +05:30
parent ca5c4e7c9d
commit f1ee85f337
1 changed files with 10 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,13 +215,6 @@ module.exports = {
if (!this.state.folder) { if (!this.state.folder) {
return []; return [];
} }
// if (this.state.folder == "default") {
// const files = this.state.gcode_list
// .filter(item => item.type == "file" && this.state.files.includes(item.name))
// .map(item => item.name)
// .sort();
// return files;
// }
const folder = this.state.gcode_list.find(item => item.name == this.state.folder); const folder = this.state.gcode_list.find(item => item.name == this.state.folder);
if (folder) { if (folder) {
return folder.files return folder.files
@@ -443,13 +436,8 @@ module.exports = {
this.config.non_macros_list = [...this.state.non_macros_list]; this.config.non_macros_list = [...this.state.non_macros_list];
this.config.non_macros_list.push({ file_name: file.name }); this.config.non_macros_list.push({ file_name: file.name });
} }
this.config.gcode_list = [...this.state.gcode_list]; this.config.gcode_list = [...this.state.gcode_list];
// if (
// this.state.folder == "default" &&
// !this.state.gcode_list.find(item => item.name == file.name && item.type == "file")
// ) {
// this.config.gcode_list.push({ name: file.name, type: "file", files: [] });
// } else {
var folder_to_add = this.config.gcode_list.find(item => item.type == "folder" && item.name == this.state.folder); var folder_to_add = this.config.gcode_list.find(item => item.type == "folder" && item.name == this.state.folder);
if (!folder_to_add) { if (!folder_to_add) {
folder_to_add = this.config.gcode_list.unshift({ folder_to_add = this.config.gcode_list.unshift({
@@ -465,8 +453,8 @@ module.exports = {
} }
if (!folder_to_add.files.find(item => item.file_name == file.name)) { if (!folder_to_add.files.find(item => item.file_name == file.name)) {
folder_to_add.files.push({ file_name: file.name }); folder_to_add.files.push({ file_name: file.name });
// }
} }
this.save_config(this.config); this.save_config(this.config);
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
@@ -639,16 +627,14 @@ module.exports = {
const macrosList = this.state.macros_list.map(item => item.file_name).toString(); const macrosList = this.state.macros_list.map(item => item.file_name).toString();
api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`); api.delete(`file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${macrosList}`);
this.config.non_macros_list = []; this.config.non_macros_list = [];
this.config.gcode_list = [...this.state.gcode_list]; this.config.gcode_list = [
// if (this.state.folder == "default") { {
// this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file"); name: "default",
// } else { type: "folder",
this.config.gcode_list files: [],
.filter(item => item.type == "folder") },
.forEach(item => { ];
item.files = [];
});
// }
this.save_config(this.config); this.save_config(this.config);
this.deleteGCode = false; this.deleteGCode = false;
}, },
@@ -663,19 +649,6 @@ module.exports = {
const default_folder = this.config.gcode_list.find(item => item.name == "default"); const default_folder = this.config.gcode_list.find(item => item.name == "default");
default_folder.files = [...default_folder.files, ...files_to_move.files].sort(); default_folder.files = [...default_folder.files, ...files_to_move.files].sort();
this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder); this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder);
// files_to_move.files.forEach(item => {
// this.config.gcode_list.push({
// name: item.file_name,
// type: "file",
// files: [],
// });
// });
// this.config.gcode_list = this.config.gcode_list.filter(item => {
// if (item.type == "folder" && item.name == this.state.folder) {
// return false;
// }
// return true;
// });
this.save_config(this.config); this.save_config(this.config);
} }
} }
@@ -704,22 +677,6 @@ module.exports = {
selected_folder.files = []; selected_folder.files = [];
} }
// if (this.state.folder != "default") {
// const selected_folder = this.config.gcode_list.find(
// item => item.type == "folder" && item.name == this.state.folder,
// ).files;
// if (selected_folder) {
// var files_to_delete = selected_folder.map(item => item.file_name);
// this.config.gcode_list = this.config.gcode_list.filter(item => item.name != this.state.folder);
// }
// } else {
// const selected_folder = this.config.gcode_list.filter(item => item.type == "file");
// if (selected_folder) {
// var files_to_delete = selected_folder.map(item => item.name);
// this.config.gcode_list = this.config.gcode_list.filter(item => item.type != "file");
// }
// }
await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete.toString()}`); await api.delete(`file/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH${files_to_delete.toString()}`);
this.config.non_macros_list = this.config.non_macros_list.filter( this.config.non_macros_list = this.config.non_macros_list.filter(
item => !files_to_delete.includes(item.file_name), item => !files_to_delete.includes(item.file_name),