show defaults at options tab

dist/panel-triggers/partials/options_tab.html

@@ -74,10 +74,9 @@
     <div class="gf-form">
       <label class="gf-form-label width-8">Limit triggers</label>
       <input class="gf-form-input width-5"
-        type="number"
+        type="number" placeholder="100"
         ng-model="ctrl.panel.limit"
-        ng-model-onblur
+        ng-model-onblur ng-change="ctrl.refresh()">
-        ng-change="ctrl.refresh()">
     </div>
   </div>
 
@@ -95,10 +94,9 @@
     <div class="gf-form">
       <label class="gf-form-label width-10">Page size</label>
       <input class="gf-form-input width-8"
-        type="number"
+        type="number" placeholder="10"
         ng-model="ctrl.panel.pageSize"
-        ng-model-onblur
+        ng-model-onblur ng-change="ctrl.render()">
-        ng-change="ctrl.render()">
     </div>
     <gf-form-switch class="gf-form"
       label-class="width-10"
@@ -108,9 +106,8 @@
     </gf-form-switch>
     <div class="gf-form">
       <label class="gf-form-label width-10">Newer than</label>
-      <input class="gf-form-input width-8"
+      <input class="gf-form-input width-8" placeholder="1h"
         ng-model="ctrl.panel.highlightNewerThan"
-        placeholder="1h"
         ng-model-onblur ng-change="ctrl.render()">
     </div>
     <gf-form-switch class="gf-form"

dist/panel-triggers/triggers_panel_ctrl.js

@@ -297,7 +297,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
             triggers = this.sortTriggers(triggers);
 
             // Limit triggers number
-            triggers = triggers.slice(0, this.panel.limit);
+            triggers = triggers.slice(0, this.panel.limit || PANEL_DEFAULTS.limit);
 
             this.triggerList = triggers;
             this.getCurrentTriggersPage();
@@ -545,7 +545,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
         }, {
           key: 'getCurrentTriggersPage',
           value: function getCurrentTriggersPage() {
-            var pageSize = this.panel.pageSize || 10;
+            var pageSize = this.panel.pageSize || PANEL_DEFAULTS.pageSize;
             var startPos = this.pageIndex * pageSize;
             var endPos = Math.min(startPos + pageSize, this.triggerList.length);
             this.currentTriggersPage = this.triggerList.slice(startPos, endPos);
@@ -603,8 +603,7 @@ System.register(['lodash', 'jquery', 'moment', '../datasource-zabbix/utils', 'ap
           key: 'isNewTrigger',
           value: function isNewTrigger(trigger) {
             try {
-              var highlightNewerThanDefault = '1h';
+              var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || PANEL_DEFAULTS.highlightNewerThan);
-              var highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || highlightNewerThanDefault);
               var durationSec = Date.now() - trigger.lastchangeUnix * 1000;
               return durationSec < highlightIntervalMs;
             } catch (e) {

src/panel-triggers/partials/options_tab.html

@@ -74,10 +74,9 @@
     <div class="gf-form">
       <label class="gf-form-label width-8">Limit triggers</label>
       <input class="gf-form-input width-5"
-        type="number"
+        type="number" placeholder="100"
         ng-model="ctrl.panel.limit"
-        ng-model-onblur
+        ng-model-onblur ng-change="ctrl.refresh()">
-        ng-change="ctrl.refresh()">
     </div>
   </div>
 
@@ -95,10 +94,9 @@
     <div class="gf-form">
       <label class="gf-form-label width-10">Page size</label>
       <input class="gf-form-input width-8"
-        type="number"
+        type="number" placeholder="10"
         ng-model="ctrl.panel.pageSize"
-        ng-model-onblur
+        ng-model-onblur ng-change="ctrl.render()">
-        ng-change="ctrl.render()">
     </div>
     <gf-form-switch class="gf-form"
       label-class="width-10"
@@ -108,9 +106,8 @@
     </gf-form-switch>
     <div class="gf-form">
       <label class="gf-form-label width-10">Newer than</label>
-      <input class="gf-form-input width-8"
+      <input class="gf-form-input width-8" placeholder="1h"
         ng-model="ctrl.panel.highlightNewerThan"
-        placeholder="1h"
         ng-model-onblur ng-change="ctrl.render()">
     </div>
     <gf-form-switch class="gf-form"

src/panel-triggers/triggers_panel_ctrl.js

@@ -179,7 +179,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
     triggers = this.sortTriggers(triggers);
 
     // Limit triggers number
-    triggers = triggers.slice(0, this.panel.limit);
+    triggers = triggers.slice(0, this.panel.limit || PANEL_DEFAULTS.limit);
 
     this.triggerList = triggers;
     this.getCurrentTriggersPage();
@@ -405,7 +405,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
   }
 
   getCurrentTriggersPage() {
-    let pageSize = this.panel.pageSize || 10;
+    let pageSize = this.panel.pageSize || PANEL_DEFAULTS.pageSize;
     let startPos = this.pageIndex * pageSize;
     let endPos = Math.min(startPos + pageSize, this.triggerList.length);
     this.currentTriggersPage = this.triggerList.slice(startPos, endPos);
@@ -459,8 +459,7 @@ export class TriggerPanelCtrl extends PanelCtrl {
 
   isNewTrigger(trigger) {
     try {
-      const highlightNewerThanDefault = '1h';
+      const highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || PANEL_DEFAULTS.highlightNewerThan);
-      const highlightIntervalMs = utils.parseInterval(this.panel.highlightNewerThan || highlightNewerThanDefault);
       const durationSec = (Date.now() - trigger.lastchangeUnix * 1000);
       return durationSec < highlightIntervalMs;
     } catch (e) {