Skip to content

A
atlas
Commit 28c9efb1 by Shwetha GS
Options

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

parent 2b14ec10
Showing with 44 additions and 86 deletions
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -317,53 +317,53 @@ define(['require', ...@@ -317,53 +317,53 @@ define(['require',
col = {}; col = {};
var responseData = this.searchCollection.responseData; var responseData = this.searchCollection.responseData;
if (this.searchCollection.responseData) { if (this.searchCollection.responseData) {
if (responseData.dataType) { if (responseData.dataType && responseData.dataType.typeName.indexOf('_temp') == -1) {
if (responseData.dataType.attributeDefinitions.length == 2 && responseData.dataType.attributeDefinitions[1].name == "instanceInfo") { return this.getFixedDslColumn();
return this.getFixedFullTextColumn(); } else {
} else { var idFound = false;
if (responseData.dataType.typeName.indexOf('_temp') == -1) { _.each(this.searchCollection.models, function(model) {
return this.getFixedDslColumn(); var modelJSON = model.toJSON();
} else { var guid = "";
var idFound = false; _.each(modelJSON, function(val, key) {
_.each(this.searchCollection.models, function(model) { if (_.isObject(val)) {
var modelJSON = model.toJSON(); if (val.id) {
var guid = ""; model.set('id', val.id);
_.each(modelJSON, function(val, key) { guid = val.id;
if (_.isObject(val) && val.id) { } else if (val.guid) {
model.set('id', val.id); model.set('id', val.guid);
guid = val.id; guid = val.guid;
} else if (key === "id") {
model.set('id', val);
guid = val;
}
});
if (guid.length) {
idFound = true;
model.getEntity(guid, {
async: false,
success: function(data) {
if (data.definition) {
if (data.definition.id && data.definition.values) {
that.searchCollection.get(data.definition.id).set(data.definition.values);
that.searchCollection.get(data.definition.id).set('$id$', data.definition.id);
that.searchCollection.get(data.definition.id).set('$traits$', data.definition.traits);
}
}
},
error: function(error, data, status) {},
complete: function() {}
});
} }
}); } else if (key === "id") {
if (idFound) { model.set('id', val);
return this.getFixedDslColumn(); guid = val;
} else { } else if (key === "guid") {
return this.getDaynamicColumn(); model.set('id', val);
guid = val;
} }
});
if (guid.length) {
idFound = true;
model.getEntity(guid, {
async: false,
success: function(data) {
if (data.definition) {
if (data.definition.id && data.definition.values) {
that.searchCollection.get(data.definition.id).set(data.definition.values);
that.searchCollection.get(data.definition.id).set('$id$', data.definition.id);
that.searchCollection.get(data.definition.id).set('$traits$', data.definition.traits);
}
}
},
error: function(error, data, status) {},
complete: function() {}
});
} }
});
if (idFound) {
return this.getFixedDslColumn();
} else {
return this.getDaynamicColumn();
} }
} else {
return this.getFixedFullTextColumn();
} }
} }
}, },
...@@ -478,49 +478,6 @@ define(['require', ...@@ -478,49 +478,6 @@ define(['require',
that.checkTableFetch(); that.checkTableFetch();
return this.searchCollection.constructor.getTableCols(col, this.searchCollection); 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) { addTagModalView: function(e) {
var that = this; var that = this;
require(['views/tag/addTagModalView'], function(AddTagModalView) { require(['views/tag/addTagModalView'], function(AddTagModalView) {
......
release-log.txt
...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
ALL 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-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-1064 UI: Pagination for full text search results (Kalyanikashikar via shwethags)
ATLAS-1006 Paginate full text search results (shwethags) ATLAS-1006 Paginate full text search results (shwethags)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment