Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preserve whitespace in discover table cells for added fields #4102

Merged
merged 6 commits into from
Jun 4, 2015
Merged

Preserve whitespace in discover table cells for added fields #4102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
646f9e7
Preserve whitespace in discover table cells for added fields
ycombinator Jun 3, 2015
627b94e
Much cleaner CSS selector logic!
ycombinator Jun 3, 2015
318f89a
Using no_white_space utility instead of making cell template single-line
ycombinator Jun 4, 2015
d32034c
Moving the usage of noWhiteSpace to a more appropriate place, IMHO
ycombinator Jun 4, 2015
1c43563
Adding class for _source field
ycombinator Jun 4, 2015
46aea33
Extracting conditional logic to make code more readable
ycombinator Jun 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/kibana/components/doc_table/components/table_row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ define(function (require) {
* ```
*/
module.directive('kbnTableRow', function ($compile) {
var noWhiteSpace = require('utils/no_white_space');
var openRowHtml = require('text!components/doc_table/components/table_row/open.html');
var detailsHtml = require('text!components/doc_table/components/table_row/details.html');
var cellTemplate = _.template(require('text!components/doc_table/components/table_row/cell.html'));
var truncateByHeightTemplate = _.template(require('text!partials/truncate_by_height.html'));
var cellTemplate = _.template(noWhiteSpace(require('text!components/doc_table/components/table_row/cell.html')));
var truncateByHeightTemplate = _.template(noWhiteSpace(require('text!partials/truncate_by_height.html')));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!


return {
restrict: 'A',
Expand Down Expand Up @@ -106,6 +107,7 @@ define(function (require) {
$scope.columns.forEach(function (column) {
newHtmls.push(cellTemplate({
timefield: false,
sourcefield: (column === '_source'),
formatted: _displayField(row, column, true)
}));
});
Expand Down
14 changes: 12 additions & 2 deletions src/kibana/components/doc_table/components/table_row/cell.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<td <%= timefield ? 'class="discover-table-timefield" width="1%"' : '' %>>
<%
var attributes = '';
if (timefield) {
attributes='class="discover-table-timefield" width="1%"';
} else if (sourcefield) {
attributes='class="discover-table-sourcefield"';
} else {
attributes='class="discover-table-datafield"';
}
%>
<td <%= attributes %>>
<%= formatted %>
</td>
</td>
4 changes: 4 additions & 0 deletions src/kibana/components/doc_table/doc_table.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ doc-table {
margin: 5px;
.flex(1, 1, 100%);

.discover-table-datafield {
white-space: pre;
}

.loading {
opacity: @loading-opacity;
}
Expand Down