From d75a0415d243b59cb429ba6c7c472fd7324f894b Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Fri, 14 Feb 2020 22:14:26 -0800 Subject: [PATCH 1/6] replaced lodash values function with Object.values --- packages/optimizely-sdk/lib/utils/fns/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index b9b3bf3ec..0957e2175 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -37,6 +37,6 @@ module.exports = { uuid: function() { return uuid.v4(); }, - values: require('lodash/values'), + values: Object.values, isNumber: require('lodash/isNumber'), }; From 2e063cd4f5b1ca91c1e8b11f0816ec74e1ae8332 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Fri, 14 Feb 2020 22:30:35 -0800 Subject: [PATCH 2/6] replaced with Object.keys because Object.values is not available in node 6 --- packages/optimizely-sdk/lib/utils/fns/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index 0957e2175..bd98a6067 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -37,6 +37,6 @@ module.exports = { uuid: function() { return uuid.v4(); }, - values: Object.values, + values: obj => Object.keys(obj).map(key => obj[key]), isNumber: require('lodash/isNumber'), }; From ba36b7ebd24cefefd2ed958f92c03d47e37c4821 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Fri, 14 Feb 2020 22:35:58 -0800 Subject: [PATCH 3/6] fixed lint --- packages/optimizely-sdk/lib/utils/fns/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index bd98a6067..c293f8cf0 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -37,6 +37,10 @@ module.exports = { uuid: function() { return uuid.v4(); }, - values: obj => Object.keys(obj).map(key => obj[key]), + values: function(obj) { + return Object.keys(obj).map(function(key) { + return obj[key]; + }); + }, isNumber: require('lodash/isNumber'), }; From b151ccf94259645b7494605a876dce6008081651 Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 18 Feb 2020 13:49:40 -0800 Subject: [PATCH 4/6] using objectValues from js sdk utils --- packages/optimizely-sdk/lib/utils/fns/index.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index c293f8cf0..91a5ea952 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -15,6 +15,7 @@ */ var uuid = require('uuid'); var _isFinite = require('lodash/isFinite'); +var { objectValues } = require('@optimizely/js-sdk-utils'); var MAX_NUMBER_LIMIT = Math.pow(2, 53); module.exports = { @@ -37,10 +38,6 @@ module.exports = { uuid: function() { return uuid.v4(); }, - values: function(obj) { - return Object.keys(obj).map(function(key) { - return obj[key]; - }); - }, + values: objectValues, isNumber: require('lodash/isNumber'), }; From 5bf3984aaba8e8ba5eb43b061e5598e1d23381db Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Tue, 18 Feb 2020 14:22:19 -0800 Subject: [PATCH 5/6] Fixed lint error --- packages/optimizely-sdk/lib/utils/fns/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index 91a5ea952..a9ca0f4fd 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -15,7 +15,7 @@ */ var uuid = require('uuid'); var _isFinite = require('lodash/isFinite'); -var { objectValues } = require('@optimizely/js-sdk-utils'); +var objectValues = require('@optimizely/js-sdk-utils').objectValues; var MAX_NUMBER_LIMIT = Math.pow(2, 53); module.exports = { From fa6343b8aeb99f7dd7b8f57a0c05bb0a8ece26ca Mon Sep 17 00:00:00 2001 From: Zeeshan Ashraf Date: Fri, 21 Feb 2020 18:21:33 -0800 Subject: [PATCH 6/6] removed fns.values altogether. using objectValues from js sdk utils directly --- .../optimizely-sdk/lib/core/notification_center/index.js | 6 +++--- packages/optimizely-sdk/lib/utils/fns/index.js | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/optimizely-sdk/lib/core/notification_center/index.js b/packages/optimizely-sdk/lib/core/notification_center/index.js index d908c5c5b..1d26ae52a 100644 --- a/packages/optimizely-sdk/lib/core/notification_center/index.js +++ b/packages/optimizely-sdk/lib/core/notification_center/index.js @@ -16,7 +16,7 @@ var enums = require('../../utils/enums'); var fns = require('../../utils/fns'); -var sprintf = require('@optimizely/js-sdk-utils').sprintf; +var jsSdkUtils = require('@optimizely/js-sdk-utils'); var LOG_LEVEL = enums.LOG_LEVEL; var LOG_MESSAGES = enums.LOG_MESSAGES; @@ -55,7 +55,7 @@ function NotificationCenter(options) { */ NotificationCenter.prototype.addNotificationListener = function (notificationType, callback) { try { - var isNotificationTypeValid = fns.values(enums.NOTIFICATION_TYPES) + var isNotificationTypeValid = jsSdkUtils.objectValues(enums.NOTIFICATION_TYPES) .indexOf(notificationType) > -1; if (!isNotificationTypeValid) { return -1; @@ -165,7 +165,7 @@ NotificationCenter.prototype.sendNotifications = function (notificationType, not try { callback(notificationData); } catch (ex) { - this.logger.log(LOG_LEVEL.ERROR, sprintf(LOG_MESSAGES.NOTIFICATION_LISTENER_EXCEPTION, MODULE_NAME, notificationType, ex.message)); + this.logger.log(LOG_LEVEL.ERROR, jsSdkUtils.sprintf(LOG_MESSAGES.NOTIFICATION_LISTENER_EXCEPTION, MODULE_NAME, notificationType, ex.message)); } }.bind(this)); } catch (e) { diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index b9831ca94..2c92d1602 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -15,7 +15,6 @@ */ var uuid = require('uuid'); var _isFinite = require('lodash/isFinite'); -var objectValues = require('@optimizely/js-sdk-utils').objectValues; var MAX_NUMBER_LIMIT = Math.pow(2, 53); module.exports = { @@ -34,6 +33,5 @@ module.exports = { uuid: function() { return uuid.v4(); }, - values: objectValues, isNumber: require('lodash/isNumber'), };