SUP-2481, intergrate-web-links-api

Merge branch 'feature/sup-1611-web-link-support-ui' into feature/sup-2481-intergrate-web-links-api

* feature/sup-1611-web-link-support-ui:
  more fixes
  major refactoring, moving data processing to services
  SUP-1611, Settings: Support adding an external web link.

Conflicts:
	app/directives/challenge-tile/challenge-tile.directive.jade
	app/directives/external-account/external-account.directive.js
	app/directives/external-account/external-link-data.directive.jade
	app/profile/about/about.jade
	app/settings/edit-profile/edit-profile.controller.js
	app/specs.html

Author: vikasrohit

app/directives/challenge-tile/challenge-tile.directive.jade

@@ -31,7 +31,8 @@
     // Only show if not data science track
     p.roles 
       span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-       #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
+        span Role:  
+        span {{challenge.userDetails.roles | listRoles}}
 
   .completed-challenge(
     ng-show="challenge.status === 'COMPLETED' || challenge.status === 'PAST'",
@@ -65,7 +66,8 @@
     // Only show if not data science track
     p.roles
       span(ng-hide="challenge.track === 'DATA_SCIENCE'") 
-        #[span Role: ] #[span {{challenge.userDetails.roles | listRoles}}]
+        span Role:  
+        span {{challenge.userDetails.roles | listRoles}}
 
 .challenge.list-view(ng-show="view=='list'", ng-class="challenge.track")
   .active-challenge(ng-show="challenge.status === 'ACTIVE'")

app/directives/external-account/external-account.directive.js

@@ -5,11 +5,10 @@
     { provider: "linkedin", className: "fa-linkedin", displayName: "LinkedIn", disabled: true, order: 5, colorClass: 'el-linkedin', featured: true},
     { provider: "stackoverflow", className: "fa-stack-overflow", displayName: "Stack Overflow", disabled: false, order: 3, colorClass: 'el-stackoverflow'},
     { provider: "behance", className: "fa-behance", displayName: "Behance", disabled: true, order: 2, colorClass: 'el-behance'},
-    // { provider: "google-oauth2", className: "fa-google-plus", displayName: "Google+", disabled: true, order: }, colorClass: 'el-dribble',
     { provider: "github", className: "fa-github", displayName: "Github", disabled: false, order: 1, colorClass: 'el-github', featured: true},
     { provider: "bitbucket", className: "fa-bitbucket", displayName: "Bitbucket", disabled: false, order: 7, colorClass: 'el-bitbucket'},
     { provider: "twitter", className: "fa-twitter", displayName: "Twitter", disabled: true, order: 4, colorClass: 'el-twitter'},
-    { provider: "weblinks", className: "fa-globe", displayName: "Web Links", disabled: true, order: 8, colorClass: 'el-weblinks'}
+    { provider: "weblink", className: "fa-globe", displayName: "Web Links", disabled: true, order: -1, colorClass: 'el-weblinks'}
     // TODO  add more
   ];
 
@@ -20,28 +19,31 @@
       templateUrl: 'directives/external-account/external-account.directive.html',
       scope: {
         linkedAccounts: '=',
-        linksData: '=',
+        // linksData: '=',
         readOnly: '='
       },
       controller: ['$log', '$scope', 'ExternalAccountService', 'toaster',
         function($log, $scope, ExternalAccountService, toaster) {
+
           $log = $log.getInstance("ExtAccountDirectiveCtrl")
-          $scope.accountList = _.clone(_supportedAccounts, true);
+
+          var _accountList = _.clone(_supportedAccounts, true);
+          _.remove(_accountList, function(al) { return al.order < 0});
           $scope.$watchCollection('linkedAccounts', function(newValue, oldValue) {
-            for (var i=0;i<$scope.accountList.length;i++) {
-              var _idx = _.findIndex(newValue, function(a) {
-                return $scope.accountList[i].provider === a.providerType;
-              });
-              if (_idx == -1) {
-                $scope.accountList[i].status = 'unlinked';
-              } else {
-                // check if data
-                if ($scope.linksData[$scope.accountList[i].provider]) {
-                  $scope.accountList[i].status = 'linked';
+            if (newValue && newValue != oldValue) {
+              angular.forEach(_accountList, function(account) {
+                var _linkedAccount = _.find(newValue, function(p) {
+                  return p.provider === account.provider
+                });
+                if (!_linkedAccount) {
+                  account.status = 'unlinked';
+                } else if(_linkedAccount.status && _linkedAccount.status.toLowerCase() === 'pending') {
+                  account.status = 'pending';
                 } else {
-                  $scope.accountList[i].status = 'pending';
+                  account.status = 'linked';
                 }
-              }
+              });
+              $scope.accountList = _accountList;
             }
           });
 
@@ -92,11 +94,11 @@
             .then(function(resp) {
               $log.debug("Social account unlinked: " + JSON.stringify(resp));
               var toRemove = _.findIndex($scope.linkedAccounts, function(la) {
-                return la.providerType === provider.provider;
+                return la.provider === provider.provider;
               });
               // remove from both links array and links data array
               $scope.linkedAccounts.splice(toRemove, 1);
-              delete $scope.linksData[provider.provider];
+              // delete $scope.linksData[provider.provider];
               toaster.pop('success', "Success",
                 String.supplant(
                   "Your {provider} account has been unlinked.",
@@ -120,60 +122,6 @@
       ]
     };
   })
-  .directive('externalLinksData', function() {
-    return {
-     restrict: 'E',
-      templateUrl: 'directives/external-account/external-link-data.directive.html',
-      scope: {
-        linkedAccountsData: '=',
-        externalLinks: '='
-      },
-      controller: ['$log', '$scope', 'ExternalAccountService',
-        function($log, $scope, ExternalAccountService) {
-          $log = $log.getInstance('ExternalLinksDataDirective');
-          var validProviders = _.pluck(_supportedAccounts, 'provider');
-          function reCalcData(links, data) {
-            $scope.linkedAccounts = [];
-            angular.forEach(links, function(link) {
-
-              var provider = link.providerType;
-              var isValidProviderIdx = _.findIndex(validProviders, function(p) {
-                return p === provider;
-              });
-              // skip if we dont care about this provider
-              if (isValidProviderIdx == -1)
-                return;
-
-              if (!data[provider]) {
-                $scope.linkedAccounts.push({
-                  provider: provider,
-                  data: {
-                    handle: link.name,
-                    status: 'PENDING'
-                  }
-                });
-              } else {
-                // add data
-                $scope.linkedAccounts.push({
-                  provider: provider,
-                  data: data[provider]
-                });
-              }
-            });
-          }
-
-
-          $scope.$watch('linkedAccountsData', function(newValue, oldValue) {
-            reCalcData($scope.externalLinks, newValue);
-          });
-
-          $scope.$watchCollection('externalLinks', function(newValue, oldValue) {
-            reCalcData(newValue, $scope.linkedAccountsData);
-          });
-        }
-      ]
-    }
-  })
   .filter('providerData', function() {
     return function(input, field) {
       return _.result(_.find(_supportedAccounts, function(s) {

app/directives/external-account/external-account.directive.spec.js

@@ -14,127 +14,44 @@ describe('External Accounts Directive', function() {
   describe('Linked external accounts', function() {
     var linkedAccounts = [
       {
-        providerType: 'linkedin',
+        provider: 'linkedin',
         // don't care about other details
       },
       {
-        providerType: 'github'
+        provider: 'github'
       }
     ];
-    var linksData = {
-      'linkedin' : {provider: 'linkedin', name: 'name-linkedin'},
-      'github' : {provider: 'github', name: 'name-github'}
-    };
     var externalAccounts;
 
     beforeEach(function() {
       scope.linkedAccounts = linkedAccounts;
-      scope.linksData = linksData;
-      element = angular.element('<external-accounts linked-accounts="linkedAccounts", links-data="linksData"></external-accounts>)');
+      element = angular.element('<external-accounts linked-accounts="linkedAccounts"></external-accounts>)');
       externalAccounts = $compile(element)(scope);
-      scope.$digest();
-      // scope.$apply();
+      // externalAccounts.scope().$digest();
+      // externalAccounts.scope().$apply();
     });
 
     it('should have added account list to scope', function() {
-      expect(element.isolateScope().accountList).to.exist;
-
+      inject(function($timeout) {
+        scope.$digest();
+        $timeout(function() {
+          expect(element.isolateScope().accountList).to.exist;
+        }, 0)
+      });
     });
 
     it('should have "linked" property set for github & linkedin', function() {
-      var githubAccount = _.find(element.isolateScope().accountList, function(a) { return a.provider === 'github'});
-      expect(githubAccount).to.have.property('status')
-        .that.equals('linked');
+      inject(function($timeout) {
+        scope.$digest();
+        $timeout(function() {
+          var githubAccount = _.find(element.isolateScope().accountList, function(a) { return a.provider === 'github'});
+          expect(githubAccount).to.have.property('status').that.equals('linked');
+        }, 0)
+      });
 
       // var linkeindAccount = _.find(element.isolateScope().accountList, function(a) { return a.provider === 'linkedin'});
       // expect(linkeindAccount).to.have.property('linked')
       //   .that.equals(true);
     });
   });
 });
-
-describe('External Links Data Directive', function() {
-  var scope;
-  var element;
-
-  beforeEach(function() {
-    bard.appModule('topcoder');
-    bard.inject(this, '$compile', '$rootScope');
-    scope = $rootScope.$new();
-  });
-
-  bard.verifyNoOutstandingHttpRequests();
-
-  describe('Linked external accounts', function() {
-    var externalLinks = [
-      {
-        providerType: 'linkedin',
-        // don't care about other details
-      },
-      {
-        providerType: 'github'
-      },
-      {
-        providerType: 'behance'
-      },
-      {
-        providerType: 'dribbble'
-      },
-      {
-        providerType: 'bitbucket'
-      }
-    ];
-    var linkedAccounts = {
-      github: {
-        handle: "github-handle",
-        followers: 1,
-        publicRepos: 1
-      },
-      stackoverflow: {
-        handle: 'so-handle',
-        reputation: 2,
-        answers: 2
-      },
-      behance: {
-        name: 'behance name',
-        projectViews: 3,
-        projectAppreciations: 3
-      },
-      dribbble: {
-        handle: 'dribble-handle',
-        followers: 4,
-        likes: 4
-      },
-      bitbucket: {
-        username: 'bitbucket-username',
-        followers: 5,
-        repositories: 5
-      },
-      twitter: {
-        handle: 'twitter-handle',
-        noOfTweets: 6,
-        followers: 6
-      },
-      linkedin: {
-        name: 'linkedin name',
-        title: 'linkedin title'
-      }
-    };
-    var externalLinksData;
-
-    beforeEach(function() {
-      scope.linkedAccounts = linkedAccounts;
-      scope.externalLinks = externalLinks;
-      element = angular.element('<external-links-data linked-accounts-data="linkedAccounts" external-links="externalLinks"></external-links-data>)');
-      externalLinksData = $compile(element)(scope);
-      scope.$digest();
-    });
-
-    it('should have added linkedAccounts to scope', function() {
-      expect(element.isolateScope().linkedAccounts).to.exist;
-      // linkedAccounts should have 5 entries because externalLinks contains only 5 records
-      expect(element.isolateScope().linkedAccounts).to.have.length(5);
-    });
-
-  });
-});

app/directives/external-account/external-link-data.directive.jade

@@ -1,5 +1,5 @@
 .external-link-list
-  div.external-link-tile(ng-repeat="account in linkedAccounts")
+  div.external-link-tile(ng-repeat="account in linkedAccountsData")
     .top
       div.logo
         i.fa(ng-class="(account|providerData:'className') || 'fa-globe'")
@@ -97,3 +97,8 @@
         .handle {{account.data.name}}
 
         .title {{account.data.title}}
+
+      div(ng-switch-when="weblink")
+        .handle My Portfoilo
+
+        .title {{account.data.title}}

app/directives/external-account/external-links-data.directive.js

@@ -0,0 +1,22 @@
+(function() {
+  'use strict';
+
+  /**
+   * @desc links data card directive
+   * @example <external-links-data></external-links-data>
+   */
+  angular
+    .module('tcUIComponents')
+    .directive('externalLinksData', externalLinksData);
+
+  function externalLinksData() {
+    var directive = {
+     restrict: 'E',
+      templateUrl: 'directives/external-account/external-link-data.directive.html',
+      scope: {
+        linkedAccountsData: '='
+      }
+    };
+    return directive;
+  }
+})();