summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthuva4 <tharma.thuva@gmail.com>2018-01-11 18:24:31 +0530
committerthuva4 <tharma.thuva@gmail.com>2018-01-16 09:41:26 +0530
commit16e83d89c4d4d64188bf6d0249050b2740dfd913 (patch)
tree15b296a5388276f9ca2f9d04ba4474b7354cea79
parente4f902c091e47a2958d3c39d284a77875541a623 (diff)
Bug fixes in results, tastcases and header file
Remove the profile, signout option in authenticate false made Remove the sever request in authenticate false made Remove stop date, start date in results page Add build tag in results page fix issue in test cases page Change-Id: Ic3d16f53591017d2529926e4e3374aaa245c7dce Signed-off-by: thuva4 <tharma.thuva@gmail.com>
-rw-r--r--testapi/opnfv_testapi/ui/app.js43
-rw-r--r--testapi/opnfv_testapi/ui/components/profile/profileController.js11
-rw-r--r--testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html6
-rw-r--r--testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js3
-rw-r--r--testapi/opnfv_testapi/ui/components/projects/projects.html10
-rw-r--r--testapi/opnfv_testapi/ui/components/projects/projectsController.js4
-rw-r--r--testapi/opnfv_testapi/ui/components/results/results.html8
-rw-r--r--testapi/opnfv_testapi/ui/shared/header/header.html2
8 files changed, 47 insertions, 40 deletions
diff --git a/testapi/opnfv_testapi/ui/app.js b/testapi/opnfv_testapi/ui/app.js
index 3da12b1..d5cf0f9 100644
--- a/testapi/opnfv_testapi/ui/app.js
+++ b/testapi/opnfv_testapi/ui/app.js
@@ -144,6 +144,7 @@
function setup($http, $rootScope, $window, $state, testapiApiUrl, authenticate) {
$rootScope.auth = {};
+ $rootScope.authenticate = authenticate
$rootScope.auth.doSignIn = doSignIn;
$rootScope.auth.doSignOut = doSignOut;
$rootScope.auth.doSignCheck = doSignCheck;
@@ -160,10 +161,14 @@
/** This function will initate a sign out. */
function doSignOut() {
- $rootScope.auth.currentUser = null;
- $rootScope.auth.isAuthenticated = false;
- $rootScope.auth.projectNames = [];
- $window.location.href = sign_out_url;
+ if(authenticate){
+ $rootScope.auth.currentUser = null;
+ $rootScope.auth.isAuthenticated = false;
+ $rootScope.auth.projectNames = [];
+ $window.location.href = sign_out_url;
+ }else{
+ $state.go("home", {reload: true})
+ }
}
/**
@@ -171,21 +176,23 @@
* authenticated.
*/
function doSignCheck() {
- return $http.get(profile_url, {withCredentials: true}).
- success(function (data) {
- $rootScope.auth.currentUser = data;
- $rootScope.auth.isAuthenticated = true;
- if(authenticate){
+ if(authenticate){
+ return $http.get(profile_url, {withCredentials: true}).
+ success(function (data) {
+ $rootScope.auth.currentUser = data;
+ $rootScope.auth.isAuthenticated = true;
$rootScope.auth.projectNames = $rootScope.auth.doSubmitterCheck(data.groups);
- }else{
- $rootScope.auth.projectNames = ["anonymous"]
- }
- }).
- error(function () {
- $rootScope.auth.currentUser = null;
- $rootScope.auth.isAuthenticated = false;
- $rootScope.auth.projectNames = [];
- });
+ }).
+ error(function () {
+ $rootScope.auth.currentUser = null;
+ $rootScope.auth.isAuthenticated = false;
+ $rootScope.auth.projectNames = [];
+ });
+ }else{
+ $rootScope.auth.currentUser = null;
+ $rootScope.auth.isAuthenticated = true;
+ $rootScope.auth.projectNames = []
+ }
}
function doSubmitterCheck(groups){
diff --git a/testapi/opnfv_testapi/ui/components/profile/profileController.js b/testapi/opnfv_testapi/ui/components/profile/profileController.js
index 5dbdf7b..e34e745 100644
--- a/testapi/opnfv_testapi/ui/components/profile/profileController.js
+++ b/testapi/opnfv_testapi/ui/components/profile/profileController.js
@@ -35,7 +35,7 @@
ProfileController.$inject = [
'$scope', '$http', 'testapiApiUrl', 'PubKeys',
- '$uibModal', 'raiseAlert', '$state'
+ '$uibModal', 'raiseAlert', '$state' , 'authenticate'
];
/**
@@ -44,7 +44,7 @@
* account-specific information.
*/
function ProfileController($scope, $http, testapiApiUrl,
- PubKeys, $uibModal, raiseAlert, $state) {
+ PubKeys, $uibModal, raiseAlert, $state, authenticate) {
var ctrl = this;
@@ -53,7 +53,7 @@
ctrl.openShowPubKeyModal = openShowPubKeyModal;
// Must be authenticated to view this page.
- if (!$scope.auth.isAuthenticated) {
+ if (!$scope.auth.isAuthenticated || !authenticate) {
$state.go('home');
}
@@ -115,8 +115,9 @@
ctrl.updatePubKeys();
});
}
-
- ctrl.authRequest = $scope.auth.doSignCheck().then(ctrl.updatePubKeys);
+ if(authenticate){
+ ctrl.authRequest = $scope.auth.doSignCheck().then(ctrl.updatePubKeys);
+ }
}
angular
diff --git a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
index 00dd0f1..ee87e0a 100644
--- a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
+++ b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCases.html
@@ -47,9 +47,9 @@
{{testcase.name}}
</a>
</td>
- <td>{{ ctrl.data.tier}}</td>
- <td>{{ctrl.data.blocking}}</td>
- <td>{{ctrl.data.ci_loop}}</td>
+ <td>{{testcase.tier}}</td>
+ <td>{{testcase.blocking}}</td>
+ <td>{{testcase.ci_loop}}</td>
<td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">
<span class="podsTable-col">
<a class="text-warning" ng-click="testCasesCtrl.openUpdateTestModal(testcase.name)" title="Edit">
diff --git a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
index 0045284..6d3c245 100644
--- a/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
+++ b/testapi/opnfv_testapi/ui/components/projects/project/testCases/testCasesController.js
@@ -244,12 +244,13 @@
{label: 'blocking', type: 'text', required: false},
{label: 'criteria', type: 'text', required: false},
{label: 'domains', type: 'text', required: false},
+ {label: 'ci_loop', type: 'text', required: false},
{label: 'catalog_description', type: 'text', required: false}
];
ctrl.testcase = {name : null, description : null,version : null, tier : null, tags : null,
run : null, dependencies : null, trust : null, url : null, blocking : null,
- criteria : null, domains : null, catalog_description : null};
+ criteria : null, domains : null, ci_loop: null, catalog_description : null};
if(ctrl.data.text=="Update"){
ctrl.testcase = ctrl.data.testCase
diff --git a/testapi/opnfv_testapi/ui/components/projects/projects.html b/testapi/opnfv_testapi/ui/components/projects/projects.html
index 8a27a57..5a3b421 100644
--- a/testapi/opnfv_testapi/ui/components/projects/projects.html
+++ b/testapi/opnfv_testapi/ui/components/projects/projects.html
@@ -2,13 +2,13 @@
<div class="row" style="margin-bottom:24px;"></div>
<div class="row podsTable" style="vertical-align:middle">
- <div class="col-sm-1 pull-right" ng-class="{ 'hidden': ! ((auth.projectNames.length>0) &&
- auth.isAuthenticated) }" >
+ <div class="col-sm-1 pull-right" ng-class="{ 'hidden': !((auth.projectNames.length>0) &&
+ auth.isAuthenticated) && authenticate}" >
<button type="button" class="btn btn-danger" ng-click="ctrl.openBatchDeleteModal()">
<i class="fa fa-minus"></i> Delete</button>
</div>
<div class="col-sm-1 pull-right" ng-class="{ 'hidden': ! ((auth.projectNames.length>0) &&
- auth.isAuthenticated) }">
+ auth.isAuthenticated) && authenticate}">
<button type="button" class="btn btn-success" ng-click="ctrl.openCreateModal()">
<i class="fa fa-plus"></i> Create</button>
</div>
@@ -40,7 +40,7 @@
<th style="width: 1%;">Bulk Select</th>
<th style="width: 19%;">Name</th>
<th style="width: 70%;">Description</th>
- <th style="width: 10%;" ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">Operations</th>
+ <th style="width: 10%;" ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated) && authenticate}">Operations</th>
</tr>
</thead>
<tbody>
@@ -52,7 +52,7 @@
</td>
<td><a class="text-info" ng-click="ctrl.viewProject(project.name)">{{project.name}}</a></td>
<td>{{project.description}}</td>
- <td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated)}">
+ <td ng-class="{'hidden': ! ((auth.projectNames.length>0) && auth.isAuthenticated) && authenticate}">
<span class="podsTable-col">
<a class="text-warning" ng-click="ctrl.openUpdateModal(project.name)" title="Edit" >
<i class="fa fa-pencil-square-o"></i></a>
diff --git a/testapi/opnfv_testapi/ui/components/projects/projectsController.js b/testapi/opnfv_testapi/ui/components/projects/projectsController.js
index 38764ea..bb394c0 100644
--- a/testapi/opnfv_testapi/ui/components/projects/projectsController.js
+++ b/testapi/opnfv_testapi/ui/components/projects/projectsController.js
@@ -21,7 +21,7 @@
ProjectsController.$inject = [
'$scope', '$http', '$filter', '$state', '$window', '$uibModal', 'testapiApiUrl',
- 'raiseAlert', 'confirmModal'
+ 'raiseAlert', 'confirmModal', 'authenticate'
];
/**
@@ -30,7 +30,7 @@
* through projects declared in TestAPI.
*/
function ProjectsController($scope, $http, $filter, $state, $window, $uibModal, testapiApiUrl,
- raiseAlert, confirmModal) {
+ raiseAlert, confirmModal, authenticate) {
var ctrl = this;
ctrl.url = testapiApiUrl + '/projects';
diff --git a/testapi/opnfv_testapi/ui/components/results/results.html b/testapi/opnfv_testapi/ui/components/results/results.html
index 7809065..b0c05ba 100644
--- a/testapi/opnfv_testapi/ui/components/results/results.html
+++ b/testapi/opnfv_testapi/ui/components/results/results.html
@@ -103,14 +103,13 @@
<th>Version</th>
<th>Scenario</th>
<th>Criteria</th>
- <th>Start Date</th>
- <th>Stop Date</th>
+ <th>Build&nbsp;tag</th>
</tr>
</thead>
<tbody>
<tr ng-repeat-start="(index, result) in ctrl.data.results">
- <td><a ng-click="ctrl.viewResult(result._id)">{{ result._id }}</a></td>
+ <td><a ng-click="ctrl.viewResult(result._id)">{{ result._id.substr(-8) }}</a></td>
<td>{{ result.pod_name }}</td>
<td>{{ result.project_name }}</td>
<td>{{ result.case_name }}</td>
@@ -118,8 +117,7 @@
<td>{{ result.version }}</td>
<td>{{ result.scenario }}</td>
<td>{{ result.criteria }}</td>
- <td>{{ result.start_date }}</td>
- <td>{{ result.stop_date }}</td>
+ <td>{{ result["build_tag"]}}</td>
</tr>
<tr ng-repeat-end=>
</tr>
diff --git a/testapi/opnfv_testapi/ui/shared/header/header.html b/testapi/opnfv_testapi/ui/shared/header/header.html
index d0501a2..2300594 100644
--- a/testapi/opnfv_testapi/ui/shared/header/header.html
+++ b/testapi/opnfv_testapi/ui/shared/header/header.html
@@ -21,7 +21,7 @@ TestAPI
<li ng-class="{ active: header.isActive('/projects')}"><a ui-sref="projects">Projects</a></li>
<li ng-class="{ active: header.isActive('/results')}"><a ui-sref="results">Results</a></li>
</ul>
- <ul class="nav navbar-nav navbar-right">
+ <ul class="nav navbar-nav navbar-right" ng-class="{'hidden' : !authenticate}">
<li ng-class="{ active: header.isActive('/profile')}" ng-if="auth.isAuthenticated"><a ui-sref="profile">Profile</a></li>
<li ng-if="auth.isAuthenticated"><a href="" ng-click="auth.doSignOut()">Sign Out</a></li>
<li ng-if="!auth.isAuthenticated"><a href="" ng-click="auth.doSignIn()">Sign In / Sign Up</a></li>