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

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -253,6 +253,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                     deleteIcon = "";
                 if (obj.guid === tag.entityGuid) {
                     deleteIcon = '<i class="fa fa-times" data-id="delete"  data-assetname="' + entityName + '"data-name="' + tag.typeName + '" data-type="tag" data-guid="' + obj.guid + '" ></i>';
+                } else if (obj.guid !== tag.entityGuid && tag.entityStatus === "DELETED") {
+                    deleteIcon = '<i class="fa fa-times" data-id="delete"  data-assetname="' + entityName + '"data-name="' + tag.typeName + '" data-type="tag" data-entityguid="' + tag.entityGuid + '" data-guid="' + obj.guid + '" ></i>';
                 } else {
                     className += " propagte-classification";
                 }

dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js

@@ -320,8 +320,11 @@ define(['require',
             },
             onClickTagCross: function(e) {
                 var that = this,
-                    tagName = $(e.currentTarget).parent().text();
+                    tagName = $(e.currentTarget).parent().text(),
+                    entityGuid = $(e.currentTarget).data("entityguid");
                 CommonViewFunction.deleteTag(_.extend({}, {
+                    guid: that.id,
+                    associatedGuid: that.id != entityGuid ? entityGuid : null,
                     msg: "<div class='ellipsis'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + this.name + "?</b></div>",
                     titleMessage: Messages.removeTag,
                     okText: "Remove",
@@ -373,7 +376,8 @@ define(['require',
                     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="deleteTag" data-type="tag" title="Remove Tag"></i></span>';
                 });
                 _.each(tag.propagated, function(val) {
-                    propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span></span>';
+                    var crossButton = '<i class="fa fa-close" data-id="deleteTag" data-entityguid="' + val.entityGuid + '" data-type="tag" title="Remove Tag"></i>';
+                    propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span>' + ((that.id !== val.entityGuid && val.entityStatus === "DELETED") ? crossButton : "") + '</span>';
                 });
                 propagatedTagListData !== "" ? this.ui.propagatedTagDiv.show() : this.ui.propagatedTagDiv.hide();
                 this.ui.tagList.find("span.btn").remove();

dashboardv2/public/js/views/search/SearchResultLayoutView.js

@@ -954,10 +954,12 @@ define(['require',
                 var that = this,
                     tagName = $(e.target).data("name"),
                     guid = $(e.target).data("guid"),
+                    entityGuid = $(e.target).data("entityguid"),
                     assetName = $(e.target).data("assetname");
                 CommonViewFunction.deleteTag({
                     tagName: tagName,
                     guid: guid,
+                    associatedGuid: guid != entityGuid ? entityGuid : null,
                     msg: "<div class='ellipsis'>Remove: " + "<b>" + _.escape(tagName) + "</b> assignment from" + " " + "<b>" + assetName + " ?</b></div>",
                     titleMessage: Messages.removeTag,
                     okText: "Remove",