From 030d54c9a467aa0421afe771d258cb6072a236d7 Mon Sep 17 00:00:00 2001 From: M Starch Date: Tue, 24 Oct 2023 14:10:04 -0700 Subject: [PATCH 1/6] Fixes nasa/fprim#2312 by correcting scalar validation (#147) --- .../addons/commanding/argument-templates.js | 2 +- .../flask/static/addons/commanding/arguments.js | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/fprime_gds/flask/static/addons/commanding/argument-templates.js b/src/fprime_gds/flask/static/addons/commanding/argument-templates.js index 3e1a9de1..c5423d57 100644 --- a/src/fprime_gds/flask/static/addons/commanding/argument-templates.js +++ b/src/fprime_gds/flask/static/addons/commanding/argument-templates.js @@ -70,7 +70,7 @@ export let command_array_argument_template = ` * enumerations are handled here as they represent a single scalar input. */ export let command_scalar_argument_template = ` -
+
@@ -31,6 +33,7 @@ let template = `
{{ text }}
+
`; @@ -40,19 +43,10 @@ Vue.component('v-select', VueSelect.VueSelect); Vue.component("logging", { template: template, - data() {return {"selected": "", "logs": _datastore.logs, text: ""}}, + data() {return {"selected": "", "logs": _datastore.logs, text: "", "scroll": true, "error": ""}}, mounted() { setInterval(this.update, 1000); // Grab log updates once a second }, - computed:{ - /** - * Computes the appropriate log files available. - * @return {string[]} - */ - options: function () { - return this.logs; - } - }, methods: { /** * Updates the log data such that new logs can be displayed. @@ -65,8 +59,22 @@ Vue.component("logging", { _loader.load("/logdata/" + this.selected, "GET").then( (result) => { _self.text = result[_self.selected]; - this.$el.scrollTop = this.$el.scrollHeight - }).catch((result) => {_self.text = "[ERROR] "+ result}); + // Update on next-tick so that the updated content has been drawn already + _self.$nextTick(() => { + let panes = _self.$el.getElementsByClassName("fp-scrollable"); + if (panes && _self.scroll) + { + panes[0].scrollTop = panes[0].scrollHeight; + } + }); + _self.error = ""; + }).catch((result) => { + if (result === "") { + _self.error = "[ERROR] Failed to update log content."; + } else { + _self.error = "[ERROR] " + result + "."; + } + }); } } }); From 8677c646b8be817bf25073209bb7892a06c9f614 Mon Sep 17 00:00:00 2001 From: Thomas Boyer-Chammard <49786685+thomas-bc@users.noreply.github.com> Date: Thu, 7 Dec 2023 11:28:25 -0800 Subject: [PATCH 6/6] Add issue creation redirection links (#154) --- .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++ .github/ISSUE_TEMPLATE/do-not-use.md | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/do-not-use.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..3012790f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Open an Issue with F´ + url: https://github.com/nasa/fprime/issues/new/choose + about: Issues about this repository are centrally managed in the core F´ repository + - name: F´ Community Discussions + url: https://github.com/nasa/fprime/discussions + about: Questions should be asked in the F´ Discussions diff --git a/.github/ISSUE_TEMPLATE/do-not-use.md b/.github/ISSUE_TEMPLATE/do-not-use.md deleted file mode 100644 index bea7e220..00000000 --- a/.github/ISSUE_TEMPLATE/do-not-use.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: Do not use -about: Please use https://github.com/nasa/fprime/issues instead -title: '' -labels: bug -assignees: '' - ---- -# Do not use - -Please do not use this form. Issues should be posted to https://github.com/nasa/fprime/issues/new/choose