From 36294b08cbda2096e928354685490ab0f9bc7a2c Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 6 Oct 2024 13:49:30 +0300 Subject: [PATCH] Install ngl from npm package --- client/gulpfile.js | 11 ++++++----- .../plugins/visualizations/example/config/example.xml | 10 +++++----- config/plugins/visualizations/ngl/config/ngl.xml | 8 ++++---- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/client/gulpfile.js b/client/gulpfile.js index 85f254b65468..ac4dee853b37 100644 --- a/client/gulpfile.js +++ b/client/gulpfile.js @@ -38,7 +38,7 @@ const STATIC_PLUGIN_BUILD_IDS = [ "ts_visjs", "venn", ]; -const INSTALL_PLUGIN_BUILD_IDS = ["msa"]; // todo: derive from XML +const INSTALL_PLUGIN_BUILD_IDS = ["ngl", "msa"]; // 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); @@ -245,10 +245,11 @@ async function installDependenciesFromXML(xmlPath, pluginDir) { ); if (installResult.status === 0) { - await fs.copy( - path.join(pluginDir, "node_modules", pkgName, "static"), - path.join(pluginDir, "static") - ); + const packagePath = path.join(pluginDir, "node_modules", pkgName); + const defaultPath = path.join(packagePath, "static"); + const alternatePath = path.join(packagePath, "dist/static"); + const sourcePath = fs.existsSync(defaultPath) ? defaultPath : alternatePath; + await fs.copy(sourcePath, path.join(pluginDir, "static")); console.log(`Installed package ${pkgName}@${version} in ${pluginDir}`); } else { console.error(`Error installing package ${pkgName}@${version} in ${pluginDir}`); diff --git a/config/plugins/visualizations/example/config/example.xml b/config/plugins/visualizations/example/config/example.xml index 4fe2e0f38ff5..7ebf2f643a12 100644 --- a/config/plugins/visualizations/example/config/example.xml +++ b/config/plugins/visualizations/example/config/example.xml @@ -20,13 +20,13 @@ setting_type - + - group_input - group help - group_type + track_input + track help + track_type - + spec_value diff --git a/config/plugins/visualizations/ngl/config/ngl.xml b/config/plugins/visualizations/ngl/config/ngl.xml index d9968c3c7d8a..41b1dc3684a9 100644 --- a/config/plugins/visualizations/ngl/config/ngl.xml +++ b/config/plugins/visualizations/ngl/config/ngl.xml @@ -12,10 +12,10 @@ dataset_id - + + + +