Merge branch 'dev'

Author: James Cori

.circleci/config.yml

@@ -20,13 +20,13 @@ install_deploysuite: &install_deploysuite
 build_steps: &build_steps
       - checkout
       - run: curl -s https://raw.githubusercontent.com/chronogolf/circleci-google-chrome/master/use_chrome_stable_version.sh | bash
-      - restore_cache:
-          key: node-modules-{{ checksum "package-lock.json" }}
+      # - restore_cache:
+      #     key: node-modules-{{ checksum "package-lock.json" }}
       - run: npm install
-      - save_cache:
-          key: node-modules-{{ checksum "package-lock.json" }}
-          paths: 
-            - node_modules
+      # - save_cache:
+      #     key: node-modules-{{ checksum "package-lock.json" }}
+      #     paths: 
+      #       - node_modules
       - run: ./node_modules/gulp/bin/gulp.js clean
       - run: ./node_modules/gulp/bin/gulp.js build
       # - run: ./node_modules/gulp/bin/gulp.js publish

.nvmrc

@@ -0,0 +1 @@
+6.17.1

README.md

@@ -6,8 +6,8 @@ Internal application used to administer specific support tasks related to the To
 
 ## Software Requirements
 
-- node.js v6+
-- npm v3+
+- node.js v6 (not later)
+- npm v3
 - Google Chrome browser version >= 55.0.2883.0
 
 ## Installation
@@ -46,6 +46,10 @@ The following configuration parameters are available:
 | 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    |
+| CONNECT_URL | URL of Topcoder Connect |
+| DIRECT_URL | URL of Topcoder Direct |
+| WORK_MANAGER_URL | URL of Topcoder Work Manager |
+| ONLINE_REVIEW_URL | URL of Topcoder Online Review |
 
 
 ## Start the Application

config.json

@@ -19,7 +19,11 @@
     "RESOURCE_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
+    "DEFAULT_TERMS_TYPE_ID": 5,
+    "CONNECT_URL": "https://connect.topcoder-dev.com",
+    "DIRECT_URL": "https://www.topcoder-dev.com/direct",
+    "WORK_MANAGER_URL": "https://challenges.topcoder-dev.com",
+    "ONLINE_REVIEW_URL": "https://software.topcoder-dev.com/review"
   },
   "dev": {
     "API_URL": "https://api.topcoder-dev.com",
@@ -41,7 +45,11 @@
     "RESOURCE_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
+    "DEFAULT_TERMS_TYPE_ID": 5,
+    "CONNECT_URL": "https://connect.topcoder-dev.com",
+    "DIRECT_URL": "https://www.topcoder-dev.com/direct",
+    "WORK_MANAGER_URL": "https://challenges.topcoder-dev.com",
+    "ONLINE_REVIEW_URL": "https://software.topcoder-dev.com/review"
   },
   "qa": {
     "API_URL": "https://api.topcoder-qa.com",
@@ -63,7 +71,11 @@
     "RESOURCE_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
+    "DEFAULT_TERMS_TYPE_ID": 5,
+    "CONNECT_URL": "https://connect.topcoder-dev.com",
+    "DIRECT_URL": "https://www.topcoder-dev.com/direct",
+    "WORK_MANAGER_URL": "https://challenges.topcoder-dev.com",
+    "ONLINE_REVIEW_URL": "https://software.topcoder-dev.com/review"
   },
   "prod": {
     "API_URL": "https://api.topcoder.com",
@@ -85,6 +97,10 @@
     "RESOURCE_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
+    "DEFAULT_TERMS_TYPE_ID": 5,
+    "CONNECT_URL": "https://connect.topcoder.com",
+    "DIRECT_URL": "https://www.topcoder.com/direct",
+    "WORK_MANAGER_URL": "https://challenges.topcoder.com",
+    "ONLINE_REVIEW_URL": "https://software.topcoder.com/review"
   }
 }

package.json

@@ -82,7 +82,7 @@
     "wiredep": "~4.0.0"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": "6"
   },
   "scripts": {
     "clean": "gulp clean",

src/app/challenges/challenges.service.js

@@ -14,6 +14,7 @@ angular.module('supportAdminApp')
           getChallengeTypes: getChallengeTypes,
           getChallengeTracks: getChallengeTracks,
           getChallengeById: getChallengeById,
+          getChallengeByLegacyId: getChallengeByLegacyId,
           getChallengeResources: getChallengeResources,
           getResourceRoles: getResourceRoles,
           deleteChallengeResource: deleteChallengeResource,
@@ -305,6 +306,31 @@ angular.module('supportAdminApp')
         return deferred.promise;
       };
 
+      /**
+       * gets the challenge details by legacyId.
+       * Throws an error message if no challenge is found, as of now the api returns 200 and an empty array
+       * @param {string} legacyId the challenge legacyId.
+       * @returns {Promise} the promise base api result.
+       */
+      function getChallengeByLegacyId(id) {
+        var deferred = $q.defer();
+
+        $http({
+          method: 'GET',
+          url: V5_API_URL + '/challenges?legacyId=' + id,
+          headers: {
+            "Content-Type": "application/json"
+          }
+        }).then(function (response) {
+          if (Array.isArray(response.data) && response.data.length > 0)
+            deferred.resolve(response.data[0]);
+          else throw({"message":" Invalid \"legacyId\""});
+        }).catch(function (error) {
+          handleError(error, deferred);
+        });
+        return deferred.promise;
+      };
+
       /**
        * get the challenge resources
        * @param {string} challengeId the challenge id.

src/app/directives.js

@@ -73,4 +73,50 @@ angular.module('supportAdminApp')
                 });
             }
         };
+    })
+    .directive('backButton', function($window) {
+        return {
+            restrict: 'AE',
+            link: function(scope, element, attrs) {
+                element.on('click', function() {
+                    $window.history.back();
+                });
+            }
+        }
+
+    })
+    // gets current phase according to a predefined logic, based on the phases array of a challenge
+    .directive('currentPhase', function(moment) {
+        return {
+            restrict: 'AE',
+            replace: true,
+            template: '<span>{{phaseMessage}}</span>',
+            scope: {
+                challenge: '='
+            },
+            link: function(scope, element, attrs) {
+                var statusPhase = null;
+
+                if (scope.challenge.phases) {
+                    statusPhase = scope.challenge.phases
+                    .filter(function(p) {
+                        return p.name !== 'Registration' && p.isOpen
+                    })
+                    .sort(function(a, b) {
+                        return moment(a.scheduledEndDate).diff(b.scheduledEndDate);
+                    })[0];
+                }
+
+                if (!statusPhase && scope.challenge.type === 'First2Finish' && scope.challenge.phases.length) {
+                    statusPhase = _.clone(scope.challenge.phases[0]);
+                    statusPhase.name = 'Submission';
+                }
+
+                scope.phaseMessage = "Stalled";
+                if (statusPhase)
+                    scope.phaseMessage = statusPhase.name;
+                else if (scope.challenge.status === 'Draft')
+                    scope.phaseMessage = "In Draft";
+            }
+        }
     });

src/app/less/base.less

@@ -1372,4 +1372,25 @@ input[readonly] {
 
 .mce-container > iframe {
   height: 200px !important;
-}
+}
+
+.dropdown-go-to {
+  left: auto;
+  right: 0;
+}
+
+.table-challenge-list {
+  th:first-child {
+    width:46px;
+  }
+}
+
+.table-challenge-overflow {
+  overflow-x: auto;
+}
+
+.dropdown-menu > li > a.link-disabled {
+  cursor: default;
+  pointer-events: none;
+  color: #bbbbbb;
+}

src/app/less/challenge-users-stats.directive.less

@@ -0,0 +1,7 @@
+.challenge-users-stats {
+  min-width: 100px;
+
+  .challenge-users-stats-type:not(:first-child) {
+    margin: 0 0 0 10px;
+  }
+}

src/app/less/style.less

@@ -27,6 +27,10 @@
 @import "spinners.less";
 @import "progress-bar.directive.less";
 
+// Components
+@import "challenge-users-stats.directive.less";
+@import "track-icon.directive.less";
+
 // Landing page styles
 @import "landing.less";