You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ni...@apache.org on 2022/04/14 05:47:22 UTC
[ranger] 02/02: RANGER-3544 : security zones listing will be in alphabetical order.
This is an automated email from the ASF dual-hosted git repository.
ni3galave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
commit b0a7df141f7d3325e151fe9866eadc0437e7b151
Author: Dhaval.Rajpara <dh...@gmail.com>
AuthorDate: Mon Apr 11 18:49:20 2022 +0530
RANGER-3544 : security zones listing will be in alphabetical order.
Signed-off-by: Nitin Galave <ni...@apache.org>
---
.../src/main/webapp/scripts/collection_bases/RangerZoneListBase.js | 3 +++
.../src/main/webapp/scripts/views/policymanager/ServiceLayout.js | 1 +
.../main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js | 1 +
security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js | 1 +
.../src/main/webapp/scripts/views/reports/UserAccessLayout.js | 1 +
5 files changed, 7 insertions(+)
diff --git a/security-admin/src/main/webapp/scripts/collection_bases/RangerZoneListBase.js b/security-admin/src/main/webapp/scripts/collection_bases/RangerZoneListBase.js
index 170be9103..9f6f39073 100644
--- a/security-admin/src/main/webapp/scripts/collection_bases/RangerZoneListBase.js
+++ b/security-admin/src/main/webapp/scripts/collection_bases/RangerZoneListBase.js
@@ -41,6 +41,9 @@ define(function(require){
this.modelName = 'RangerZone';
this.modelAttrName = 'securityZones';
this.bindErrorEvents();
+ },
+ comparator: function(def) {
+ return def.get('name');
}
},{
// static class members
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 589a89abb..6d2d94589 100644
--- a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayout.js
@@ -310,6 +310,7 @@ define(function(require){
var zoneName = _.map(this.rangerZoneList.attributes, function(m){
return { 'id': m.name, 'text':m.name, 'zoneId' : m.id }
});
+ zoneName = _.sortBy(zoneName, 'id')
if(!_.isEmpty(App.vZone.vZoneName) && !_.isUndefined(App.vZone.vZoneName)){
this.ui.selectZoneName.val(App.vZone.vZoneName);
}
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 d7d46399b..94fa3135d 100644
--- a/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
+++ b/security-admin/src/main/webapp/scripts/views/policymanager/ServiceLayoutSidebar.js
@@ -388,6 +388,7 @@ define(function(require){
var zoneName = _.map(this.rangerZoneList.attributes, function(m){
return { 'id':m.name, 'text':m.name, 'zoneId' : m.id}
});
+ zoneName = _.sortBy(zoneName, 'id')
if(!_.isEmpty(App.vZone.vZoneName) && !_.isUndefined(App.vZone.vZoneName)){
this.ui.selectZoneName.val(App.vZone.vZoneName);
}
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 1420e90ea..4acebee98 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/AuditLayout.js
@@ -535,6 +535,7 @@ define(function(require) {
zoneList.push({'label' : m.name, 'value' : m.name});
});
}
+ zoneList = _.sortBy(zoneList, 'label')
callback(zoneList);
break;
}
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 08ef88b84..3b8d862a7 100644
--- a/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/reports/UserAccessLayout.js
@@ -672,6 +672,7 @@ define(function(require) {'use strict';
var zoneListOptions = _.map(this.rangerZoneList.attributes, function(m){
return { 'id':m.name, 'text':m.name}
});
+ zoneListOptions = _.sortBy(zoneListOptions, 'id')
var tags = [];
if (this.urlParam && this.urlParam['policyLabelsPartial'] && !_.isEmpty(this.urlParam['policyLabelsPartial'])) {
tags.push( { 'id' : _.escape( this.urlParam['policyLabelsPartial'] ), 'text' : _.escape( this.urlParam['policyLabelsPartial'] ) } );