From dbe19e5330c37ea32093589412027472b9ff7799 Mon Sep 17 00:00:00 2001 From: Andrew Stoltman Date: Fri, 5 Dec 2025 13:26:31 -0500 Subject: [PATCH 1/5] Changes to support legend word wrapping --- html/gui/js/modules/app_kernels/AppKernelExplorer.js | 4 ++-- html/gui/js/modules/app_kernels/AppKernelViewer.js | 4 ++-- html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js | 4 ++-- html/internal_dashboard/js/Arr/ControlRegionsPanel.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/html/gui/js/modules/app_kernels/AppKernelExplorer.js b/html/gui/js/modules/app_kernels/AppKernelExplorer.js index b38ff293..092c8c0c 100644 --- a/html/gui/js/modules/app_kernels/AppKernelExplorer.js +++ b/html/gui/js/modules/app_kernels/AppKernelExplorer.js @@ -1097,8 +1097,8 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelExplorer, XDMoD.PortalModule, { if (chartDiv) { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { - const update = relayoutChart(chartDiv, adjHeight, false); - Plotly.relayout(`plotly-panel${this.id}`, update); + const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); } } } // onResize diff --git a/html/gui/js/modules/app_kernels/AppKernelViewer.js b/html/gui/js/modules/app_kernels/AppKernelViewer.js index 77ac0425..9f891039 100644 --- a/html/gui/js/modules/app_kernels/AppKernelViewer.js +++ b/html/gui/js/modules/app_kernels/AppKernelViewer.js @@ -1238,8 +1238,8 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelViewer, XDMoD.PortalModule, { if (chartDiv) { Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { - const update = relayoutChart(chartDiv, adjHeight, false); - Plotly.relayout(this.chart.id, update); + const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); + Plotly.update(this.chart.id, update.data, update.layout, update.traces); } } } diff --git a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js index 56c970e7..084c0c1c 100644 --- a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js +++ b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js @@ -698,8 +698,8 @@ Ext.extend(XDMoD.Arr.AppKerSuccessRatePlotPanel, Ext.Panel, { if (chartDiv) { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { - const update = relayoutChart(chartDiv, adjHeight, false); - Plotly.relayout(`plotly-panel${this.id}`, update); + const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); } } } // onResize() diff --git a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js index a949b9c0..f44e091d 100644 --- a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js +++ b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js @@ -1650,8 +1650,8 @@ XDMoD.Arr.ControlRegionsPanel=Ext.extend(XDMoD.PortalModule, if (chartDiv) { Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { - const update = relayoutChart(chartDiv, adjHeight, false); - Plotly.relayout(this.chart.id, update); + const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); + Plotly.update(this.chart.id, update.data, update.layout, update.traces); } } } From 430958396e2eaaf4ef366fb7a09d63340ec52bfb Mon Sep 17 00:00:00 2001 From: Andrew Stoltman Date: Fri, 5 Dec 2025 15:17:33 -0500 Subject: [PATCH 2/5] add oname property --- classes/DataWarehouse/Visualization/AppKernelChart.php | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/DataWarehouse/Visualization/AppKernelChart.php b/classes/DataWarehouse/Visualization/AppKernelChart.php index 55458ec0..82f483a8 100644 --- a/classes/DataWarehouse/Visualization/AppKernelChart.php +++ b/classes/DataWarehouse/Visualization/AppKernelChart.php @@ -284,6 +284,7 @@ public function configureAppKernelChart( $yValues[] = $sv['y']; } $trace = array( + 'oname' => $datasetName, 'name' => $datasetName, 'zIndex' => 10, 'cliponaxis' => false, From fc1fd1c6ed861f4bd0aaa76e9ab2b907f4edeb9e Mon Sep 17 00:00:00 2001 From: Andrew Stoltman Date: Fri, 5 Dec 2025 17:34:59 -0500 Subject: [PATCH 3/5] Remove 'oname' as we don't change the trace name --- classes/DataWarehouse/Visualization/AppKernelChart.php | 1 - 1 file changed, 1 deletion(-) diff --git a/classes/DataWarehouse/Visualization/AppKernelChart.php b/classes/DataWarehouse/Visualization/AppKernelChart.php index 82f483a8..55458ec0 100644 --- a/classes/DataWarehouse/Visualization/AppKernelChart.php +++ b/classes/DataWarehouse/Visualization/AppKernelChart.php @@ -284,7 +284,6 @@ public function configureAppKernelChart( $yValues[] = $sv['y']; } $trace = array( - 'oname' => $datasetName, 'name' => $datasetName, 'zIndex' => 10, 'cliponaxis' => false, From c8460dfe467fd96d03ccdf2f7604bf9dfb9a7228 Mon Sep 17 00:00:00 2001 From: Andrew Stoltman Date: Tue, 13 Jan 2026 10:46:36 -0500 Subject: [PATCH 4/5] Update relayout call --- html/gui/js/modules/app_kernels/AppKernelExplorer.js | 2 +- html/gui/js/modules/app_kernels/AppKernelViewer.js | 2 +- html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js | 2 +- html/internal_dashboard/js/Arr/ControlRegionsPanel.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html/gui/js/modules/app_kernels/AppKernelExplorer.js b/html/gui/js/modules/app_kernels/AppKernelExplorer.js index 092c8c0c..665c3a1f 100644 --- a/html/gui/js/modules/app_kernels/AppKernelExplorer.js +++ b/html/gui/js/modules/app_kernels/AppKernelExplorer.js @@ -1098,7 +1098,7 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelExplorer, XDMoD.PortalModule, { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout); } } } // onResize diff --git a/html/gui/js/modules/app_kernels/AppKernelViewer.js b/html/gui/js/modules/app_kernels/AppKernelViewer.js index 9f891039..e5900594 100644 --- a/html/gui/js/modules/app_kernels/AppKernelViewer.js +++ b/html/gui/js/modules/app_kernels/AppKernelViewer.js @@ -1239,7 +1239,7 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelViewer, XDMoD.PortalModule, { Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(this.chart.id, update.data, update.layout, update.traces); + Plotly.update(this.chart.id, update.data, update.layout); } } } diff --git a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js index 084c0c1c..4990b573 100644 --- a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js +++ b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js @@ -699,7 +699,7 @@ Ext.extend(XDMoD.Arr.AppKerSuccessRatePlotPanel, Ext.Panel, { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout); } } } // onResize() diff --git a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js index f44e091d..ec3af4d0 100644 --- a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js +++ b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js @@ -1651,7 +1651,7 @@ XDMoD.Arr.ControlRegionsPanel=Ext.extend(XDMoD.PortalModule, Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(this.chart.id, update.data, update.layout, update.traces); + Plotly.update(this.chart.id, update.data, update.layout); } } } From bef2af3290964cc0334aee34cb6260da1feb8ada Mon Sep 17 00:00:00 2001 From: Andrew Stoltman Date: Wed, 14 Jan 2026 16:37:07 -0500 Subject: [PATCH 5/5] Add back specifying traces --- html/gui/js/modules/app_kernels/AppKernelExplorer.js | 2 +- html/gui/js/modules/app_kernels/AppKernelViewer.js | 2 +- html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js | 2 +- html/internal_dashboard/js/Arr/ControlRegionsPanel.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/html/gui/js/modules/app_kernels/AppKernelExplorer.js b/html/gui/js/modules/app_kernels/AppKernelExplorer.js index 665c3a1f..092c8c0c 100644 --- a/html/gui/js/modules/app_kernels/AppKernelExplorer.js +++ b/html/gui/js/modules/app_kernels/AppKernelExplorer.js @@ -1098,7 +1098,7 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelExplorer, XDMoD.PortalModule, { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(`plotly-panel${this.id}`, update.data, update.layout); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); } } } // onResize diff --git a/html/gui/js/modules/app_kernels/AppKernelViewer.js b/html/gui/js/modules/app_kernels/AppKernelViewer.js index e5900594..9f891039 100644 --- a/html/gui/js/modules/app_kernels/AppKernelViewer.js +++ b/html/gui/js/modules/app_kernels/AppKernelViewer.js @@ -1239,7 +1239,7 @@ Ext.extend(XDMoD.Module.AppKernels.AppKernelViewer, XDMoD.PortalModule, { Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(this.chart.id, update.data, update.layout); + Plotly.update(this.chart.id, update.data, update.layout, update.traces); } } } diff --git a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js index 4990b573..084c0c1c 100644 --- a/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js +++ b/html/internal_dashboard/js/Arr/AppKerSuccessRatePlotPanel.js @@ -699,7 +699,7 @@ Ext.extend(XDMoD.Arr.AppKerSuccessRatePlotPanel, Ext.Panel, { Plotly.relayout(`plotly-panel${this.id}`, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(`plotly-panel${this.id}`, update.data, update.layout); + Plotly.update(`plotly-panel${this.id}`, update.data, update.layout, update.traces); } } } // onResize() diff --git a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js index ec3af4d0..f44e091d 100644 --- a/html/internal_dashboard/js/Arr/ControlRegionsPanel.js +++ b/html/internal_dashboard/js/Arr/ControlRegionsPanel.js @@ -1651,7 +1651,7 @@ XDMoD.Arr.ControlRegionsPanel=Ext.extend(XDMoD.PortalModule, Plotly.relayout(this.chart.id, { width: adjWidth, height: adjHeight }); if (chartDiv._fullLayout.annotations.length > 0) { const update = relayoutChart(chartDiv, adjWidth, adjHeight, false); - Plotly.update(this.chart.id, update.data, update.layout); + Plotly.update(this.chart.id, update.data, update.layout, update.traces); } } }