Repository: incubator-ranger Updated Branches: refs/heads/master 220c13237 -> c366a0ae5
RANGER-1004 : Remove need to set access type for column masking, row filtering in Ranger UI Signed-off-by: Velmurugan Periasamy <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c366a0ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c366a0ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c366a0ae Branch: refs/heads/master Commit: c366a0ae5ec0598215ecb2bbaf7a465f606cdd76 Parents: 220c132 Author: Gautam Borad <[email protected]> Authored: Thu May 26 11:55:46 2016 +0530 Committer: Velmurugan Periasamy <[email protected]> Committed: Thu Jun 2 01:00:14 2016 -0400 ---------------------------------------------------------------------- security-admin/src/main/webapp/scripts/utils/XAEnums.js | 7 ++++--- security-admin/src/main/webapp/scripts/utils/XAUtils.js | 2 +- .../webapp/scripts/views/policies/PermissionList.js | 4 ++++ .../webapp/scripts/views/policies/RangerPolicyForm.js | 12 ++++++++++-- .../templates/policies/RangerPolicyForm_tmpl.html | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c366a0ae/security-admin/src/main/webapp/scripts/utils/XAEnums.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAEnums.js b/security-admin/src/main/webapp/scripts/utils/XAEnums.js index bebb02c..c05dcf3 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAEnums.js +++ b/security-admin/src/main/webapp/scripts/utils/XAEnums.js @@ -167,8 +167,9 @@ define(function(require) { CLASS_TYPE_RESPONSE:{value:11, label:'Response', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_RESPONSE', modelName:'VXResponse', type:'vXResponse', tt: 'lbl.ClassTypes_CLASS_TYPE_RESPONSE'}, CLASS_TYPE_XA_ASSET:{value:1000, label:'Asset', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_ASSET', modelName:'VXAsset', type:'vXAsset', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_ASSET'}, CLASS_TYPE_XA_RESOURCE:{value:1001, label:'Resource', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_RESOURCE', modelName:'VXResource', type:'vXResource', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_RESOURCE'}, - CLASS_TYPE_XA_GROUP:{value:1002, label:'XA Group', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP', modelName:'VXGroup', type:'vXGroup', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_GROUP'}, - CLASS_TYPE_XA_USER:{value:1003, label:'XA User', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_USER', modelName:'VXUser', type:'vXUser', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_USER'}, + CLASS_TYPE_XA_GROUP:{value:1002, label:'Ranger Group', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP', modelName:'VXGroup', type:'vXGroup', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_GROUP'}, + CLASS_TYPE_XA_USER:{value:1003, label:'Ranger User', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_USER', modelName:'VXUser', type:'vXUser', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_USER'}, + CLASS_TYPE_XA_GROUP_USER:{value:1004, label:'XA Group of Users', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_USER', modelName:'VXGroupUser', type:'vXGroupUser', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_GROUP_USER'}, CLASS_TYPE_XA_GROUP_GROUP:{value:1005, label:'XA Group of groups', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_GROUP_GROUP', modelName:'VXGroupGroup', type:'vXGroupGroup', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_GROUP_GROUP'}, CLASS_TYPE_XA_PERM_MAP:{value:1006, label:'XA permissions for resource', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_PERM_MAP', modelName:'VXPermMap', type:'vXPermMap', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_PERM_MAP'}, @@ -180,7 +181,7 @@ define(function(require) { CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE:{value:1012, label:'Transaction log attribute', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE', tt: 'lbl.ClassTypes_CLASS_TYPE_XA_TRANSACTION_LOG_ATTRIBUTE'}, CLASS_TYPE_RANGER_POLICY:{value:1020, label:'Ranger Policy', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_RANGER_POLICY', modelName:'VXRangerPolicy', type:'vXResource', tt: 'lbl.ClassTypes_CLASS_TYPE_RANGER_POLICY'}, CLASS_TYPE_RANGER_SERVICE:{value:1030, label:'Ranger Service', rbkey:'xa.enum.ClassTypes.CLASS_TYPE_RANGER_SERVICE', modelName:'VXRangerService', type:'vXRangerService', tt: 'lbl.ClassTypes_CLASS_TYPE_RANGER_SERVICE'}, - + }); XAEnums.DataType = mergeParams(XAEnums.DataType, { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c366a0ae/security-admin/src/main/webapp/scripts/utils/XAUtils.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAUtils.js b/security-admin/src/main/webapp/scripts/utils/XAUtils.js index e2aab57..8ca8a01 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAUtils.js @@ -467,7 +467,7 @@ define(function(require) { }; XAUtils.showGroupsOrUsersForPolicy = function(rawValue, model, showGroups) { var showMoreLess = false, groupArr = [], items = []; - var itemList = ['policyItems','allowExceptions','denyPolicyItems','denyExceptions','dataMaskPolicyItems'] + var itemList = ['policyItems','allowExceptions','denyPolicyItems','denyExceptions','dataMaskPolicyItems','rowFilterPolicyItems'] var type = _.isUndefined(showGroups) ? 'groups' : 'users'; _.each(itemList, function(item){ if(!_.isUndefined(model.get(item)) && !_.isEmpty(model.get(item))) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c366a0ae/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js index 788e729..44134af 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js +++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js @@ -256,6 +256,10 @@ define(function(require) { var that = this; this.perms = _.map(this.accessTypes,function(m){return {text:m.label, value:m.name};}); this.perms.push({'value' : -1, 'text' : 'Select/Deselect All'}); + //set default access type 'select' for add new masking & row filter policies + if(!XAUtil.isAccessPolicy(this.rangerPolicyType) && !_.contains(this.permsIds,'select')) { + this.permsIds.push('select'); + } //create x-editable for permissions this.ui.addPerms.editable({ emptytext : 'Add Permissions', http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c366a0ae/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js index ea0cd0e..50006e8 100644 --- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js +++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js @@ -53,9 +53,17 @@ define(function(require){ * @constructs */ templateData : function(){ - var obj = XAUtil.enumElementByValue(XAEnums.RangerPolicyType, this.model.get('policyType')) + var policyType = XAUtil.enumElementByValue(XAEnums.RangerPolicyType, this.model.get('policyType')), conditionType; + if (XAUtil.isMaskingPolicy(policyType.value)) { + conditionType = 'Mask'; + } else if (XAUtil.isRowFilterPolicy(policyType.value)) { + conditionType = 'Row Filter'; + } else { + conditionType = 'Allow'; + } return { 'id' : this.model.id, - 'policyType' : obj.label + 'policyType' : policyType.label, + 'conditionType' : conditionType }; }, initialize: function(options) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c366a0ae/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html index 3937696..71aad5f 100644 --- a/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html +++ b/security-admin/src/main/webapp/templates/policies/RangerPolicyForm_tmpl.html @@ -33,7 +33,7 @@ language governing permissions and limitations under the License. --}} </fieldset> <fieldset> <p class="wrap-header bold formHeader"> - Allow Conditions : <span class="label label-yellow pull-right"></span> + {{conditionType}} Conditions : <span class="label label-yellow pull-right"></span> </p> <div class=" wrap position-relative">
