atlas git commit: ATLAS-3018 : UI - classification search table shows then Basic search text with loader which is incorrect

2019-01-08 Thread nixon 
Repository: atlas
Updated Branches:
  refs/heads/branch-1.0 b9c146b72 -> e7b7de0fa


ATLAS-3018 : UI - classification search table shows then Basic search text with 
loader which is incorrect

(cherry picked from commit 4003858919bfff58d55479cbb2f2a79b5f4e9826)


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/e7b7de0f
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/e7b7de0f
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/e7b7de0f

Branch: refs/heads/branch-1.0
Commit: e7b7de0fa6de94bb96f1a5c7325caadb40347269
Parents: b9c146b
Author: kevalbhatt 
Authored: Fri Jan 4 11:29:10 2019 +0530
Committer: nixonrodrigues 
Committed: Tue Jan 8 17:51:17 2019 +0530

--
 .../public/js/templates/search/SearchResultLayoutView_tmpl.html   | 3 ++-
 dashboardv2/public/js/views/search/SearchResultLayoutView.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/e7b7de0f/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
--
diff --git 
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 6675664..b10a0b8 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -53,7 +53,8 @@
 
 
 
-{{searchType}} {{#if entityCreate}}
+{{#if isSearchTab}}{{searchType}}{{/if}}
+{{#if entityCreate}}
 
 Search Atlas for existing entities or
  
create new entity 

http://git-wip-us.apache.org/repos/asf/atlas/blob/e7b7de0f/dashboardv2/public/js/views/search/SearchResultLayoutView.js
--
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 38a5de8..83e88f2 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -75,7 +75,8 @@ define(['require',
 return {
 entityCreate: Globals.entityCreate,
 searchType: this.searchType,
-fromView: this.fromView
+fromView: this.fromView,
+isSearchTab: Utils.getUrlState.isSearchTab()
 };
 },
 /** ui events hash */

atlas git commit: ATLAS-3018 : UI - classification search table shows then Basic search text with loader which is incorrect

2019-01-04 Thread kbhatt 
Repository: atlas
Updated Branches:
  refs/heads/master a5f971a32 -> 400385891


ATLAS-3018 : UI - classification search table shows then Basic search text with 
loader which is incorrect


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/40038589
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/40038589
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/40038589

Branch: refs/heads/master
Commit: 4003858919bfff58d55479cbb2f2a79b5f4e9826
Parents: a5f971a
Author: kevalbhatt 
Authored: Fri Jan 4 11:29:10 2019 +0530
Committer: kevalbhatt 
Committed: Fri Jan 4 17:29:21 2019 +0530

--
 .../public/js/templates/search/SearchResultLayoutView_tmpl.html   | 3 ++-
 dashboardv2/public/js/views/search/SearchResultLayoutView.js  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/40038589/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
--
diff --git 
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 6675664..b10a0b8 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -53,7 +53,8 @@
 
 
 
-{{searchType}} {{#if entityCreate}}
+{{#if isSearchTab}}{{searchType}}{{/if}}
+{{#if entityCreate}}
 
 Search Atlas for existing entities or
  
create new entity 

http://git-wip-us.apache.org/repos/asf/atlas/blob/40038589/dashboardv2/public/js/views/search/SearchResultLayoutView.js
--
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 38a5de8..83e88f2 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -75,7 +75,8 @@ define(['require',
 return {
 entityCreate: Globals.entityCreate,
 searchType: this.searchType,
-fromView: this.fromView
+fromView: this.fromView,
+isSearchTab: Utils.getUrlState.isSearchTab()
 };
 },
 /** ui events hash */

atlas git commit: ATLAS-3018 : UI - classification search table shows then Basic search text with loader which is incorrect

2019-01-04 Thread kbhatt 
Repository: atlas
Updated Branches:
  refs/heads/branch-0.8 41b48c82f -> a48249e0b


ATLAS-3018 : UI - classification search table shows then Basic search text with 
loader which is incorrect


Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/a48249e0
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/a48249e0
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/a48249e0

Branch: refs/heads/branch-0.8
Commit: a48249e0b2f3068d61a6b973a3c7280abe6e4395
Parents: 41b48c8
Author: kevalbhatt 
Authored: Fri Jan 4 11:33:25 2019 +0530
Committer: kevalbhatt 
Committed: Fri Jan 4 17:28:42 2019 +0530

--
 .../public/js/templates/search/SearchResultLayoutView_tmpl.html   | 2 +-
 dashboardv2/public/js/views/search/SearchResultLayoutView.js  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/a48249e0/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
--
diff --git 
a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html 
b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
index 9a39289..2f0e0d5 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -55,7 +55,7 @@
 
 
 
-{{searchType}}
+{{#if isSearchTab}}{{searchType}}{{/if}}
 {{#if entityCreate}}
 
 Search Atlas for existing entities or

http://git-wip-us.apache.org/repos/asf/atlas/blob/a48249e0/dashboardv2/public/js/views/search/SearchResultLayoutView.js
--
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js 
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 80a1f4e..41c069a 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -77,7 +77,8 @@ define(['require',
 entityCreate: Globals.entityCreate,
 searchType: this.searchType,
 taxonomy: Globals.taxonomy,
-fromView: this.fromView
+fromView: this.fromView,
+isSearchTab: Utils.getUrlState.isSearchTab()
 };
 },
 /** ui events hash */