Skip to content

fixing tabifyAggResponse #61214

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

Merged
ppisljar merged 2 commits into from
Mar 26, 2020
Merged

fixing tabifyAggResponse #61214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc57edf
fixing tabifyAggResponse
ppisljar Mar 25, 2020
db7c65f
Update response_writer.test.ts
alexwizp Mar 25, 2020
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
21 changes: 18 additions & 3 deletions src/plugins/data/public/search/tabify/response_writer.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,35 @@ describe('TabbedAggResponseWriter class', () => {
});

test('adds the row to the array', () => {
responseWriter.bucketBuffer = [{ id: 'col-0', value: 'US' }];
responseWriter.metricBuffer = [{ id: 'col-1', value: 5 }];
responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
responseWriter.metricBuffer = [{ id: 'col-1-2', value: 5 }];

responseWriter.row();

expect(responseWriter.rows.length).toEqual(1);
expect(responseWriter.rows[0]).toEqual({ 'col-0': 'US', 'col-1': 5 });
expect(responseWriter.rows[0]).toEqual({ 'col-0-1': 'US', 'col-1-2': 5 });
});

test("doesn't add an empty row", () => {
responseWriter.row();

expect(responseWriter.rows.length).toEqual(0);
});

test('doesnt add a partial row', () => {
responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
responseWriter.row();

expect(responseWriter.rows.length).toEqual(0);
});

test('adds partial row if partialRows is set to true', () => {
responseWriter = createResponseWritter(splitAggConfig, { partialRows: true });
responseWriter.bucketBuffer = [{ id: 'col-0-1', value: 'US' }];
responseWriter.row();

expect(responseWriter.rows.length).toEqual(1);
});
});

describe('response()', () => {
Expand Down
7 changes: 3 additions & 4 deletions src/plugins/data/public/search/tabify/response_writer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,9 @@ export class TabbedAggResponseWriter {
rowBuffer[metric.id] = metric.value;
});

const isPartialRow =
this.partialRows && !this.columns.every(column => rowBuffer.hasOwnProperty(column.id));

if (!isEmpty(rowBuffer) && !isPartialRow) {
const isPartialRow = !this.columns.every(column => rowBuffer.hasOwnProperty(column.id));
const removePartial = isPartialRow && !this.partialRows;
if (!isEmpty(rowBuffer) && !removePartial) {
this.rows.push(rowBuffer);
}
}
Expand Down