You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ni...@apache.org on 2018/03/16 13:22:31 UTC
[2/3] atlas git commit: ATLAS-2484 :- UI ,
Tag propagation : On Search results page ,
entities with propagated tags have Tag Remove button
ATLAS-2484 :- UI , Tag propagation : On Search results page , entities with propagated tags have Tag Remove button
Signed-off-by: nixonrodrigues <ni...@apache.org>
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 <pr...@gmail.com>
Authored: Thu Mar 15 17:33:03 2018 +0530
Committer: nixonrodrigues <ni...@apache.org>
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 = '<a class="' + className + '" data-id="tagClick"><span title="' + tag + '">' + tag + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '"data-name="' + tag + '" data-type="tag" data-guid="' + obj.guid + '" ></i></a>';
+ deleteIcon = "";
+ if (obj.guid === tag.entityGuid) {
+ deleteIcon = '<i class="fa fa-times" data-id="delete" data-assetname="' + entityName + '"data-name="' + tag.typeName + '" data-type="tag" data-guid="' + obj.guid + '" ></i>';
+ } else {
+ className += " propagte-classification";
+ }
+ var tagString = '<a class="' + className + '" data-id="tagClick"><span title="' + tag.typeName + '">' + tag.typeName + '</span>' + deleteIcon + '</a>';
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) {