ATLAS-1668: updated UI to exclude terms from tag UI elements
Signed-off-by: Madhan Neethiraj <madhan@apache.org>
diff --git a/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js b/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js
index dd45e48..0212efe 100644
--- a/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js
+++ b/dashboardv2/public/js/views/business_catalog/AddTermToEntityLayoutView.js
@@ -74,9 +74,9 @@
}
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({
diff --git a/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
index 0bca0df..998c8f4 100644
--- a/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
+++ b/dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
@@ -377,7 +377,6 @@
}
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 {
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js b/dashboardv2/public/js/views/search/SearchLayoutView.js
index d3a9030..e68f8c0 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -172,11 +172,15 @@
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);
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index d2a3b51..3446a67 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -294,7 +294,7 @@
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
diff --git a/dashboardv2/public/js/views/tag/CreateTagLayoutView.js b/dashboardv2/public/js/views/tag/CreateTagLayoutView.js
index 957a056..34fa114 100644
--- a/dashboardv2/public/js/views/tag/CreateTagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/CreateTagLayoutView.js
@@ -98,7 +98,11 @@
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
diff --git a/dashboardv2/public/js/views/tag/TagLayoutView.js b/dashboardv2/public/js/views/tag/TagLayoutView.js
index e6b2065..5311ad1 100644
--- a/dashboardv2/public/js/views/tag/TagLayoutView.js
+++ b/dashboardv2/public/js/views/tag/TagLayoutView.js
@@ -144,18 +144,17 @@
};
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);
diff --git a/dashboardv2/public/js/views/tag/addTagModalView.js b/dashboardv2/public/js/views/tag/addTagModalView.js
index 559b2d5..cda5cf6 100644
--- a/dashboardv2/public/js/views/tag/addTagModalView.js
+++ b/dashboardv2/public/js/views/tag/addTagModalView.js
@@ -193,6 +193,9 @@
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>';
