ATLAS-2713: Glossary UI: enable assign button only when correct object-type is selected

dashboardv2/public/js/views/glossary/AssignTermLayoutView.js

@@ -87,6 +87,7 @@ define(['require',
                     "mainClass": "wizard-modal"
                 });
                 this.modal.open();
+                this.modal.$el.find('button.ok').attr("disabled", true);
                 this.modal.on('closeModal', function() {
                     that.modal.trigger('cancel');
                     if (that.assignTermError && that.hideLoader) {
@@ -99,8 +100,13 @@ define(['require',
                 this.modal.on('ok', function() {
                     that.assignTerm();
                 });
+                this.bindEvents();
+            },
+            bindEvents: function() {
+                this.listenTo(this.glossaryCollection, "node_selected", function(skip) {
+                    this.modal.$el.find('button.ok').attr("disabled", false);
+                }, this);
             },
-            bindEvents: function() {},
             onRender: function() {
                 this.renderGlossaryTree();
                 var that = this;

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

@@ -256,7 +256,11 @@ define(['require',
                     var objGuid = options.objGuid,
                         node = options.node,
                         index = options.index;
-                    if (!that.guid) {
+                    if (that.isAssignView) {
+                        return {
+                            'opened': true
+                        }
+                    } else if (!that.guid) {
                         that.query[that.viewType].isNodeNotFoundAtLoad = false;
                         var selectedItem = {
                             "type": "Glossary",
@@ -461,6 +465,7 @@ define(['require',
                             .on("select_node.jstree", function(e, data) {
                                 if (that.isAssignView) {
                                     that.glossary.selectedItem = data.node.original;
+                                    that.glossaryCollection.trigger("node_selected");
                                 } else {
                                     var popoverClassName = (type == "term" ? '.termPopover' : '.categoryPopover'),
                                         currentClickedPopoverEl = "";