From 41ff15069d96ea1040cb457b39f909967dabb8bc Mon Sep 17 00:00:00 2001 From: thuva4 Date: Tue, 5 Dec 2017 05:13:32 +0530 Subject: Add view option in pods page Created the view function for the pods page. It will redirect to pods/:name page where user can see the more details about the pod. Change-Id: I0d6c06098fd78ecca523a49e2bb532001adaeaa8 Signed-off-by: thuva4 --- .../static/testapi-ui/assets/css/style.css | 24 +++++++--- testapi/opnfv_testapi/ui/app.js | 5 ++ .../opnfv_testapi/ui/components/pods/pod/pod.html | 47 ++++++++++++++++++ .../ui/components/pods/pod/podController.js | 56 ++++++++++++++++++++++ testapi/opnfv_testapi/ui/components/pods/pods.html | 22 ++++----- .../ui/components/pods/podsController.js | 5 ++ testapi/opnfv_testapi/ui/index.html | 1 + 7 files changed, 140 insertions(+), 20 deletions(-) create mode 100644 testapi/opnfv_testapi/ui/components/pods/pod/pod.html create mode 100644 testapi/opnfv_testapi/ui/components/pods/pod/podController.js diff --git a/testapi/3rd_party/static/testapi-ui/assets/css/style.css b/testapi/3rd_party/static/testapi-ui/assets/css/style.css index 3811638..feed1b6 100644 --- a/testapi/3rd_party/static/testapi-ui/assets/css/style.css +++ b/testapi/3rd_party/static/testapi-ui/assets/css/style.css @@ -243,23 +243,23 @@ a.glyphicon { vertical-align: middle; } -.podTable-col { +.podsTable-col { font-size: 20px !important; } -.podTable-col a:not(:first-child) { +.podsTable-col a:not(:first-child) { margin-left: 10px; } -.podTable { +.podsTable { padding: 10px 0; margin: 10px 0; background-color: #fff; } -.podTable .search { +.podsTable .search { width: 150px; } -.podTable >div { +.podsTable >div { display: -webkit-box; display: -ms-flexbox; display: flex; @@ -268,4 +268,16 @@ a.glyphicon { -ms-flex-align: center; align-items: right; margin: 10px 0; -} \ No newline at end of file +} + +.podsTableTd { + border-top:none!important; + float: right!important; + padding-bottom:0px!important; + font-weight:bold; +} + +.podsTableLeftTd{ + border-top:none!important; + padding-bottom:0px!important; +} diff --git a/testapi/opnfv_testapi/ui/app.js b/testapi/opnfv_testapi/ui/app.js index 77fb1fb..28e5810 100644 --- a/testapi/opnfv_testapi/ui/app.js +++ b/testapi/opnfv_testapi/ui/app.js @@ -64,6 +64,11 @@ templateUrl: 'testapi-ui/components/pods/pods.html', controller: 'PodsController as ctrl' }). + state('pod', { + url: '/pods/:name', + templateUrl: 'testapi-ui/components/pods/pod/pod.html', + controller: 'PodController as ctrl' + }). state('projects', { url: '/projects', templateUrl: 'testapi-ui/components/projects/projects.html', diff --git a/testapi/opnfv_testapi/ui/components/pods/pod/pod.html b/testapi/opnfv_testapi/ui/components/pods/pod/pod.html new file mode 100644 index 0000000..b78eb2d --- /dev/null +++ b/testapi/opnfv_testapi/ui/components/pods/pod/pod.html @@ -0,0 +1,47 @@ +Pod +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Id :{{ctrl.data._id}}
Name :{{ctrl.data.name}}
Owner :{{ctrl.data.owner}}
Role :{{ctrl.data.role}}
Mode :{{ctrl.data.mode}}
Created at :{{ctrl.data['creation_date']}}
Details :{{ctrl.data.details}}
+
+
+
+ + +
\ No newline at end of file diff --git a/testapi/opnfv_testapi/ui/components/pods/pod/podController.js b/testapi/opnfv_testapi/ui/components/pods/pod/podController.js new file mode 100644 index 0000000..a2e18e8 --- /dev/null +++ b/testapi/opnfv_testapi/ui/components/pods/pod/podController.js @@ -0,0 +1,56 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +(function () { + 'use strict'; + + angular + .module('testapiApp') + .controller('PodController', PodController); + + PodController.$inject = [ + '$scope', '$http', '$filter', '$state', '$window', '$uibModal', 'testapiApiUrl','raiseAlert', + 'confirmModal' + ]; + + /** + * TestAPI Pod Controller + * This controller is for the '/pod' page where a user can browse + * through pod declared in TestAPI. + */ + function PodController($scope, $http, $filter, $state, $window, $uibModal, testapiApiUrl, + raiseAlert, confirmModal) { + var ctrl = this; + ctrl.url = testapiApiUrl + '/pods'; + ctrl.name = $state.params['name']; + ctrl.loadDetails = loadDetails + + /** + *Contact the testapi and retrevie the pod details + */ + function loadDetails(){ + var podUrl = ctrl.url + '/' + ctrl.name; + ctrl.showError = false; + ctrl.podsRequest = + $http.get(podUrl).success(function (data) { + ctrl.data = data; + }).catch(function (error) { + ctrl.data = null; + ctrl.showError = true; + ctrl.error = error.statusText; + }); + } + ctrl.loadDetails(); + } +})(); \ No newline at end of file diff --git a/testapi/opnfv_testapi/ui/components/pods/pods.html b/testapi/opnfv_testapi/ui/components/pods/pods.html index ca0458b..02f4a48 100644 --- a/testapi/opnfv_testapi/ui/components/pods/pods.html +++ b/testapi/opnfv_testapi/ui/components/pods/pods.html @@ -7,7 +7,7 @@

-
+
@@ -50,10 +50,8 @@ text-align: center;"> Bulk Select Name - Details Role Mode - CreatedAt Operation @@ -65,20 +63,16 @@
{{pod.name}} - {{pod.details}} {{pod.role}} {{pod.mode}} - {{pod.creation_date}} - - - - - - - - - + + + + + + + diff --git a/testapi/opnfv_testapi/ui/components/pods/podsController.js b/testapi/opnfv_testapi/ui/components/pods/podsController.js index fa60143..c66873a 100644 --- a/testapi/opnfv_testapi/ui/components/pods/podsController.js +++ b/testapi/opnfv_testapi/ui/components/pods/podsController.js @@ -46,6 +46,7 @@ ctrl.openCreateModal = openCreateModal ctrl.podDelete = podDelete ctrl.batchDelete = batchDelete; + ctrl.viewPod = viewPod /** * This is called when the date filter calendar is opened. It @@ -117,6 +118,10 @@ }); } + function viewPod(name){ + console.log('hello'); + $state.go('pod', {'name':name}, {reload: true}); + } /** * This will contact the TestAPI to delete a pod for given * name. diff --git a/testapi/opnfv_testapi/ui/index.html b/testapi/opnfv_testapi/ui/index.html index 00c2b9c..3191858 100644 --- a/testapi/opnfv_testapi/ui/index.html +++ b/testapi/opnfv_testapi/ui/index.html @@ -44,6 +44,7 @@ + -- cgit 1.2.3-korg