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

fixing state update while upload

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-29 00:32:35 +05:30
parent e0af22ef5b
commit 751e16bee7
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -498,34 +498,35 @@ module.exports = {
return; return;
} }
const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name);
if (!isAlreadyPresent) {
this.config.non_macros_list.push({ file_name: file.name });
}
const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName);
console.log(folder);
if (folder) {
console.log("513", file.name);
folder.files.push({ file_name: file.name });
} else {
console.log("516", file.name);
this.config.gcode_list.push({
name: folderName,
type: "folder",
files: [
{
file_name: file.name,
},
],
});
}
console.log("523", this.config.gcode_list);
SvelteComponents.showDialog("Upload", { SvelteComponents.showDialog("Upload", {
file, file,
onComplete: () => { onComplete: () => {
this.last_file_time = undefined; // Force reload this.last_file_time = undefined; // Force reload
// this.$broadcast("gcode-reload", file.name); // this.$broadcast("gcode-reload", file.name);
const isAlreadyPresent = this.config.non_macros_list.find(element => element.file_name == file.name);
if (!isAlreadyPresent) {
this.config.non_macros_list.push({ file_name: file.name });
}
const folder = this.config.gcode_list.find(item => item.type == "folder" && item.name == folderName);
console.log(folder);
if (folder) {
console.log("513", file.name);
folder.files.push({ file_name: file.name });
} else {
console.log("516", file.name);
this.config.gcode_list.push({
name: folderName,
type: "folder",
files: [
{
file_name: file.name,
},
],
});
}
console.log("523", this.config.gcode_list);
const remaining_files = this.modify_files(files); const remaining_files = this.modify_files(files);
const updated_event = { ...e }; const updated_event = { ...e };
if (updated_event.target) { if (updated_event.target) {
@@ -572,7 +573,7 @@ module.exports = {
}, },
delete_folder: async function () { delete_folder: async function () {
if (this.state.folder) { if (this.state.folder && this.state.folder != "Unorganized files") {
console.log("595"); console.log("595");
const files_to_move = this.config.gcode_list.find( const files_to_move = this.config.gcode_list.find(
item => item.type == "folder" && item.name == this.state.folder, item => item.type == "folder" && item.name == this.state.folder,
@@ -596,10 +597,11 @@ module.exports = {
this.save_config(this.config); this.save_config(this.config);
} }
} }
this.state.folder = "Unorganized files";
this.confirmDelete = false; this.confirmDelete = false;
}, },
delete_folder_and_files: async function () { delete_folder_and_files: async function () {
if (this.state.folder) { if (this.state.folder && this.state.folder != "Unorganized files") {
const selected_folder = this.config.gcode_list.find( const selected_folder = this.config.gcode_list.find(
item => (item.type = "folder" && item.name == this.state.folder), item => (item.type = "folder" && item.name == this.state.folder),
); );
@@ -618,6 +620,7 @@ module.exports = {
this.save_config(this.config); this.save_config(this.config);
} }
} }
this.state.folder = "Unorganized files";
this.confirmDelete = false; this.confirmDelete = false;
}, },