From 99565bb6bd87cfc46591cea73985c58c3a3697dd Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Mon, 10 Jul 2017 14:04:15 -0400
Subject: [PORTAL-20,PORTAL-23,PORTAL-32] Repair defects

PORTAL-20: remove mariadb client reference from be-common pom

PORTAL-23: Release Portal's SDK version 1.1.0

PORTAL-32: API URL correction for onboarded Apps

Change-Id: If75b54ca9202f94ce63c59343b94384da1040912
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../support/get-access/get-access.controller.js    | 24 ++++++++++++++--------
 .../views/support/get-access/get-access.tpl.html   |  4 +---
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/support/get-access')

diff --git a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js
index c93d8643..0c43c1fa 100644
--- a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.controller.js
@@ -20,36 +20,42 @@
 'use strict';
 (function () {
     class GetAccessCtrl {
-        constructor($log, $scope,  $stateParams, getAccessService, userProfileService, ExternalRequestAccessService, applicationsService, ngDialog) {
+        constructor($log, $scope,  $stateParams, filterFilter, getAccessService, userProfileService, ExternalRequestAccessService, applicationsService, ngDialog) {
         	// $log.debug('GetAccessCtrl: appService param is: ' + applicationsService.goGetAccessAppName);
         	var resultAccessValue = null;
-        	var externalRequest = true;
-        	
+       	
         	$scope.openAppRoleModal = (itemData) => {    	
         		if(resultAccessValue){
         		let data = null;
                     data = {
                         dialogState: 2,
                         selectedUser:{
-                            attuid: $scope.attuid,
+                            orgUserId: $scope.orgUserId,
                             firstName: $scope.firstName,
                             lastName: $scope.lastName,
                             headerText: itemData.app_name,
-                            extReqValue : externalRequest
                         }
                     }
                 ngDialog.open({
-                    templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html',
-                    controller: 'NewCatalogModalCtrl',
+                    templateUrl: 'app/views/catalog/request-access-catalog-dialogs/request-access-catalog.modal.html',
+                    controller: 'ExternalRequestAccessCtrl',
                     controllerAs: 'userInfo',
                     data: data
                 });
         		}
             }
         	
+            $scope.$watch('access.searchString', function (searchKey) {
+                var search = searchKey;               
+                this.totalPage = filterFilter($scope.access.appTable, search);
+                var resultLen = this.totalPage.length;
+                $scope.access.totalPage = Math.ceil(resultLen/$scope.access.viewPerPage);
+                $scope.access.currentPage = 1;
+            });
+        	
             userProfileService.getUserProfile().then(
         			function(profile) {
-        				$scope.attuid = profile.orgUserId;
+        				$scope.orgUserId = profile.orgUserId;
         				$scope.firstName = profile.firstName;
         				$scope.lastName = profile.lastName;
         	  });
@@ -120,6 +126,6 @@
             init();
         }
     }
-    GetAccessCtrl.$inject = ['$log', '$scope', '$stateParams', 'getAccessService', 'userProfileService', 'ExternalRequestAccessService','applicationsService', 'ngDialog'];
+    GetAccessCtrl.$inject = ['$log', '$scope', '$stateParams', 'filterFilter', 'getAccessService', 'userProfileService', 'ExternalRequestAccessService','applicationsService', 'ngDialog'];
     angular.module('ecompApp').controller('GetAccessCtrl', GetAccessCtrl);
 })();
diff --git a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html
index 08ccbf48..ef0c2428 100644
--- a/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html
+++ b/ecomp-portal-FE-common/client/app/views/support/get-access/get-access.tpl.html
@@ -50,12 +50,11 @@
 								</tr>
 							</thead>
 							<tbody b2b-table-row type="body"
-								row-repeat="rowData in access.appTable | filter:access.searchString | limitTo:access.viewPerPage:access.startIndex | orderBy:'ecomp_function'"  track-by="$index">
+								row-repeat="rowData in access.appTable | filter:access.searchString | startFrom:(access.currentPage-1)*access.viewPerPage | limitTo:access.viewPerPage | orderBy:'ecomp_function'"  track-by="$index">
 								<tr id="tr-rowData" ng-click="openAppRoleModal(rowData)">
 									<td b2b-table-body>
 										<div id="access-page-function"
 											ng-if="rowData.ecomp_function !== 'Ecomp Function Not Available'"
-											ng-show="$index == 0 || access.appTable[$index-1].ecomp_function != rowData.ecomp_function"
 											ng-bind="rowData.ecomp_function"></div>
 										<div id="access-page-function"
 											ng-if="rowData.ecomp_function === 'Ecomp Function Not Available'"
@@ -63,7 +62,6 @@
 									</td>
 									<td b2b-table-body>
 										<div id="access-page-appName"
-											ng-show="$index == 0 || access.appTable[$index-1].app_name != rowData.app_name"
 											ng-bind="rowData.app_name"></div>
 									</td>
 									<td b2b-table-body>
-- 
cgit 1.2.3-korg