From 391fdea72ec33ad467176b751f211945734fb7a9 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 27 Nov 2024 12:39:52 +0300 Subject: [PATCH] Switch h5web to new visualization framework --- client/gulpfile.js | 13 ++++- .../visualizations/h5web/config/h5web.xml | 12 ++-- .../plugins/visualizations/h5web/package.json | 24 -------- .../visualizations/h5web/src/script.js | 58 ------------------- .../visualizations/h5web/src/styles.css | 43 -------------- 5 files changed, 15 insertions(+), 135 deletions(-) delete mode 100644 config/plugins/visualizations/h5web/package.json delete mode 100644 config/plugins/visualizations/h5web/src/script.js delete mode 100644 config/plugins/visualizations/h5web/src/styles.css diff --git a/client/gulpfile.js b/client/gulpfile.js index 56aa5798b004..cd26d0912e3d 100644 --- a/client/gulpfile.js +++ b/client/gulpfile.js @@ -20,7 +20,6 @@ const STATIC_PLUGIN_BUILD_IDS = [ "example", "fits_graph_viewer", "fits_image_viewer", - "h5web", "hyphyvision", "jqplot/jqplot_bar", "media_player", @@ -34,7 +33,17 @@ const STATIC_PLUGIN_BUILD_IDS = [ "tiffviewer", "ts_visjs", ]; -const INSTALL_PLUGIN_BUILD_IDS = ["cytoscape", "heatmap", "ngl", "msa", "openlayers", "phylocanvas", "venn", "vizarr"]; // todo: derive from XML +const INSTALL_PLUGIN_BUILD_IDS = [ + "cytoscape", + "h5web", + "heatmap", + "ngl", + "msa", + "openlayers", + "phylocanvas", + "venn", + "vizarr", +]; // todo: derive from XML const DIST_PLUGIN_BUILD_IDS = ["new_user"]; const PLUGIN_BUILD_IDS = Array.prototype.concat(DIST_PLUGIN_BUILD_IDS, STATIC_PLUGIN_BUILD_IDS); diff --git a/config/plugins/visualizations/h5web/config/h5web.xml b/config/plugins/visualizations/h5web/config/h5web.xml index 792d223dcd9f..48a767d8bf2a 100644 --- a/config/plugins/visualizations/h5web/config/h5web.xml +++ b/config/plugins/visualizations/h5web/config/h5web.xml @@ -11,12 +11,8 @@ dataset_id - - - - explorer - false - boolean - - + + + + diff --git a/config/plugins/visualizations/h5web/package.json b/config/plugins/visualizations/h5web/package.json deleted file mode 100644 index 87715cdaa687..000000000000 --- a/config/plugins/visualizations/h5web/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "visualization", - "version": "0.2.0", - "keywords": [ - "galaxy", - "visualization", - "h5web" - ], - "license": "AFL-3.0", - "dependencies": { - "@h5web/app": "^12.0.1", - "buffer": "^6.0.3", - "normalize.css": "^8.0.1", - "react": "18.3.1", - "react-dom": "18.3.1" - }, - "scripts": { - "build": "parcel build src/script.js --dist-dir static" - }, - "devDependencies": { - "parcel": "^2.12.0", - "process": "^0.11.10" - } -} diff --git a/config/plugins/visualizations/h5web/src/script.js b/config/plugins/visualizations/h5web/src/script.js deleted file mode 100644 index a1a944ec045a..000000000000 --- a/config/plugins/visualizations/h5web/src/script.js +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Visualizer interface for h5web (https://github.com/silx-kit/h5web) - * - * This relies on Galaxy being able to serve files using the - * h5grove protocol (https://silx-kit.github.io/h5grove/). - * This provides efficient access to the contents of the - * HDF5 file and avoids having to read the whole file at any - * point. - */ - -import "./styles.css"; -import React from "react"; -import { createRoot } from "react-dom/client"; -import { App, H5GroveProvider } from "@h5web/app"; - -/* This will be part of the charts/viz standard lib in 23.1 */ -const slashCleanup = /(\/)+/g; -function prefixedDownloadUrl(root, path) { - return `${root}/${path}`.replace(slashCleanup, "/"); -} - -function MyApp(props) { - return ( - - - - ); -} - -window.bundleEntries = window.bundleEntries || {}; -window.bundleEntries.load = function (options) { - const dataset = options.dataset; - const settings = options.chart.settings; - const explorer = settings.get("explorer"); - const url = - window.location.origin + - prefixedDownloadUrl( - options.root, - "/api/datasets/" + dataset.id + "/content" - ); - const root = createRoot(document.getElementById(options.target)); - root.render( - - ); - options.chart.state("ok", "Chart drawn."); - options.process.resolve(); -}; - -export default MyApp; diff --git a/config/plugins/visualizations/h5web/src/styles.css b/config/plugins/visualizations/h5web/src/styles.css deleted file mode 100644 index 36ccace70eb5..000000000000 --- a/config/plugins/visualizations/h5web/src/styles.css +++ /dev/null @@ -1,43 +0,0 @@ -@import 'npm:normalize.css'; -@import 'npm:@h5web/app/dist/styles.css'; /* global app styles */ - -*, -*::before, -*::after { - box-sizing: inherit; -} - -body { - box-sizing: border-box; - min-width: 42em; - font-family: var(--sans-serif); - line-height: 1.2; - color: #020402; -} - -body { - --primary: #c0da74; - --primary-lighter: #eaf0cd; - --primary-light: #d4e09b; - --primary-dark: #9aae5d; - --primary-bg: #f5fbef; - --primary-light-bg: #fafdf7; - --primary-dark-bg: #dde2d7; - --secondary: #8cdfc7; - --secondary-light: #b7fcf3; - --secondary-lighter: #dbfef9; - --secondary-dark: #1b998b; - --secondary-dark-15: #1b998b26; - --secondary-darker: #0e5846; - --secondary-bg: #d9f4ec; - --secondary-light-bg: #ecfaf6; - --monospace: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, - monospace; - --sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', - 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; -} - -#root { - height: 100vh; -} \ No newline at end of file