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

Jump to bottom

Fix _source formatting #22800

Merged
merged 4 commits into from
Sep 10, 2018
Merged

Fix _source formatting #22800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
059baff
Fix _source formatting
markov00 Sep 7, 2018
0e3e22d
Update unit test
markov00 Sep 7, 2018
e5bb874
Add functional test
markov00 Sep 7, 2018
5183f5d
Fix CI error, move functional test to the end
markov00 Sep 7, 2018
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
2 changes: 1 addition & 1 deletion src/core_plugins/kibana/common/field_formats/types/source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function createSourceFormat(FieldFormat) {
SourceFormat.prototype._convert = {
text: (value) => toJson(value),
html: function sourceToHtml(source, field, hit) {
if (!field) return this.getConverterFor('text')(source, field, hit);
if (!field) return _.escape(this.getConverterFor('text')(source));
epixa marked this conversation as resolved.
Show resolved Hide resolved

const highlights = (hit && hit.highlight) || {};
const formatted = field.indexPattern.formatHit(hit);
Expand Down
5 changes: 3 additions & 2 deletions src/core_plugins/kibana/public/field_formats/__tests__/_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ describe('_source formatting', function () {
}));

it('should use the text content type if a field is not passed', function () {
const hit = _.first(hits);
expect(convertHtml(hit._source)).to.be(`<span ng-non-bindable>${JSON.stringify(hit._source)}</span>`);
const hit = { 'foo': 'bar', 'number': 42, 'hello': '<h1>World</h1>', 'also': 'with "quotes" or \'single quotes\'' };
// eslint-disable-next-line
expect(convertHtml(hit)).to.be('<span ng-non-bindable>{&quot;foo&quot;:&quot;bar&quot;,&quot;number&quot;:42,&quot;hello&quot;:&quot;&lt;h1&gt;World&lt;/h1&gt;&quot;,&quot;also&quot;:&quot;with \\&quot;quotes\\&quot; or &#39;single quotes&#39;&quot;}</span>');
});

it('uses the _source, field, and hit to create a <dl>', function () {
Expand Down
14 changes: 14 additions & 0 deletions test/functional/apps/visualize/_data_table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,5 +178,19 @@ export default function ({ getService, getPageObjects }) {
'2015-09-20', '4,757',
]);
});

it('should show correct data for a data table with top hits', async () => {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickDataTable();
await PageObjects.visualize.clickNewSearch();
await PageObjects.header.setAbsoluteRange(fromTime, toTime);
await PageObjects.visualize.clickMetricEditor();
await PageObjects.visualize.selectAggregation('Top Hit', 'metrics');
await PageObjects.visualize.selectField('_source', 'metrics');
await PageObjects.visualize.clickGo();
const data = await PageObjects.visualize.getTableVisData();
log.debug(data);
expect(data.length).to.be.greaterThan(0);
});
});
}