[2/3] atlas git commit: ATLAS-2484 :- UI , Tag propagation : On Search results page , entities with propagated tags have Tag Remove button

2018-03-16 Thread nixon 
ATLAS-2484 :- UI , Tag propagation : On Search results page , entities with 
propagated tags have Tag Remove button

Signed-off-by: nixonrodrigues 


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

Branch: refs/heads/master
Commit: 242733c0b292f729269fe43d26e3189472d04545
Parents: 5f71cad
Author: pratik24mac 
Authored: Thu Mar 15 17:33:03 2018 +0530
Committer: nixonrodrigues 
Committed: Fri Mar 16 18:51:21 2018 +0530

--
 dashboardv2/public/css/scss/form.scss |  5 +
 dashboardv2/public/js/utils/CommonViewFunction.js | 10 --
 .../public/js/views/search/SearchResultLayoutView.js  |  3 ++-
 3 files changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/242733c0/dashboardv2/public/css/scss/form.scss
--
diff --git a/dashboardv2/public/css/scss/form.scss 
b/dashboardv2/public/css/scss/form.scss
index 0765dde..0789978 100644
--- a/dashboardv2/public/css/scss/form.scss
+++ b/dashboardv2/public/css/scss/form.scss
@@ -222,6 +222,11 @@ button:focus {
 .btn-fixed-width {
 .btn-icon {
 min-width: 100px;
+&.propagte-classification {
+>span {
+width: 98px;
+}
+}
 >span {
 @include ellipsis();
 float: left;

http://git-wip-us.apache.org/repos/asf/atlas/blob/242733c0/dashboardv2/public/js/utils/CommonViewFunction.js
--
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index 47e50d6..0e097d4 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -232,7 +232,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 return table;
 }
 CommonViewFunction.tagForTable = function(obj) {
-var traits = obj.classificationNames || _.pluck(obj.classifications, 
'typeName'),
+var traits = obj.classifications,
 atags = "",
 addTag = "",
 popTag = "",
@@ -241,7 +241,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 if (traits) {
 traits.map(function(tag) {
 var className = "btn btn-action btn-sm btn-blue btn-icon",
-tagString = '' + tag + '';
+deleteIcon = "";
+if (obj.guid === tag.entityGuid) {
+deleteIcon = '';
+} else {
+className += " propagte-classification";
+}
+var tagString = '' + tag.typeName + 
'' + deleteIcon + '';
 if (count >= 1) {
 popTag += tagString;
 } else {

http://git-wip-us.apache.org/repos/asf/atlas/blob/242733c0/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 ccc666b..dc4f49a 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -450,7 +450,8 @@ define(['require',
 var checkBoxValue = {
 'excludeDeletedEntities': (this.value.includeDE ? 
false : true),
 'includeSubClassifications': (this.value.excludeSC ? 
false : true),
-'includeSubTypes': (this.value.excludeST ? false : 
true)
+'includeSubTypes': (this.value.excludeST ? false : 
true),
+'includeClassificationAttributes' : true // server 
will return classication details with guid
 }
 }
 if (value) {

[3/3] atlas git commit: ATLAS-2502 : UI - Entity page not rendering tags and loader keeps loading when server 403 during deleting classification

2018-03-16 Thread nixon 
ATLAS-2502 : UI - Entity page not rendering tags and loader keeps loading when 
server 403 during deleting classification

Signed-off-by: nixonrodrigues 


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

Branch: refs/heads/master
Commit: 809a99c8a7601b7ede3f6d5da4bfd68d970a38e6
Parents: 242733c
Author: kevalbhatt 
Authored: Fri Mar 16 13:10:36 2018 +0530
Committer: nixonrodrigues 
Committed: Fri Mar 16 18:51:36 2018 +0530

--
 .../public/js/templates/search/SearchResultLayoutView_tmpl.html| 2 +-
 dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js| 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/809a99c8/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 c23a8c5..fb9481a 100644
--- a/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
+++ b/dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
@@ -51,9 +51,9 @@
 
 
 
+{{searchType}}
 {{#if entityCreate}}
 
-{{searchType}}
 Search Atlas for existing entities or
  
create new entity 
 

http://git-wip-us.apache.org/repos/asf/atlas/blob/809a99c8/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
--
diff --git a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js 
b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
index 7bcda67..7c0cd55 100644
--- a/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
+++ b/dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
@@ -312,6 +312,7 @@ define(['require',
 tagName = options.el.text();
 Utils.showTitleLoader(this.$('.page-title .fontLoader'), 
this.$('.entityDetail'));
 CommonViewFunction.deleteTag(_.extend({}, options, {
+hideLoader: that.hideLoader.bind(that),
 callback: function() {
 that.fetchCollection();
 }

atlas git commit: ATLAS-2483 : UI - Display of faceted query

2018-03-16 Thread kbhatt 
Repository: atlas
Updated Branches:
  refs/heads/branch-0.8 2c3d53a68 -> a2a829c2b


ATLAS-2483 : UI - Display of faceted query

Signed-off-by: kevalbhatt 


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

Branch: refs/heads/branch-0.8
Commit: a2a829c2b52ed36f9d8d26925efa6d32322f3470
Parents: 2c3d53a
Author: pratik24mac 
Authored: Fri Mar 9 17:32:01 2018 +0530
Committer: kevalbhatt 
Committed: Fri Mar 16 12:35:43 2018 +0530

--
 dashboardv2/public/js/utils/CommonViewFunction.js | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/atlas/blob/a2a829c2/dashboardv2/public/js/utils/CommonViewFunction.js
--
diff --git a/dashboardv2/public/js/utils/CommonViewFunction.js 
b/dashboardv2/public/js/utils/CommonViewFunction.js
index e05a6b2..1b81c75 100644
--- a/dashboardv2/public/js/utils/CommonViewFunction.js
+++ b/dashboardv2/public/js/utils/CommonViewFunction.js
@@ -405,14 +405,16 @@ define(['require', 'utils/Utils', 'modules/Modal', 
'utils/Messages', 'utils/Enum
 if (value.type) {
 var typeKeyValue = 'Type:' + _.escape(value.type) + '';
 if (entityFilters) {
-typeKeyValue += 'AND(' + 
entityFilters.condition + '(' + objToString(entityFilters) + '))';
+var conditionForEntity = entityFilters.rules.length == 1 ? '' 
: 'AND';
+typeKeyValue += '' + 
conditionForEntity + '(' + 
entityFilters.condition + '(' + objToString(entityFilters) + '))';
 }
 queryArray.push(typeKeyValue)
 }
 if (value.tag) {
 var tagKeyValue = 'Tag:' + _.escape(value.tag) + '';
 if (tagFilters) {
-tagKeyValue += 'AND(' + 
tagFilters.condition + '(' + objToString(tagFilters) + '))';
+var conditionFortag = tagFilters.rules.length == 1 ? '' : 
'AND';
+tagKeyValue += '' + 
conditionFortag + '(' + tagFilters.condition 
+ '(' + objToString(tagFilters) + '))';
 }
 queryArray.push(tagKeyValue);
 }