This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 24a746b7f RANGER-4258: increased maximum number of
service-defs/services/zones listed in UI from 25 to 1000
24a746b7f is described below
commit 24a746b7fa525c635a59b1e7af23e04cb50718ef
Author: Nitin Galave <[email protected]>
AuthorDate: Wed May 31 13:02:45 2023 +0530
RANGER-4258: increased maximum number of service-defs/services/zones listed
in UI from 25 to 1000
Signed-off-by: Madhan Neethiraj <[email protected]>
---
security-admin/src/main/webapp/scripts/controllers/Controller.js | 9 ++++++---
security-admin/src/main/webapp/scripts/utils/XAGlobals.js | 2 ++
.../src/main/webapp/scripts/views/policies/RangerPolicyCreate.js | 2 ++
.../src/main/webapp/scripts/views/policymanager/ServiceLayout.js | 4 +++-
.../webapp/scripts/views/policymanager/ServiceLayoutSidebar.js | 3 ++-
.../src/main/webapp/scripts/views/reports/AuditLayout.js | 3 ++-
.../src/main/webapp/scripts/views/reports/UserAccessLayout.js | 1 +
7 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/security-admin/src/main/webapp/scripts/controllers/Controller.js
b/security-admin/src/main/webapp/scripts/controllers/Controller.js
index d984bac9d..3ceb89c51 100755
--- a/security-admin/src/main/webapp/scripts/controllers/Controller.js
+++ b/security-admin/src/main/webapp/scripts/controllers/Controller.js
@@ -128,6 +128,7 @@ define(function(require) {
var VXAccessAuditList = require('collections/VXAccessAuditList');
var RangerServiceDefList =
require('collections/RangerServiceDefList');
var serviceDefList = new RangerServiceDefList();
+ serviceDefList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
serviceDefList.fetch({
cache : false,
async:false,
@@ -305,6 +306,7 @@ define(function(require) {
var rangerZoneList = new RangerZoneList();
var collection = new RangerServiceDefList();
+ collection.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
collection.queryParams.sortBy = 'serviceTypeId';
if (type == 'tag') {
var tagServiceDef = new RangerServiceDef();
@@ -562,11 +564,12 @@ define(function(require) {
var RangerZoneList = require('collections/RangerZoneList');
var rangerServiceList = new RangerServiceList();
var rangerZoneList = new RangerZoneList();
- rangerServiceList.setPageSize(200);
+ rangerServiceList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
rangerServiceList.fetch({
cache: false,
async: false
});
+ rangerZoneList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
rangerZoneList.fetch({
cache: false,
async: false,
@@ -588,7 +591,7 @@ define(function(require) {
var RangerZoneList = require('collections/RangerZoneList');
var zoneSerivesColl = new RangerZoneList();
var rangerServiceList = new RangerServiceList();
- rangerServiceList.setPageSize(200);
+ rangerServiceList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
rangerServiceList.fetch({
cache: false,
}).done(function() {
@@ -616,7 +619,7 @@ define(function(require) {
id: zoneId
})
var zoneSerivesColl = new RangerZoneList();
- rangerServiceList.setPageSize(200);
+ rangerServiceList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
rangerServiceList.fetch({
cache: false,
async: false,
diff --git a/security-admin/src/main/webapp/scripts/utils/XAGlobals.js
b/security-admin/src/main/webapp/scripts/utils/XAGlobals.js
index 4b0c98e30..f721899f4 100644
--- a/security-admin/src/main/webapp/scripts/utils/XAGlobals.js
+++ b/security-admin/src/main/webapp/scripts/utils/XAGlobals.js
@@ -25,6 +25,8 @@ define(function(require){
XAGlobals.settings = {};
XAGlobals.settings.PAGE_SIZE = 25;
+ XAGlobals.settings.MAX_PAGE_SIZE = 1000;
+
XAGlobals.settings.AUDIT_REPORT_POLLING = 100000;
XAGlobals.settings.uploadDefaultOpts = {
disableImageResize: false,
diff --git
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
index e6c262235..c195e97d6 100644
---
a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
+++
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyCreate.js
@@ -30,6 +30,7 @@ define(function(require){
var XAEnums = require('utils/XAEnums');
var XAUtil = require('utils/XAUtils');
var XALinks = require('modules/XALinks');
+ var XAGlobals = require('utils/XAGlobals');
var localization = require('utils/XALangSupport');
var RangerPolicycreateTmpl =
require('hbs!tmpl/policies/RangerPolicyCreate_tmpl');
@@ -141,6 +142,7 @@ define(function(require){
initializeServiceDef : function(){
var that = this
this.RangerServiceDefList = new RangerServiceDefList();
+
this.RangerServiceDefList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
this.RangerServiceDefList.fetch({
cache : false,
async : false
diff --git
a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
index 6d2d94589..aed7633cd 100644
---
a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
+++
b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
@@ -27,6 +27,8 @@ define(function(require){
var XAUtil = require('utils/XAUtils');
var SessionMgr = require('mgrs/SessionMgr');
var localization = require('utils/XALangSupport');
+ var XAGlobals = require('utils/XAGlobals');
+
var RangerServiceList = require('collections/RangerServiceList');
var RangerService = require('models/RangerService');
var ServicemanagerlayoutTmpl =
require('hbs!tmpl/common/ServiceManagerLayout_tmpl');
@@ -147,7 +149,7 @@ define(function(require){
},
initializeServices : function(){
- this.services.setPageSize(200);
+
this.services.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
this.services.fetch({
cache : false,
async : false
diff --git
a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
index 94fa3135d..965c52c37 100644
---
a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
+++
b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
@@ -249,6 +249,7 @@ define(function(require){
componentListing: function(type) {
this.collection = new RangerServiceDefList();
this.collection.queryParams.sortBy = 'serviceTypeId';
+ this.collection.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
if(type == 'tag'){
var tagServiceDef = new RangerServiceDef();
tagServiceDef.url =
XAUtil.getRangerServiceDef(XAEnums.ServiceType.SERVICE_TAG.label)
@@ -278,7 +279,7 @@ define(function(require){
initializeServices : function(){
this.services = new RangerServiceList();
- this.services.setPageSize(200);
+ this.services.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
this.services.fetch({
cache : false,
async : false
diff --git
a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
index 4acebee98..8eea802f9 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
@@ -181,13 +181,14 @@ define(function(require) {
initializeServiceDefColl : function() {
this.serviceDefList = new RangerServiceDefList();
+
this.serviceDefList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
this.serviceDefList.fetch({
cache : false,
async:false,
data :{'pageSource':'Audit'}
});
this.serviceList = new RangerServiceList();
- this.serviceList.setPageSize(200)
+ this.serviceList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE)
this.serviceList.fetch({
cache : false,
async:false,
diff --git
a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
index 3b8d862a7..ebdd2a0b2 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
@@ -139,6 +139,7 @@ define(function(require) {'use strict';
initializeServiceDef : function() {
var that = this;
this.serviceDefList = new RangerServiceDefList();
+
this.serviceDefList.setPageSize(XAGlobals.settings.MAX_PAGE_SIZE);
this.serviceDefList.fetch({
cache : false,
async:false
