removed values function from fns. using it directly from js sdk utils

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;
@@ -37,7 +37,9 @@ function NotificationCenter(options) {
   this.logger = options.logger;
   this.errorHandler = options.errorHandler;
   this.__notificationListeners = {};
-  fns.forOwn(enums.NOTIFICATION_TYPES, function(notificationTypeEnum) {
+
+  Object.keys(enums.NOTIFICATION_TYPES).forEach(function(key) {
+    var notificationTypeEnum = enums.NOTIFICATION_TYPES[key];
     this.__notificationListeners[notificationTypeEnum] = [];
   }.bind(this));
   this.__listenerId = 1;
@@ -55,7 +57,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;
@@ -101,19 +103,18 @@ NotificationCenter.prototype.removeNotificationListener = function (listenerId)
   try {
     var indexToRemove;
     var typeToRemove;
-    fns.forOwn(this.__notificationListeners, function (listenersForType, notificationType) {
+
+    Object.keys(this.__notificationListeners).forEach(function(notificationType) {
+      var listenersForType = this.__notificationListeners[notificationType];      
       fns.forEach(listenersForType, function (listenerEntry, i) {
         if (listenerEntry.id === listenerId) {
           indexToRemove = i;
           typeToRemove = notificationType;
           return false;
         }
       });
-      if (indexToRemove !== undefined && typeToRemove !== undefined) {
-        return false;
-      }
-    });
-
+    }.bind(this));
+    
     if (indexToRemove !== undefined && typeToRemove !== undefined) {
       this.__notificationListeners[typeToRemove].splice(indexToRemove, 1);
       return true;
@@ -130,7 +131,8 @@ NotificationCenter.prototype.removeNotificationListener = function (listenerId)
  */
 NotificationCenter.prototype.clearAllNotificationListeners = function () {
   try{
-    fns.forOwn(enums.NOTIFICATION_TYPES, function (notificationTypeEnum) {
+    Object.keys(enums.NOTIFICATION_TYPES).forEach(function (key) {
+      var notificationTypeEnum = enums.NOTIFICATION_TYPES[key];
       this.__notificationListeners[notificationTypeEnum] = [];
     }.bind(this));
   } catch (e) {
@@ -165,7 +167,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

@@ -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'),
 };