Skip to content

A
atlas
Commit e0145ffd by kevalbhatt Committed by Madhan Neethiraj
Options

ATLAS-1668: updated UI to exclude terms from tag UI elements

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 2d68d4ce
Showing with 27 additions and 18 deletions
dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js
......@@ -74,9 +74,9 @@ define(['require',
}
var obj = {
termName: termName,
guid: that.multiple[i].id.id,
deletedEntity: Enums.entityStateReadOnly[that.multiple[i].id.state],
entityName: that.multiple[i].model.get('name')
guid: that.multiple[i].id,
deletedEntity: Enums.entityStateReadOnly[that.multiple[i].model.status],
entityName: Utils.getName(that.multiple[i].model)
};
if (obj.deletedEntity) {
Utils.notifyError({
......
dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
......@@ -377,7 +377,6 @@ define(['require',
}
var name = Utils.checkTagOrTerm(model.get('name'), true);
if (name.name) {
// data-name="<space>'<tagName>'" Space is required for DSL search Input
if (that.viewBased) {
parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></i><i class="fa fa-ellipsis-h termPopover"></i></div><i class="fa fa-angle-right toggleArrow" data-id="expandArrow" data-href="' + hrefUrl + '"></i><a href="javascript:void(0)" data-href="' + hrefUrl + '" data-name="`' + model.get('name') + '`">' + name.name + '</a>';
} else {
......
dashboardv2/public/js/views/search/SearchLayoutView.js
......@@ -172,11 +172,15 @@ define(['require',
return Utils.getName(model.toJSON(), 'name').toLowerCase();
}
this.typeHeaders.fullCollection.sort().each(function(model) {
var name = Utils.getName(model.toJSON(), 'name');
if (model.get('category') == 'ENTITY') {
typeStr += '<option>' + (Utils.getName(model.toJSON(), 'name')) + '</option>';
typeStr += '<option>' + (name) + '</option>';
}
if (model.get('category') == 'CLASSIFICATION') {
tagStr += '<option>' + (Utils.getName(model.toJSON(), 'name')) + '</option>';
var checkTagOrTerm = Utils.checkTagOrTerm(name);
if (checkTagOrTerm.tag) {
tagStr += '<option>' + (name) + '</option>';
}
}
});
that.ui.typeLov.html(typeStr);
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
......@@ -294,7 +294,7 @@ define(['require',
if (Globals.entityCreate && Globals.entityTypeConfList && Utils.getUrlState.isSearchTab()) {
createEntityTag = "<p>If you do not find the entity in search result below then you can" + '<a href="javascript:void(0)" data-id="createEntity"> create new entity</a></p>';
}
that.$('.searchResult').html(resultData + multiAssignDataTag + multiAssignDataTerm + createEntityTag);
that.$('.searchResult').html(resultData + multiAssignDataTerm + multiAssignDataTag + createEntityTag);
},
silent: true,
reset: true
......
dashboardv2/public/js/views/tag/CreateTagLayoutView.js
......@@ -98,7 +98,11 @@ define(['require',
that = this;
this.ui.parentTag.empty();
this.tagCollection.fullCollection.each(function(val) {
str += '<option>' + (Utils.getName(val.toJSON())) + '</option>';
var name = Utils.getName(val.toJSON()),
checkTagOrTerm = Utils.checkTagOrTerm(name);
if (checkTagOrTerm.tag) {
str += '<option>' + (name) + '</option>';
}
});
that.ui.parentTag.html(str);
// IE9 support
......
dashboardv2/public/js/views/tag/TagLayoutView.js
......@@ -144,18 +144,17 @@ define(['require',
};
that.collection.fullCollection.sort().each(function(model) {
var name = Utils.getName(model.toJSON(), 'name');
if (name.indexOf(".") > -1) {
return;
}
if (searchString) {
if (name.search(new RegExp(searchString, "i")) != -1) {
// data-name="<space>'<tagName>'" Space is required for DSL search Input
str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + name + '" data-name=" `' + name + '`" >' + name + '</a></li>';
var checkTagOrTerm = Utils.checkTagOrTerm(name);
if (checkTagOrTerm.tag) {
if (searchString) {
if (name.search(new RegExp(searchString, "i")) != -1) {
str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + name + '" data-name="`' + name + '`" >' + name + '</a></li>';
} else {
return;
}
} else {
return;
str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + name + '" data-name="`' + name + '`">' + name + '</a></li>';
}
} else {
str += '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + name + '" data-name=" `' + name + '`">' + name + '</a></li>';
}
});
this.ui.tagsParent.empty().html(str);
......
dashboardv2/public/js/views/tag/addTagModalView.js
......@@ -193,6 +193,9 @@ define(['require',
var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>';
this.collection.fullCollection.sort().each(function(obj, key) {
var name = Utils.getName(obj.toJSON(), 'name');
if (name === "TaxonomyTerm") {
return;
}
// using obj.get('name') insted of name variable because if html is presen in name then escaped name will not found in tagList.
if (_.indexOf(that.tagList, obj.get('name')) === -1) {
str += '<option>' + name + '</option>';
......
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