Merge branch 'feature/SUP-2289-image-update' into dev

Author: Parth Shah

app/directives/page-state-header/page-state-header.directive.js

@@ -13,12 +13,12 @@
         hideMoney: '=',
         defaultState: '@'
       },
-      controller: ['$scope', 'NotificationService', 'ProfileService', '$log', '$state', pageStateHeader],
+      controller: ['CONSTANTS', '$rootScope', '$scope', 'NotificationService', 'ProfileService', '$log', '$state', pageStateHeader],
       controllerAs: "vm"
     };
   });
 
-  function pageStateHeader($scope, NotificationService, ProfileService, $log, $state) {
+  function pageStateHeader(CONSTANTS, $rootScope, $scope, NotificationService, ProfileService, $log, $state) {
     var vm = this;
     vm.handle = $scope.handle;
     vm.profile = null;
@@ -31,12 +31,16 @@
     vm.backHandler = backHandler;
     activate();
 
+    // watch for profile update event in case handle/image are updated
+    $rootScope.$on(CONSTANTS.EVENT_PROFILE_UPDATED, function() {
+      activate();
+    });
+
     function activate() {
       vm.loading = true;
 
       // identifies the previous state
       if ($scope.$root.previousState && $scope.$root.previousState.name.length > 0) {
-        console.log($scope.$root.previousState);
         vm.previousState = $scope.$root.previousState;
         vm.previousStateName = vm.previousState.name;
       } else if ($scope.defaultState) {

app/layout/header/header.controller.js

@@ -32,6 +32,7 @@
       angular.forEach([
         CONSTANTS.EVENT_USER_LOGGED_IN,
         CONSTANTS.EVENT_USER_LOGGED_OUT,
+        CONSTANTS.EVENT_PROFILE_UPDATED
       ], function(event) {
         $rootScope.$on(event, function() {
           initHeaderProps(event);

app/services/profile.service.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.services').factory('ProfileService', ProfileService);
 
-  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q', '$filter'];
+  ProfileService.$inject = ['CONSTANTS', 'ApiService', 'UserService', '$q', '$filter', '$rootScope'];
 
-  function ProfileService(CONSTANTS, ApiService, UserService, $q, $filter) {
+  function ProfileService(CONSTANTS, ApiService, UserService, $q, $filter, $rootScope) {
 
     var restangular = ApiService.restangularV3;
 
@@ -42,7 +42,11 @@
     }
 
     function updateUserProfile(userData) {
-      return userData.save();
+      return userData.save().then(function(resp) {
+        // notify listeners of profile update event
+        $rootScope.$broadcast(CONSTANTS.EVENT_PROFILE_UPDATED);
+        return resp;
+      });
     }
 
     function getUserSkills(username) {

app/settings/edit-profile/edit-profile.controller.js

@@ -4,9 +4,9 @@
   angular.module('tc.settings').controller('EditProfileController', EditProfileController);
 
 
-  EditProfileController.$inject = ['userData', 'userHandle', 'ProfileService', 'ExternalAccountService', '$log', 'ISO3166', 'ImageService', 'CONSTANTS', 'TagsService', 'toaster', '$scope'];
+  EditProfileController.$inject = ['$rootScope', 'userData', 'userHandle', 'ProfileService', 'ExternalAccountService', '$log', 'ISO3166', 'ImageService', 'CONSTANTS', 'TagsService', 'toaster', '$scope'];
 
-  function EditProfileController(userData, userHandle, ProfileService, ExternalAccountService, $log, ISO3166, ImageService, CONSTANTS, TagsService, toaster, $scope) {
+  function EditProfileController($rootScope, userData, userHandle, ProfileService, ExternalAccountService, $log, ISO3166, ImageService, CONSTANTS, TagsService, toaster, $scope) {
     $log = $log.getInstance("EditProfileCtrl");
     var vm = this;
     vm.toggleTrack    = toggleTrack;
@@ -112,6 +112,7 @@
       .then(ImageService.createFileRecord)
       .then(function(newPhotoURL) {
         vm.userData.photoURL = newPhotoURL;
+        $rootScope.$broadcast(CONSTANTS.EVENT_PROFILE_UPDATED);
       });
     }