Skip to content

Commit e87f568

Browse files
committed
GenericChartHelper.generateChartSVG: return plot objects
Bump components
1 parent 269c5a8 commit e87f568

9 files changed

Lines changed: 27 additions & 22 deletions

File tree

assay/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assay/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
1313
},
1414
"dependencies": {
15-
"@labkey/components": "6.67.0"
15+
"@labkey/components": "6.67.1-fb-curve-fit-stats-grid.0"
1616
},
1717
"devDependencies": {
1818
"@labkey/build": "8.6.0",

core/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
}
5454
},
5555
"dependencies": {
56-
"@labkey/components": "6.67.0",
56+
"@labkey/components": "6.67.1-fb-curve-fit-stats-grid.0",
5757
"@labkey/themes": "1.4.2"
5858
},
5959
"devDependencies": {

experiment/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

experiment/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"test-integration": "cross-env NODE_ENV=test jest --ci --runInBand -c test/js/jest.config.integration.js"
1414
},
1515
"dependencies": {
16-
"@labkey/components": "6.67.0"
16+
"@labkey/components": "6.67.1-fb-curve-fit-stats-grid.0"
1717
},
1818
"devDependencies": {
1919
"@labkey/build": "8.6.0",

pipeline/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pipeline/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"build-prod": "npm run clean && cross-env NODE_ENV=production PROD_SOURCE_MAP=source-map webpack --config node_modules/@labkey/build/webpack/prod.config.js --color --progress --profile"
1515
},
1616
"dependencies": {
17-
"@labkey/components": "6.67.0"
17+
"@labkey/components": "6.67.1-fb-curve-fit-stats-grid.0"
1818
},
1919
"devDependencies": {
2020
"@labkey/build": "8.6.0",

visualization/resources/web/vis/genericChart/genericChartHelper.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,14 +1949,19 @@ LABKEY.vis.GenericChartHelper = new function(){
19491949
return;
19501950

19511951
var plotConfigArr = generatePlotConfigs(renderTo, chartConfig, labels, aes, scales, geom, data, trendlineData);
1952+
let plots = [];
19521953
$.each(plotConfigArr, function(idx, plotConfig) {
19531954
if (chartType === 'pie_chart') {
1954-
new LABKEY.vis.PieChart(plotConfig);
1955+
plots.push(new LABKEY.vis.PieChart(plotConfig));
19551956
}
19561957
else {
1957-
new LABKEY.vis.Plot(plotConfig).render();
1958+
const plot = new LABKEY.vis.Plot(plotConfig);
1959+
plot.render();
1960+
plots.push(plot);
19581961
}
19591962
}, this);
1963+
1964+
return plots;
19601965
}
19611966

19621967
var _renderMessages = function(divId, messages) {

0 commit comments

Comments
 (0)