grafana-dash-gen 3.3.0 → 3.3.2

package/grafana/dashboard.js

@@ -70,12 +70,6 @@ Dashboard.prototype._initRows = function _initRows(opts) {
 Dashboard.prototype._initLinks = function _initLinks(opts) {
   this.links = opts.links || [];
   this.state.links = [];
-
-  this.links.forEach(link => {
-    if (!(link instanceof ExternalLink)) {
-      throw new TypeError('links must be defined using ExternalLink')
-    }
-  })
 };
 
 Dashboard.prototype._initTemplating = function _initRows(opts) {
@@ -125,7 +119,12 @@ Dashboard.prototype.addAnnotation = function addAnnotation(annotation) {
 Dashboard.prototype.generate = function generate() {
     // Generate jsons.
     this.state.rows = this.rows.map(row => row.generate());
-    this.state.links = this.links.map(link => link.generate());
+    this.state.links = this.links.map(link => {
+      if (link instanceof ExternalLink) {
+        return link.generate()
+      }
+      return link
+    });
 
     return this.state;
 };

package/grafana/external-link.js

@@ -50,14 +50,17 @@ ExternalLink.prototype.generate = function generate() {
 
 ExternalLink.prototype.includeVariableValues = function includeVariableValues() {
   this.state.includeVars = true;
+  return this
 };
 
 ExternalLink.prototype.includeTimeFilter = function includeTimeFilter() {
   this.state.keepTime = true;
+  return this
 };
 
 ExternalLink.prototype.withIcon = function withIcon(iconName) {
   this.state.icon = iconName;
+  return this
 };
 
 module.exports = ExternalLink;

package/index.js

@@ -22,6 +22,7 @@
 
 var Dashboard = require('./grafana/dashboard');
 var Row = require('./grafana/row');
+var ExternalLink = require('./grafana/external-link')
 var Target = require('./grafana/target');
 var Panels = require('./grafana/panels');
 var Alert = require('./grafana/alert/alert');
@@ -35,6 +36,7 @@ var Annotations = require('./grafana/annotations');
 module.exports = {
     Dashboard: Dashboard,
     Row: Row,
+    ExternalLink: ExternalLink,
     Panels: Panels,
     Templates: Templates,
     Alert,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grafana-dash-gen",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "A grafana dashboard generator",
   "main": "index.js",
   "scripts": {

package/test/dashboard.js

@@ -109,7 +109,17 @@ test('Dashboard can generate correct body', function t(assert) {
         new ExternalLink({
           title: "Uber Homepage",
           url: "www.uber.com",
-        })
+        }),
+        {
+          title: "Google Homepage",
+          tooltip: "",
+          url: "www.google.com",
+          icon: "external link",
+          targetBlank: true,
+          type: "link",
+          includeVars: false,
+          keepTime: false,
+        }
       ]
     });
     var row = {
@@ -134,16 +144,19 @@ test('Dashboard can generate correct body', function t(assert) {
           type: "link",
           includeVars: false,
           keepTime: false,
+        },
+        {
+          title: "Google Homepage",
+          tooltip: "",
+          url: "www.google.com",
+          icon: "external link",
+          targetBlank: true,
+          type: "link",
+          includeVars: false,
+          keepTime: false,
         }
       ]
     }
     assert.deepEqual(json, expectedJson);
     assert.end();
 });
-
-test('Dashboard throws error if links are defined with wrong type', function t(assert) {
-  assert.throws(() => new Dashboard({
-    links: [{ title: "custom link", url: "www.wrong.com"}]
-  }), new TypeError('links must be defined using ExternalLink'))
-  assert.end();
-});

package/test/external-link.js

@@ -38,10 +38,10 @@ test('external link with custom settings', function t(assert) {
     title: "Uber Home Page",
     tooltip: "click to view",
     url: "www.uber.com",
-  });
-  externalLink.includeTimeFilter()
-  externalLink.includeVariableValues()
-  externalLink.withIcon("custom icon")
+  })
+    .includeTimeFilter()
+    .includeVariableValues()
+    .withIcon("custom icon");
 
   assert.deepEqual(externalLink.generate(), {
     title: 'Uber Home Page',