Merge branch 'dev'

Author: James Cori

README.md

@@ -43,6 +43,7 @@ The following configuration parameters are available:
 | TERMS_V5_API_URL            | URL of the v5 Terms API      |
 | CHALLENGES_V5_API_URL       | URL of the v5 Challenges API    |
 | RESOURCE_V5_API_URL         | URL of the v5 Resources API    |
+| MEMBER_V5_API_URL           | URL of the v5 Member API    |
 | AGREE_FOR_DOCUSIGN_TEMPLATE            | UUID from Database of the `"DocuSign Template"` Agreeable type      |
 | AGREE_ELECTRONICALLY | UUID from Database of the `Electronically` Agreeable Type  |
 | DEFAULT_TERMS_TYPE_ID | The default terms type id    |
@@ -54,15 +55,12 @@ The following configuration parameters are available:
 
 ## Start the Application
 
-As application uses Topcoder authorization we have to run it on the one of allowed domains. For development purposes we can use `local.topcoder-dev.com:3000`. So before run we have to add into `hosts` file the line `127.0.0.1 local.topcoder-dev.com`. Be aware, that we also have to run on the port `3000` to be able to authorize when run locally.
-
 Simply execute the following command to start the app in development mode (with browsersync)
 ```
 npm install
-npm run build
 npm run dev
 ```
-Application will be hosted and running at http://local.topcoder-dev.com:3000.
+Application will be hosted and running at http://localhost:3000.
 
 ## Execute E2E Tests
 

config.json

@@ -4,19 +4,20 @@
     "ADMIN_TOOL_URL": "https://api.topcoder-dev.com/v2",
     "API_VERSION_PATH": "v3",
     "COOKIES_SECURE": false,
-    "AUTH_URL": "https://accounts.topcoder-dev.com/member",
-    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+    "AUTH_URL": "http://localhost:5000",
+    "ACCOUNTS_CONNECTOR_URL": "http://localhost:5000",
     "JWT_V3_NAME": "v3jwt",
     "JWT_V2_NAME": "tcjwt",
     "OAUTH2_TOKEN_NAME": "oa2spigit",
     "OAUTH2_TOKEN_EXPIRETIME_TAGNAME": "oa2expire",
     "SPIGIT_API_URL": "spigit.com",
     "SPIGIT_API_VERSION_PATH": "/api/v1",
-    "GROUP_V5_API_URL": "http://localhost:3000/v5",
-    "LOOKUP_V5_API_URL": "http://localhost:3000/v5",
-    "TERMS_V5_API_URL": "http://localhost:3000/v5",
+    "GROUP_V5_API_URL": "https://api.topcoder-dev.com/v5",
+    "LOOKUP_V5_API_URL": "https://api.topcoder-dev.com/v5",
+    "TERMS_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "CHALLENGES_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "RESOURCE_V5_API_URL": "https://api.topcoder-dev.com/v5",
+    "MEMBER_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
     "AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
     "DEFAULT_TERMS_TYPE_ID": 5,
@@ -43,6 +44,7 @@
     "TERMS_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "CHALLENGES_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "RESOURCE_V5_API_URL": "https://api.topcoder-dev.com/v5",
+    "MEMBER_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
     "AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
     "DEFAULT_TERMS_TYPE_ID": 5,
@@ -69,6 +71,7 @@
     "TERMS_V5_API_URL": "http://localhost:3000/v5",
     "CHALLENGES_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "RESOURCE_V5_API_URL": "https://api.topcoder-dev.com/v5",
+    "MEMBER_V5_API_URL": "https://api.topcoder-dev.com/v5",
     "AGREE_FOR_DOCUSIGN_TEMPLATE": "999a26ad-b334-453c-8425-165d4cf496d7",
     "AGREE_ELECTRONICALLY": "5b2798b2-ae82-4210-9b4d-5d6428125ccb",
     "DEFAULT_TERMS_TYPE_ID": 5,
@@ -94,7 +97,8 @@
     "LOOKUP_V5_API_URL": "https://api.topcoder.com/v5",
     "TERMS_V5_API_URL": "https://api.topcoder.com/v5",
     "CHALLENGES_V5_API_URL": "https://api.topcoder.com/v5",
-    "RESOURCE_V5_API_URL": "https://api.topcoder.com/v5", 
+    "RESOURCE_V5_API_URL": "https://api.topcoder.com/v5",
+    "MEMBER_V5_API_URL": "https://api.topcoder.com/v5",
     "AGREE_FOR_DOCUSIGN_TEMPLATE": "1363a7ab-fd3e-4d7c-abbb-2f7440b8b355",
     "AGREE_ELECTRONICALLY": "2db6c920-4089-4755-9cd1-99b0df0af961",
     "DEFAULT_TERMS_TYPE_ID": 5,

gulp/server.js

@@ -28,12 +28,11 @@ function browserSyncInit(baseDir, files, browser) {
       routes: routes
     },
     browser: browser,
-    host: 'local.topcoder-dev.com',
-    open: 'external'
+    host: 'localhost'
   });
 }
 
-gulp.task('serve', ['watch'], function () {
+gulp.task('serve', ['ng-config', 'watch'], function () {
   browserSyncInit([
     paths.tmp + '/serve',
     paths.src

package.json

@@ -44,6 +44,7 @@
     "browserify-css": "0.10.1",
     "browserify-shim": "^3.8.10",
     "chalk": "~0.5.1",
+    "cross-env": "^5.2.1",
     "del": "~2.2.2",
     "ejsify": "1.0.0",
     "gulp": "^3.8.11",
@@ -89,6 +90,6 @@
     "build": "gulp build",
     "start": "gulp publish",
     "test": "gulp protractor",
-    "dev": "gulp serve"
+    "dev": "cross-env BUILD_ENV=local gulp serve"
   }
 }

src/app/challenges/challenges.service.js

@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('supportAdminApp')
-  .factory('ChallengeService', ['$q', '$http', 'API_URL', 'CHALLENGES_V5_API_URL', 'RESOURCE_V5_API_URL',
-    function ($q, $http, API_URL, V5_API_URL, RESOURCE_V5_API_URL) {
+  .factory('ChallengeService', ['$q', '$http', 'API_URL', 'CHALLENGES_V5_API_URL', 'RESOURCE_V5_API_URL', 'MEMBER_V5_API_URL', '$httpParamSerializer',
+    function ($q, $http, API_URL, V5_API_URL, RESOURCE_V5_API_URL, MEMBER_V5_API_URL, $httpParamSerializer) {
 
       var service = {
         findChallengeById: findChallengeById,
@@ -17,6 +17,7 @@ angular.module('supportAdminApp')
           getChallengeByLegacyId: getChallengeByLegacyId,
           getChallengeResources: getChallengeResources,
           getResourceRoles: getResourceRoles,
+          getResourceEmails: getResourceEmails,
           deleteChallengeResource: deleteChallengeResource,
           addChallengeResource: addChallengeResource
         }
@@ -380,6 +381,37 @@ angular.module('supportAdminApp')
         return deferred.promise;
       };
 
+      /**
+       * gets a list of e-mails based on a list of users
+       * @returns {Promise} the promise with a list of userIds and e-mails.
+       */
+      function getResourceEmails(users) {
+        var deferred = $q.defer();
+        var qs = ""
+        if (users.length > 1) {
+          qs = $httpParamSerializer({
+            userIds: users.map(function(user) { return user.memberId })
+          });
+        } else { // need to check if the list is made of just one user, in this case the qs parameter must be userId instead of userIds
+          qs = $httpParamSerializer({
+            userId: users.map(function(user) { return user.memberId })
+          });
+        }
+
+        $http({
+          method: 'GET',
+          url: MEMBER_V5_API_URL + '/members?' + qs + '&fields=userId,email&perPage=' + users.length,
+          headers: {
+            'Content-Type': 'application/json',
+          }
+        }).then(function (response) {
+          deferred.resolve(response.data);
+        }).catch(function (error) {
+          handleError(error, deferred);
+        });
+        return deferred.promise;
+      }
+
       /**
        * delete the challenge resource.
        * @param {object} data the data.

src/app/less/multiple-member-handler.directive.less

@@ -0,0 +1,33 @@
+.multiple-member-handle {
+    border: 1px solid #e5e6e7;
+    background: #ffffff;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 3px 1px 3px 3px;
+    flex: 1;
+    
+    .multiple-member-handle-tag {
+        display: inline-flex;margin: 0 2px 2px 0;
+        height: 24px;
+        align-items: center;
+        font-size: 14px;
+        font-weight: normal;
+    }
+
+    .multiple-member-handle-input {
+        border: 0px #ffffff;
+        display: inline-flex;
+        flex-grow: 1;
+        width: 10%;
+        min-width: 20px;
+        height: 26px;
+        padding: 0px;
+        outline: none;
+        box-shadow: none;
+    }
+
+    a {
+        color: #3333;
+        margin-left:5px
+    }
+}

src/app/less/style.less

@@ -30,6 +30,7 @@
 // Components
 @import "challenge-users-stats.directive.less";
 @import "track-icon.directive.less";
+@import "multiple-member-handler.directive.less";
 
 // Landing page styles
 @import "landing.less";

src/app/sso/sso.service.js

@@ -4,7 +4,7 @@ angular.module('supportAdminApp')
   .factory('SSOService', ['$log', '$q','$http', 'API_URL',
     function ($log, $q, $http, API_URL) {
     // local dev
-    // var API_URL = 'http://local.topcoder-dev.com:8080';
+    // var API_URL = 'http://localhost:8080';
       return ({
         /* add sso user */
         addSSOUser: function(jsonInput, activate, showFullResponse) {
@@ -70,4 +70,4 @@ angular.module('supportAdminApp')
 
                 }, // addSSOUser()
       });
-    }]);
+    }]);

src/app/users/users.service.js

@@ -10,8 +10,9 @@ angular
     'API_URL',
     'API_VERSION_PATH',
     'helper',
-    function ($log, $q, $http, User, API_URL, API_VERSION_PATH, helper) {
-      // local dev var API_URL = 'http://local.topcoder-dev.com:8080'; The base path
+    'MEMBER_V5_API_URL',
+    function ($log, $q, $http, User, API_URL, API_VERSION_PATH, helper, MEMBER_V5_API_URL) {
+      // local dev var API_URL = 'http://localhost:8080'; The base path
       // of the API including version.
       var basePath = API_URL + '/' + API_VERSION_PATH;
 
@@ -405,6 +406,24 @@ angular
         }, helper.handleError)
       };
 
+      /**
+       * gets a list of members given a list of handles.
+       * @param {Array} handles the handle.
+       */
+      UserService.getMembersByHandle = function (handles) {
+        var qs = "";
+        handles.forEach(function(handle) {
+          qs += "&handlesLower[]=" + handle.toLowerCase();
+        })
+        var request = $http({
+          method: 'GET',
+          url: MEMBER_V5_API_URL +'/members?fields=userId,handle' + qs
+        });
+        return request.then(function (response) {
+          return response.data;
+        }, helper.handleError)
+      };
+
       return UserService;
     }
   ]);

src/app/v5_challenges/add-user-challenge.controller.js

@@ -1,13 +1,13 @@
 module.controller('v5challenge.AddUserController', [
     '$scope',
-    '$timeout',
+    '$q',
     '$uibModalInstance',
     'UserService',
     'ChallengeService',
     'Alert',
     'parentScope',
     'challenge',
-    function ($scope, $timeout, $modalInstance, UserService, $challengeService, $alert, $parentScope, challenge) {
+    function ($scope, $q, $modalInstance, UserService, $challengeService, $alert, $parentScope, challenge) {
         $scope.challenge = challenge
         $scope.handle = '';
         $scope.isLoading = false;
@@ -28,35 +28,45 @@ module.controller('v5challenge.AddUserController', [
             $modalInstance.close();
         };
 
-        /**
-         * searches the handle.
-         * @param {string} filter the filter.
-         */
-        $scope.searchHandle = function (filter) {
-            $scope.isLoading = true;
-            return UserService.getMemberSuggestByHandle(filter).then(function (data) {
-                $scope.isLoading = false;
-                return _.map(data, function (x) { return x.handle });
-            })
-        };
+
 
         /**
          * handles save click.
          */
         $scope.save = function () {
             $scope.clearError()
             $scope.isLoading = true;
+            var success = [];
+            var errors = [];
+
+            var promiseArray = $scope.handles.map(function(handle) {
+                return $challengeService.v5.addChallengeResource({
+                    challengeId: $scope.challenge.id,
+                    memberHandle: handle,
+                    roleId: $scope.roleId
+                }).then(function () {
+                    success.push({handle: handle});
+                }).catch(function (error) {
+                    errors.push({handle: handle, message: error.error});
+                })
+            })
 
-            $challengeService.v5.addChallengeResource({
-                challengeId: $scope.challenge.id,
-                memberHandle: $scope.handle,
-                roleId: $scope.roleId
-            }).then(function () {
-                $alert.success('User has been added.', $scope);
-                $parentScope.search();
-            }).catch(function (error) {
-                $alert.error(error.error, $scope);
-            }).finally(function () {
+            $q.all(promiseArray)
+            .finally(function () {
+                if (success.length) {
+                    $parentScope.search();
+                    if (success.length > 1)
+                        $alert.success(success.length + ' users have been added.', $scope);
+                    else
+                        $alert.success('User has been added.', $scope);
+                }
+                if (errors.length) {
+                    var messages = [];
+                    messages = errors.map(function(error) {
+                        return error.handle + ": " + error.message;
+                    })
+                    $alert.error(messages, $scope);
+                }
                 $scope.isLoading = false;
             });
         };

src/app/v5_challenges/add-user-challenge.html

@@ -8,13 +8,11 @@ <h4 class="modal-title" id="reg-dialog-label">Add User</h4>
     <div class="modal-body">
         <div class="row">
             <form role="form" name="addUserForm" data-toggle="validator" autocomplete="off">
-                <div class="col-md-12" ng-include src="'components/alert/alert.html'"></div>
+                <div class="col-md-12" ng-include src="'components/alert/alert-list.html'"></div>
                 <div class="form-group scrollable-dropdown-menu"
                     ng-class="{'has-error': addUserForm.handle.$touched && addUserForm.handle.$invalid}">
                     <label for="auto-handle">Handle</label>
-                    <input id="auto-handle" type="text" class="form-control" ng-model="handle"
-                        uib-typeahead="handle for handle in searchHandle($viewValue)" name="handle"
-                        required="required">
+                    <multiple-member-handler handles="handles"/>
                 </div>
                 <div class="form-group" ng-class="{'has-error': addUserForm.roleId.$touched && addUserForm.roleId.$invalid}">
                     <label for="role">Role</label>
@@ -31,7 +29,7 @@ <h4 class="modal-title" id="reg-dialog-label">Add User</h4>
             Close
         </button>
         <button type="button" class="btn btn-primary" ng-click="save()"
-            ng-disabled="addUserForm.$invalid || isLoading">
+            ng-disabled="handles.length < 1 || !roleId || isLoading">
             Add User
         </button>
     </div>