diff options
author | thuva4 <tharma.thuva@gmail.com> | 2017-11-22 11:08:05 +0530 |
---|---|---|
committer | thuva4 <tharma.thuva@gmail.com> | 2017-11-22 11:10:05 +0530 |
commit | 2b0da4f9ccdd488005f8b01c94153b4b41cad59c (patch) | |
tree | 03556d6d00dfe9a75529f3d19c30c772f58ea920 /testapi/opnfv_testapi/ui | |
parent | 7773c55be4b63fc36c1135edf9226cae35f3d2db (diff) |
showing the response message in the pods page
Edit the response from the server and remove the
traceback part from the error response.
Add create success alert.
Change-Id: I887a9ca1b55050d961c6db1141c15203a978aec1
Signed-off-by: thuva4 <tharma.thuva@gmail.com>
Diffstat (limited to 'testapi/opnfv_testapi/ui')
-rw-r--r-- | testapi/opnfv_testapi/ui/Gruntfile.js | 26 | ||||
-rw-r--r-- | testapi/opnfv_testapi/ui/components/pods/pods.html | 13 | ||||
-rw-r--r-- | testapi/opnfv_testapi/ui/components/pods/podsController.js | 10 |
3 files changed, 25 insertions, 24 deletions
diff --git a/testapi/opnfv_testapi/ui/Gruntfile.js b/testapi/opnfv_testapi/ui/Gruntfile.js index 13f484f..dd116a0 100644 --- a/testapi/opnfv_testapi/ui/Gruntfile.js +++ b/testapi/opnfv_testapi/ui/Gruntfile.js @@ -27,18 +27,12 @@ module.exports = function (grunt) { copy: { assets: { expand: true, - cwd: 'assets', + cwd: '../../3rd_party/static/testapi-ui/assets', src: '**', dest: 'testapi-ui/assets', }, components: { expand: true, - cwd: '../../../opnfv_testapi/ui', - src: '**', - dest: 'components', - }, - copyComponents: { - expand: true, cwd: 'components', src: '**', dest: 'testapi-ui/components', @@ -91,7 +85,7 @@ module.exports = function (grunt) { } }, deleteFiles: { - command: 'rm -r testapi-ui && rm -r components', + command: 'rm -r testapi-ui', options: { async: false } @@ -110,28 +104,28 @@ module.exports = function (grunt) { }, karma: { unit: { - configFile: '../../../opnfv_testapi/tests/UI/karma.conf.js' + configFile: 'karma.conf.js' } }, protractor_coverage: { options: { keepAlive: true, noColor: false, - coverageDir: '../../../opnfv_testapi/tests/UI/coverage', + coverageDir: '../tests/UI/coverage', args: { - specs: ['../../../opnfv_testapi/tests/UI/e2e/podsControllerSpec.js', - '../../../opnfv_testapi/tests/UI/e2e/projectsControllerSpec.js', - '../../../opnfv_testapi/tests/UI/e2e/projectControllerSpec.js'] + specs: ['../tests/UI/e2e/podsControllerSpec.js', + '../tests/UI/e2e/projectsControllerSpec.js', + '../tests/UI/e2e/projectControllerSpec.js'] } }, local: { options: { - configFile: '../../../opnfv_testapi/tests/UI/protractor-conf.js' + configFile: '../tests/UI/protractor-conf.js' } } }, makeReport: { - src: '../../../opnfv_testapi/tests/UI/coverage/*.json', + src: '../tests/UI/coverage/*.json', options: { print: 'detail' } @@ -143,7 +137,6 @@ module.exports = function (grunt) { grunt.registerTask('e2e', [ 'copy:assets', 'copy:components', - 'copy:copyComponents', 'copy:shared', 'copy:filesPng', 'copy:filesIco', @@ -157,6 +150,5 @@ module.exports = function (grunt) { 'protractor_coverage', 'makeReport', 'shell:deleteFiles' - ]); } diff --git a/testapi/opnfv_testapi/ui/components/pods/pods.html b/testapi/opnfv_testapi/ui/components/pods/pods.html index 22f2934..72a9f6c 100644 --- a/testapi/opnfv_testapi/ui/components/pods/pods.html +++ b/testapi/opnfv_testapi/ui/components/pods/pods.html @@ -27,9 +27,18 @@ </div> </div> - <div class="col-md-3" style="margin-top:12px; margin-left:8px;"> + <div class="col-md-1" style="margin-top:12px;"> <button type="submit" class="btn btn-primary" ng-click="ctrl.create()">Create</button> </div> + <div ng-show="ctrl.showError" class="col-md-11 alert alert-danger" role="alert"> + <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> + <span class="sr-only">Error:</span> + {{ctrl.error}} + </div> + <div ng-show="ctrl.showSuccess" class="col-md-11 alert alert-success" role="alert"> + <span class="glyphicon glyphicon-ok" aria-hidden="true"></span> + Create Success + </div> </div> </div> @@ -69,7 +78,7 @@ </table> </div> <br> -<div ng-show="ctrl.showError" class="alert alert-danger" role="alert"> +<div ng-show="ctrl.showError" class="alert alert-danger" ng-class="{ 'hidden': auth.isAuthenticated }" role="alert"> <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> <span class="sr-only">Error:</span> {{ctrl.error}} diff --git a/testapi/opnfv_testapi/ui/components/pods/podsController.js b/testapi/opnfv_testapi/ui/components/pods/podsController.js index 489fa8a..9789cf2 100644 --- a/testapi/opnfv_testapi/ui/components/pods/podsController.js +++ b/testapi/opnfv_testapi/ui/components/pods/podsController.js @@ -78,6 +78,7 @@ */ function create() { ctrl.showError = false; + ctrl.showSuccess = false; if(ctrl.name != ""){ var pods_url = ctrl.url; @@ -88,12 +89,11 @@ details: ctrl.details }; ctrl.podsRequest = - $http.post(pods_url, body).error(function (data, status) { + $http.post(pods_url, body).success(function (data) { + ctrl.showSuccess = true ; + }).catch(function (data) { ctrl.showError = true; - if(status == 403){ - ctrl.error = - 'Error creating the new pod from server: Pod\'s name already exists' - } + ctrl.error = "Error creating the new pod from server: " + data.statusText; }); } else{ |