Skip to content

Commit

Permalink
updates to 6.3.0, after_render and before_render hooks added
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Greenberg authored and Jason Greenberg committed Feb 22, 2018
1 parent 4076d1b commit e3dde9a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
14 changes: 5 additions & 9 deletions TESTS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,12 @@ Result:
PUT /_bulk
{"index":{"_index":"test","_type":"doc"}}
{"test":1}
{"index":{"_index":".kibana","_type":"doc","_id":"index-pattern:de98ba40-cc5f-11e7-aadb-7b129851f054"}}
{"type":"index-pattern","index-pattern":{"title":"test","fields":"[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"test\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"}}
{"index":{"_index":".kibana","_type":"doc","_id":"visualization:12d5aed0-cc60-11e7-aadb-7b129851f054"}}
{"type":"visualization","visualization":{"title":"Style Tags Test","visState":"{\"title\":\"Style Tags Test\",\"type\":\"transform\",\"params\":{\"meta\":\"({\\n count_hits: function() {\\n return this.response.hits.total;\\n }\\n})\",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [\\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ]\\n }\\n }\\n}\",\"formula\":\"<style>\\n .myfont {\\n font-size: 40px;\\n }\\n</style>\\n\\n<hr>\\n<div class=\\\"myfont\\\">My Text</div>\\n<hr>\",\"indexpattern\":\"de98ba40-cc5f-11e7-aadb-7b129851f054\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
{"type":"visualization","visualization":{"title":"Style Tags Test","visState":"{\"title\":\"Style Tags Test\",\"type\":\"transform\",\"params\":{\"meta\":\"({\\n count_hits: function() {\\n return this.response.hits.total;\\n }\\n})\",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [\\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ]\\n }\\n }\\n}\",\"formula\":\"<style>\\n .myfont {\\n font-size: 40px;\\n }\\n</style>\\n\\n<hr>\\n<div class=\\\"myfont\\\">My Text</div>\\n<hr>\",\"indexpattern\":\"test\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
{"index":{"_index":".kibana","_type":"doc","_id":"visualization:248ac390-cc60-11e7-aadb-7b129851f054"}}
{"type":"visualization","visualization":{"title":"Javascript Test","visState":"{\"title\":\"Javascript Test\",\"type\":\"transform\",\"params\":{\"meta\":\"({\\n hello_world: function() {\\n return \\\"Hello World!\\\";\\n }\\n})\",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [\\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ]\\n }\\n }\\n}\",\"formula\":\"<hr>\\n{{meta.hello_world}}\\n<hr>\",\"indexpattern\":\"de98ba40-cc5f-11e7-aadb-7b129851f054\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
{"index":{"_index":".kibana","_type":"doc","_id":"index-pattern:80812210-cc61-11e7-8949-83d23621e0bf"}}
{"type":"index-pattern","index-pattern":{"title":"test-filters","timeFieldName":"@datetime","fields":"[{\"name\":\"@datetime\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"colour\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"colour.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"}}
{"index":{"_index":".kibana","_type":"doc","_id":"visualization:bab222e0-cc61-11e7-8949-83d23621e0bf"}}
{"type":"visualization","visualization":{"title":"Filters Test","visState":"{\"title\":\"Filters Test\",\"type\":\"transform\",\"params\":{\"meta\":\"({\\n count_hits: function() {\\n return this.response.hits.total;\\n }\\n})\",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [\\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ]\\n }\\n }\\n}\",\"formula\":\"<hr>\\n{{meta.count_hits}}\\n<hr>\",\"indexpattern\":\"80812210-cc61-11e7-8949-83d23621e0bf\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
{"type":"visualization","visualization":{"title":"Javascript Test","visState":"{\"title\":\"Javascript Test\",\"type\":\"transform\",\"params\":{\"meta\":\"({\\n hello_world: function() {\\n return \\\"Hello World!\\\";\\n }\\n})\",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [\\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ]\\n }\\n }\\n}\",\"formula\":\"<hr>\\n{{meta.hello_world}}\\n<hr>\",\"indexpattern\":\"test\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
{"index":{"_index":".kibana","_type":"doc","_id":"visualization:00f9e390-17e0-11e8-bf14-c9dbfc6e6269"}}
{"type":"visualization","updated_at":"2018-02-22T15:37:32.540Z","visualization":{"title":"Test D3","visState":"{\"title\":\"Test D3\",\"type\":\"transform\",\"params\":{\"formula\":\"<div id=\\\"viz\\\"> </div>\\n\\n\",\"indexpattern\":\"test\",\"meta\":\"({\\n after_render: function() {\\n\\n var sampleSVG = d3.select(\\\"#viz\\\")\\n .append(\\\"svg\\\")\\n .attr(\\\"width\\\", 100)\\n .attr(\\\"height\\\", 100); \\n\\n sampleSVG.append(\\\"circle\\\") \\n .style(\\\"stroke\\\", \\\"gray\\\") \\n .style(\\\"fill\\\", \\\"white\\\")\\n .attr(\\\"r\\\", 40)\\n .attr(\\\"cx\\\", 50)\\n .attr(\\\"cy\\\", 50)\\n .on(\\\"mouseover\\\", function(){d3.select(this).style(\\\"fill\\\", \\\"aliceblue\\\");})\\n .on(\\\"mouseout\\\", function(){d3.select(this).style(\\\"fill\\\", \\\"white\\\");});\\n }\\n}) \",\"querydsl\":\"{\\n \\\"query\\\": {\\n \\\"bool\\\": {\\n \\\"must\\\": [ \\n \\\"_DASHBOARD_CONTEXT_\\\"\\n ] \\n } \\n } \\n}\"},\"aggs\":[]}","uiStateJSON":"{}","description":"","version":1,"kibanaSavedObjectMeta":{"searchSourceJSON":"{}"}}}
```

Create an index pattern called `test` and point it at the test index
Create an index pattern called `test` with id `test` and point it at the test index
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "transform_vis",
"version": "6.1.1",
"version": "6.2.2",
"description": "Transform Visualization",
"main": "index.js",
"kibana": {
Expand Down
11 changes: 8 additions & 3 deletions public/request_handler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const createRequestHandler = function(Private, es, indexPatterns, $saniti
return new Promise((resolve, reject) => {

function display_error(message) {
resolve(`<div style="text-align: center;"><i>${message}</i></div>`);
resolve({ html: `<div style="text-align: center;"><i>${message}</i></div>`});
}

function search(indexPattern){
Expand Down Expand Up @@ -58,9 +58,14 @@ export const createRequestHandler = function(Private, es, indexPatterns, $saniti
console.log("Javascript Compilation Error", jserr);
return; // Abort!
}
resolve(Mustache.render(formula, bindme));
if (typeof bindme.meta.before_render === "function") { bindme.meta.before_render(); }
resolve({
html: Mustache.render(formula, bindme),
after_render: bindme.meta.after_render
});

} else {
resolve($sanitize(Mustache.render(formula, bindme)));
resolve({ html: $sanitize(Mustache.render(formula, bindme)) });
}

}
Expand Down
3 changes: 2 additions & 1 deletion public/vis_controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ class VisController {

render(visData, status) {
return new Promise(resolve => {
this.container.innerHTML = visData;
this.container.innerHTML = visData.html;
if (typeof visData.after_render === "function") { visData.after_render(); }
resolve('done rendering');
});
}
Expand Down

0 comments on commit e3dde9a

Please sign in to comment.