From a43a8640fecc06fae31854d0549fcb78d2bfee9c Mon Sep 17 00:00:00 2001 From: Joris Tirado Date: Mon, 14 Aug 2017 17:44:49 -0700 Subject: [PATCH] UI-2866: Migrate from underscore to lodash (#36) * UI-2866: Reference lodash intead of underscore following migration * UI-2866: Migrate underscore specific utils to lodash --- app.js | 2 +- submodules/callLogs/callLogs.js | 2 +- submodules/devices/devices.js | 2 +- submodules/featureCodes/featureCodes.js | 2 +- submodules/groups/groups.js | 2 +- submodules/myOffice/myOffice.js | 14 +++++++------- submodules/strategy/strategy.js | 6 +++--- submodules/users/users.js | 2 +- submodules/vmboxes/vmboxes.js | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app.js b/app.js index e39b2ca..657842e 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'); require([ diff --git a/submodules/callLogs/callLogs.js b/submodules/callLogs/callLogs.js index 11e327a..542c744 100644 --- a/submodules/callLogs/callLogs.js +++ b/submodules/callLogs/callLogs.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'); var app = { diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index 7a5fdc6..34d4841 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), toastr = require('toastr'); diff --git a/submodules/featureCodes/featureCodes.js b/submodules/featureCodes/featureCodes.js index c46e1a3..68d57b0 100644 --- a/submodules/featureCodes/featureCodes.js +++ b/submodules/featureCodes/featureCodes.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), chart = require('chart'); diff --git a/submodules/groups/groups.js b/submodules/groups/groups.js index e9fcca0..2a45fc3 100644 --- a/submodules/groups/groups.js +++ b/submodules/groups/groups.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), toastr = require('toastr'); diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 7a17559..d7ad8a3 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), chart = require('chart'); @@ -129,20 +129,20 @@ define(function(require) { .append(template); createDoughnutCanvas($devicesCanvas, { - data: _.pluck(devicesDataSet, 'count'), - backgroundColor: _.pluck(devicesDataSet, 'color'), + data: _.map(devicesDataSet, 'count'), + backgroundColor: _.map(devicesDataSet, 'color'), borderWidth: 0 }); createDoughnutCanvas($assignedNumbersCanvas, { - data: _.pluck(assignedNumbersDataSet, 'count'), - backgroundColor: _.pluck(assignedNumbersDataSet, 'color'), + data: _.map(assignedNumbersDataSet, 'count'), + backgroundColor: _.map(assignedNumbersDataSet, 'color'), borderWidth: 0 }); createDoughnutCanvas($classifiedNumbersCanvas, { - data: _.pluck(classifiedNumbersDataSet, 'count'), - backgroundColor: _.pluck(classifiedNumbersDataSet, 'color'), + data: _.map(classifiedNumbersDataSet, 'count'), + backgroundColor: _.map(classifiedNumbersDataSet, 'color'), borderWidth: 0 }); diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js index 382c74c..87e7c7a 100644 --- a/submodules/strategy/strategy.js +++ b/submodules/strategy/strategy.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), timezone = require('monster-timezone'), toastr = require('toastr'); @@ -1668,7 +1668,7 @@ define(function(require) { monster.parallel(holidayRulesRequests, function(err, results) { // First extract all ids from the new holidayList var existingHolidaysCallflowsIds = [], - newHolidayCallflowsIds = _.pluck(holidayRulesRequests, 'id'); + newHolidayCallflowsIds = _.map(holidayRulesRequests, 'id'); // Find all IDs of existing Callflows in the Main Callflow that are linking to the Main Holidays _.each(mainCallflow.flow.children, function(directChild, id) { @@ -3306,7 +3306,7 @@ define(function(require) { } }, success: function(data, status) { - var mapCallflowsByOwnerId = _.indexBy(data.data, 'owner_id'); + var mapCallflowsByOwnerId = _.keyBy(data.data, 'owner_id'); _callback(null, mapCallflowsByOwnerId); } }); diff --git a/submodules/users/users.js b/submodules/users/users.js index 1627770..b32071f 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), timezone = require('monster-timezone'), toastr = require('toastr'); diff --git a/submodules/vmboxes/vmboxes.js b/submodules/vmboxes/vmboxes.js index a889645..c3ddbd7 100644 --- a/submodules/vmboxes/vmboxes.js +++ b/submodules/vmboxes/vmboxes.js @@ -1,6 +1,6 @@ define(function(require) { var $ = require('jquery'), - _ = require('underscore'), + _ = require('lodash'), monster = require('monster'), toastr = require('toastr'), timezone = require('monster-timezone');