Skip to content

A
atlas
Commit 08c49867 by kevalbhatt Committed by Madhan Neethiraj
Options

ATLAS-2639: UI: Associating a classification to entity from term page results in…

ATLAS-2639: UI: Associating a classification to entity from term page results in adding tag to term rather than entity Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 3a002db4
Showing with 64 additions and 25 deletions
dashboardv2/public/css/scss/glossary.scss
......@@ -22,6 +22,14 @@
.jstree-default-dark {
background: transparent !important;
.jstree-anchor {
width: calc(100% - 50px);
overflow: hidden;
text-overflow: ellipsis;
}
.jstree-children {
max-width: 500px;
}
.jstree-clicked,
.jstree-wholerow-clicked {
background: $color_jungle_green_approx !important;
......@@ -43,11 +51,12 @@
}
.tools {
display: none;
position: relative;
width: 9%;
float: right;
position: absolute;
width: 30px;
text-align: center;
cursor: pointer;
top: 0;
right: 0;
}
}
}
\ No newline at end of file
dashboardv2/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
......@@ -36,8 +36,8 @@
{{#if isTermView}}
<div class="form-group clearfix">
<span class="control-label-sm-pr pull-left">Classifications:</span>
<div class="pull-left" data-id="tagList">
<button class="btn btn-action btn-sm" title="Add Classification" data-id="addTag">
<div class="pull-left" data-id="tagListTerm">
<button class="btn btn-action btn-sm" title="Add Classification" data-id="addTagTerm">
<i class="fa fa-plus"> </i>
</button>
</div>
......
dashboardv2/public/js/templates/glossary/GlossaryLayoutView_tmpl.html
......@@ -38,14 +38,14 @@
<div>
<input type="text" class="form-control" data-id="searchTerm" placeholder="{{#if isAssignView}}Search Term{{else}}Search Glossary, Term{{/if}}">
</div>
<div data-id="termTree" style="margin-top: 5px;">
<div data-id="termTree" style="margin-top: 5px;overflow-x: auto;">
</div>
</div>
<div class="col-sm-12 no-padding category-view" style="display: none;">
<div>
<input type="text" class="form-control" data-id="searchCategory" placeholder="{{#if isAssignView}}Search Catalog{{else}}Search Glossary, Category{{/if}}">
</div>
<div data-id="categoryTree" style="margin-top: 5px;">
<div data-id="categoryTree" style="margin-top: 5px;overflow-x: auto;">
</div>
</div>
</div>
......
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -664,11 +664,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
content: messageType + ref.ui.displayName.val() + Messages[model ? "editSuccessMessage" : "addSuccessMessage"]
});
if (options.callback) {
var obj = rModel;
if (isGlossaryView) {
obj = _.omit((rModel && rModel.toJSON ? rModel.toJSON() : rModel), 'terms', 'categories');
}
options.callback(obj);
options.callback(rModel);
}
modal.trigger('closeModal');
},
......
dashboardv2/public/js/utils/Utils.js
......@@ -386,6 +386,11 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
returnObj.key = 'name';
return returnObj;
}
if (collectionJSON.attributes.displayName) {
returnObj.name = _.escape(collectionJSON.attributes.displayName);
returnObj.key = 'displayName';
return returnObj;
}
if (collectionJSON.attributes.qualifiedName) {
returnObj.name = _.escape(collectionJSON.attributes.qualifiedName);
returnObj.key = 'qualifiedName';
......@@ -408,6 +413,11 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
returnObj.key = 'name';
return returnObj;
}
if (collectionJSON.displayName) {
returnObj.name = _.escape(collectionJSON.displayName);
returnObj.key = 'displayName';
return returnObj;
}
if (collectionJSON.qualifiedName) {
returnObj.name = _.escape(collectionJSON.qualifiedName);
returnObj.key = 'qualifiedName';
......@@ -526,11 +536,16 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
if (data.superTypes && data.superTypes.length) {
_.each(data.superTypes, function(superTypeName) {
if (collection.fullCollection) {
var collectionData = collection.fullCollection.findWhere({ name: superTypeName }).toJSON();
var collectionData = collection.fullCollection.findWhere({ name: superTypeName });
} else {
var collectionData = collection.findWhere({ name: superTypeName }).toJSON();
var collectionData = collection.findWhere({ name: superTypeName });
}
collectionData = collectionData && collectionData.toJSON ? collectionData.toJSON() : collectionData;
if (collectionData) {
return getData(collectionData, collection);
} else {
return;
}
});
}
}
......
dashboardv2/public/js/views/glossary/AssignTermLayoutView.js
......@@ -18,7 +18,7 @@
define(['require',
'backbone',
'hbs!tmpl/glossary/AssignTermLayoutViewTmpl',
'hbs!tmpl/glossary/AssignTermLayoutView_tmpl',
'utils/Utils',
'utils/UrlLinks',
'modules/Modal'
......
dashboardv2/public/js/views/glossary/GlossaryDetailLayoutView.js
......@@ -63,10 +63,10 @@ define(['require',
termClick: "[data-id='termClick']",
addTerm: "[data-id='addTerm']",
tagList: "[data-id='tagList']",
removeTag: '[data-id="removeTag"]',
tagClick: '[data-id="tagClick"]',
addTag: '[data-id="addTag"]',
tagList: "[data-id='tagListTerm']",
removeTag: '[data-id="removeTagTerm"]',
tagClick: '[data-id="tagClickTerm"]',
addTag: '[data-id="addTagTerm"]',
},
/** ui events hash */
events: function() {
......@@ -122,8 +122,9 @@ define(['require',
"model": model,
"isGlossaryView": this.isGlossaryView,
"collection": this.glossaryCollection,
"callback": function(data) {
model.set(_.extend({}, model.toJSON(), data), { silent: true });
"callback": function(sModel) {
var data = sModel.toJSON();
model.set(data, { silent: true }); // update glossaryCollection
that.data = data;
that.renderDetails(that.data);
that.glossaryCollection.trigger("update:details", { isGlossaryUpdate: true });
......@@ -189,9 +190,16 @@ define(['require',
var that = this;
},
getData: function() {
if (this.glossaryCollection.fullCollection.length && this.isGlossaryView) {
if (this.isGlossaryView) {
if (this.glossaryCollection.fullCollection.length) {
this.data = this.glossaryCollection.fullCollection.get(this.guid).toJSON();
this.renderDetails(this.data);
} else {
this.listenTo(this.glossaryCollection.fullCollection, "reset ", function(skip) {
this.data = this.glossaryCollection.fullCollection.get(this.guid).toJSON();
this.renderDetails(this.data);
}, this);
}
} else {
Utils.showTitleLoader(this.$('.page-title .fontLoader'), this.ui.details);
var getApiFunctionKey = "getCategory",
......@@ -262,7 +270,7 @@ define(['require',
var that = this,
tagData = "";
_.each(tagObject, function(val) {
tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTag" data-type="tag" title="Remove Tag"></i></span>';
tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClickTerm"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="removeTagTerm" data-type="tag" title="Remove Tag"></i></span>';
});
this.ui.tagList.find("span.btn").remove();
this.ui.tagList.prepend(tagData);
......
dashboardv2/public/js/views/glossary/GlossaryLayoutView.js
......@@ -559,7 +559,11 @@ define(['require',
"isCategoryView": true,
"collection": that.glossaryCollection,
"callback": function() {
if (that.value.gType == "glossary") {
that.getGlossary();
} else {
that.ui.categoryTree.jstree(true).refresh();
}
},
"node": this.glossary.selectedItem
})
......@@ -665,8 +669,10 @@ define(['require',
var obj = {};
if (selectedItem.glossaryId) {
obj["gId"] = selectedItem.glossaryId;
} else if (selectedItem.type == "Glossary") {
obj["gId"] = selectedItem.guid;
}
this.query[this.viewType] = _.extend(obj, this.value, _.pick(this.glossary.selectedItem, 'model', 'type', 'gType', 'guid'), { "viewType": this.viewType, "isNodeNotFoundAtLoad": this.query[this.viewType].isNodeNotFoundAtLoad });
this.query[this.viewType] = _.extend(obj, _.omit(this.value, 'gId'), _.pick(this.glossary.selectedItem, 'model', 'type', 'gType', 'guid'), { "viewType": this.viewType, "isNodeNotFoundAtLoad": this.query[this.viewType].isNodeNotFoundAtLoad });
Utils.setUrl({
url: '#!/glossary/' + obj.guid,
mergeBrowserUrl: false,
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
......@@ -895,7 +895,11 @@ define(['require',
} else {
return [];
}
return obj.classificationNames;
return _.compact(_.map(obj.classifications, function(val) {
if (val.entityGuid == guid) {
return val.typeName
}
}));
} else {
return [];
}
......
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