From b4963d48720117e52b0f7c73b152fe17fd010e60 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Tue, 16 Jul 2024 16:33:42 -0400 Subject: [PATCH 1/4] Update h5web, should be compatible with provider now. --- config/plugins/visualizations/h5web/package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/config/plugins/visualizations/h5web/package.json b/config/plugins/visualizations/h5web/package.json index 928466adde0f..87715cdaa687 100644 --- a/config/plugins/visualizations/h5web/package.json +++ b/config/plugins/visualizations/h5web/package.json @@ -8,16 +8,17 @@ ], "license": "AFL-3.0", "dependencies": { - "@h5web/app": "^8.0.0", + "@h5web/app": "^12.0.1", "buffer": "^6.0.3", "normalize.css": "^8.0.1", - "react": "18.2.0", - "react-dom": "18.2.0" + "react": "18.3.1", + "react-dom": "18.3.1" }, "scripts": { "build": "parcel build src/script.js --dist-dir static" }, "devDependencies": { - "parcel": "^2.12.0" + "parcel": "^2.12.0", + "process": "^0.11.10" } } From cdcb5bc8c6544a7b88911adbf014dcc81c092a57 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 17 Jul 2024 12:43:08 -0400 Subject: [PATCH 2/4] Add basic h5web viz test --- .../selenium/test_visualizations.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/galaxy_test/selenium/test_visualizations.py b/lib/galaxy_test/selenium/test_visualizations.py index f73d27de539a..c23f046f7b1b 100644 --- a/lib/galaxy_test/selenium/test_visualizations.py +++ b/lib/galaxy_test/selenium/test_visualizations.py @@ -47,3 +47,21 @@ def test_charts_nvd3_bar(self): with self.visualization_panel(): self.wait_for_selector("g.nvd3") self.screenshot("visualization_plugin_charts_nvd3_bar_landing") + + @managed_history + @selenium_test + @skip_without_visualization_plugin("h5web") + def test_charts_h5web(self): + hid = 1 + self.perform_upload(self.get_filename("chopper.h5")) + dataset_component = self.history_panel_click_item_title(hid, wait=True) + dataset_component.visualize_button.wait_for_and_click() + + self.components.visualization.plugin_item(id="h5web").wait_for_visible() + self.screenshot("visualization_plugins_h5") + self.components.visualization.plugin_item(id="h5web").wait_for_and_click() + + with self.visualization_panel(): + # Look for the h5web-explorer-tree identifier to verify it loads. + self.wait_for_selector("#h5web-explorer-tree") + self.screenshot("visualization_plugin_charts_h5web_landing") From 083ea07eaecc83fdfe0e1b1197d991341d778dd8 Mon Sep 17 00:00:00 2001 From: Dannon Date: Fri, 19 Jul 2024 09:24:34 -0400 Subject: [PATCH 3/4] Update lib/galaxy_test/selenium/test_visualizations.py Co-authored-by: Marius van den Beek --- lib/galaxy_test/selenium/test_visualizations.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy_test/selenium/test_visualizations.py b/lib/galaxy_test/selenium/test_visualizations.py index c23f046f7b1b..840e30967c9a 100644 --- a/lib/galaxy_test/selenium/test_visualizations.py +++ b/lib/galaxy_test/selenium/test_visualizations.py @@ -54,6 +54,7 @@ def test_charts_nvd3_bar(self): def test_charts_h5web(self): hid = 1 self.perform_upload(self.get_filename("chopper.h5")) + self.history_panel_wait_for_hid_ok(hid) dataset_component = self.history_panel_click_item_title(hid, wait=True) dataset_component.visualize_button.wait_for_and_click() From ab90c943ffb7f212e8132da0364030b2c66de66e Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Mon, 5 Aug 2024 10:58:22 -0400 Subject: [PATCH 4/4] Load h5 datatype in reduced test datatypes set --- test/functional/tools/sample_datatypes_conf.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/tools/sample_datatypes_conf.xml b/test/functional/tools/sample_datatypes_conf.xml index 802c286be68f..e61be45f2e3a 100644 --- a/test/functional/tools/sample_datatypes_conf.xml +++ b/test/functional/tools/sample_datatypes_conf.xml @@ -59,5 +59,6 @@ +