Merge pull request #1856 from Gilead-BioStats/fix-1855

Add `rbm-viz` v2.1.0.
Gilead-BioStats · Oct 4, 2024 · db4119f · db4119f
2 parents 05e4561 + 89d26e2
commit db4119f
Show file tree

Hide file tree

Showing 23 changed files with 114 additions and 98 deletions.
diff --git a/inst/htmlwidgets/Widget_BarChart.yaml b/inst/htmlwidgets/Widget_BarChart.yaml
@@ -1,26 +1,26 @@
 dependencies:
   - name: rbmviz
-    version: 1.2.0
-    src: 'rbm-viz-1.2.0'
+    version: 2.1.0
+    src: 'htmlwidgets/lib/rbm-viz-2.1.0'
     script: 'rbm-viz.js'
   - name: clickCallback
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'clickCallback.js'
   - name: addWidgetControls
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addWidgetControls.js'
     stylesheet: 'widgetControls.css'
   - name: addSelectControl
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addSelectControl.js'
   - name: getGroups
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getGroups.js'
   - name: getCountries
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getCountries.js'
diff --git a/inst/htmlwidgets/Widget_FlagOverTime.yaml b/inst/htmlwidgets/Widget_FlagOverTime.yaml
@@ -1,17 +1,17 @@
 dependencies:
   - name: addGroupSubsetLongitudinal
-    version: 0.0.1
-    src: 'gt-utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addGroupSubsetLongitudinal.js'
   - name: findMatchingRows
-    version: 0.0.1
-    src: 'gt-utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'findMatchingRows.js'
   - name: findHeadersWithMatchingSiblings
-    version: 0.0.1
-    src: 'gt-utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'findHeadersWithMatchingSiblings.js'
   - name: showHideRows
-    version: 0.0.1
-    src: 'gt-utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'showHideRows.js'
diff --git a/inst/htmlwidgets/Widget_GroupOverview.yaml b/inst/htmlwidgets/Widget_GroupOverview.yaml
@@ -1,10 +1,10 @@
 dependencies:
   - name: rbmviz
-    version: 1.2.0
-    src: 'rbm-viz-1.2.0'
+    version: 2.1.0
+    src: 'htmlwidgets/lib/rbm-viz-2.1.0'
     script: 'rbm-viz.js'
     stylesheet: 'rbm-viz.css'
   - name: addGroupSubset
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addGroupSubset.js'
diff --git a/inst/htmlwidgets/Widget_ScatterPlot.yaml b/inst/htmlwidgets/Widget_ScatterPlot.yaml
@@ -1,26 +1,26 @@
 dependencies:
   - name: rbmviz
-    version: 1.2.0
-    src: 'rbm-viz-1.2.0'
+    version: 2.1.0
+    src: 'htmlwidgets/lib/rbm-viz-2.1.0'
     script: 'rbm-viz.js'
   - name: clickCallback
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'clickCallback.js'
   - name: addWidgetControls
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addWidgetControls.js'
     stylesheet: 'widgetControls.css'
   - name: addSelectControl
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addSelectControl.js'
   - name: getGroups
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getGroups.js'
   - name: getCountries
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getCountries.js'
diff --git a/inst/htmlwidgets/Widget_TimeSeries.yaml b/inst/htmlwidgets/Widget_TimeSeries.yaml
@@ -1,26 +1,26 @@
 dependencies:
   - name: rbmviz
-    version: 1.2.0
-    src: 'rbm-viz-1.2.0'
+    version: 2.1.0
+    src: 'htmlwidgets/lib/rbm-viz-2.1.0'
     script: 'rbm-viz.js'
   - name: clickCallback
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'clickCallback.js'
   - name: addWidgetControls
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addWidgetControls.js'
     stylesheet: 'widgetControls.css'
   - name: addSelectControl
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'addSelectControl.js'
   - name: getGroups
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getGroups.js'
   - name: getCountries
-    version: 0.0.1
-    src: 'utils-0.0.1'
+    version: 1.0.0
+    src: 'htmlwidgets/lib'
     script: 'getCountries.js'
diff --git a/inst/htmlwidgets/Widget_TimeSeriesQTL.yaml b/inst/htmlwidgets/Widget_TimeSeriesQTL.yaml
@@ -1,5 +1,5 @@
 dependencies:
   - name: rbmviz
-    version: 1.2.0
-    src: 'rbm-viz-1.2.0'
+    version: 2.1.0
+    src: 'htmlwidgets/lib/rbm-viz-2.1.0'
     script: 'rbm-viz.js'
diff --git a/inst/utils-0.0.1/addGroupSubset.js → inst/htmlwidgets/lib/addGroupSubset.js b/inst/utils-0.0.1/addGroupSubset.js → inst/htmlwidgets/lib/addGroupSubset.js
diff --git a/...utils-0.0.1/addGroupSubsetLongitudinal.js → ...widgets/lib/addGroupSubsetLongitudinal.js b/...utils-0.0.1/addGroupSubsetLongitudinal.js → ...widgets/lib/addGroupSubsetLongitudinal.js
diff --git a/inst/utils-0.0.1/addSelectControl.js → inst/htmlwidgets/lib/addSelectControl.js b/inst/utils-0.0.1/addSelectControl.js → inst/htmlwidgets/lib/addSelectControl.js
diff --git a/inst/utils-0.0.1/addWidgetControls.js → inst/htmlwidgets/lib/addWidgetControls.js b/inst/utils-0.0.1/addWidgetControls.js → inst/htmlwidgets/lib/addWidgetControls.js
@@ -57,6 +57,9 @@ const addWidgetControls = function(el, dfResults, lMetrics, dfGroups, bAddGroupS
         else if (Object.keys(instance.helpers).includes('updateSelectedGroupIDs')) {
             instance.helpers.updateSelectedGroupIDs(instance.data.config.selectedGroupIDs);
         }
+
+        // Dispatch [ riskSignalSelected ] event.
+        instance.canvas.dispatchEvent(instance.canvas.riskSignalSelected);
     });
 
     // add event listener to country select

diff --git a/inst/utils-0.0.1/clickCallback.js → inst/htmlwidgets/lib/clickCallback.js b/inst/utils-0.0.1/clickCallback.js → inst/htmlwidgets/lib/clickCallback.js
@@ -1,7 +1,8 @@
 const clickCallback = function(el, input) {
     return function(d) {
         // Get chart instance, attached to canvas element.
-        const instance = el.querySelector('canvas').chart;
+        const canvas = el.querySelector('canvas');
+        const instance = canvas.chart;
 
         instance.data.config.selectedGroupIDs = instance.data.config.selectedGroupIDs.includes(d.GroupID)
             ? 'None'
@@ -43,5 +44,8 @@ const clickCallback = function(el, input) {
                 )
             }
         }
+
+        // Dispatch [ riskSignalSelected ] event.
+        instance.canvas.dispatchEvent(instance.canvas.riskSignalSelected);
     };
 };
diff --git a/...-0.0.1/findHeadersWithMatchingSiblings.js → ...ts/lib/findHeadersWithMatchingSiblings.js b/...-0.0.1/findHeadersWithMatchingSiblings.js → ...ts/lib/findHeadersWithMatchingSiblings.js
diff --git a/inst/gt-utils-0.0.1/findMatchingRows.js → inst/htmlwidgets/lib/findMatchingRows.js b/inst/gt-utils-0.0.1/findMatchingRows.js → inst/htmlwidgets/lib/findMatchingRows.js
diff --git a/inst/utils-0.0.1/getCountries.js → inst/htmlwidgets/lib/getCountries.js b/inst/utils-0.0.1/getCountries.js → inst/htmlwidgets/lib/getCountries.js
diff --git a/inst/utils-0.0.1/getGroups.js → inst/htmlwidgets/lib/getGroups.js b/inst/utils-0.0.1/getGroups.js → inst/htmlwidgets/lib/getGroups.js
diff --git a/inst/rbm-viz-1.2.0/rbm-viz.css → ...htmlwidgets/lib/rbm-viz-2.1.0/rbm-viz.css b/inst/rbm-viz-1.2.0/rbm-viz.css → ...htmlwidgets/lib/rbm-viz-2.1.0/rbm-viz.css
@@ -40,21 +40,27 @@
     cursor: pointer;
     padding: 0.25em 0.5em;
 }
-.group-overview th.group-overview--GroupLabel { }
-.group-overview th.group-overview--ParticipantCount { }
-.group-overview th.group-overview--nRedFlags { }
-.group-overview th.group-overview--nAmberFlags { }
+.group-overview th.group-overview--GroupLabel {
+}
+.group-overview th.group-overview--ParticipantCount {
+}
+.group-overview th.group-overview--nRedFlags {
+}
+.group-overview th.group-overview--nAmberFlags {
+}
 .group-overview th.group-overview--metric {
     font-size: 0.8em;
 }
 
 /* table body */
 
-.group-overview td { }
+.group-overview td {
+}
 .group-overview td.group-overview--GroupLabel {
     white-space: nowrap;
 }
-.group-overview td.group-overview--ParticipantCount { }
+.group-overview td.group-overview--ParticipantCount {
+}
 .group-overview td.group-overview--nRedFlags {
     background-color: #ffcccc;
 }
@@ -64,5 +70,5 @@
 .group-overview td.group-overview--metric {
     width: 3em;
     text-align: center;
-    padding-top: .4em;
+    padding-top: 0.4em;
 }