Skip to content

A
atlas
Commit 425237d5 by keval Committed by Suma Shivaprasad
Options

ATLAS-1056 : Differentiate between tag and term using attribute "taxonomy.namespace"

parent 5de10081
Showing with 166 additions and 137 deletions
dashboardv2/public/css/scss/breadcrumb.scss
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
display: none !important; display: none !important;
} }
.breadcrumb-dropdown .popover.bottom { #new-header .breadcrumb-dropdown .popover.bottom {
margin-top: 45px; margin-top: 45px !important;
} }
.breadcrumb>li:last-child a { .breadcrumb>li:last-child a {
......
dashboardv2/public/css/scss/theme.scss
...@@ -19,15 +19,32 @@ ...@@ -19,15 +19,32 @@
/* theme.scss */ /* theme.scss */
.user-dropdown { .header-menu {
display: inline-block; .dropdown-menu > li > a {
padding: 14px; color: $color_ironside_gray_approx;
color: $color_ironside_gray_approx; &:hover {
.user-circle { color: $color_jungle_green_approx;
padding: 8px 10px; }
border: 1px solid $color_ironside_gray_approx; i {
border-radius: 20px; padding-right: 3px;
margin: 0px 4px; }
}
>a {
display: inline-block;
color: $color_ironside_gray_approx;
padding: 16px 14px;
&:hover {
border-bottom: 2px solid $color_jungle_green_approx;
padding: 14px 14px;
color: $color_jungle_green_approx;
}
span {
padding: 5px;
}
i {
margin-top: 7px;
font-size: 18px;
}
} }
} }
...@@ -132,6 +149,7 @@ ...@@ -132,6 +149,7 @@
color: $color_jungle_green_approx; color: $color_jungle_green_approx;
} }
} }
.position-relative{
position:relative; .position-relative {
} position: relative;
\ No newline at end of file }
dashboardv2/public/js/templates/business_catalog/BusinessCatalogHeader.html
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
<ol class="breadcrumb col-md-6"> <ol class="breadcrumb col-md-6">
</ol> </ol>
<header class="clearfix"> <header class="clearfix">
<div class="btn-group pull-right"> <div class="btn-group pull-right header-menu">
<a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><span class="userName"></span><i class="fa fa-user user-circle"></i></a> <a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home" title="Help"><i class="fa fa-question-circle"></i></a>
<a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user user-circle"></i><span class="userName"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- <li><a href="#">Edit Profile</a></li> <!-- <li><a href="#">Edit Profile</a></li>
<li><a href="#">Change Password</a></li> --> <li><a href="#">Change Password</a></li> -->
<li class="aboutAtlas"><a href="javascript:void(0)">About</a></li> <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
<li><a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home">Help</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li><a href="logout.html">Logout</a></li> <li><a href="logout.html"><i class="fa fa-sign-out"></i>Logout</a></li>
</ul> </ul>
</div> </div>
</header> </header>
dashboardv2/public/js/templates/site/header.html
...@@ -15,16 +15,16 @@ ...@@ -15,16 +15,16 @@
* limitations under the License. * limitations under the License.
--> -->
<header class="clearfix"> <header class="clearfix">
<div class="btn-group pull-right"> <div class="btn-group pull-right header-menu ">
<a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><span class="userName"></span><i class="fa fa-user user-circle "></i></a> <a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home" title="Help"><i class="fa fa-question-circle"></i></a>
<a href="javascript:void(0);" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="user-dropdown"><i class="fa fa-user user-circle "></i><span class="userName"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- <li><a href="#">Edit Profile</a></li> <!-- <li><a href="#">Edit Profile</a></li>
<li><a href="#">Change Password</a></li> --> <li><a href="#">Change Password</a></li> -->
<li class="aboutAtlas"><a href="javascript:void(0)">About</a></li> <li class="aboutAtlas"><a href="javascript:void(0)">About</a></li>
<li><a target="_blank" href="https://cwiki.apache.org/confluence/display/ATLAS/Atlas+Home">Help</a></li>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li> <li>
<a href="logout.html"> <i class="fa fa-sign-out"></i> Logout</a> <a href="logout.html"><i class="fa fa-sign-out"></i>Logout</a>
</li> </li>
</ul> </ul>
</div> </div>
......
dashboardv2/public/js/utils/CommonViewFunction.js
...@@ -39,20 +39,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -39,20 +39,10 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
tagModel.deleteTag(options.guid, options.tagName, { tagModel.deleteTag(options.guid, options.tagName, {
success: function(data) { success: function(data) {
var msg = "Tag " + name.name + Messages.removeSuccessMessage; var msg = "Tag " + name.name + Messages.removeSuccessMessage;
if (data.traitName) { if (options.tagOrTerm === "term") {
var tagOrTerm = Utils.checkTagOrTerm(data.traitName); msg = "Term " + options.tagName + Messages.removeSuccessMessage;
if (tagOrTerm.term) { } else if (options.tagOrTerm === "tag") {
msg = "Term " + data.traitName + Messages.removeSuccessMessage; msg = "Tag " + options.tagName + Messages.removeSuccessMessage;
} else {
msg = "Tag " + data.traitName + Messages.removeSuccessMessage;
}
} else {
var tagOrTerm = Utils.checkTagOrTerm(options.tagName);
if (tagOrTerm.term) {
msg = "Term " + data.traitName + Messages.removeSuccessMessage;
} else {
msg = "Tag " + data.traitName + Messages.removeSuccessMessage;
}
} }
Utils.notifySuccess({ Utils.notifySuccess({
content: msg content: msg
...@@ -405,14 +395,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -405,14 +395,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
id = model.get('$id$').id, id = model.get('$id$').id,
terms = []; terms = [];
_.keys(traits).map(function(key) { _.keys(traits).map(function(key) {
if (traits[key].$typeName$) { if (traits[key]) {
var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); var tagName = Utils.checkTagOrTerm(traits[key]);
} else {
var tagName = Utils.checkTagOrTerm(traits[key].typeName);
} }
if (tagName.term) { if (tagName.term) {
terms.push({ terms.push({
deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-assetname="' + model.get("name") + '" data-name="' + tagName.fullName+ '" data-guid="' + model.get('$id$').id + '" ></i></a>', deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-type="term" data-assetname="' + model.get("name") + '" data-name="' + tagName.fullName + '" data-guid="' + model.get('$id$').id + '" ></i></a>',
url: tagName.fullName.split(".").join("/"), url: tagName.fullName.split(".").join("/"),
name: tagName.fullName name: tagName.fullName
}); });
...@@ -447,17 +435,15 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -447,17 +435,15 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
popTag = "", popTag = "",
count = 0; count = 0;
_.keys(model.get('$traits$')).map(function(key) { _.keys(model.get('$traits$')).map(function(key) {
if (traits[key].$typeName$) { if (traits[key]) {
var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); var tagName = Utils.checkTagOrTerm(traits[key]);
} else {
var tagName = Utils.checkTagOrTerm(traits[key].typeName);
} }
var className = "inputTag"; var className = "inputTag";
if (!tagName.term) { if (tagName.tag) {
if (count >= 1) { if (count >= 1) {
popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.name + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '"data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>'; popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.fullName + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '"data-name="' + tagName.fullName + '" data-type="tag" data-guid="' + model.get('$id$').id + '" ></i></a>';
} else { } else {
atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.name + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '" data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>'; atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.fullName + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '" data-name="' + tagName.fullName + '" data-type="tag" data-guid="' + model.get('$id$').id + '" ></i></a>';
} }
++count; ++count;
} }
......
dashboardv2/public/js/utils/Messages.js
...@@ -24,8 +24,8 @@ define(['require'], function(require) { ...@@ -24,8 +24,8 @@ define(['require'], function(require) {
addErrorMessage: " could not be Created", addErrorMessage: " could not be Created",
addTermToEntitySuccessMessage: " has been added to entity", addTermToEntitySuccessMessage: " has been added to entity",
deleteTerm: "Delete Term", deleteTerm: "Delete Term",
removeTag: "Remove Tag", removeTag: "Remove Tag Assignment",
removeTerm: "Remove Term", removeTerm: "Remove Term Assignment",
deleteSuccessMessage: " has been deleted successfully", deleteSuccessMessage: " has been deleted successfully",
deleteErrorMessage: " could not be deleted", deleteErrorMessage: " could not be deleted",
removeSuccessMessage: " has been removed successfully", removeSuccessMessage: " has been removed successfully",
......
dashboardv2/public/js/utils/Utils.js
...@@ -233,20 +233,51 @@ define(['require', 'utils/Globals'], function(require, Globals) { ...@@ -233,20 +233,51 @@ define(['require', 'utils/Globals'], function(require, Globals) {
} }
} }
} }
Utils.checkTagOrTerm = function(value) { Utils.checkTagOrTerm = function(value, isTermView) {
if (value && _.isString(value)) { if (value && _.isString(value) && isTermView) {
// For string break
if (value == "TaxonomyTerm") {
return {}
}
var name = value.split('.'); var name = value.split('.');
if (name.length > 1) { return {
term: true,
tag: false,
name: name[name.length - 1],
fullName: value
}
}
if (_.isObject(value)) {
var name = "";
if (value && value.$typeName$) {
name = value.$typeName$;
} else if (value && value.typeName) {
name = value.typeName;
}
if (name === "TaxonomyTerm") {
return {}
}
name = name.split('.');
var trem = false;
if (value['taxonomy.namespace']) {
trem = true;
} else if (value.values && value.values['taxonomy.namespace']) {
trem = true;
}
if (trem) {
return { return {
term: true, term: true,
tag: false,
name: name[name.length - 1], name: name[name.length - 1],
fullName: value fullName: name.join('.')
} }
} else { } else {
return { return {
term: false, term: false,
tag: true,
name: name[name.length - 1], name: name[name.length - 1],
fullName: value fullName: name.join('.')
} }
} }
} }
......
dashboardv2/public/js/views/business_catalog/BusinessCatalogDetailLayoutView.js
...@@ -97,7 +97,7 @@ define(['require', ...@@ -97,7 +97,7 @@ define(['require',
createdDate = this.model.get('creation_time'); createdDate = this.model.get('creation_time');
if (name) { if (name) {
this.ui.title.show(); this.ui.title.show();
this.termName = Utils.checkTagOrTerm(name); this.termName = Utils.checkTagOrTerm(name, true);
this.ui.title.html('<span>' + this.termName.name + '</span>'); this.ui.title.html('<span>' + this.termName.name + '</span>');
} else { } else {
this.ui.title.hide(); this.ui.title.hide();
......
dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
...@@ -382,13 +382,14 @@ define(['require', ...@@ -382,13 +382,14 @@ define(['require',
} }
} }
} }
var name = Utils.checkTagOrTerm(model.get('name')); var name = Utils.checkTagOrTerm(model.get('name'), true);
if (that.viewBased) { if (name.name) {
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>'; if (that.viewBased) {
} else { 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>';
parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></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 {
parentLi = '<div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></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>';
}
} }
}); });
if (href) { if (href) {
var hrefUrl = "/api" + href.split("/api")[1]; var hrefUrl = "/api" + href.split("/api")[1];
...@@ -401,12 +402,14 @@ define(['require', ...@@ -401,12 +402,14 @@ define(['require',
function createTerm() { function createTerm() {
_.each(that.childCollection.fullCollection.models, function(model, key) { _.each(that.childCollection.fullCollection.models, function(model, key) {
var name = Utils.checkTagOrTerm(model.get('name')); var name = Utils.checkTagOrTerm(model.get('name'), true);
var hrefUrl = "/api" + model.get('href').split("/api")[1]; var hrefUrl = "/api" + model.get('href').split("/api")[1];
if (that.viewBased) { if (name.name) {
childLi += '<li class="children"><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></li>'; if (that.viewBased) {
} else { childLi += '<li class="children"><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></li>';
childLi += '<li class="children"><div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></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></li>'; } else {
childLi += '<li class="children"><div class="tools"><i class="fa fa-refresh fa-spin-custom taxanomyloader"></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></li>';
}
} }
}); });
that.ui.childList.html(childLi); that.ui.childList.html(childLi);
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -167,8 +167,7 @@ define(['require', ...@@ -167,8 +167,7 @@ define(['require',
} }
} }
if (collectionJSON[0].traits) { if (collectionJSON[0].traits) {
this.tagElement = _.keys(collectionJSON[0].traits); this.addTagToTerms(collectionJSON[0].traits);
this.addTagToTerms(this.tagElement);
} }
} }
...@@ -194,34 +193,37 @@ define(['require', ...@@ -194,34 +193,37 @@ define(['require',
}, },
onClickTagCross: function(e) { onClickTagCross: function(e) {
var tagName = $(e.currentTarget).parent().text(), var tagName = $(e.currentTarget).parent().text(),
tagOrTerm = $(e.target).data("type"),
that = this; that = this;
var tagOrTerm = Utils.checkTagOrTerm(tagName); if (tagOrTerm === "term") {
if (tagOrTerm.term) {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + this.name + "?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + this.name + "?</b></div>",
titleMessage: Messages.removeTerm, titleMessage: Messages.removeTerm,
buttonText: "Remove" buttonText: "Remove"
}); });
} else { } else if (tagOrTerm === "tag") {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + this.name + "?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + this.name + "?</b></div>",
titleMessage: Messages.removeTag, titleMessage: Messages.removeTag,
buttonText: "Remove" buttonText: "Remove"
}); });
} }
modal.on('ok', function() { if (modal) {
that.deleteTagData(e); modal.on('ok', function() {
}); that.deleteTagData(e, tagOrTerm);
modal.on('closeModal', function() { });
modal.trigger('cancel'); modal.on('closeModal', function() {
}); modal.trigger('cancel');
});
}
}, },
deleteTagData: function(e) { deleteTagData: function(e, tagOrTerm) {
var that = this, var that = this,
tagName = $(e.currentTarget).text(); tagName = $(e.currentTarget).text();
CommonViewFunction.deleteTag({ CommonViewFunction.deleteTag({
'tagName': tagName, 'tagName': tagName,
'guid': that.id, 'guid': that.id,
'tagOrTerm': tagOrTerm,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
...@@ -234,13 +236,12 @@ define(['require', ...@@ -234,13 +236,12 @@ define(['require',
_.each(tagObject, function(val) { _.each(tagObject, function(val) {
var isTerm = Utils.checkTagOrTerm(val); var isTerm = Utils.checkTagOrTerm(val);
if (!isTerm.term) { if (isTerm.tag) {
tagData += '<span class="inputTag" data-id="tagClick"><span class="inputValue">' + val + '</span><i class="fa fa-close" data-id="deleteTag"></i></span>'; tagData += '<span class="inputTag" data-id="tagClick"><span class="inputValue">' + isTerm.fullName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag"></i></span>';
} }
if (isTerm.term) { if (isTerm.term) {
termData += '<span class="inputTag term" data-id="tagClick" data-href="' + val + '"><span class="inputValue">' + val + '</span><i class="fa fa-close" data-id="deleteTag"></i></span>'; termData += '<span class="inputTag term" data-id="tagClick" data-href="' + isTerm.fullName + '"><span class="inputValue">' + isTerm.fullName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="term"></i></span>';
} }
}); });
this.ui.tagList.find("span.inputTag").remove(); this.ui.tagList.find("span.inputTag").remove();
this.ui.termList.find("span.inputTag").remove(); this.ui.termList.find("span.inputTag").remove();
......
dashboardv2/public/js/views/schema/SchemaLayoutView.js
...@@ -321,37 +321,40 @@ define(['require', ...@@ -321,37 +321,40 @@ define(['require',
}, },
onClickTagCross: function(e) { onClickTagCross: function(e) {
var tagName = $(e.target).data("name"), var tagName = $(e.target).data("name"),
guid = $(e.target).data("guid"),
assetName = $(e.target).data("assetname"), assetName = $(e.target).data("assetname"),
tagOrTerm = $(e.target).data("type"),
that = this; that = this;
var tagOrTerm = Utils.checkTagOrTerm(tagName); if (tagOrTerm === "term") {
if (tagOrTerm.term) {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + "?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>",
titleMessage: Messages.removeTerm, titleMessage: Messages.removeTerm,
buttonText: "Remove" buttonText: "Remove"
}); });
} else { } else if (tagOrTerm === "tag") {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + "?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>",
titleMessage: Messages.removeTag, titleMessage: Messages.removeTag,
buttonText: "Remove" buttonText: "Remove"
}); });
} }
if (modal) {
modal.on('ok', function() { modal.on('ok', function() {
that.deleteTagData(e); that.deleteTagData(e, tagOrTerm);
}); });
modal.on('closeModal', function() { modal.on('closeModal', function() {
modal.trigger('cancel'); modal.trigger('cancel');
}); });
}
}, },
deleteTagData: function(e) { deleteTagData: function(e, tagOrTerm) {
var that = this, var that = this,
tagName = $(e.target).data("name"), tagName = $(e.target).data("name"),
guid = $(e.target).data("guid"); guid = $(e.target).data("guid");
CommonViewFunction.deleteTag({ CommonViewFunction.deleteTag({
'tagName': tagName, 'tagName': tagName,
'guid': guid, 'guid': guid,
'tagOrTerm': tagOrTerm,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
......
dashboardv2/public/js/views/search/SearchLayoutView.js
...@@ -79,10 +79,6 @@ define(['require', ...@@ -79,10 +79,6 @@ define(['require',
} }
}); });
this.type = "fulltext"; this.type = "fulltext";
this.tagCollection = new VTagList();
$.extend(this.tagCollection.queryParams, { type: 'TRAIT' });
this.typeCollection = new VTagList();
$.extend(this.typeCollection.queryParams, { type: 'CLASS' });
this.bindEvents(); this.bindEvents();
}, },
bindEvents: function(param) { bindEvents: function(param) {
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -545,35 +545,38 @@ define(['require', ...@@ -545,35 +545,38 @@ define(['require',
var tagName = $(e.target).data("name"), var tagName = $(e.target).data("name"),
guid = $(e.target).data("guid"), guid = $(e.target).data("guid"),
assetName = $(e.target).data("assetname"), assetName = $(e.target).data("assetname"),
that = this, tagOrTerm = $(e.target).data("type"),
tagOrTerm = Utils.checkTagOrTerm(tagName); that = this;
if (tagOrTerm.term) { if (tagOrTerm === "term") {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>",
titleMessage: Messages.removeTerm, titleMessage: Messages.removeTerm,
buttonText: "Remove" buttonText: "Remove"
}); });
} else { } else if (tagOrTerm === "tag") {
var modal = CommonViewFunction.deleteTagModel({ var modal = CommonViewFunction.deleteTagModel({
msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>", msg: "<div class='ellipsis'>Remove: " + "<b>" + tagName + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>",
titleMessage: Messages.removeTag, titleMessage: Messages.removeTag,
buttonText: "Remove" buttonText: "Remove"
}); });
} }
modal.on('ok', function() { if (modal) {
that.deleteTagData(e); modal.on('ok', function() {
}); that.deleteTagData(e, tagOrTerm);
modal.on('closeModal', function() { });
modal.trigger('cancel'); modal.on('closeModal', function() {
}); modal.trigger('cancel');
});
}
}, },
deleteTagData: function(e) { deleteTagData: function(e, tagOrTerm) {
var that = this, var that = this,
tagName = $(e.target).data("name"), tagName = $(e.target).data("name"),
guid = $(e.target).data("guid"); guid = $(e.target).data("guid");
CommonViewFunction.deleteTag({ CommonViewFunction.deleteTag({
'tagName': tagName, 'tagName': tagName,
'guid': guid, 'guid': guid,
'tagOrTerm': tagOrTerm,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
......
dashboardv2/public/js/views/tag/CreateTagLayoutView.js
...@@ -85,11 +85,7 @@ define(['require', ...@@ -85,11 +85,7 @@ define(['require',
placeholder: "Search Tags", placeholder: "Search Tags",
allowClear: true allowClear: true
}); });
}, }
fetchCollection: function() {
$.extend(this.tagCollection.queryParams, { type: 'TRAIT' });
this.tagCollection.fetch({ reset: true });
},
}); });
return CreateTagLayoutView; return CreateTagLayoutView;
}); });
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
...@@ -67,14 +67,13 @@ define(['require', ...@@ -67,14 +67,13 @@ define(['require',
tagTermList = [], tagTermList = [],
that = this; that = this;
_.each(tagorterm, function(object) { _.each(tagorterm, function(object) {
var checkTagOrTerm = Utils.checkTagOrTerm(object);
if (that.term) { if (that.term) {
var checkTagOrTerm = Utils.checkTagOrTerm(object.typeName);
if (checkTagOrTerm.term) { if (checkTagOrTerm.term) {
tagTermList.push(object); tagTermList.push(object);
} }
} else { } else {
var checkTagOrTerm = Utils.checkTagOrTerm(object.typeName); if (checkTagOrTerm.tag) {
if (!checkTagOrTerm.term) {
tagTermList.push(object); tagTermList.push(object);
} }
} }
...@@ -191,7 +190,6 @@ define(['require', ...@@ -191,7 +190,6 @@ define(['require',
}); });
} }
modal.on('ok', function() { modal.on('ok', function() {
that.deleteTagData(e); that.deleteTagData(e);
}); });
...@@ -205,6 +203,7 @@ define(['require', ...@@ -205,6 +203,7 @@ define(['require',
CommonViewFunction.deleteTag({ CommonViewFunction.deleteTag({
'tagName': tagName, 'tagName': tagName,
'guid': that.guid, 'guid': that.guid,
'tagOrTerm': (that.term ? "term" : "tag"),
callback: function() { callback: function() {
that.$('.fontLoader').show(); that.$('.fontLoader').show();
that.collection.fetch({ reset: true }); that.collection.fetch({ reset: true });
......
dashboardv2/public/js/views/tag/TagLayoutView.js
...@@ -103,7 +103,7 @@ define(['require', ...@@ -103,7 +103,7 @@ define(['require',
}); });
}, },
fetchCollections: function() { fetchCollections: function() {
$.extend(this.tagCollection.queryParams, { type: 'TRAIT', }); $.extend(this.tagCollection.queryParams, { type: 'TRAIT', notsupertype: 'TaxonomyTerm' });
this.tagCollection.fetch({ reset: true }); this.tagCollection.fetch({ reset: true });
this.ui.offLineSearchTag.val(""); this.ui.offLineSearchTag.val("");
}, },
...@@ -159,18 +159,14 @@ define(['require', ...@@ -159,18 +159,14 @@ define(['require',
str = ''; str = '';
_.each(this[collection].fullCollection.models, function(model) { _.each(this[collection].fullCollection.models, function(model) {
var tagName = model.get("tags"); var tagName = model.get("tags");
var tagOrTerm = Utils.checkTagOrTerm(tagName); if (searchString) {
if (!tagOrTerm.term) { if (tagName.search(new RegExp(searchString, "i")) != -1) {
if (searchString) { str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-ellipsis-h tagPopover"></i></div><a href="#!/tag/tagAttribute/' + tagName + '" data-name="`' + tagName + '`" >' + tagName + '</a></li>' + str;
if (tagName.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/' + tagName + '" data-name="`' + tagName + '`" >' + tagName + '</a></li>' + str;
} else {
return;
}
} else { } else {
//str = '<li class="parent-node" data-id="tags"><div class="tools"><i class="fa fa-trash-o" data-id="deleteTerm"></i></div><a href="#!/tag/tagAttribute/' + tagName + '">' + tagName + '</a></li>' + str; 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/' + tagName + '" data-name="`' + tagName + '`">' + tagName + '</a></li>' + str;
} }
} 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/' + tagName + '" data-name="`' + tagName + '`">' + tagName + '</a></li>' + str;
} }
}); });
this.ui.tagsParent.empty().html(str); this.ui.tagsParent.empty().html(str);
......
dashboardv2/public/js/views/tag/addTagModalView.js
...@@ -67,7 +67,7 @@ define(['require', ...@@ -67,7 +67,7 @@ define(['require',
}, },
onRender: function() { onRender: function() {
$.extend(this.collection.queryParams, { type: 'TRAIT' }); $.extend(this.collection.queryParams, { type: 'TRAIT', notsupertype: 'TaxonomyTerm' });
this.collection.fetch({ reset: true }); this.collection.fetch({ reset: true });
}, },
bindEvents: function() { bindEvents: function() {
...@@ -81,10 +81,7 @@ define(['require', ...@@ -81,10 +81,7 @@ define(['require',
tagsCollection: function() { tagsCollection: function() {
var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>'; var str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>';
_.each(this.collection.fullCollection.models, function(obj, key) { _.each(this.collection.fullCollection.models, function(obj, key) {
var tagOrTerm = Utils.checkTagOrTerm(obj.get('tags')); str += '<option>' + obj.get('tags') + '</option>';
if (!tagOrTerm.term) {
str += '<option>' + obj.get('tags') + '</option>';
}
}); });
this.ui.addTagOptions.html(str); this.ui.addTagOptions.html(str);
this.ui.addTagOptions.select2({ this.ui.addTagOptions.select2({
......
release-log.txt
...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
ALL CHANGES: ALL CHANGES:
ATLAS-1056 Differentiate between tag and term using attribute "taxonomy.namespace" (kevalbhat18 via sumasai)
ATLAS-1059 Change log level to debug for search APIs(sumasai) ATLAS-1059 Change log level to debug for search APIs(sumasai)
ATLAS-1049 Fix validation while filtering by supertypes(mneethiraj via sumasai) ATLAS-1049 Fix validation while filtering by supertypes(mneethiraj via sumasai)
ATLAS-1053 Fix issues flagged by Coverity scan - potential NPE (mneethiraj via sumasai) ATLAS-1053 Fix issues flagged by Coverity scan - potential NPE (mneethiraj via sumasai)
......
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