From d55b32cd28035271a5a13a930902b17fb2447f45 Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Wed, 3 Apr 2024 14:58:19 +0530 Subject: [PATCH] using state for files listing --- src/js/control-view.js | 11 +++++++---- src/pug/index.pug | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/js/control-view.js b/src/js/control-view.js index 6f7e222..4ef3e0a 100644 --- a/src/js/control-view.js +++ b/src/js/control-view.js @@ -209,16 +209,19 @@ module.exports = { return Math.min(1, p); }, gcode_files: function () { - let files = []; if (!this.state.folder || this.state.folder == "") { - return files; + return []; } + let files = []; if (this.state.folder == "Unorganized files") { - files = this.config.gcode_list.filter(item => item.type == "file"); + files = this.config.gcode_list.filter(item => item.type == "file" && this.state.files.includes(item.name)); files = files.map(item => item.name); return files; } - files = this.config.gcode_list.find(item => item.name == this.state.folder).files.map(item => item.file_name); + files = this.config.gcode_list + .find(item => item.name == this.state.folder) + .filter(item => this.state.files.includes(item.file_name)) + .files.map(item => item.file_name); return files; }, gcode_folders: function () { diff --git a/src/pug/index.pug b/src/pug/index.pug index 158f680..46c118b 100644 --- a/src/pug/index.pug +++ b/src/pug/index.pug @@ -76,7 +76,7 @@ html(lang="en") .brand img(src="/images/onefinity_logo.png") .version - div Version: v{{config.full_version}} Alpha 3 + div Version: v{{config.full_version}} Alpha 4 div IP Address: {{config.ip}} div WiFi: {{config.wifiName}} a.upgrade-link(v-if="show_upgrade()", href="#admin-general")