Merge pull request #9 from sakshityagi/master

Pull request after bug fixing

Author: DanielHindi

README.md

@@ -1,2 +1,7 @@
-# smoochChatPlugin
-integration with Smooch.io
+# Smooch Chat Plugin ![](https://api.travis-ci.org/BuildFire/smoochChatPlugin.svg)
+
+BuildFire plugin for integration with Smooch.io.
+
+### How to run test cases(For plugin)
+- npm install
+- karma start

control/design/app.js

@@ -57,12 +57,12 @@
           DesignHome.success = function (result) {
           console.info('Saved data result: ', result);
               DesignHome.saveDataCompletion = false;
+              Buildfire.messaging.sendMessageToWidget({'name': STATUS_CODE.UPDATED, 'data': result.data});
         };
           DesignHome.error = function (err) {
           console.error('Error while saving data : ', err);
               DesignHome.saveDataCompletion = false;
         };
-            Buildfire.messaging.sendMessageToWidget({'name': STATUS_CODE.UPDATED, 'color': DesignHome.data.design.color});
             DataStore.save(newObj, tag).then(DesignHome.success, DesignHome.error);
       };
 

control/settings/app.js

@@ -18,7 +18,7 @@
       //    }
       //});
 
-      SettingsHome.data = {
+      var _data = {
         settings: {
           "apiKey": "",
           "headerText": ""
@@ -33,14 +33,18 @@
         SettingsHome.masterData = angular.copy(data);
       };
 
+          SettingsHome.getAPIKeyStatus = function () {
+              return SettingsHome.data && SettingsHome.data.settings && SettingsHome.data.settings.apiKey ? "true" : 'Please enter Smooch Chat API Key';
+          };
+
       /*Init method call, it will bring all the pre saved data*/
       SettingsHome.init = function () {
         SettingsHome.success = function (result) {
           console.info('init success result:', result);
           if (result) {
             SettingsHome.data = result.data;
             if (!SettingsHome.data.settings)
-              SettingsHome.data.settings = {};
+              SettingsHome.data.settings = {"apiKey": "", "headerText": ""};
             SettingsHome.updateMasterItem(SettingsHome.data);
           }
         };
@@ -49,6 +53,11 @@
             console.error('Error while getting data', err);
           }
           else if (err && err.code === STATUS_CODE.NOT_FOUND) {
+            if(!SettingsHome.data) {
+                SettingsHome.data = angular.copy(_data);
+            } else if(SettingsHome.data && !SettingsHome.data.settings) {
+                SettingsHome.data.settings = {"apiKey": "", "headerText": ""};
+            }
             SettingsHome.saveData(JSON.parse(angular.toJson(SettingsHome.data)), TAG_NAMES.SMOOCH_CHAT_INFO);
           }
         };
@@ -62,6 +71,7 @@
         }
         SettingsHome.success = function (result) {
           console.info('Saved data result: ', result);
+          Buildfire.messaging.sendMessageToWidget({'name': STATUS_CODE.SETTINGS_UPDATED, 'data': result.data});
         };
         SettingsHome.error = function (err) {
           console.error('Error while saving data : ', err);

control/settings/enums.js

@@ -8,6 +8,7 @@
         .constant('STATUS_CODE', {
             INSERTED: 'inserted',
             UPDATED: 'updated',
+            SETTINGS_UPDATED: 'SETTINGS_UPDATED',
             NOT_FOUND: 'NOTFOUND',
             UNDEFINED_DATA: 'UNDEFINED_DATA',
             UNDEFINED_OPTIONS: 'UNDEFINED_OPTIONS',

control/settings/index.html

@@ -28,8 +28,7 @@
 <div ng-controller="SettingsHomeCtrl as SettingsHome">
   <div class="item clearfix row" ng-if="SettingsHome.data">
     <div class="main pull-right col-md-9">
-      <div class="alert alert-danger alert-sm text-center"
-           ng-if="!SettingsHome.data.settings.apiKey">Please enter Smooch Chat API Key
+      <div class="alert alert-danger alert-sm text-center" ng-if="SettingsHome.getAPIKeyStatus() != 'true'">{{SettingsHome.getAPIKeyStatus()}}
       </div>
     </div>
   </div>

test/widget/app.spec.js

@@ -83,15 +83,6 @@ describe('Unit: smoochChatPluginWidget app', function () {
         };
         WidgetHome.error(err);
       });
-      it('it should pass if  WidgetHome.onUpdateCallback is called', function () {
-        var event = {
-          tag: TAG_NAMES.SMOOCH_CHAT_INFO
-        };
-        WidgetHome.data = {
-          design: ""
-        };
-        WidgetHome.onUpdateCallback(event);
-      });
     });
   });
 });