github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add keepArrays option to flatten mixin, make table fields flatten correctly, closes #43

Browse source
This commit is contained in:
Rashid Khan 2014-04-15 11:28:59 -07:00
parent b469f140e2
commit 6c58b355f9
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/kibana/directives/table.js
View file

@ -17,7 +17,7 @@ define(function (require) {
scope: {
columns: '=',
getSort: '=',
setSort: '='
setSort: '=',
},
template: headerHtml,
controller: function ($scope) {
@ -115,7 +115,10 @@ define(function (require) {
// itterate the columns and rows, rebuild the table's html
function render() {
// Close all rows
opened = [];
// Clear the body
$body.empty();
if (!$scope.rows || $scope.rows.length === 0) return;
if (!$scope.columns || $scope.columns.length === 0) return;
@ -140,7 +143,7 @@ define(function (require) {
function forEachRow(row, i, currentChunk) {
var id = rowId(row);
var $summary = createSummaryRow(row, id);
var $details = createDetailsRow(row, id);
var $details = $('<tr></tr>');
// cursor is the end of current selection, so
// subtract the remaining queue size, then the
// size of this chunk, and add the current i
@ -236,13 +239,23 @@ define(function (require) {
);
};
var topLevelDetails = '_index _type _id'.split(' ');
function createDetailsRow(row, id) {
var $tr = $(document.createElement('tr'));
return appendDetailsToRow($tr, row, id);
}
function appendDetailsToRow($tr, row, id) {
var topLevelDetails = ['_index', '_type', '_id'];
var rowFlat = _.flattenWith('.', row._source, true);
/*
_.each(topLevelDetails, function (field) {
rowFlat[field] = row[field];
});
*/
console.log(rowFlat);
// we need a td to wrap the details table
var containerTd = document.createElement('td');
containerTd.setAttribute('colspan', $scope.columns.length);
@ -265,7 +278,7 @@ define(function (require) {
// itterate each row and append it to the tbody
// TODO: This doesn't work since _source is not flattened
_(row._source)
_(rowFlat)
.keys()
.concat(topLevelDetails)
.sort()

3
src/kibana/utils/mixins.js
View file

@ -31,7 +31,8 @@ define(function (require) {
(function flattenObj(obj) {
_.keys(obj).forEach(function (key) {
stack.push(key);
if (typeof obj[key] === 'object') flattenObj(obj[key]);
if (typeof keepArrays && _.isArray(obj[key])) flatObj[stack.join(dot)] = obj[key];
else if (typeof obj[key] === 'object') flattenObj(obj[key]);
else flatObj[stack.join(dot)] = obj[key];
stack.pop();
});