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

bug fix in delete_current in macros

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-10 03:50:37 +05:30
parent 9137441f11
commit b51fe5a10f
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -606,16 +606,11 @@ module.exports = {
this.update_config(); this.update_config();
this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected); this.config.non_macros_list = this.config.non_macros_list.filter(item => item.file_name != this.state.selected);
// if (this.state.folder == "default") {
// this.config.gcode_list = this.config.gcode_list.filter(
// item => (item.type == "file" || item.type == "folder") && item.name != this.state.selected,
// );
// } else {
const file_to_delete = this.config.gcode_list.find( const file_to_delete = this.config.gcode_list.find(
item => item.name == this.state.folder && item.type == "folder", item => item.name == this.state.folder && item.type == "folder",
); );
file_to_delete.files = file_to_delete.files.filter(item => item.file_name != this.state.selected); file_to_delete.files = file_to_delete.files.filter(item => item.file_name != this.state.selected);
// }
if (!this.state.macros_list.find(item => item.file_name == this.state.selected)) { if (!this.state.macros_list.find(item => item.file_name == this.state.selected)) {
api.delete(`file/${this.state.selected}`); api.delete(`file/${this.state.selected}`);
} }

5
src/js/macros.js
View File

@@ -238,6 +238,7 @@ module.exports = {
} }
this.update_config(); this.update_config();
const macros = [...this.state.macros];
macros.splice(this.tab - 1, 1); macros.splice(this.tab - 1, 1);
const macros_list = macros.map(item => item.name); const macros_list = macros.map(item => item.name);
@@ -305,7 +306,9 @@ module.exports = {
item.file_name = "default"; item.file_name = "default";
}); });
} }
api.delete(`file/${filename}`); if (!this.state.non_macros_list.find(item => item.file_name == filename)) {
api.delete(`file/${filename}`);
}
this.newGcode = ""; this.newGcode = "";
this.config.macros_list = this.config.macros_list.filter(item => item.file_name !== filename); this.config.macros_list = this.config.macros_list.filter(item => item.file_name !== filename);
this.fileName = "default"; this.fileName = "default";