Repository: ranger Updated Branches: refs/heads/master 14a0b8ebb -> c85ef5476
RANGER-1963: Follow-up tasks from demo: Show Actual Hive Query feature. Signed-off-by: Gautam Borad <gau...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/c85ef547 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/c85ef547 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/c85ef547 Branch: refs/heads/master Commit: c85ef54762b94b77fe7ef7b71a97a7acea7e8b26 Parents: 14a0b8e Author: ni3galave <nitin.gal...@gmail.com> Authored: Thu Mar 8 15:14:03 2018 +0530 Committer: Gautam Borad <gau...@apache.org> Committed: Thu Mar 8 19:42:22 2018 +0530 ---------------------------------------------------------------------- .../main/webapp/scripts/utils/XAViewUtils.js | 21 ++++++++++++++++---- security-admin/src/main/webapp/styles/xa.css | 9 ++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/c85ef547/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js b/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js index 28a6b44..11a0624 100644 --- a/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js +++ b/security-admin/src/main/webapp/scripts/utils/XAViewUtils.js @@ -35,7 +35,9 @@ define(function(require) { return '<div class="clearfix">\ <div class="pull-left resourceText" title="'+ resourcePath+'">'+resourcePath+'</div>\ <div class="pull-right">\ - <i class="icon-table queryInfo" title="Query Info" data-id ="'+model.get('id')+'"data-name = "queryInfo"></i>\ + <div class="queryInfo btn btn-mini link-tag query-icon" title="Query Info" data-name = "queryInfo" data-id ="'+model.get('id')+'">\ + <i class="icon-table" ></i>\ + </div>\ </div>\ </div>\ <div title="'+resourceType+'" class="border-top-1">'+resourceType+'</div>'; @@ -43,7 +45,9 @@ define(function(require) { return '<div class="clearfix">\ <div class="pull-left">--</div>\ <div class="pull-right">\ - <i class="icon-table queryInfo" title="Query Info" data-id ="'+model.get('id')+'"data-name = "queryInfo"></i>\ + <div class="queryInfo btn btn-mini link-tag query-icon" title="Query Info" data-id ="'+model.get('id')+'"data-name = "queryInfo"">\ + <i class="icon-table"></i>\ + </div>\ </div>\ </div>'; } @@ -60,11 +64,11 @@ define(function(require) { XAViewUtil.showQueryPopup = function(model, that){ if(model.get('serviceType') == XAEnums.ServiceType.Service_HIVE.label && model.get('aclEnforcer') == "ranger-acl" && model.get('requestData') && !_.isEmpty(model.get('requestData'))){ - var msg = '<div class="query-content">'+model.get('requestData')+'</div>'; + var msg = '<div class="pull-right link-tag query-icon copyQuery btn btn-mini" title="Copy Query"><i class="icon-copy"></i></div><div class="query-content">'+model.get('requestData')+'</div>'; var $elements = that.$el.find('table [data-name = "queryInfo"][data-id = "'+model.id+'"]'); $elements.popover({ html: true, - title:'<b> Query </b>'+ + title:'<b> Hive Query </b>'+ '<button type="button" id="queryInfoClose" class="close closeBtn" onclick="$(".queryInfo").popover("hide");">×</button>', content: msg, selector : true, @@ -74,6 +78,15 @@ define(function(require) { e.stopPropagation(); if($(e.target).data('toggle') !== 'popover' && $(e.target).parents('.popover.in').length === 0){ $('.queryInfo').not(this).popover('hide'); + $('.copyQuery').on("click", function(e){ + var input = document.createElement('input'); + input.setAttribute('value', model.get('requestData')); + document.body.appendChild(input); + input.select(); + document.execCommand('copy'); + document.body.removeChild(input); + e.currentTarget.title="Copied!"; + }) } }); } http://git-wip-us.apache.org/repos/asf/ranger/blob/c85ef547/security-admin/src/main/webapp/styles/xa.css ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css index d57d169..1f04aa2 100644 --- a/security-admin/src/main/webapp/styles/xa.css +++ b/security-admin/src/main/webapp/styles/xa.css @@ -2244,7 +2244,7 @@ textarea:read-only{ }.resourceText{ overflow: hidden; text-overflow: ellipsis; - width: 85%; + max-width: 85%; } .closeBtn{ position: absolute; @@ -2284,3 +2284,10 @@ textarea:read-only{ .infoWidth{ width: 475px; } +.query-icon{ + padding: 0 4px; + float: right; + margin-top: -3px; + cursor: pointer; + margin-left: 4px; +}
