ATLAS-2562 : UI: Support Business Terms and Categories (bug fixes)

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -683,7 +683,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
     }
     CommonViewFunction.removeCategoryTermAssociation = function(options) {
         if (options) {
-            var selectedGuid = options.guid,
+            var selectedGuid = options.selectedGuid,
                 termGuid = options.termGuid,
                 isCategoryView = options.isCategoryView,
                 isTermView = options.isTermView,
@@ -728,9 +728,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 } else {
                     var data = _.extend({}, model);
                     if (isTermView) {
-                        data.categories = _.reject(data.categories, function(term) { return term.categoryGuid != selectedGuid });
+                        data.categories = _.reject(data.categories, function(term) { return term.categoryGuid == selectedGuid });
                     } else {
-                        data.terms = _.reject(data.terms, function(term) { return term.termGuid != selectedGuid });
+                        data.terms = _.reject(data.terms, function(term) { return term.termGuid == selectedGuid });
                     }
 
                     newModel[isTermView ? "createEditTerm" : "createEditCategory"](_.extend(ajaxOptions, {

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

@@ -412,7 +412,9 @@ define(['require',
                 var that = this,
                     termData = "";
                 _.each(data, function(val) {
-                    termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.displayText + ' data-id="termClick"><span>' + val.displayText + '</span><i class="fa fa-close" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>';
+                    if (val.relationshipStatus == "ACTIVE") {
+                        termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.displayText + ' data-id="termClick"><span>' + val.displayText + '</span><i class="fa fa-close" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>';
+                    }
                 });
                 this.ui.termList.find("span.btn").remove();
                 this.ui.termList.prepend(termData);