From 0d48a7fb19a578c526ba99477683c5107b1f26af Mon Sep 17 00:00:00 2001 From: M Starch Date: Mon, 25 Nov 2024 15:13:52 -0800 Subject: [PATCH 1/2] Resets display after view edit. Fixes: nasa/fprime#1757 --- src/fprime_gds/flask/static/js/vue-support/fptable.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fprime_gds/flask/static/js/vue-support/fptable.js b/src/fprime_gds/flask/static/js/vue-support/fptable.js index 9765eed9..90f721e8 100644 --- a/src/fprime_gds/flask/static/js/vue-support/fptable.js +++ b/src/fprime_gds/flask/static/js/vue-support/fptable.js @@ -354,12 +354,14 @@ Vue.component("fp-table", { */ saveView: function() { this.editing = false; + setTimeout(this.send, 10); // Force refresh when no data is available }, /** * Puts the user into view-edit mode. Thus allowing the user to set channels. */ editViews: function () { this.editing = true; + setTimeout(this.send, 10); // Force refresh when no data is available }, /** * Adds everything into the view From e0f365c9bb931db9eeffa72f985d749008c6f253 Mon Sep 17 00:00:00 2001 From: M Starch Date: Mon, 25 Nov 2024 15:25:41 -0800 Subject: [PATCH 2/2] Clear fliter on transition in/out of filters. Fixes: nasa/fprime#2476 --- src/fprime_gds/flask/static/js/vue-support/fptable.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/fprime_gds/flask/static/js/vue-support/fptable.js b/src/fprime_gds/flask/static/js/vue-support/fptable.js index 90f721e8..b1ba8625 100644 --- a/src/fprime_gds/flask/static/js/vue-support/fptable.js +++ b/src/fprime_gds/flask/static/js/vue-support/fptable.js @@ -354,6 +354,7 @@ Vue.component("fp-table", { */ saveView: function() { this.editing = false; + this.matching = ""; setTimeout(this.send, 10); // Force refresh when no data is available }, /** @@ -361,6 +362,7 @@ Vue.component("fp-table", { */ editViews: function () { this.editing = true; + this.matching = ""; setTimeout(this.send, 10); // Force refresh when no data is available }, /**