ATLAS-2945 UI - If a Term is assigned to an Category then to user is able to…

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enums', 'moment'], function(require, Utils, Modal, Messages, Enums, moment) {
+define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Globals', 'utils/Enums', 'moment'], function(require, Utils, Modal, Messages, Globals, Enums, moment) {
     'use strict';
 
     var CommonViewFunction = {};
@@ -314,6 +314,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
         }
         if (!Enums.entityStateReadOnly[obj.status]) {
             if (obj.guid) {
+                var newD = { "guid": obj.guid, "termLinks": obj.meanings };
+                Globals.termMeanings = Globals.termMeanings ? Globals.termMeanings : [];
+                if (Globals.termMeanings.length > 0) {
+                    for (var x in Globals.termMeanings) {
+                        if (Globals.termMeanings[x]['guid'] == obj.guid) {
+                            Globals.termMeanings[x].termLinks = obj.meanings;
+                        }
+                    }
+                }
+                if (newD.termLinks.length > 0 && Globals.termMeanings == 0) {
+                    Globals.termMeanings.push(newD);
+                }
                 addTerm += '<a href="javascript:void(0)" data-id="addTerm" class="btn btn-action btn-sm assignTag" data-guid="' + obj.guid + '" ><i class="fa fa-plus"></i></a>';
             } else {
                 addTerm += '<a href="javascript:void(0)" data-id="addTerm" class="btn btn-action btn-sm assignTag"><i style="right:0" class="fa fa-plus"></i></a>';

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

@@ -198,7 +198,7 @@ define(['require',
                             this.generateTag([]);
                         }
                         if (collectionJSON.relationshipAttributes && collectionJSON.relationshipAttributes.meanings) {
-                            this.generateTerm(collectionJSON.relationshipAttributes.meanings);
+                            this.generateTerm(collectionJSON.relationshipAttributes.meanings, collectionJSON);
                         }
                         if (Globals.entityTypeConfList && _.isEmptyArray(Globals.entityTypeConfList)) {
                             this.ui.editButtonContainer.html(ButtonsTmpl({ btn_edit: true }));
@@ -403,10 +403,23 @@ define(['require',
                 this.ui.propagatedTagList.html(propagatedTagListData);
 
             },
-            generateTerm: function(data) {
+            generateTerm: function(data, obj) {
                 var that = this,
                     termData = "";
+                var newD = { "guid": obj.guid, "termLinks": obj.relationshipAttributes.meanings };
+                Globals.termMeanings = Globals.termMeanings ? Globals.termMeanings : [];
+                if (Globals.termMeanings.length > 0) {
+                    for (var x in Globals.termMeanings) {
+                        if (Globals.termMeanings[x]['guid'] == obj.guid) {
+                            Globals.termMeanings[x].termLinks = obj.relationshipAttributes.meanings;
+                        }
+                    }
+                }
+                if (newD.termLinks.length > 0 && Globals.termMeanings == 0) {
+                    Globals.termMeanings.push(newD);
+                }
                 _.each(data, function(val) {
+                    console.log(val.guid)
                     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>';
                     }

dashboardv2/public/js/views/glossary/GlossaryLayoutView.js

@@ -248,6 +248,7 @@ define(['require',
             },
             generateData: function(opt) {
                 var that = this,
+                    selectedGuid = that.guid,
                     type = opt.type;
                 if (opt.type == this.viewType) {
                     this.query[opt.type].isNodeNotFoundAtLoad = true;
@@ -338,27 +339,38 @@ define(['require',
                         });
                     }
                     if (type == "term" && obj.terms) {
+                        var theTerm = _.find(Globals.termMeanings, function(obj, index) {
+                            if (obj.guid == selectedGuid) {
+                                return obj;
+                            }
+                        });
                         _.each(obj.terms, function(term) {
-                            var typeName = term.typeName || "GlossaryTerm",
-                                guid = term.termGuid,
-                                termObj = {
-                                    "text": term.displayText,
-                                    "type": typeName,
-                                    "gType": "term",
-                                    "guid": guid,
-                                    "id": guid,
-                                    "parent": obj,
-                                    "glossaryName": obj.name,
-                                    "glossaryId": obj.guid,
-                                    "model": term,
-                                    "icon": "fa fa-file-o"
-                                }
-                            termObj.state = getSelectedState({
-                                index: i,
-                                node: termObj,
-                                objGuid: guid
-                            })
-                            parent.children.push(termObj);
+                            var includedTerms = _.map(theTerm && theTerm.termLinks, function(obj, index) {
+                                return obj.termGuid || obj.guid;
+                            });
+                            if ((!includedTerms.includes(term.termGuid))) {
+                                var typeName = term.typeName || "GlossaryTerm",
+                                    guid = term.termGuid,
+                                    termObj = {
+                                        "text": term.displayText,
+                                        "type": typeName,
+                                        "gType": "term",
+                                        "guid": guid,
+                                        "id": guid,
+                                        "parent": obj,
+                                        "glossaryName": obj.name,
+                                        "glossaryId": obj.guid,
+                                        "model": term,
+                                        "icon": "fa fa-file-o"
+                                    }
+                                termObj.state = getSelectedState({
+                                    index: i,
+                                    node: termObj,
+                                    objGuid: guid
+                                })
+                                parent.children.push(termObj);
+
+                            }
                         });
                     }
                     return parent;
@@ -398,6 +410,7 @@ define(['require',
                 var $termTree = this.ui.termTree,
                     $categoryTree = this.ui.categoryTree,
                     that = this,
+                    this_guid = that.guid,
                     getTreeConfig = function(options) {
                         return {
                             "plugins": ["search", "themes", "core", "wholerow", "sort", "conditionalselect"],