Skip to content

A
atlas
Commit 1099f1ba by Abhishek Kadam Committed by Sarath Subramanian
Options

ATLAS-2819: UI: Re-evaluate classification propagation during entity delete

Signed-off-by: 's avatarSarath Subramanian <ssubramanian@hortonworks.com>
parent 4c901bd0
Showing with 15 additions and 13 deletions
dashboardv2/public/js/models/VTag.js
......@@ -40,8 +40,8 @@ define(['require',
/*************************
* Non - CRUD operations
*************************/
deleteAssociation: function(guid, name, options) {
var url = UrlLinks.entitiesApiUrl({ guid: guid, name: name });
deleteAssociation: function(guid, name, associatedGuid, options) {
var url = UrlLinks.entitiesApiUrl({ guid: guid, name: name, associatedGuid: associatedGuid });
options = _.extend({
contentType: 'application/json',
dataType: 'json'
......
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -33,7 +33,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
if (options.showLoader) {
options.showLoader();
}
tagModel.deleteAssociation(options.guid, options.tagName, {
tagModel.deleteAssociation(options.guid, options.tagName, options.associatedGuid, {
skipDefaultError: true,
success: function(data) {
Utils.notifySuccess({
......
dashboardv2/public/js/utils/UrlLinks.js
......@@ -52,9 +52,12 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require
var entitiesUrl = this.baseUrlV2 + '/entity';
if (options) {
var guid = options.guid,
associatedGuid = options.associatedGuid,
name = options.name,
minExtInfo = options.minExtInfo;
if (guid && name) {
if (guid && name && associatedGuid) {
return entitiesUrl + '/guid/' + guid + '/classification/' + name + '?associatedEntityGuid=' + associatedGuid;
} else if (guid && name) {
entitiesUrl += '/guid/' + guid + '/classification/' + name;
} else if (guid && !name) {
entitiesUrl += '/guid/' + guid;
......@@ -81,9 +84,6 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require
entityCollectionaudit: function(guid) {
return this.baseUrlV2 + '/entity/' + guid + '/audit';
},
replicationCollectionaudit: function(name) {
return this.baseUrl + '/admin/cluster/audit/' + name;
},
classicationApiUrl: function(name, guid) {
var typeUrl = this.typedefsUrl();
if (name) {
......
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
......@@ -151,12 +151,12 @@ define(['require',
var val = _.isNull(values[sortedObj.name]) ? "-" : values[sortedObj.name],
key = sortedObj.name;
if (_.isObject(val)) {
val = JSON.stringify(val);
val = JSON.stringify(val);
}
if (sortedObj.typeName === "date") {
val = new Date(val)
}
stringValue += "<tr><td class='html-cell string-cell renderable'>" + _.escape(key) + "</td><td class='html-cell string-cell renderable' data-type='"+sortedObj.typeName+"'>" + _.escape(val) + "</td>";
stringValue += "<tr><td class='html-cell string-cell renderable'>" + _.escape(key) + "</td><td class='html-cell string-cell renderable' data-type='" + sortedObj.typeName + "'>" + _.escape(val) + "</td>";
});
tagValue = "<div class='mainAttrTable'><table class='attriTable'><tr><th class='html-cell string-cell renderable'>Name</th><th class='html-cell string-cell renderable'>Value</th>" + stringValue + "</table></div>";
}
......@@ -171,13 +171,13 @@ define(['require',
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var deleteData = '<button title="Delete" class="btn btn-action btn-sm" data-id="delete" data-name="' + model.get('typeName') + '"><i class="fa fa-trash"></i></button>',
var deleteData = '<button title="Delete" class="btn btn-action btn-sm" data-id="delete" data-entityguid="' + model.get('entityGuid') + '" data-name="' + model.get('typeName') + '"><i class="fa fa-trash"></i></button>',
editData = '<button title="Edit" class="btn btn-action btn-sm" data-id="edit" data-name="' + model.get('typeName') + '"><i class="fa fa-pencil"></i></button>',
btnObj = null;
if (that.guid === model.get('entityGuid')) {
return '<div class="btn-inline">' + deleteData + editData + '</div>'
} else {
return;
} else if (that.guid !== model.get('entityGuid') && model.get('entityStatus') === "DELETED") {
return '<div class="btn-inline">' + deleteData + '</div>';
}
}
})
......@@ -198,10 +198,12 @@ define(['require',
},
onClickTagCross: function(e) {
var that = this,
tagName = $(e.currentTarget).data("name");
tagName = $(e.currentTarget).data("name"),
entityGuid = $(e.currentTarget).data("entityguid");
CommonViewFunction.deleteTag({
tagName: tagName,
guid: that.guid,
associatedGuid: that.guid != entityGuid ? entityGuid : null,
msg: "<div class='ellipsis'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + this.entityName + "?</b></div>",
titleMessage: Messages.removeTag,
okText: "Remove",
......
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