Merge pull request #556 from appirio-tech/feature/sup-2481-intergrate-web-links-api

SUP-2481 intergrate web links api

Author: parthshah

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

@@ -32,7 +32,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'",
@@ -66,7 +67,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,36 @@
       templateUrl: 'directives/external-account/external-account.directive.html',
       scope: {
         linkedAccounts: '=',
-        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) {
+              angular.forEach(_accountList, function(account) {
+                var _linkedAccount = _.find(newValue, function(p) {
+                  return p.provider === account.provider
+                });
+                var accountStatus = _.get(_linkedAccount, 'data.status', null);
+                if (!_linkedAccount) {
+                  account.status = 'unlinked';
+                } else if(accountStatus && accountStatus.toLowerCase() === 'pending') {
+                  account.status = 'pending';
                 } else {
-                  $scope.accountList[i].status = 'pending';
+                  account.status = 'linked';
                 }
-              }
+              });
+              $scope.accountList = _accountList;
+            } else {
+              // reset the status for all accounts
+              angular.forEach(_accountList, function(account) {
+                delete account.status;
+              });
             }
           });
 
@@ -62,7 +69,7 @@
             ExternalAccountService.linkExternalAccount(provider.provider, null)
             .then(function(resp) {
               $log.debug("Social account linked: " + JSON.stringify(resp));
-              $scope.linkedAccounts.push(resp.profile);
+              $scope.linkedAccounts.push(resp.linkedAccount);
               toaster.pop('success', "Success",
                 String.supplant(
                   "Your {provider} account has been linked. Data from your linked account will be visible on your profile shortly.",
@@ -92,11 +99,12 @@
             .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];
+              if (toRemove > -1) {
+                // remove from the linkedAccounts array
+                $scope.linkedAccounts.splice(toRemove, 1);
+              }
               toaster.pop('success', "Success",
                 String.supplant(
                   "Your {provider} account has been unlinked.",
@@ -120,60 +128,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) {