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

delete current

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-27 23:40:55 +05:30
parent 6d71ca4be4
commit a3719a7926
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,12 +399,12 @@ module.exports = {
} }
const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name); const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name);
if (isAlreadyPresent == undefined) { if (!isAlreadyPresent) {
this.config.non_macros_list.push({ file_name: file.name }); this.config.non_macros_list.push({ file_name: file.name });
} }
if ( if (
this.state.folder == "Unorganized files" && this.state.folder == "Unorganized files" &&
this.config.gcode_list.find(item => item.name == file.name && item.type == "file") == undefined !this.config.gcode_list.find(item => item.name == file.name && item.type == "file")
) { ) {
this.config.gcode_list.push({ name: file.name, type: "file", files: [] }); this.config.gcode_list.push({ name: file.name, type: "file", files: [] });
} else if (!this.state.folder || this.state.folder == "") { } else if (!this.state.folder || this.state.folder == "") {
@@ -456,7 +456,7 @@ module.exports = {
} }
const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name); const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name);
if (isAlreadyPresent == undefined) { if (!isAlreadyPresent) {
this.config.non_macros_list.push({ file_name: file.name }); this.config.non_macros_list.push({ file_name: file.name });
} }
const uploadPromise = new Promise((resolve, reject) => { const uploadPromise = new Promise((resolve, reject) => {
@@ -502,12 +502,16 @@ module.exports = {
}, },
delete_current: async function () { delete_current: async function () {
if (this.config.macros_list.find(item => item.file_name == this.state.selected) == undefined) { if (!this.config.macros_list.find(item => item.file_name == this.state.selected)) {
if (this.state.selected) { if (this.state.selected && !this.state.folder) {
this.config.non_macros_list = this.config.non_macros_list.filter( this.config.non_macros_list = this.config.non_macros_list.filter(
item => item.file_name != this.state.selected, item => item.file_name != this.state.selected,
); );
//TODO: remove file from the gcode_list if (this.state.folder == "Unorganized files" || !this.state.folder) {
this.config.gcode_list.filter(item => item.type == "file" && item.name == this.state.selected);
} else {
this.config.gcode_list[this.state.folder].files.filter(item => item.file_name == this.state.selected);
}
api.delete(`file/${this.state.selected}`); api.delete(`file/${this.state.selected}`);
} }
} else { } else {