From 70503a0647bdaab5e4252f0d874241f77b3bb976 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 17 Sep 2016 21:25:26 +0300
Subject: [PATCH] Fixed lodash migration issues after upgrade to 4.x. 	Moved:
 _.contains -> _.includes 		   _.object -> _.zipObject 	
    _.first - replaced by native slice()

---
 src/datasource-zabbix/datasource.js | 10 +++++-----
 src/datasource-zabbix/utils.js      |  2 +-
 src/panel-triggers/module.js        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/datasource-zabbix/datasource.js b/src/datasource-zabbix/datasource.js
index 7f04e80..2e914a4 100644
--- a/src/datasource-zabbix/datasource.js
+++ b/src/datasource-zabbix/datasource.js
@@ -158,7 +158,7 @@ export class ZabbixAPIDatasource {
           // Find trendValue() function and get specified trend value
           var trendFunctions = _.map(metricFunctions.getCategories()['Trends'], 'name');
           var trendValueFunc = _.find(target.functions, func => {
-            return _.contains(trendFunctions, func.def.name);
+            return _.includes(trendFunctions, func.def.name);
           });
           var valueType = trendValueFunc ? trendValueFunc.params[0] : "avg";
 
@@ -196,7 +196,7 @@ export class ZabbixAPIDatasource {
 
             let aggFuncNames = _.map(metricFunctions.getCategories()['Aggregate'], 'name');
             let lastAgg = _.findLast(target.functions, func => {
-              return _.contains(aggFuncNames, func.def.name);
+              return _.includes(aggFuncNames, func.def.name);
             });
 
             timeseries_data = [
@@ -307,7 +307,7 @@ export class ZabbixAPIDatasource {
       }
       parts.push(part);
     });
-    let template = _.object(['group', 'host', 'app', 'item'], parts);
+    let template = _.zipObject(['group', 'host', 'app', 'item'], parts);
 
     // Get items
     if (parts.length === 4) {
@@ -414,7 +414,7 @@ export class ZabbixAPIDatasource {
 function bindFunctionDefs(functionDefs, category) {
   var aggregationFunctions = _.map(metricFunctions.getCategories()[category], 'name');
   var aggFuncDefs = _.filter(functionDefs, function(func) {
-    return _.contains(aggregationFunctions, func.def.name);
+    return _.includes(aggregationFunctions, func.def.name);
   });
 
   return _.map(aggFuncDefs, function(func) {
@@ -426,7 +426,7 @@ function bindFunctionDefs(functionDefs, category) {
 function filterFunctionDefs(funcs, category) {
   let filteredFuncs = _.map(metricFunctions.getCategories()[category]);
   return _.filter(funcs, func => {
-    return _.contains(filteredFuncs, func.def.name);
+    return _.includes(filteredFuncs, func.def.name);
   });
 }
 
diff --git a/src/datasource-zabbix/utils.js b/src/datasource-zabbix/utils.js
index 5925da0..1f05572 100644
--- a/src/datasource-zabbix/utils.js
+++ b/src/datasource-zabbix/utils.js
@@ -35,7 +35,7 @@ export function isTemplateVariable(str, templateVariables) {
     var variables = _.map(templateVariables, variable => {
       return '$' + variable.name;
     });
-    return _.contains(variables, str);
+    return _.includes(variables, str);
   } else {
     return false;
   }
diff --git a/src/panel-triggers/module.js b/src/panel-triggers/module.js
index 32ca76f..ce412f5 100644
--- a/src/panel-triggers/module.js
+++ b/src/panel-triggers/module.js
@@ -222,7 +222,7 @@ class TriggerPanelCtrl extends MetricsPanelCtrl {
                 }
 
                 // Limit triggers number
-                self.triggerList  = _.first(triggerList, self.panel.limit);
+                self.triggerList  = triggerList.slice(0, self.panel.limit);
 
                 // Notify panel that request is finished
                 self.setTimeQueryEnd();