ATLAS-1065 UI: Full text search view same as DSL's (kevalbhat18 via shwethags)

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

@@ -317,11 +317,7 @@ define(['require',
                     col = {};
                 var responseData = this.searchCollection.responseData;
                 if (this.searchCollection.responseData) {
-                    if (responseData.dataType) {
-                        if (responseData.dataType.attributeDefinitions.length == 2 && responseData.dataType.attributeDefinitions[1].name == "instanceInfo") {
-                            return this.getFixedFullTextColumn();
-                        } else {
-                            if (responseData.dataType.typeName.indexOf('_temp') == -1) {
+                    if (responseData.dataType && responseData.dataType.typeName.indexOf('_temp') == -1) {
                         return this.getFixedDslColumn();
                     } else {
                         var idFound = false;
@@ -329,12 +325,20 @@ define(['require',
                             var modelJSON = model.toJSON();
                             var guid = "";
                             _.each(modelJSON, function(val, key) {
-                                        if (_.isObject(val) && val.id) {
+                                if (_.isObject(val)) {
+                                    if (val.id) {
                                         model.set('id', val.id);
                                         guid = val.id;
+                                    } else if (val.guid) {
+                                        model.set('id', val.guid);
+                                        guid = val.guid;
+                                    }
                                 } else if (key === "id") {
                                     model.set('id', val);
                                     guid = val;
+                                } else if (key === "guid") {
+                                    model.set('id', val);
+                                    guid = val;
                                 }
                             });
                             if (guid.length) {
@@ -362,10 +366,6 @@ define(['require',
                         }
                     }
                 }
-                    } else {
-                        return this.getFixedFullTextColumn();
-                    }
-                }
             },
             getDaynamicColumn: function() {
                 var that = this,
@@ -478,49 +478,6 @@ define(['require',
                 that.checkTableFetch();
                 return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
             },
-            getFixedFullTextColumn: function() {
-                var that = this;
-                return this.searchCollection.constructor.getTableCols({
-                    instanceInfo: {
-                        label: "Type Name",
-                        cell: "html",
-                        editable: false,
-                        sortable: false,
-                        formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
-                            fromRaw: function(rawValue, model) {
-                                var modelObject = model.toJSON();
-                                if (modelObject.$typeName$ && modelObject.instanceInfo) {
-                                    return '<a href="#!/detailPage/' + modelObject.instanceInfo.guid + '">' + modelObject.instanceInfo.typeName + '</a>';
-                                } else if (!modelObject.$typeName$) {
-                                    return '<a href="#!/detailPage/' + modelObject.guid + '">' + modelObject.typeName + '</a>';
-                                }
-                            }
-                        })
-                    },
-                    name: {
-                        label: "Name",
-                        cell: "html",
-                        editable: false,
-                        sortable: false,
-                        formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
-                            fromRaw: function(rawValue, model) {
-                                var modelObject = model.toJSON();
-                                if (modelObject.$typeName$ && modelObject.instanceInfo) {
-                                    var guid = model.toJSON().instanceInfo.guid;
-                                    var json = model.toJSON();
-                                    json['id'] = guid;
-                                    return CommonViewFunction.propertyTable({ 'notUsedKey': json }, that, true);
-                                } else if (!modelObject.$typeName$) {
-                                    var guid = model.toJSON().guid;
-                                    var json = model.toJSON();
-                                    json['id'] = guid;
-                                    return CommonViewFunction.propertyTable({ 'notUsedKey': json }, that, true);
-                                }
-                            }
-                        })
-                    }
-                }, this.searchCollection);
-            },
             addTagModalView: function(e) {
                 var that = this;
                 require(['views/tag/addTagModalView'], function(AddTagModalView) {

release-log.txt

@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 
 
 ALL CHANGES:
+ATLAS-1065 UI: Full text search view same as DSL's (kevalbhat18 via shwethags)
 ATLAS-1066 Falcon fails to post entity to Atlas due to kafka exception (mneethiraj via shwethags)
 ATLAS-1064 UI: Pagination for full text search results (Kalyanikashikar via shwethags)
 ATLAS-1006 Paginate full text search results (shwethags)