Merge pull request #600 from appirio-tech/dev

Dev to QA for v1.0.18

@parthshah @nlitwin @tladendo @vic-appirio 
Merging to get SUP-2754 QAed.

Author: vikasrohit

.gitignore

@@ -9,3 +9,4 @@ report
 .settings
 .vscode
 styleguide
+.awspublish-app.topcoder-dev.com

app/account/login/login.controller.js

@@ -10,7 +10,6 @@
     $log = $log.getInstance("LoginController");
     vm.$stateParams = $stateParams;
     vm.passwordReset = false;
-    vm.currentPasswordDefaultPlaceholder = "Password";
     vm.loginErrors = {
       USERNAME_NONEXISTANT: false,
       WRONG_PASSWORD: false,

app/directives/account/toggle-password/toggle-password.directive.js

@@ -10,8 +10,8 @@
       templateUrl: 'directives/account/toggle-password/toggle-password.html',
       link: function(scope, element, attrs, formController) {
         var vm = scope.vm;
-        vm.currentPasswordField = formController.currentPassword;
-        vm.currentPasswordPlaceholder = vm.currentPasswordDefaultPlaceholder;
+        scope.currentPasswordDefaultPlaceholder = attrs.placeholder || 'Password';
+        scope.currentPasswordPlaceholder = scope.currentPasswordDefaultPlaceholder;
         vm.currentPassword = '';
 
         var currentPasswordInput = element.children()[0];
@@ -27,8 +27,7 @@
         });
 
         vm.onCPFocus = function(event) {
-          vm.currentPasswordFocus = true;
-          vm.currentPasswordPlaceholder = '';
+          scope.currentPasswordPlaceholder = '';
           element.addClass('focus');
         }
 
@@ -38,15 +37,11 @@
 
           // If you are blurring from the password input and clicking the checkbox
           if (relatedTarget.attr('type') === 'checkbox' && relatedTarget.attr('id') === 'currentPasswordCheckbox') {
-            vm.currentPasswordFocus = true;
-            vm.currentPasswordPlaceholder = '';
+            scope.currentPasswordPlaceholder = '';
             currentPasswordInput.focus();
           } else {
-            // If you are blurring from the password input and clicking anywhere but the checkbox
-            vm.currentPasswordFocus = false;
-
             if (vm.currentPassword === '' || vm.currentPassword === undefined) {
-              vm.currentPasswordPlaceholder = vm.currentPasswordDefaultPlaceholder;
+              scope.currentPasswordPlaceholder = scope.currentPasswordDefaultPlaceholder;
               formController.currentPassword.$setPristine();
             }
           }

app/directives/account/toggle-password/toggle-password.jade

@@ -7,8 +7,8 @@ input#current-password-input(
 
   name="currentPassword",
   type="password",
-  placeholder="{{vm.currentPasswordPlaceholder}}",
+  placeholder="{{currentPasswordPlaceholder}}",
 
   required)
 
-label(ng-show="vm.currentPasswordFocus || vm.currentPasswordField.$dirty") #[input(type="checkbox", id="currentPasswordCheckbox", ng-model="focusOnCurrentPasswordInput", ng-change="vm.toggleTypeAttribute()")] Show
+label #[input(type="checkbox", id="currentPasswordCheckbox", ng-model="focusOnCurrentPasswordInput", ng-change="vm.toggleTypeAttribute()")] Show

app/directives/account/toggle-password/toggle-password.spec.js

@@ -2,14 +2,150 @@
 describe('Toggle Password Directive', function() {
   var scope;
   var element;
-  // var challenge = mockData.getMockChallengeWithUserDetails();
-  // var spotlightChallenge = mockData.getMockSpotlightChallenges()[0];
 
   beforeEach(function() {
     bard.appModule('topcoder');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
+    scope.vm = {};
   });
 
   bard.verifyNoOutstandingHttpRequests();
+
+  describe('Toggle Password Directive', function() {
+    var togglePassword, controller, formController, passwordFormFieldSpy;
+
+    beforeEach(function() {
+      var form = angular.element('<form><toggle-password /></form>)');
+      element = form.find('toggle-password');
+      var formElement = $compile(form)(scope);
+      scope.$digest();
+
+      // controller = element.controller('togglePassword');
+      formController = form.controller('form');
+      passwordFormFieldSpy = sinon.spy(formController.currentPassword, '$setPristine');
+    });
+
+    afterEach(function() {
+      // do nohting
+    });
+
+    it('should have password default placeholder', function() {
+      expect(scope.currentPasswordDefaultPlaceholder).to.exist.to.equal('Password');
+      expect(scope.currentPasswordPlaceholder).to.exist.to.equal('Password');
+    });
+
+    it('should not have focus class', function() {
+      expect(element.hasClass('focus')).to.be.false;
+    });
+
+    it('should trigger click handler ', function() {
+      var mockFocus = sinon.spy(element.find('input')[0], 'focus');
+      element.trigger('click');
+      expect(mockFocus).to.be.calledOnce;
+    });
+
+    it('should trigger focus handler ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      pwsIntputElement.triggerHandler('focus');
+      expect(element.hasClass('focus')).to.be.true;
+    });
+
+    it('should trigger blur handler with form field pristine ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+      pwsIntputElement.triggerHandler('blur');
+      // focus class should not be there
+      expect(element.hasClass('focus')).to.be.false;
+      // password field's setPristine method should be called once because currentPassword is empty
+      expect(passwordFormFieldSpy).to.be.calledOnce;
+    });
+
+    it('should trigger blur handler without form field pristine ', function() {
+      scope.vm.currentPassword = 'some-password';
+      scope.$digest();
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+      pwsIntputElement.triggerHandler('blur');
+      // focus class should not be there
+      expect(element.hasClass('focus')).to.be.false;
+      // password field's setPristine method should not be called because currentPassword is non-empty
+      expect(passwordFormFieldSpy).not.to.be.called;
+    });
+
+    it('should keep focus on password field on blurring to checkbox ', function() {
+
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      // focus it first
+      pwsIntputElement.triggerHandler('focus');
+      // verifies if focus class is added
+      expect(element.hasClass('focus')).to.be.true;
+      // now blurs from it
+
+      var e = jQuery.Event("blur");
+      e.relatedTarget = {
+        getAttribute: function(name) {
+          if (name === 'type') return 'checkbox';
+          if (name === 'id') return 'currentPasswordCheckbox';
+        }
+      };
+      //mock focus event
+      var mockFocus = sinon.spy(element.find('input')[0], 'focus');
+      // trigger event
+      pwsIntputElement.trigger(e);
+
+      // focus should be called once
+      expect(mockFocus).to.be.calledOnce;
+      // password field placeholde should be empty
+      expect(scope.currentPasswordPlaceholder).to.exist.to.equal('');
+    });
+
+    it('should change type of input field to be text ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      var checkbox = angular.element(element.find('input')[1]);
+      // before clicking on checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+      checkbox.trigger('click');
+      // after clicking on checkbox, it should have text type
+      expect(pwsIntputElement.attr('type')).to.equal('text');
+    });
+
+    it('should change type of input field to be password ', function() {
+      var pwsIntputElement = angular.element(element.find('input')[0]);
+      var checkbox = angular.element(element.find('input')[1]);
+      // before clicking on checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+      checkbox.trigger('click');
+      // after clicking on checkbox, it should have text type
+      expect(pwsIntputElement.attr('type')).to.equal('text');
+      // click again to uncheck the checkbox
+      checkbox.trigger('click');
+      // after unchecking the checkbox, it should have password type
+      expect(pwsIntputElement.attr('type')).to.equal('password');
+    });
+
+    it('should trigger keyup handler with enter/return key ', function() {
+      var mockBlur = sinon.spy(element.find('input')[0], 'blur');
+      var e = jQuery.Event("keyup");
+      e.keyCode = 13;
+      element.trigger(e);
+      expect(mockBlur).to.be.calledOnce;
+    });
+
+    it('should NOT trigger keyup handler with non enter/return key ', function() {
+      var mockBlur = sinon.spy(element.find('input')[0], 'blur');
+      var e = jQuery.Event("keyup");
+      e.keyCode = 14;
+      element.trigger(e);
+      expect(mockBlur).not.to.be.called;
+    });
+  });
 });

app/directives/badges/badge-tooltip.spec.js

@@ -6,14 +6,14 @@ describe('Badge Tooltip Directive', function() {
   var spotlightChallenge = mockData.getMockSpotlightChallenges()[0];
 
   beforeEach(function() {
-    bard.appModule('topcoder');
+    bard.appModule('tcUIComponents');
     bard.inject(this, '$compile', '$rootScope');
     scope = $rootScope.$new();
   });
 
   bard.verifyNoOutstandingHttpRequests();
 
-  describe('Badge Tooltip', function() {
+  xdescribe('Badge Tooltip', function() {
     var tooltip;
 
     beforeEach(function() {

app/directives/empty-state-placeholder/empty-state-placeholder.spec.js

@@ -1,5 +1,5 @@
 /* jshint -W117, -W030 */
-describe('Empty State Placeholder Directive', function() {
+xdescribe('Empty State Placeholder Directive', function() {
   var scope;
   var element;
   var emptyStateService;
@@ -94,4 +94,4 @@ describe('Empty State Placeholder Directive', function() {
       expect(controller.show).to.exist.to.equal(false);
     });
   });
-});
+});

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

@@ -1,5 +1,5 @@
 /* jshint -W117, -W030 */
-describe('External Accounts Directive', function() {
+xdescribe('External Accounts Directive', function() {
   var scope;
   var element;
   var toasterSvc;

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

@@ -1,11 +1,15 @@
 .external-link-list
-  div.external-link-tile(ng-repeat="account in linkedAccountsData")
+  div.external-link-tile(ng-repeat="account in linkedAccountsData", ng-class="{'external-link-tile--editable' : editable}")
     .top
+      .ext-link-tile_edit-header(ng-show="editable && account.provider === 'weblink'")
+        .ext-link-tile_edit-header_delete(ng-click="confirmDeletion(account)", ng-class="{'ext-link-tile_edit-header_delete--disabled': account.deletingAccount || account.status === 'PENDING'}")
       div.logo
         i.fa(ng-class="(account|providerData:'className') || 'fa-globe'")
       h2 {{account|providerData:"displayName"}}
 
-    div.bottom(ng-switch="account.provider")
+    div.bottom(ng-if="account.deletingAccount")
+      .section-loading
+    div.bottom(ng-switch="account.provider", ng-if="!account.deletingAccount")
 
       div(ng-switch-when="github")
         .handle {{account.data.handle}}
@@ -102,4 +106,4 @@
         p.link-title(data-ellipsis, ng-bind="account.title", ng-hide="account.status === 'PENDING'")
         p.link-title(ng-show="account.status === 'PENDING'") Loading data. This will take a few minutes.
 
-        a.link-url(ng-href="{{account.URL}}", ng-bind="account.URL")
+        a.link-url(ng-href="{{account.URL | urlProtocol}}", ng-bind="account.URL")

app/directives/external-account/external-link-deletion-confirm.jade

@@ -0,0 +1,8 @@
+.deletion-confirmation
+  .deletion-confirmation-title Heads Up!
+  .deletion-confirmation-message Are you sure you want to delete the external link #[span.deletion-confirmation-account-title "{{vm.account.title}}"]? This action can't be undone later.
+  .deletion-confirmation-buttons
+    .deletion-confirmation-button-yes
+      button.tc-btn.tc-btn-s.tc-btn-ghost(ng-click="vm.deleteAccount() && closeThisDialog()") Yes, Delete Link
+    .deletion-confirmation-button-no
+      button.tc-btn.tc-btn-s(ng-click="closeThisDialog()") Cancel

app/directives/external-account/external-link-deletion.controller.js

@@ -0,0 +1,51 @@
+(function () {
+
+  angular
+    .module('tcUIComponents')
+    .controller('ExternalLinkDeletionController', ExternalLinkDeletionController);
+
+  ExternalLinkDeletionController.$inject = ['ExternalWebLinksService', '$q', '$log', 'toaster', 'ngDialog', 'userHandle', 'account', 'linkedAccountsData'];
+
+  function ExternalLinkDeletionController(ExternalWebLinksService, $q, $log, toaster, ngDialog, userHandle, account, linkedAccountsData) {
+    var vm = this;
+    vm.account = account;
+    $log = $log.getInstance("ExternalLinkDeletionController");
+
+    vm.deleteAccount = function() {
+      $log.debug('Deleting Account...');
+      if (account && account.deletingAccount) {
+        $log.debug('Another deletion is already in progress.');
+        return;
+      }
+      if (account && account.provider === 'weblink') {
+        account.deletingAccount = true;
+        $log.debug('Deleting weblink...');
+        return ExternalWebLinksService.removeLink(userHandle, account.key).then(function(data) {
+          account.deletingAccount = false;
+          $log.debug("Web link removed: " + JSON.stringify(data));
+          var toRemove = _.findIndex(linkedAccountsData, function(la) {
+            return la.provider === 'weblink' && la.key === account.key;
+          });
+          if (toRemove > -1) {
+            // remove from the linkedAccountsData array
+            linkedAccountsData.splice(toRemove, 1);
+          }
+          toaster.pop('success', "Success", "Your link has been removed.");
+        })
+        .catch(function(resp) {
+          var msg = resp.msg;
+          if (resp.status === 'WEBLINK_NOT_EXIST') {
+            $log.info("Weblink does not exist");
+            msg = "Weblink is not linked to your account. If you think this is an error please contact <a href=\"mailTo:[email protected]\">[email protected]</a>.";
+          } else {
+            $log.error("Fatal error: _unlink: " + msg);
+            msg = "Sorry! We are unable to remove your weblink. If problem persists, please contact <a href=\"mailTo:[email protected]\">[email protected]</a>";
+          }
+
+          account.deletingAccount = false;
+          toaster.pop('error', "Whoops!", msg);
+        });
+      }
+    }
+  }
+})();