Merge remote-tracking branch 'origin/develop'

jmgasper · jmgasper · commit 330275d866b0 · 2020-01-28T11:34:06.000+11:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/TopcoderXDeploy.md b/TopcoderXDeploy.md
@@ -159,7 +159,7 @@ Once you have registered your account, go into `Project Management` and add a ne
 
 Use Topcoder Direct ID `7377` since this has a valid billing account in the dev environment.
 
-Once it's been added, click `Edit` for the project in the list on `Project Management` and click `Add Webhooks`.  Once the webhook has been added, you should be able to see it in the Gitlab project under `Settings` --> `Integrations` --> `Webhooks`
+Once it's been added, click `Manage` for the project in the list on `Project Management` and click `Add Webhooks`.  Once the webhook has been added, you should be able to see it in the Gitlab project under `Settings` --> `Integrations` --> `Webhooks`
 
 To test the webhook, create a new issue in the project with a title like `[$1] This is a test issue`
 
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
         "angular-storage": "~0.0.11",
         "angular-touch": "~1.7.4",
         "angular-ui-bootstrap": "~2.5.0",
-        "angular-ui-router": "~0.2.13",
+        "angular-ui-router": "~1.0.23",
         "auth0-angular": "~4.0.4",
         "auth0-js": "^9.11.3",
         "auth0-lock": "^11.17.2",
diff --git a/src/common/constants.js b/src/common/constants.js
@@ -43,7 +43,7 @@ const GITLAB_MAX_PER_PAGE = Number.MAX_SAFE_INTEGER;
 const GITLAB_DEFAULT_GROUP_ACCESS_LEVEL = 30;
 
 // The Gitlab access token default expiration in seconds
-const GITLAB_ACCESS_TOKEN_DEFAULT_EXPIRATION = 3600;
+const GITLAB_ACCESS_TOKEN_DEFAULT_EXPIRATION = 3600 * 24 * 14;
 
 // The Gitlab refresh token time in seconds before expiration
 const GITLAB_REFRESH_TOKEN_BEFORE_EXPIRATION = 300;
diff --git a/src/common/db-helper.js b/src/common/db-helper.js
@@ -17,7 +17,7 @@ const logger = require('./logger');
  */
 async function getById(model, id) {
   return await new Promise((resolve, reject) => {
-    model.query('id').eq(id).exec((err, result) => {
+    model.query('id').eq(id).consistent().all().exec((err, result) => {
       if (err) {
         logger.error(`DynamoDB getById error ${err}`);
         reject(err);
@@ -47,6 +47,39 @@ async function scan(model, scanParams) {
   });
 }
 
+/**
+ * Get single data by query parameters
+ * @param {Object} model The dynamoose model to query
+ * @param {String} repositoryId The repository id to query
+ * @param {Number} number The number id to query
+ * @param {String} provider The provider id to query
+ * @returns {Promise<void>}
+ */
+async function queryOneIssue(model, repositoryId, number, provider) {
+  logger.debug('Enter queryOne.');
+
+  return await new Promise((resolve, reject) => {
+
+    logger.debug(`repositoryId : ${repositoryId}`);
+    logger.debug(`number : ${number}`);
+    logger.debug(`provider : ${provider}`);
+    model.query('repositoryId').eq(repositoryId)
+    .filter('number').eq(number)
+    .filter('provider').eq(provider)
+    .all()
+    .exec((err, result) => {
+      if (err) {
+        logger.debug(`queryOne. Error. ${err}`);
+        return reject(err);
+      }
+      logger.debug('queryOne. Result.');
+      logger.debug(result);
+
+      return resolve(result.count === 0 ? null : result[0]);
+    });
+  });
+}
+
 /**
  * Get single data by scan parameters
  * @param {Object} model The dynamoose model to scan
@@ -55,7 +88,7 @@ async function scan(model, scanParams) {
  */
 async function scanOne(model, scanParams) {
   return await new Promise((resolve, reject) => {
-    model.scan(scanParams).exec((err, result) => {
+    model.scan(scanParams).consistent().all().exec((err, result) => {
       if (err) {
         logger.error(`DynamoDB scanOne error ${err}`);
         reject(err);
@@ -136,4 +169,5 @@ module.exports = {
   create,
   update,
   remove,
+  queryOneIssue
 };
diff --git a/src/front/src/app/main/issue.service.js b/src/front/src/app/main/issue.service.js
@@ -9,14 +9,25 @@ angular.module('topcoderX')
     .factory('IssueService', ['$http', 'Helper', function ($http, Helper) {
         var baseUrl = Helper.baseUrl;
         var service = {};
+        var issuesDataPromise = {};
+        var issuesGetLock = {};
 
         /**
          * search for issues
          */
         service.search = function (label, sortBy, sortDir, pageNo, pageSize) {
-            return $http.get(baseUrl + '/api/v1/issues?label=' + label + '&sortBy=' + sortBy + '&sortDir=' + sortDir + '&page=' + pageNo + '&perPage=' + pageSize).then(function (response) {
+            var url = baseUrl + '/api/v1/issues?label=' + label + '&sortBy=' + sortBy + '&sortDir=' + sortDir + '&page=' + pageNo + '&perPage=' + pageSize;
+
+            if (issuesGetLock[url]) {
+                return issuesDataPromise[url];
+            }
+
+            issuesGetLock[url] = true;
+            issuesDataPromise[url] = $http.get(url).then(function (response) {
+                issuesGetLock[url] = false;
                 return response;
             });
+            return issuesDataPromise[url];
         };
 
         /**
diff --git a/src/front/src/app/projects/project.service.js b/src/front/src/app/projects/project.service.js
@@ -9,6 +9,9 @@ angular.module('topcoderX')
   .factory('ProjectService', ['Helper', '$http', function (Helper, $http) {
     // object we will return
     var ProjectService = {};
+    var projectsDataPromise = {};
+    var projectsGetLock = {};
+
     /**
      * Create a project
      * @param project  the project to be created
@@ -23,9 +26,17 @@ angular.module('topcoderX')
      * Get all projects
      */
     ProjectService.getProjects = function (status, showAll) {
-      return $http.get(Helper.baseUrl + '/api/v1/projects?status=' + status + '&showAll=' + showAll).then(function (response) {
+      var url = Helper.baseUrl + '/api/v1/projects?status=' + status + '&showAll=' + showAll;
+      if (projectsGetLock[url]) {
+        return projectsDataPromise[url];
+      }
+
+      projectsGetLock[url] = true;
+      projectsDataPromise[url] = $http.get(url).then(function (response) {
+        projectsGetLock[url] = false;
         return response;
       });
+      return projectsDataPromise[url];
     };
 
     /**
diff --git a/src/front/src/app/projects/projects.controller.js b/src/front/src/app/projects/projects.controller.js
@@ -52,6 +52,7 @@ angular.module('topcoderX')
         ProjectService.getProjects(status, $scope.filter.showAll).then(function (response) {
           $scope.isLoaded = true;
           $scope.projects = response.data;
+          $scope.allProjects = angular.copy($scope.projects);
           $timeout(function () {
             $scope.init();
           }, 1000);
@@ -78,4 +79,32 @@ angular.module('topcoderX')
         $scope.filter.showAll = !$scope.filter.showAll;
         $scope.getProjects($scope.state.status);
       };
-    }]);
+
+
+      $scope.onSearchChange = function (obj) {
+        $scope.searchText = obj.searchText;
+        if (!obj.searchText || obj.searchText.length === 0) {
+          $scope.getProjects($scope.state.status);
+        }
+
+        if ($scope.allProjects.length > 0) {
+            _searchLocal(obj.searchText);
+        }
+      };
+
+      $scope.onSearchIconClicked = function () {
+        if ($scope.allProjects.length > 0 && $scope.searchText) {
+            _searchLocal($scope.searchText);
+        }
+      };
+
+      function _searchLocal(query) {
+        $scope.projects = $scope.allProjects.filter(function(value) {
+          return value['title'].toLowerCase().includes(query.toLowerCase());
+        })
+        $timeout(function () {
+          $('.footable').filter('[data-page="0"]').trigger('click');
+        }, 1000);
+      }
+
+  }]);
diff --git a/src/front/src/app/projects/projects.html b/src/front/src/app/projects/projects.html
@@ -30,7 +30,7 @@ <h2>{{title}}</h2>
                                 <uib-tab index="0" heading="Current Projects" select="getProjects('active')">
                                     <br />
                                     <div ng-if="isLoaded">
-                                        <div ng-show="projects.length===0">
+                                        <div ng-show="allProjects.length===0">
                                             <div class="text-center m-t-lg">
                                                 <h4>You don't have active projects right now. Please
                                                     <button class="btn btn-sm btn-info" ng-click="goProject()">
@@ -41,7 +41,17 @@ <h4>You don't have active projects right now. Please
                                                 </h4>
                                             </div>
                                         </div>
-                                        <div ng-hide="projects.length===0">
+                                        <div ng-hide="allProjects.length===0">
+                                            <div class="col-lg-4" style="padding-left: 0px">
+                                                <div class="input-group custom-search-form">
+                                                    <input ng-model="searchText" type="text" class="form-control" placeholder="Find projects" ng-change="onSearchChange(this)">
+                                                    <span class="input-group-btn">
+                                                        <button class="btn btn-default" type="button" ng-click="onSearchIconClicked('github')">
+                                                            <span class="glyphicon glyphicon-search"></span>
+                                                        </button>
+                                                    </span>
+                                                </div>
+                                            </div>
                                             <table class="footable table table-stripped toggle-arrow-tiny"
                                                 data-page-navigation=".pagination" data-page-size="10">
                                                 <thead>
@@ -68,12 +78,12 @@ <h4>You don't have active projects right now. Please
                                                         <td class="col-lg-2" ng-show="isAdminUser">{{project.owner}}</td>
                                                         <td class="col-lg-2">
                                                             <button class="btn btn-sm btn-success" ng-click="goProject(project)">
-                                                                <strong>Edit</strong>
+                                                                <strong>Manage</strong>
                                                             </button>
                                                         </td>
                                                     </tr>
                                                 </tbody>
-                                                <tfoot>
+                                                <tfoot ng-hide="searchText">
                                                     <tr>
                                                         <td colspan="{{isAdminUser? 5: 4}}">
                                                             <ul class="pagination pull-right"></ul>
@@ -87,10 +97,20 @@ <h4>You don't have active projects right now. Please
                                 <uib-tab index="1" heading="Archived Projects" select="getProjects('archived')">
                                     <br />
                                     <div ng-if="isLoaded">
-                                        <div ng-show="projects.length===0" class="text-center m-t-lg">
+                                        <div ng-show="allProjects.length===0" class="text-center m-t-lg">
                                             <p>No projects have been archived.</p>
                                         </div>
-                                        <div ng-hide="projects.length===0">
+                                        <div ng-hide="allProjects.length===0">
+                                            <div class="col-lg-4" style="padding-left: 0px">
+                                                <div class="input-group custom-search-form">
+                                                    <input ng-model="searchText" type="text" class="form-control" placeholder="Find projects" ng-change="onSearchChange(this)">
+                                                    <span class="input-group-btn">
+                                                        <button class="btn btn-default" type="button" ng-click="onSearchIconClicked()">
+                                                            <span class="glyphicon glyphicon-search"></span>
+                                                        </button>
+                                                    </span>
+                                                </div>
+                                            </div>
                                             <table class="footable table table-stripped toggle-arrow-tiny"
                                                 data-page-size="10">
                                                 <thead>
@@ -112,12 +132,12 @@ <h4>You don't have active projects right now. Please
                                                         <td class="col-lg-2" ng-show="isAdminUser">{{archivedProject.owner}}</td>
                                                         <td class="col-lg-2">
                                                             <button class="btn btn-sm btn-success" ng-click="goProject(archivedProject)">
-                                                                <strong>Edit</strong>
+                                                                <strong>Manage</strong>
                                                             </button>
                                                         </td>
                                                     </tr>
                                                 </tbody>
-                                                <tfoot>
+                                                <tfoot ng-hide="searchText">
                                                     <tr>
                                                         <td colspan="{{isAdminUser? 5: 4}}">
                                                             <ul class="pagination pull-right"></ul>
diff --git a/src/front/src/app/upsertissue/upsertissue.controller.js b/src/front/src/app/upsertissue/upsertissue.controller.js
@@ -6,16 +6,18 @@
 'use strict';
 
 angular.module('topcoderX').controller('IssueController', ['currentUser', '$scope', '$timeout', 'ProjectService', 'IssueService',
-  '$rootScope', '$state', 'Alert',
+  '$rootScope', '$state', 'Alert', '$log',
   function (currentUser, $scope, $timeout, ProjectService, IssueService, $rootScope, $state,
-    Alert) {
+    Alert, $log) {
     // Maintain the navigation state.
     $timeout(function () {
       angular.element('#projectsManagement').addClass('active');
     }, 0);
 
     // get topcoderx projects
     $scope.getProjects = function () {
+      $log.log('getProjects dipanggil cui... dari upsert');
+
       ProjectService.getProjects('active', false).then(function (response) {
         $scope.projects = response.data;
         if ($scope.projects.length === 0) {
diff --git a/src/front/src/app/upsertproject/upsertproject.controller.js b/src/front/src/app/upsertproject/upsertproject.controller.js
@@ -26,7 +26,7 @@ angular.module('topcoderX').controller('ProjectController', ['currentUser', '$sc
       archived: false,
     };
     if ($rootScope.project) {
-      $scope.title = 'Edit a Project';
+      $scope.title = 'Manage a Project';
       $scope.project = $rootScope.project;
       $scope.project.id = $rootScope.project.id;
       $scope.project.copilot = $rootScope.project.copilot;
@@ -92,9 +92,14 @@ angular.module('topcoderX').controller('ProjectController', ['currentUser', '$sc
       } else {
         ProjectService.create($scope.project).then(function () {
           Alert.info('Project has been added successfully, and Topcoder X issue labels, webhook, and wiki rules have been added to the repository', $scope);
-          $state.go('app.projects');
+          setTimeout(function() {
+            $state.go('app.projects');
+          }, 3000);
         }).catch(function (error) {
           Alert.error(error.data.message, $scope);
+          setTimeout(function() {
+            $state.go('app.projects');
+          }, 3000);
         });
       }
     };
diff --git a/src/front/src/app/upsertproject/upsertproject.html b/src/front/src/app/upsertproject/upsertproject.html
@@ -6,7 +6,7 @@ <h2>{{title}}</h2>
     </div>
 
     <div class="pull-right" ng-if="editing">
-      <div class="pull-right col-lg-8" ng-if="editing">
+      <div class="pull-right col-lg-12" ng-if="editing">
         <div class="pull-right col-lg-2" ng-if="!isAdminUser"></div>
         <div class="pull-right col-lg-2 with-button btn-top" ng-if="isAdminUser">
           <button class="btn btn-sm btn-info btn-top" ng-click="openTransferOwnershipDialog()">
@@ -20,8 +20,6 @@ <h2>{{title}}</h2>
             <strong>Recreate an Issue</strong>
           </button>
         </div>
-      </div>
-      <div class="pull-right col-lg-8" ng-if="editing">
         <div class="pull-right col-lg-2 with-button btn-top">
           <button class="btn btn-sm btn-info btn-top" ng-click="addWikiRules()">
             <strong>
diff --git a/src/services/IssueService.js b/src/services/IssueService.js
@@ -238,22 +238,6 @@ async function recreate(issue, currentUser) {
     },
   };
 
-  const dbIssue = await dbHelper.scanOne(models.Issue, {
-    number: issueNumber,
-    projectId: issue.projectId
-  });
-
-  if (!issue.recreate) {
-    if (dbIssue) dbIssue.delete();
-    return {
-      success: true
-    };
-  }
-
-  if (!dbIssue) {
-    createEvent.event = 'issue.created';
-  }
-
   const labels = [];
 
   if (provider === 'github') {
@@ -315,6 +299,22 @@ async function recreate(issue, currentUser) {
     }
   }
 
+  const dbIssue = await dbHelper.queryOneIssue(models.Issue, 
+    createEvent.data.repository.id,
+    issueNumber,
+    provider);
+
+  if (!issue.recreate) {
+    if (dbIssue) dbIssue.delete();
+    return {
+      success: true
+    };
+  }
+
+  if (!dbIssue) {
+    createEvent.event = 'issue.created';
+  }
+
   if (labels.length > 0) {
     createEvent.data.issue.labels = labels;
   }
diff --git a/src/services/ProjectService.js b/src/services/ProjectService.js
@@ -127,9 +127,14 @@ async function create(project, currentUser) {
 
   const createdProject = await dbHelper.create(models.Project, project);
 
-  await createLabel({projectId: project.id}, currentUser);
-  await createHook({projectId: project.id}, currentUser);
-  await addWikiRules({projectId: project.id}, currentUser);
+  try {
+    await createLabel({projectId: project.id}, currentUser);
+    await createHook({projectId: project.id}, currentUser);
+    await addWikiRules({projectId: project.id}, currentUser);
+  }
+  catch (err) {
+    throw new Error('Project created. Adding the webhook, issue labels, and wiki rules failed.');
+  }
 
   return createdProject;
 }
