ATLAS-2846 : UI : clusterName queryparam is missing in expimp/audit API
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/c3bd5098 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/c3bd5098 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/c3bd5098 Branch: refs/heads/branch-0.8 Commit: c3bd5098e78bd011ad9512c683bd418c80b4d252 Parents: 3deabe3 Author: kevalbhatt <[email protected]> Authored: Wed Aug 29 14:05:01 2018 +0530 Committer: kevalbhatt <[email protected]> Committed: Wed Aug 29 19:26:03 2018 +0530 ---------------------------------------------------------------------- .../js/templates/common/TableLayout_tmpl.html | 2 +- .../public/js/utils/CommonViewFunction.js | 21 +++++++++++--------- dashboardv2/public/js/utils/UrlLinks.js | 2 +- dashboardv2/public/js/utils/Utils.js | 2 +- .../audit/ReplicationAuditTableLayoutView.js | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/c3bd5098/dashboardv2/public/js/templates/common/TableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/templates/common/TableLayout_tmpl.html b/dashboardv2/public/js/templates/common/TableLayout_tmpl.html index 1209bd4..b91ffe2 100644 --- a/dashboardv2/public/js/templates/common/TableLayout_tmpl.html +++ b/dashboardv2/public/js/templates/common/TableLayout_tmpl.html @@ -28,7 +28,7 @@ </div> {{/if}} {{#if includeAtlasPagination}} <div class="row form-group pagination-box filter-box"> - <div class="col-sm-3"> + <div class="col-sm-4"> <span class="labelShowRecord pull-left" data-id="pageRecordText"> </span> </div> </div> http://git-wip-us.apache.org/repos/asf/atlas/blob/c3bd5098/dashboardv2/public/js/utils/CommonViewFunction.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js b/dashboardv2/public/js/utils/CommonViewFunction.js index 11c2334..9863dca 100644 --- a/dashboardv2/public/js/utils/CommonViewFunction.js +++ b/dashboardv2/public/js/utils/CommonViewFunction.js @@ -143,15 +143,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum if (extractJSON && extractJSON.extractKey) { var newAttributesList = {}; _.each(attributesList, function(objValue, objKey) { - var value = _.isObject(objValue) ? objValue : _.escape(objValue); - if (_.isObject(extractJSON.extractKey)) { - _.each(extractJSON.extractKey, function(extractKey) { - if (objKey === extractKey) { - newAttributesList[_.escape(objKey)] = value; - } - }); - } else if (_.isString(extractJSON.extractKey) && extractJSON.extractKey === objKey) { - newAttributesList[_.escape(objKey)] = value; + var value = _.isObject(objValue) ? objValue : _.escape(objValue), + tempVarfor$check = objKey.toString(); + if (tempVarfor$check.indexOf("$") == -1) { + if (_.isObject(extractJSON.extractKey)) { + _.each(extractJSON.extractKey, function(extractKey) { + if (objKey === extractKey) { + newAttributesList[_.escape(objKey)] = value; + } + }); + } else if (_.isString(extractJSON.extractKey) && extractJSON.extractKey === objKey) { + newAttributesList[_.escape(objKey)] = value; + } } }); valueOfArray.push(Utils.JSONPrettyPrint(newAttributesList)); http://git-wip-us.apache.org/repos/asf/atlas/blob/c3bd5098/dashboardv2/public/js/utils/UrlLinks.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/UrlLinks.js b/dashboardv2/public/js/utils/UrlLinks.js index 3eda25e..dd1537b 100644 --- a/dashboardv2/public/js/utils/UrlLinks.js +++ b/dashboardv2/public/js/utils/UrlLinks.js @@ -97,7 +97,7 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require } if (clusterName) { - queryParam.push("clusterName=" + sourceClusterName); + queryParam.push("clusterName=" + clusterName); } if (limit) { queryParam.push("limit=" + limit); http://git-wip-us.apache.org/repos/asf/atlas/blob/c3bd5098/dashboardv2/public/js/utils/Utils.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/utils/Utils.js b/dashboardv2/public/js/utils/Utils.js index 18895c7..21d387a 100644 --- a/dashboardv2/public/js/utils/Utils.js +++ b/dashboardv2/public/js/utils/Utils.js @@ -732,7 +732,7 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums', $(this).trigger('fullscreen_done', [$(this).parents('.panel')]); } }); - + $('body').on('click', 'pre.code-block .expand-collapse-button', function(e) { var $el = $(this).parents('.code-block'); if ($el.hasClass('shrink')) { http://git-wip-us.apache.org/repos/asf/atlas/blob/c3bd5098/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js ---------------------------------------------------------------------- diff --git a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js index a18b938..433213f 100644 --- a/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js +++ b/dashboardv2/public/js/views/audit/ReplicationAuditTableLayoutView.js @@ -116,7 +116,7 @@ define(['require', that.RReplicationAuditTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, { columns: columns }))); - _.extend(that.searchCollection.queryParams, { limit: that.limit, offset: that.offset, "sourceClusterName": that.name }); + _.extend(that.searchCollection.queryParams, { limit: that.limit, offset: that.offset, "clusterName": that.name }); that.fetchCollection(_.extend({ 'fromUrl': true })); }); },
