From 09a3a12526622154d570668cd2be850f6cfbb1e8 Mon Sep 17 00:00:00 2001
From: thuva4 <tharma.thuva@gmail.com>
Date: Thu, 15 Mar 2018 16:42:44 +0530
Subject: Add sort in scenarios page + tests

Change-Id: I1b1e4c9cc3739c4ed13fe4c76562b8c35fed4531
Signed-off-by: thuva4 <tharma.thuva@gmail.com>
---
 .../opnfv_testapi/ui/components/scenarios/scenarios.html    |  9 ++++++++-
 .../ui/components/scenarios/scenariosController.js          | 13 ++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'testapi/opnfv_testapi/ui')

diff --git a/testapi/opnfv_testapi/ui/components/scenarios/scenarios.html b/testapi/opnfv_testapi/ui/components/scenarios/scenarios.html
index 9057b0f..bde946c 100644
--- a/testapi/opnfv_testapi/ui/components/scenarios/scenarios.html
+++ b/testapi/opnfv_testapi/ui/components/scenarios/scenarios.html
@@ -27,7 +27,14 @@
         <tr style="
         text-align: center;">
             <th style="width: 1%;">Bulk&nbsp;Select</th>
-            <th style="width: 80%;">Name</th>
+            <th style="width: 80%;">Name
+                    <a class="text-danger"  ng-click="ctrl.sortBy()" ng-class="{ 'hidden': ctrl.sortName }" >
+                        <span class="glyphicon glyphicon-sort-by-alphabet pull-right" aria-hidden="true"></span>
+                    </a>
+                    <a class="text-danger"  ng-click="ctrl.sortBy()" ng-class="{ 'hidden': !ctrl.sortName}" >
+                        <span class="glyphicon glyphicon-sort-by-alphabet-alt pull-right" aria-hidden="true"></span>
+                    </a>
+            </th>
             <th style="width: 19%;" ng-class="{'hidden': !auth.isAuthenticated}">Operations</th>
         </tr>
         </thead>
diff --git a/testapi/opnfv_testapi/ui/components/scenarios/scenariosController.js b/testapi/opnfv_testapi/ui/components/scenarios/scenariosController.js
index 98e4089..240287c 100644
--- a/testapi/opnfv_testapi/ui/components/scenarios/scenariosController.js
+++ b/testapi/opnfv_testapi/ui/components/scenarios/scenariosController.js
@@ -21,7 +21,7 @@
 
         ScenariosController.$inject = [
         '$scope', '$http', '$filter', '$state', '$window', '$uibModal', 'testapiApiUrl',
-        'raiseAlert', 'confirmModal'
+        'raiseAlert', 'confirmModal', 'sortService'
     ];
 
     /**
@@ -30,7 +30,7 @@
      * through projects declared in TestAPI.
      */
     function ScenariosController($scope, $http, $filter, $state, $window, $uibModal, testapiApiUrl,
-        raiseAlert, confirmModal) {
+        raiseAlert, confirmModal, sortService) {
         var ctrl = this;
         ctrl.url = testapiApiUrl + '/scenarios';
 
@@ -44,8 +44,9 @@
         ctrl.deleteScenario = deleteScenario;
         ctrl.openBatchDeleteModal = openBatchDeleteModal;
         ctrl.deleteBatchScenario = deleteBatchScenario
-
+        ctrl.sortBy = sortBy
         ctrl.checkBox = [];
+        ctrl.sortName = false
 
         function openUpdateModal(name){
             $uibModal.open({
@@ -68,6 +69,11 @@
             confirmModal("Delete", 'scenarios', ctrl.deleteScenario,name);
         }
 
+        function sortBy(){
+            ctrl.data.scenarios = sortService.sortFunction(ctrl.data.scenarios, 'name' , ctrl.sortName)
+            ctrl.sortName=!ctrl.sortName
+        }
+
         function deleteScenario(name){
             var scenarioURL = ctrl.url+"/"+name;
             ctrl.scenarioRequest =
@@ -142,6 +148,7 @@
            ctrl.resultsRequest =
                $http.get(ctrl.url).success(function (data) {
                    ctrl.data = data;
+                   ctrl.sortBy()
                }).catch(function (data)  {
                    ctrl.data = null;
                    ctrl.showError = true;
-- 
cgit 1.2.3-korg