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

unorganised to default folder

Browse Source
This commit is contained in:
sanjayk03-dev
2024-04-08 11:15:22 +05:30
parent b59fffa50a
commit b3c89027a5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,7 +213,7 @@ module.exports = {
return []; return [];
} }
let files = []; let files = [];
if (this.state.folder == "Unorganized files") { if (this.state.folder == "default") {
files = this.config.gcode_list.filter(item => item.type == "file" && this.state.files.includes(item.name)); files = this.config.gcode_list.filter(item => item.type == "file" && this.state.files.includes(item.name));
files = files.map(item => item.name); files = files.map(item => item.name);
return files.sort(); return files.sort();
@@ -430,7 +430,7 @@ module.exports = {
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 == "default" &&
!this.config.gcode_list.find(item => item.name == file.name && item.type == "file") !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: [] });
@@ -567,7 +567,7 @@ module.exports = {
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 == "Unorganized files") { if (this.state.folder == "default") {
this.config.gcode_list = this.config.gcode_list.filter( this.config.gcode_list = this.config.gcode_list.filter(
item => (item.type == "file" || item.type == "folder") && item.name != this.state.selected, item => (item.type == "file" || item.type == "folder") && item.name != this.state.selected,
); );
@@ -593,14 +593,14 @@ module.exports = {
const macrosList = this.config.macros_list.map(item => item.file_name).toString(); const macrosList = this.config.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.state.folder = "Unorganized files"; this.state.folder = "default";
this.config.gcode_list = []; this.config.gcode_list = [];
this.save_config(this.config); this.save_config(this.config);
this.deleteGCode = false; this.deleteGCode = false;
}, },
delete_folder: async function () { delete_folder: async function () {
if (this.state.folder && this.state.folder != "Unorganized files") { if (this.state.folder && this.state.folder != "default") {
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,
@@ -624,7 +624,7 @@ module.exports = {
this.save_config(this.config); this.save_config(this.config);
} }
} }
this.state.folder = "Unorganized files"; this.state.folder = "default";
this.confirmDelete = false; this.confirmDelete = false;
}, },
delete_folder_and_files: async function () { delete_folder_and_files: async function () {
@@ -633,7 +633,7 @@ module.exports = {
return; return;
} }
if (this.state.folder != "Unorganized files") { if (this.state.folder != "default") {
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,
).files; ).files;
@@ -651,7 +651,7 @@ module.exports = {
} }
} }
this.save_config(this.config); this.save_config(this.config);
this.state.folder = "Unorganized files"; this.state.folder = "default";
this.confirmDelete = false; this.confirmDelete = false;
}, },

2
src/pug/templates/control-view.pug
View File

@@ -351,7 +351,7 @@ script#control-view-template(type="text/x-template")
select(title="Select previously uploaded GCode folder.", select(title="Select previously uploaded GCode folder.",
v-model="state.folder", :disabled="!is_ready", v-model="state.folder", :disabled="!is_ready",
style="max-width:100%") style="max-width:100%")
option( selected='' value='Unorganized files') Unorganized files option( selected='' value='default') Default folder
option(v-for="file in gcode_folders", :value="file") {{file}} option(v-for="file in gcode_folders", :value="file") {{file}}
//- button.pure-button(title="Upload a new folder.", @click="open_folder", //- button.pure-button(title="Upload a new folder.", @click="open_folder",