Commit 242733c0 by pratik24mac Committed by nixonrodrigues

ATLAS-2484 :- UI , Tag propagation : On Search results page , entities with…

ATLAS-2484 :- UI , Tag propagation : On Search results page , entities with propagated tags have Tag Remove button Signed-off-by: 's avatarnixonrodrigues <nixon@apache.org>
parent 5f71cad0
...@@ -222,6 +222,11 @@ button:focus { ...@@ -222,6 +222,11 @@ button:focus {
.btn-fixed-width { .btn-fixed-width {
.btn-icon { .btn-icon {
min-width: 100px; min-width: 100px;
&.propagte-classification {
>span {
width: 98px;
}
}
>span { >span {
@include ellipsis(); @include ellipsis();
float: left; float: left;
......
...@@ -232,7 +232,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -232,7 +232,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
return table; return table;
} }
CommonViewFunction.tagForTable = function(obj) { CommonViewFunction.tagForTable = function(obj) {
var traits = obj.classificationNames || _.pluck(obj.classifications, 'typeName'), var traits = obj.classifications,
atags = "", atags = "",
addTag = "", addTag = "",
popTag = "", popTag = "",
...@@ -241,7 +241,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -241,7 +241,13 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if (traits) { if (traits) {
traits.map(function(tag) { traits.map(function(tag) {
var className = "btn btn-action btn-sm btn-blue btn-icon", 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) { if (count >= 1) {
popTag += tagString; popTag += tagString;
} else { } else {
......
...@@ -450,7 +450,8 @@ define(['require', ...@@ -450,7 +450,8 @@ define(['require',
var checkBoxValue = { var checkBoxValue = {
'excludeDeletedEntities': (this.value.includeDE ? false : true), 'excludeDeletedEntities': (this.value.includeDE ? false : true),
'includeSubClassifications': (this.value.excludeSC ? 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) { if (value) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment