Skip to content

Commit

Permalink
Merge pull request #19193 from guerler/phylocanvas
Browse files Browse the repository at this point in the history 
Move phylocanvas to script entry point
  • Loading branch information
@guerler
guerler authored Nov 25, 2024
2 parents 71f87d8 + ad667fb commit 7a68911
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 142 deletions.
3 changes: 1 addition & 2 deletions client/gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@ const STATIC_PLUGIN_BUILD_IDS = [
"nvd3/nvd3_bar",
"openseadragon",
"PCA_3Dplot",
"phylocanvas",
"pv",
"scatterplot",
"tiffviewer",
"ts_visjs",
];
const INSTALL_PLUGIN_BUILD_IDS = ["cytoscape", "ngl", "msa", "openlayers", "venn", "vizarr"]; // todo: derive from XML
const INSTALL_PLUGIN_BUILD_IDS = ["cytoscape", "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);

Expand Down
103 changes: 33 additions & 70 deletions config/plugins/visualizations/phylocanvas/config/phylocanvas.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
<params>
<param type="dataset" var_name_in_template="hda" required="true">dataset_id</param>
</params>
<entry_point entry_point_type="chart" src="script.js"/>
<requirements>
<requirement type="npm" version="0.0.2" package="@galaxyproject/phylocanvas"/>
</requirements>
<entry_point entry_point_type="script" src="dist/index.js" css="dist/index.css" />
<settings>
<input>
<label>Tree types</label>
Expand Down Expand Up @@ -45,6 +48,32 @@
</data>
</data>
</input>
<input>
<label>Node shapes for leaves</label>
<name>node_shape</name>
<help>Select a node shape for leaves.</help>
<type>select</type>
<display>radio</display>
<value>circle</value>
<data>
<data>
<label>Circle</label>
<value>circle</value>
</data>
<data>
<label>Square</label>
<value>square</value>
</data>
<data>
<label>Star</label>
<value>star</value>
</data>
<data>
<label>Triangle</label>
<value>triangle</value>
</data>
</data>
</input>
<input>
<name>edge_color</name>
<label>Select a color for the tree</label>
Expand All @@ -64,84 +93,18 @@
<value>#333333</value>
</input>
<input>
<label>Show/Hide labels</label>
<label>Show labels</label>
<name>show_labels</name>
<help>Select false to hide labels.</help>
<type>select</type>
<display>radio</display>
<type>boolean</type>
<value>true</value>
<data>
<data>
<label>True</label>
<value>true</value>
</data>
<data>
<label>False</label>
<value>false</value>
</data>
</data>
</input>
<input>
<label>Align labels</label>
<name>align_labels</name>
<help>Select to align the labels of tree. Supported with rectangular, circular, and hierarchical tree types.</help>
<type>select</type>
<display>radio</display>
<value>true</value>
<data>
<data>
<label>True</label>
<value>true</value>
</data>
<data>
<label>False</label>
<value>false</value>
</data>
</data>
</input>
<input>
<label>Show bootstrap confidence values</label>
<name>show_bootstrap</name>
<help>Select true to show bootstrap confidence values.</help>
<type>select</type>
<display>radio</display>
<type>boolean</type>
<value>false</value>
<data>
<data>
<label>True</label>
<value>true</value>
</data>
<data>
<label>False</label>
<value>false</value>
</data>
</data>
</input>
<input>
<label>Node shapes for leaves</label>
<name>node_shape</name>
<help>Select a node shape for leaves.</help>
<type>select</type>
<display>radio</display>
<value>circle</value>
<data>
<data>
<label>Circle</label>
<value>circle</value>
</data>
<data>
<label>Square</label>
<value>square</value>
</data>
<data>
<label>Star</label>
<value>star</value>
</data>
<data>
<label>Triangle</label>
<value>triangle</value>
</data>
</data>
</input>
</settings>
</visualization>
22 changes: 0 additions & 22 deletions config/plugins/visualizations/phylocanvas/package.json
View file

This file was deleted.

48 changes: 0 additions & 48 deletions config/plugins/visualizations/phylocanvas/src/script.js
View file

This file was deleted.

Binary file modified config/plugins/visualizations/phylocanvas/static/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7a68911

Please sign in to comment.