triggers-panel: replace variables in trigger name, issue #428

dist/panel-triggers/module.js

@@ -206,6 +206,7 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
             return this.datasourceSrv.get(this.panel.datasource).then(function (datasource) {
               var zabbix = datasource.zabbix;
               _this3.zabbix = zabbix;
+              _this3.datasource = datasource;
               var showEvents = _this3.panel.showEvents.value;
               var triggerFilter = _this3.panel.triggers;
               var hideHostsInMaintenance = _this3.panel.hideHostsInMaintenance;
@@ -219,10 +220,10 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
                 showTriggers: showEvents,
                 hideHostsInMaintenance: hideHostsInMaintenance
               };
-              var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
+
-              return getTriggers.then(function (triggers) {
+              return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
-                return _.map(triggers, _this3.formatTrigger.bind(_this3));
+            }).then(function (triggers) {
-              });
+              return _.map(triggers, _this3.formatTrigger.bind(_this3));
             });
           }
         }, {
@@ -272,6 +273,7 @@ System.register(['lodash', 'jquery', 'moment', 'app/plugins/sdk', '../datasource
 
             // Filter triggers by description
             var triggerFilter = this.panel.triggers.trigger.filter;
+            triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
             if (triggerFilter) {
               triggerList = _filterTriggers(triggerList, triggerFilter);
             }

dist/test/panel-triggers/module.js

@@ -165,6 +165,7 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
       return this.datasourceSrv.get(this.panel.datasource).then(function (datasource) {
         var zabbix = datasource.zabbix;
         _this3.zabbix = zabbix;
+        _this3.datasource = datasource;
         var showEvents = _this3.panel.showEvents.value;
         var triggerFilter = _this3.panel.triggers;
         var hideHostsInMaintenance = _this3.panel.hideHostsInMaintenance;
@@ -178,10 +179,10 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
           showTriggers: showEvents,
           hideHostsInMaintenance: hideHostsInMaintenance
         };
-        var getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
+
-        return getTriggers.then(function (triggers) {
+        return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
-          return _lodash2.default.map(triggers, _this3.formatTrigger.bind(_this3));
+      }).then(function (triggers) {
-        });
+        return _lodash2.default.map(triggers, _this3.formatTrigger.bind(_this3));
       });
     }
   }, {
@@ -231,6 +232,7 @@ var TriggerPanelCtrl = function (_PanelCtrl) {
 
       // Filter triggers by description
       var triggerFilter = this.panel.triggers.trigger.filter;
+      triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
       if (triggerFilter) {
         triggerList = _filterTriggers(triggerList, triggerFilter);
       }

src/panel-triggers/module.js

@@ -130,6 +130,7 @@ class TriggerPanelCtrl extends PanelCtrl {
     .then(datasource => {
       var zabbix = datasource.zabbix;
       this.zabbix = zabbix;
+      this.datasource = datasource;
       var showEvents = this.panel.showEvents.value;
       var triggerFilter = this.panel.triggers;
       var hideHostsInMaintenance = this.panel.hideHostsInMaintenance;
@@ -143,10 +144,11 @@ class TriggerPanelCtrl extends PanelCtrl {
         showTriggers: showEvents,
         hideHostsInMaintenance: hideHostsInMaintenance
       };
-      let getTriggers = zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
+
-      return getTriggers.then(triggers => {
+      return zabbix.getTriggers(groupFilter, hostFilter, appFilter, triggersOptions);
-        return _.map(triggers, this.formatTrigger.bind(this));
+    })
-      });
+    .then(triggers => {
+      return _.map(triggers, this.formatTrigger.bind(this));
     });
   }
 
@@ -191,6 +193,7 @@ class TriggerPanelCtrl extends PanelCtrl {
   filterTriggers(triggerList) {
     // Filter triggers by description
     var triggerFilter = this.panel.triggers.trigger.filter;
+    triggerFilter = this.datasource.replaceTemplateVars(triggerFilter);
     if (triggerFilter) {
       triggerList = filterTriggers(triggerList, triggerFilter);
     }