From 397fb1c066ede6b491c922bc976c9e50247d469a Mon Sep 17 00:00:00 2001
From: thuva4 <tharma.thuva@gmail.com>
Date: Thu, 8 Feb 2018 14:41:05 +0530
Subject: Fix the authenticate=false in scenario

fix authetication issue in scenario page
add tests

Change-Id: I5d1457c4fde7c803459352223b1dfb2f970212df
Signed-off-by: thuva4 <tharma.thuva@gmail.com>
---
 .../ui/components/scenarios/scenario/scenario.html | 23 ++++++++--------------
 .../scenarios/scenario/scenarioController.js       |  4 ++--
 2 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'testapi/opnfv_testapi/ui/components/scenarios')

diff --git a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenario.html b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenario.html
index 328a5e6..2a73e9b 100644
--- a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenario.html
+++ b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenario.html
@@ -24,7 +24,7 @@
                                     <p ng-if="!ctrl.collapeInstallers">Show</p>
                             </a>
                         </div>
-                        <div class="col-md-1" style="padding:0px" ng-class="{'hidden' : !ctrl.buttonInstaller || !auth.isAuthenticated}">
+                        <div class="col-md-1" style="padding:0px" ng-class="{'hidden' : !ctrl.buttonInstaller || (!auth.isAuthenticated && authenticate)}">
                             <button type="button" class="btn btn-success btn-xs" ng-click="ctrl.openAddInstaller()" ><i class="fa fa-plus"></i>Add</button>
                         </div>
                         <div ng-class="{ 'hidden' : ! ctrl.collapeInstallers } ">
@@ -39,7 +39,7 @@
                                                     <a ng-click="ctrl.expandInstaller(indexI)">{{installer.installer}}</a>
                                             </td>
                                             <td  style="width:80%;border: none; padding: 0px;" ng-class="{'hidden' : !ctrl.buttonInstaller}">
-                                                    <button type="button" ng-class="{'hidden' : !auth.isAuthenticated}"  class="btn btn-danger btn-xs" ng-click="ctrl.openDeleteInstallerModal(installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
+                                                    <button type="button" ng-class="{'hidden' : !auth.isAuthenticated && authenticate}"  class="btn btn-danger btn-xs" ng-click="ctrl.openDeleteInstallerModal(installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
                                             </td>
                                         </tr>
                                         <tr ng-class="{ 'hidden' : ! ctrl.collapeInstaller[indexI] }">
@@ -54,7 +54,7 @@
                                                     </a>
                                                 </div>
                                                 <div class="col-md-1" style="padding:0px" ng-class="{'hidden' : !ctrl.buttonVersion}">
-                                                    <button type="button" class="btn btn-success btn-xs"  ng-class="{'hidden' : !auth.isAuthenticated}" ng-click="ctrl.openAddVersionModal(installer.installer)" ><i class="fa fa-plus"></i>Add</button>
+                                                    <button type="button" class="btn btn-success btn-xs"  ng-class="{'hidden' : !auth.isAuthenticated && authenticate}" ng-click="ctrl.openAddVersionModal(installer.installer)" ><i class="fa fa-plus"></i>Add</button>
                                                 </div>
                                                 <div ng-class="{ 'hidden' : ! ctrl.collapeVersions[indexI] } " class="col-md-12">
                                                     <div class="table-responsive">
@@ -68,7 +68,7 @@
                                                                     <a ng-click="ctrl.expandVersion(indexI,indexV)">{{version.version}}</a>
                                                                 </td>
                                                                 <td  style="width:80%;border: none; padding: 0px;" ng-class="{'hidden' : !ctrl.buttonVersion}">
-                                                                        <button type="button" class="btn btn-danger btn-xs" ng-class="{'hidden' : !auth.isAuthenticated}"  ng-click="ctrl.openDeleteVersionModal(version.version, installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
+                                                                        <button type="button" class="btn btn-danger btn-xs" ng-class="{'hidden' : !auth.isAuthenticated && authenticate}"  ng-click="ctrl.openDeleteVersionModal(version.version, installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
                                                                 </td>
                                                             </tr>
                                                             <tr style="padding:9px" ng-class="{ 'hidden' : ! ctrl.collapeVersion[indexI][indexV] } ">
@@ -89,7 +89,7 @@
                                                                         </a>
                                                                     </div>
                                                                     <div class="col-md-1" style="padding:0px" ng-class="{'hidden' : !ctrl.buttonProject }">
-                                                                        <button type="button" ng-class="{'hidden' : !auth.isAuthenticated}"  class="btn btn-success btn-xs" ng-click="ctrl.openAddProjectModal(version.version,installer.installer)" ><i class="fa fa-plus"></i>Add</button>
+                                                                        <button type="button" ng-class="{'hidden' : !auth.isAuthenticated && authenticate}"  class="btn btn-success btn-xs" ng-click="ctrl.openAddProjectModal(version.version,installer.installer)" ><i class="fa fa-plus"></i>Add</button>
                                                                     </div>
                                                                     <div ng-class="{ 'hidden' : ! ctrl.collapeProjects[indexI][indexV] } " class="col-md-12">
                                                                         <div class="table-responsive">
@@ -103,7 +103,7 @@
                                                                                     <a ng-click="ctrl.expandProject(indexI, indexV, indexP)">{{project.project}}</a>
                                                                                 </td>
                                                                                 <td  style="width:80%;border: none; padding: 0px;" ng-class="{'hidden' : !ctrl.buttonProject}">
-                                                                                        <button type="button" class="btn btn-danger btn-xs" ng-class="{'hidden' : !auth.isAuthenticated}"  ng-click="ctrl.openDeleteProjectModal(project,version.version, installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
+                                                                                        <button type="button" class="btn btn-danger btn-xs" ng-class="{'hidden' : !auth.isAuthenticated && authenticate}"  ng-click="ctrl.openDeleteProjectModal(project,version.version, installer.installer)" ><i class="fa fa-minus"></i>Delete</button>
                                                                                 </td>
                                                                             </tr>
                                                                             <tr ng-class="{ 'hidden' : ! ctrl.collapeProject[indexI][indexV][indexP] }">
@@ -134,10 +134,6 @@
                                                                                                     </td>
                                                                                                 </tr>
                                                                                             </tbody>
-                                                                                            <tr>
-                                                                                                <button type="button" class="btn btn-success btn-xs" ng-click="ctrl.openAddTrustIndicatorModal(project.project,version.version,installer.installer)"  ng-class="{ 'hidden' : !ctrl.collapeTrustIndicator[index] || !auth.isAuthenticated}">
-                                                                                                    <i class="fa fa-plus"></i>Add</button>
-                                                                                            </tr>
                                                                                             </table>
                                                                                 </td>
                                                                             </tr>
@@ -169,9 +165,6 @@
                                                                                                     </td>
                                                                                             </tr>
                                                                                             </tbody>
-                                                                                            <tr>
-                                                                                                <button type="button" class="btn btn-success btn-xs" ng-click="ctrl.openAddScoreModal(project.project,version.version,installer.installer)"  ng-class="{ 'hidden' : !ctrl.collapeScore[index] || !auth.isAuthenticated}"><i class="fa fa-plus"></i>Add</button>
-                                                                                            </tr>
                                                                                             </table>
                                                                                 </td>
                                                                             </tr>
@@ -191,13 +184,13 @@
                                                                                                     {{custom}}
                                                                                                 </td>
                                                                                                 <td width="90%" class="podsTableLeftTd">
-                                                                                                        <button type="button" class="btn btn-danger btn-xs" ng-click="ctrl.openDeleteCustomModal(custom,project.project,version.version,installer.installer)" ng-class="{'hidden' : !auth.isAuthenticated}" ><i class="fa fa-minus"></i>Delete</button>
+                                                                                                        <button type="button" class="btn btn-danger btn-xs" ng-click="ctrl.openDeleteCustomModal(custom,project.project,version.version,installer.installer)" ng-class="{'hidden' : !auth.isAuthenticated && authenticate}" ><i class="fa fa-minus"></i>Delete</button>
                                                                                                 </td>
                                                                                             </tr>
                                                                                             <tr ng-repeat-end=>
                                                                                             </tr>
                                                                                             <tr>
-                                                                                                <button type="button" class="btn btn-success btn-xs" ng-click="ctrl.openAddCustomModal(project.project,version.version,installer.installer)"  ng-class="{ 'hidden' : !ctrl.collapeCustom[indexI][indexV][indexP] || !auth.isAuthenticated}"><i class="fa fa-plus"></i>Add</button>
+                                                                                                <button type="button" class="btn btn-success btn-xs" ng-click="ctrl.openAddCustomModal(project.project,version.version,installer.installer)"  ng-class="{ 'hidden' : !ctrl.collapeCustom[indexI][indexV][indexP] || (!auth.isAuthenticated && authenticate)}"><i class="fa fa-plus"></i>Add</button>
                                                                                             </tr>
                                                                                             </tbody>
                                                                                             </table>
diff --git a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js
index 53eb13a..9935649 100644
--- a/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js
+++ b/testapi/opnfv_testapi/ui/components/scenarios/scenario/scenarioController.js
@@ -21,7 +21,7 @@
 
         ScenarioController.$inject = [
         '$scope', '$http', '$filter', '$state', '$window', '$uibModal', 'testapiApiUrl','raiseAlert',
-        'confirmModal'
+        'confirmModal', 'authenticate'
     ];
 
     /**
@@ -30,7 +30,7 @@
      * through Scenario declared in TestAPI.
      */
     function ScenarioController($scope, $http, $filter, $state, $window, $uibModal, testapiApiUrl,
-        raiseAlert, confirmModal) {
+        raiseAlert, confirmModal, authenticate) {
         var ctrl = this;
         ctrl.name = $state.params['name'];
         ctrl.url = testapiApiUrl + '/scenarios?name=' + ctrl.name;
-- 
cgit 1.2.3-korg