This is an automated email from the ASF dual-hosted git repository.
nixon pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 395574e ATLAS-4229: UI[DSL-Advanced search] If the search query does
not match any results, then Atlas UI keep loading forever.
395574e is described below
commit 395574e8279fdbfd520e5b6e43c30261e53fb34e
Author: prasad pawar <prasad.pa...@freestoneinfotech.com>
AuthorDate: Tue Mar 30 19:05:11 2021 +0530
ATLAS-4229: UI[DSL-Advanced search] If the search query does not match any
results, then Atlas UI keep loading forever.
Signed-off-by: nixonrodrigues <ni...@apache.org>
(cherry picked from commit 4be86b58732ede51c6e0228a4ee102f7283d9652)
---
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 2 +-
dashboardv3/public/js/views/search/SearchResultLayoutView.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 98c9ec0..74dc58d 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -568,7 +568,7 @@ define(['require',
});
var columns = new
columnCollection((that.searchCollection.dynamicTable ?
that.getDaynamicColumns(that.searchCollection.toJSON()) :
that.getFixedDslColumn()));
columns.setPositions().sort();
- if (this.searchType == "Advanced Search" && columns.length) {
+ if (this.searchType == "Advanced Search" && columns.length &&
that.searchCollection.length) {
//for dsl search with Select clause, default column to be
use as sorting
var tableColumnNames =
Object.keys(that.searchCollection.toJSON()[0]);
that.commonTableOptions['sortOpts'] = {
diff --git a/dashboardv3/public/js/views/search/SearchResultLayoutView.js
b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
index d5883ca..26bd969 100644
--- a/dashboardv3/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
@@ -584,7 +584,7 @@ define(['require',
});
var columns = new
columnCollection((that.searchCollection.dynamicTable ?
that.getDaynamicColumns(that.searchCollection.toJSON()) :
that.getFixedDslColumn()));
columns.setPositions().sort();
- if (this.searchType == "Advanced Search" && columns.length) {
+ if (this.searchType == "Advanced Search" && columns.length &&
that.searchCollection.length) {
//for dsl search with Select clause, default column to be
use as sorting
var tableColumnNames =
Object.keys(that.searchCollection.toJSON()[0]);
that.commonTableOptions['sortOpts'] = {
