From 992e6df43f9ecca5e57cc5241b3f2f168dc98d3b Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 17 Nov 2022 12:47:56 -0500 Subject: [PATCH 1/3] Chart confirmation message tweak for clarity --- client/src/mvc/visualization/chart/views/viewer.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/src/mvc/visualization/chart/views/viewer.js b/client/src/mvc/visualization/chart/views/viewer.js index 1e2e72eee14..f49763707ec 100644 --- a/client/src/mvc/visualization/chart/views/viewer.js +++ b/client/src/mvc/visualization/chart/views/viewer.js @@ -36,7 +36,10 @@ export default Backbone.View.extend({ self._draw(process, self.chart); }); } else { - self.chart.state("info", "Please confirm the settings before rendering the results."); + self.chart.state( + "info", + "Please review the chart settings in the menu to the right and select 'Confirm' to render the visualization." + ); } }); this.chart.on("set:state", function () { From c863b9c20567f86789b4bf33ca22d083aa623e0b Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 17 Nov 2022 13:09:52 -0500 Subject: [PATCH 2/3] Swap default state of menu to open? Seems like we have plenty of space here. --- client/src/mvc/visualization/chart/views/menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/mvc/visualization/chart/views/menu.js b/client/src/mvc/visualization/chart/views/menu.js index 5671b0843de..adfbf1d917d 100644 --- a/client/src/mvc/visualization/chart/views/menu.js +++ b/client/src/mvc/visualization/chart/views/menu.js @@ -5,7 +5,7 @@ import Ui from "mvc/ui/ui-misc"; export default Backbone.View.extend({ initialize: function (app) { this.app = app; - this.model = new Backbone.Model({ visible: false }); + this.model = new Backbone.Model({ visible: true }); this.execute_button = new Ui.Button({ icon: "fa-check-square", tooltip: "Confirm", From 7bc1559052fb1d71a355409c3f165f1e4896577e Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 17 Nov 2022 14:54:00 -0500 Subject: [PATCH 3/3] Only expand by default when using a chart that requires confirmation before running --- client/src/mvc/visualization/chart/chart-client.js | 6 ++++++ client/src/mvc/visualization/chart/views/menu.js | 2 +- client/src/mvc/visualization/chart/views/viewer.js | 7 +------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/client/src/mvc/visualization/chart/chart-client.js b/client/src/mvc/visualization/chart/chart-client.js index 99951812d78..7c9d4dcb0c4 100644 --- a/client/src/mvc/visualization/chart/chart-client.js +++ b/client/src/mvc/visualization/chart/chart-client.js @@ -10,6 +10,11 @@ import Editor from "mvc/visualization/chart/views/editor"; import Viewer from "mvc/visualization/chart/views/viewer"; import Menu from "mvc/visualization/chart/views/menu"; +/** Get boolean as string */ +function asBoolean(value) { + return String(value).toLowerCase() == "true"; +} + export default Backbone.View.extend({ initialize: function (options) { const Galaxy = getGalaxyInstance(); @@ -26,6 +31,7 @@ export default Backbone.View.extend({ this.$buttons = this.$(".charts-buttons"); this.chart = new Chart({}, options); this.chart.plugin = options.visualization_plugin; + this.chart.requiresConfirmation = asBoolean(this.chart.plugin.specs.confirm); this.chart.plugin.specs = this.chart.plugin.specs || {}; this.chart_load = options.chart_load; this.message = new Ui.Message(); diff --git a/client/src/mvc/visualization/chart/views/menu.js b/client/src/mvc/visualization/chart/views/menu.js index adfbf1d917d..e1f259704cb 100644 --- a/client/src/mvc/visualization/chart/views/menu.js +++ b/client/src/mvc/visualization/chart/views/menu.js @@ -5,7 +5,7 @@ import Ui from "mvc/ui/ui-misc"; export default Backbone.View.extend({ initialize: function (app) { this.app = app; - this.model = new Backbone.Model({ visible: true }); + this.model = new Backbone.Model({ visible: app.chart.requiresConfirmation }); this.execute_button = new Ui.Button({ icon: "fa-check-square", tooltip: "Confirm", diff --git a/client/src/mvc/visualization/chart/views/viewer.js b/client/src/mvc/visualization/chart/views/viewer.js index f49763707ec..2261a3950c4 100644 --- a/client/src/mvc/visualization/chart/views/viewer.js +++ b/client/src/mvc/visualization/chart/views/viewer.js @@ -30,7 +30,7 @@ export default Backbone.View.extend({ this.$text = this.$(".text"); this._fullscreen(this.$el, 20); this.chart.on("redraw", function (confirmed) { - if (!self.chart.get("modified") || !self._asBoolean(self.chart.plugin.specs.confirm) || confirmed) { + if (!self.chart.get("modified") || !self.chart.requiresConfirmation || confirmed) { self.app.deferred.execute(function (process) { console.debug("viewer:redraw() - Redrawing..."); self._draw(process, self.chart); @@ -71,11 +71,6 @@ export default Backbone.View.extend({ }); }, - /** Get boolean as string */ - _asBoolean: function (value) { - return String(value).toLowerCase() == "true"; - }, - /** Force resize to fullscreen */ _fullscreen: function ($el, margin) { $el.css("height", $(window).height() - margin);