Merge branch 'master' into zeeshan/replace_lodash_assign

Author: zashraf1985

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) {

packages/optimizely-sdk/lib/utils/fns/index.js

@@ -1,5 +1,5 @@
 /**
- * Copyright 2017, 2019, Optimizely
+ * Copyright 2017, 2019-2020, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 var uuid = require('uuid');
 var _isFinite = require('lodash/isFinite');
+var keyBy = require('@optimizely/js-sdk-utils').keyBy;
 var MAX_NUMBER_LIMIT = Math.pow(2, 53);
 
 module.exports = {
@@ -47,13 +48,17 @@ module.exports = {
   isFinite: function(number) {
     return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT;
   },
-  keyBy: require('lodash/keyBy'),
+  keyBy: function(arr, key) {
+    if (!arr) return {};
+    return keyBy(arr, function(item) {
+      return item[key];
+    });
+  },
   forEach: require('lodash/forEach'),
   forOwn: require('lodash/forOwn'),
   uuid: function() {
     return uuid.v4();
   },
-  values: require('lodash/values'),
   isNumber: function(value) {
     return typeof value === 'number';
   },

packages/optimizely-sdk/lib/utils/fns/index.tests.js

@@ -37,6 +37,35 @@ describe('lib/utils/fns', function() {
         assert.isTrue(fns.isFinite(-Math.pow(2, 53)));
       });
     });
+
+    describe('keyBy', function() {
+      it('should return correct object when a key is provided', function() {
+        var arr = [
+          { key1: 'row1', key2: 'key2row1' },
+          { key1: 'row2', key2: 'key2row2' },
+          { key1: 'row3', key2: 'key2row3' },
+          { key1: 'row4', key2: 'key2row4' },
+        ];
+
+        var obj = fns.keyBy(arr, 'key1');
+
+        assert.deepEqual(obj, {
+          row1: { key1: 'row1', key2: 'key2row1' },
+          row2: { key1: 'row2', key2: 'key2row2' },
+          row3: { key1: 'row3', key2: 'key2row3' },
+          row4: { key1: 'row4', key2: 'key2row4' }
+        });
+      });
+      
+      it('should return empty object when first argument is null or undefined', function() {
+        var obj = fns.keyBy(null, 'key1');
+        assert.isEmpty(obj);
+
+        obj = fns.keyBy(undefined, 'key1');
+        assert.isEmpty(obj);
+        });
+    });
+    
     describe('isNumber', function() {
       it('should return true in case of number', function() {
         assert.isTrue(fns.isNumber(3));