Move heatmap visualization to new script endpoint

client/gulpfile.js

@@ -20,7 +20,6 @@ const STATIC_PLUGIN_BUILD_IDS = [
     "example",
     "fits_image_viewer",
     "h5web",
-    "heatmap/heatmap_default",
     "hyphyvision",
     "jqplot/jqplot_bar",
     "media_player",
@@ -35,7 +34,7 @@ const STATIC_PLUGIN_BUILD_IDS = [
     "tiffviewer",
     "ts_visjs",
 ];
-const INSTALL_PLUGIN_BUILD_IDS = ["cytoscape", "ngl", "msa", "openlayers", "venn", "vizarr"]; // todo: derive from XML
+const INSTALL_PLUGIN_BUILD_IDS = ["cytoscape", "heatmap_default", "heatmap_cluster", "ngl", "msa", "openlayers", "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);
 

config/plugins/visualizations/heatmap/heatmap_cluster/config/heatmap_cluster.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE visualization SYSTEM "../../visualization.dtd">
-<visualization name="Clustered Heatmap" embeddable="false">
+<visualization name="Clustered Heatmap" embeddable="false" logo="logo.cluster.svg">
     <macros>
-        <import>../../heatmap_default/config/heatmap_shared.xml</import>
+        <import>heatmap_shared.xml</import>
     </macros>
     <description>Applies hierarchical clustering to a matrix using R. The data has to be provided in 3-column format. The result is displayed as clustered heatmap.</description>
-    <entry_point entry_point_type="chart" src="../../heatmap_default/static/dist/script.js" load="heatmap_cluster"/>
+    <requirements>
+        <requirement type="npm" version="0.0.0" package="@galaxyproject/heatmap"/>
+    </requirements>
     <expand macro="shared"/>
     <specs>
-        <zoomable>true</zoomable>
-        <confirm>True</confirm>
+        <variant>cluster</variant>
         <exports>
             <exports>pdf</exports>
             <exports>png</exports>

config/plugins/visualizations/heatmap/heatmap_default/config/heatmap_shared.xml

@@ -11,7 +11,8 @@
     <params>
         <param type="dataset" var_name_in_template="hda" required="true">dataset_id</param>
     </params>
-    <groups>
+    <entry_point entry_point_type="script" src="dist/index.js" css="dist/index.css" />
+    <tracks>
         <input>
             <label>Provide a label</label>
             <name>key</name>
@@ -23,23 +24,19 @@
             <label>Column labels</label>
             <name>x</name>
             <type>data_column</type>
-            <is_label>true</is_label>
-            <is_numeric>true</is_numeric>
         </input>
         <input>
             <label>Row labels</label>
             <name>y</name>
             <type>data_column</type>
-            <is_label>true</is_label>
-            <is_numeric>true</is_numeric>
         </input>
         <input>
             <label>Observation</label>
             <name>z</name>
             <type>data_column</type>
-            <is_numeric>true</is_numeric>
+            <is_number>true</is_number>
         </input>
-    </groups>
+    </tracks>
     <settings>
         <input>
             <name>color_set</name>