mir/vinyldns
2
0
Fork 0
mirror of https://github.com/VinylDNS/vinyldns synced 2025-09-02 15:25:44 +00:00
Code Issues Releases Wiki Activity

Added portal tests and updated ACL modal view page

Browse Source
This commit is contained in:
Jay07GIT
2022-07-25 18:04:12 +05:30
parent 877d4fe76d
commit b58efee7f3
6 changed files with 209 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
modules/portal/public/lib/controllers/controller.manageZones.js
View File

@@ -38,7 +38,7 @@ angular.module('controller.manageZones', [])
$scope.alerts = [];
$scope.zoneInfo = {};
$scope.zoneChanges={};
$scope.zoneChanges = {};
$scope.updateZoneInfo = {};
$scope.manageZoneState = {
UPDATE: 0,
@@ -61,7 +61,8 @@ angular.module('controller.manageZones', [])
CREATE: 0,
UPDATE: 1,
CONFIRM_UPDATE: 2,
CONFIRM_DELETE: 3
CONFIRM_DELETE: 3,
VIEW_DETAILS: 4
};
$scope.aclModalParams = {
readOnly: {
@@ -77,7 +78,6 @@ angular.module('controller.manageZones', [])
var zoneHistoryPaging = pagingService.getNewPagingParams(100);
/**
* Zone modal control functions
*/
@@ -306,27 +306,51 @@ angular.module('controller.manageZones', [])
$scope.refreshAclRule = function (index) {
$scope.allAclRules = [];
for (var length = 0; length < $scope.allZonesChange[index].zone.acl.rules.length; length++) {
$scope.allAclRules.push($scope.allZonesChange[index].zone.acl.rules[length]);
$scope.aclRulesModal = {
action: $scope.aclModalState.VIEW_DETAILS,
title: "ACL Rules Info",
basics: $scope.aclModalParams.readOnly,
details: $scope.aclModalParams.readOnly,
};
if ($scope.zoneChanges[index].zone.acl.rules.length!=0){
for (var length = 0; length < $scope.zoneChanges[index].zone.acl.rules.length; length++) {
$scope.allAclRules.push($scope.zoneChanges[index].zone.acl.rules[length]);
if ($scope.allAclRules[length].hasOwnProperty('userId')){
getAclUser($scope.allAclRules[length].userId, length); }
else{ getAclGroup($scope.allAclRules[length].groupId, length);}
}
$scope.aclModalViewForm.$setPristine();
$("#aclModalView").modal("show");}
else{$("#aclModalView").modal("hide");}
};
$scope.closeAclModalView = function() {
$scope.aclModalViewForm.$setPristine();
};
function updateZoneChangeDisplay (zoneChange) {
$scope.allZonesChange = zoneChange;
for (var length = 0; length < zoneChange.length; length++) {
getZoneGroup(zoneChange[length].zone.adminGroupId, length);
getZoneUser(zoneChange[length].userId, length);
}
$scope.zoneChanges = zoneChange;
};
$scope.refreshAclRuleDisplay = function() {
$scope.aclRules = [];
angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
$scope.aclRules.push(zonesService.toDisplayAclRule(rule));
});
};
/**
* Get User name and Group Name with Ids for Zone history
*/
function getZoneGroup(groupId, length) {
function success(response) {
$log.log('groupsService::getZoneGroup-success');
$scope.allZonesChange[length].zone.adminGroupName = response.data.name;
$scope.zoneChanges[length].zone.adminGroupName = response.data.name;
}
return groupsService
.getGroup(groupId)
@@ -339,7 +363,7 @@ angular.module('controller.manageZones', [])
function getZoneUser(userId, length) {
function success(response) {
$log.log('profileService::getZoneUserDataById-success');
$scope.allZonesChange[length].userName = response.data.userName;
$scope.zoneChanges[length].userName = response.data.userName;
}
return profileService
.getUserDataById(userId)
@@ -375,6 +399,10 @@ angular.module('controller.manageZones', [])
});
};
/**
* Zone history Pagination
*/
$scope.getZoneHistoryPageNumber = function() {
return pagingService.getPanelTitle(zoneHistoryPaging);
};
@@ -387,7 +415,7 @@ angular.module('controller.manageZones', [])
return pagingService.nextPageEnabled(zoneHistoryPaging);
};
$scope.nextPageAllZoneHistory = function () {
$scope.nextPageZoneHistory = function () {
return zonesService
.getZoneChanges(zoneHistoryPaging.maxItems, zoneHistoryPaging.next, $scope.zoneId )
.then(function(response) {
@@ -416,13 +444,6 @@ angular.module('controller.manageZones', [])
});
};
$scope.refreshAclRuleDisplay = function() {
$scope.aclRules = [];
angular.forEach($scope.zoneInfo.acl.rules, function (rule) {
$scope.aclRules.push(zonesService.toDisplayAclRule(rule));
});
};
/**
* Service interaction functions
*/