Skip to content

A
atlas
Commit fa11d13a by kevalbhatt Committed by Madhan Neethiraj
Options

ATLAS-2046: UI Regression - Columns Filter not listing all attributes of a datatype

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 37629854
Showing with 38 additions and 38 deletions
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -637,48 +637,48 @@ define(['require', ...@@ -637,48 +637,48 @@ define(['require',
} }
}) })
}; };
if (this.value && this.value.searchType === "basic") { }
var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }); if (this.value && this.value.searchType === "basic") {
if (def) { var def = this.entityDefCollection.fullCollection.find({ name: this.value.type });
var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }); if (def) {
_.each(attrObj, function(obj, key) { var attrObj = Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true });
var key = obj.name, _.each(attrObj, function(obj, key) {
isRenderable = _.contains(columnToShow, key) var key = obj.name,
if (key == "name" || key == "description" || key == "owner") { isRenderable = _.contains(columnToShow, key)
if (columnToShow) { if (key == "name" || key == "description" || key == "owner") {
col[key].renderable = isRenderable; if (columnToShow) {
} col[key].renderable = isRenderable;
return;
} }
col[obj.name] = { return;
label: obj.name.capitalize(), }
cell: "Html", col[obj.name] = {
editable: false, label: obj.name.capitalize(),
sortable: false, cell: "Html",
resizeable: true, editable: false,
orderable: true, sortable: false,
renderable: isRenderable, resizeable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { orderable: true,
fromRaw: function(rawValue, model) { renderable: isRenderable,
var modelObj = model.toJSON(); formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
if (modelObj && modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) { var modelObj = model.toJSON();
var tempObj = {
'scope': that,
'attributeDefs': [obj],
'valueObject': {},
'isTable': false
}
tempObj.valueObject[key] = modelObj.attributes[key] if (modelObj && modelObj.attributes && !_.isUndefined(modelObj.attributes[key])) {
Utils.findAndMergeRefEntity(tempObj.valueObject, that.searchCollection.referredEntities); var tempObj = {
return CommonViewFunction.propertyTable(tempObj); 'scope': that,
'attributeDefs': [obj],
'valueObject': {},
'isTable': false
} }
tempObj.valueObject[key] = modelObj.attributes[key]
Utils.findAndMergeRefEntity(tempObj.valueObject, that.searchCollection.referredEntities);
return CommonViewFunction.propertyTable(tempObj);
} }
}) }
}; })
}); };
} });
} }
} }
return this.searchCollection.constructor.getTableCols(col, this.searchCollection); return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
......
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