This is an automated email from the ASF dual-hosted git repository. kbhatt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push: new 4ab4962 ATLAS-3978: In Administration, Audits filter for 'OR' condition does not work 4ab4962 is described below commit 4ab4962314a80d9e0ac766f81018e22995c8e83d Author: kevalbhatt <kbh...@apache.org> AuthorDate: Thu Oct 8 16:04:51 2020 +0530 ATLAS-3978: In Administration, Audits filter for 'OR' condition does not work --- dashboardv2/public/js/utils/TableLayout.js | 1 + .../js/views/audit/AdminAuditTableLayoutView.js | 34 ++-------------------- dashboardv3/public/js/utils/TableLayout.js | 1 + .../js/views/audit/AdminAuditTableLayoutView.js | 34 ++-------------------- 4 files changed, 8 insertions(+), 62 deletions(-) diff --git a/dashboardv2/public/js/utils/TableLayout.js b/dashboardv2/public/js/utils/TableLayout.js index 7edce4d..89216bd 100644 --- a/dashboardv2/public/js/utils/TableLayout.js +++ b/dashboardv2/public/js/utils/TableLayout.js @@ -459,6 +459,7 @@ define(['require', this.activePage = Math.round(this.pageTo / this.limit); this.ui.activePage.attr('title', "Page " + this.activePage); this.ui.activePage.text(this.activePage); + this.ui.showPage.val(this.limit).trigger('change', { "skipViewChange": true }); }, /** diff --git a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js index b50a5e8..4a3f689 100644 --- a/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js +++ b/dashboardv2/public/js/views/audit/AdminAuditTableLayoutView.js @@ -127,19 +127,6 @@ define(['require', that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down'); that.$('.attribute-filter-container, .attr-filter-overlay').toggleClass('hide'); }, - getAttributes: function(options) { - var adminAttributes = []; - if (options.isFilter) { - _.each(options.isFilter, function(adminFilter) { - adminAttributes.push({ - "attributeName": adminFilter.id, - "operator": adminFilter.operator, - "attributeValue": (adminFilter.type == "date" && options.isDateParsed) ? Date.parse(adminFilter.value).toString() : adminFilter.value - }) - }) - } - return adminAttributes; - }, onClickAttrFilter: function() { var that = this; this.ui.adminRegion.show(); @@ -154,6 +141,7 @@ define(['require', if (queryBuilderRef.data("queryBuilder")) { var queryBuilder = queryBuilderRef.queryBuilder("getRules"); if (queryBuilder) { + that.ruleUrl = that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: queryBuilder, formatedDateToLong: true }); that.isFilters = queryBuilder.rules.length ? queryBuilder.rules : null; } else { isFilterValidate = false @@ -167,24 +155,8 @@ define(['require', }, getAdminCollection: function(option) { var that = this, - options = { - isDateParsed: true, - isFilter: this.isFilters - }, - adminParam = { - condition: "AND", - criterion: that.getAttributes(options) - }; - options.isDateParsed = false; - if (this.isFilters) { - var auditQueryParam = { - condition: "AND", - criterion: that.getAttributes(options) - }; - that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true }); - } - - $.extend(that.entityCollection.queryParams, { auditFilters: that.isFilters ? adminParam : null }); + auditFilters = CommonViewFunction.attributeFilter.generateAPIObj(that.ruleUrl); + $.extend(that.entityCollection.queryParams, { auditFilters: that.isFilters ? auditFilters : null }); var apiObj = { sort: false, data: that.entityCollection.queryParams, diff --git a/dashboardv3/public/js/utils/TableLayout.js b/dashboardv3/public/js/utils/TableLayout.js index 7edce4d..89216bd 100644 --- a/dashboardv3/public/js/utils/TableLayout.js +++ b/dashboardv3/public/js/utils/TableLayout.js @@ -459,6 +459,7 @@ define(['require', this.activePage = Math.round(this.pageTo / this.limit); this.ui.activePage.attr('title', "Page " + this.activePage); this.ui.activePage.text(this.activePage); + this.ui.showPage.val(this.limit).trigger('change', { "skipViewChange": true }); }, /** diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js index b50a5e8..4a3f689 100644 --- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js +++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js @@ -127,19 +127,6 @@ define(['require', that.ui.attrFilter.find('.fa-angle-right').toggleClass('fa-angle-down'); that.$('.attribute-filter-container, .attr-filter-overlay').toggleClass('hide'); }, - getAttributes: function(options) { - var adminAttributes = []; - if (options.isFilter) { - _.each(options.isFilter, function(adminFilter) { - adminAttributes.push({ - "attributeName": adminFilter.id, - "operator": adminFilter.operator, - "attributeValue": (adminFilter.type == "date" && options.isDateParsed) ? Date.parse(adminFilter.value).toString() : adminFilter.value - }) - }) - } - return adminAttributes; - }, onClickAttrFilter: function() { var that = this; this.ui.adminRegion.show(); @@ -154,6 +141,7 @@ define(['require', if (queryBuilderRef.data("queryBuilder")) { var queryBuilder = queryBuilderRef.queryBuilder("getRules"); if (queryBuilder) { + that.ruleUrl = that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: queryBuilder, formatedDateToLong: true }); that.isFilters = queryBuilder.rules.length ? queryBuilder.rules : null; } else { isFilterValidate = false @@ -167,24 +155,8 @@ define(['require', }, getAdminCollection: function(option) { var that = this, - options = { - isDateParsed: true, - isFilter: this.isFilters - }, - adminParam = { - condition: "AND", - criterion: that.getAttributes(options) - }; - options.isDateParsed = false; - if (this.isFilters) { - var auditQueryParam = { - condition: "AND", - criterion: that.getAttributes(options) - }; - that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true }); - } - - $.extend(that.entityCollection.queryParams, { auditFilters: that.isFilters ? adminParam : null }); + auditFilters = CommonViewFunction.attributeFilter.generateAPIObj(that.ruleUrl); + $.extend(that.entityCollection.queryParams, { auditFilters: that.isFilters ? auditFilters : null }); var apiObj = { sort: false, data: that.entityCollection.queryParams,