Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 62 additions & 0 deletions x-pack/plugins/lens/public/indexpattern_plugin/__mocks__/loader.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

export function getIndexPatterns() {
return new Promise(resolve => {
resolve([
{
id: '1',
title: 'Fake Index Pattern',
timeFieldName: 'timestamp',
fields: [
{
name: 'timestamp',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
],
},
{
id: '2',
title: 'Fake Rollup Pattern',
timeFieldName: 'timestamp',
fields: [
{
name: 'timestamp',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
],
},
]);
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,78 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { indexPatternDatasource, IndexPatternPersistedState } from './indexpattern';
import { DatasourcePublicAPI, Operation } from '../types';
import {
getIndexPatternDatasource,
IndexPatternPersistedState,
IndexPatternPrivateState,
} from './indexpattern';
import { DatasourcePublicAPI, Operation, Datasource } from '../types';

jest.mock('./loader');

const expectedIndexPatterns = {
1: {
id: '1',
title: 'Fake Index Pattern',
timeFieldName: 'timestamp',
fields: [
{
name: 'timestamp',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
],
},
2: {
id: '2',
title: 'Fake Rollup Pattern',
timeFieldName: 'timestamp',
fields: [
{
name: 'timestamp',
type: 'date',
aggregatable: true,
searchable: true,
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
},
],
},
};

describe('IndexPattern Data Source', () => {
let persistedState: IndexPatternPersistedState;
let indexPatternDatasource: Datasource<IndexPatternPrivateState, IndexPatternPersistedState>;

beforeEach(() => {
// @ts-ignore
indexPatternDatasource = getIndexPatternDatasource();

persistedState = {
currentIndexPattern: '',
currentIndexPattern: '1',
columnOrder: ['col1'],
columns: {
col1: {
Expand All @@ -32,8 +95,8 @@ describe('IndexPattern Data Source', () => {
it('should load a default state', async () => {
const state = await indexPatternDatasource.initialize();
expect(state).toEqual({
currentIndexPattern: '',
indexPatterns: {},
currentIndexPattern: '1',
indexPatterns: expectedIndexPatterns,
columns: {},
columnOrder: [],
});
Expand All @@ -44,7 +107,7 @@ describe('IndexPattern Data Source', () => {

expect(state).toEqual({
...persistedState,
indexPatterns: {},
indexPatterns: expectedIndexPatterns,
});
});
});
Expand Down
169 changes: 97 additions & 72 deletions x-pack/plugins/lens/public/indexpattern_plugin/indexpattern.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
*/

import React from 'react';
import { Chrome } from 'ui/chrome';
import { ToastNotifications } from 'ui/notify/toasts/toast_notifications';
import { render } from 'react-dom';
import { Datasource, DataType } from '..';
import { DatasourceDimensionPanelProps, DatasourceDataPanelProps } from '../types';
import { getIndexPatterns } from './loader';

type OperationType = 'value' | 'terms' | 'date_histogram';

Expand All @@ -24,14 +27,15 @@ interface IndexPatternColumn {

export interface IndexPattern {
id: string;
fields: Field[];
fields: IndexPatternField[];
title: string;
timeFieldName?: string;
}

export interface Field {
export interface IndexPatternField {
name: string;
type: string;
esTypes?: string[];
aggregatable: boolean;
searchable: boolean;
}
Expand All @@ -40,80 +44,101 @@ export interface IndexPatternPersistedState {
currentIndexPattern: string;

columnOrder: string[];
columns: {
[columnId: string]: IndexPatternColumn;
};
columns: Record<string, IndexPatternColumn>;
}

export type IndexPatternPrivateState = IndexPatternPersistedState & {
indexPatterns: { [id: string]: IndexPattern };
indexPatterns: Record<string, IndexPattern>;
};

// Not stateful. State is persisted to the frame
export const indexPatternDatasource: Datasource<
IndexPatternPrivateState,
IndexPatternPersistedState
> = {
async initialize(state?: IndexPatternPersistedState) {
// TODO: Make fetch request to load indexPatterns from saved objects
if (state) {
export function getIndexPatternDatasource(chrome: Chrome, toastNotifications: ToastNotifications) {
// Not stateful. State is persisted to the frame
const indexPatternDatasource: Datasource<IndexPatternPrivateState, IndexPatternPersistedState> = {
async initialize(state?: IndexPatternPersistedState) {
const indexPatternObjects = await getIndexPatterns(chrome, toastNotifications);
const indexPatterns: Record<string, IndexPattern> = {};

if (indexPatternObjects) {
indexPatternObjects.forEach(obj => {
indexPatterns[obj.id] = obj;
});
}

if (state) {
return {
...state,
indexPatterns,
};
}
return {
...state,
indexPatterns: {},
currentIndexPattern: indexPatternObjects ? indexPatternObjects[0].id : '',
indexPatterns,
columns: {},
columnOrder: [],
};
}
return {
currentIndexPattern: '',
indexPatterns: {},
columns: {},
columnOrder: [],
};
},

getPersistableState({ currentIndexPattern, columns, columnOrder }: IndexPatternPrivateState) {
return { currentIndexPattern, columns, columnOrder };
},

toExpression(state: IndexPatternPrivateState) {
return `${JSON.stringify(state.columns)}`;
},

renderDataPanel(domElement: Element, props: DatasourceDataPanelProps<IndexPatternPrivateState>) {
render(<div>Index Pattern Data Source</div>, domElement);
},

getPublicAPI(state, setState) {
return {
getTableSpec: () => {
return state.columnOrder.map(colId => ({ columnId: colId }));
},
getOperationForColumnId: (columnId: string) => {
const column = state.columns[columnId];
if (columnId) {
const { dataType, label, isBucketed, operationId } = column;
return {
id: operationId,
label,
dataType,
isBucketed,
};
}
return null;
},

renderDimensionPanel: (domElement: Element, props: DatasourceDimensionPanelProps) => {},

removeColumnInTableSpec: (columnId: string) => [],
moveColumnTo: (columnId: string, targetIndex: number) => {},
duplicateColumn: (columnId: string) => [],
};
},

getDatasourceSuggestionsForField() {
return [];
},

getDatasourceSuggestionsFromCurrentState() {
return [];
},
};
},

getPersistableState({ currentIndexPattern, columns, columnOrder }: IndexPatternPrivateState) {
return { currentIndexPattern, columns, columnOrder };
},

toExpression(state: IndexPatternPrivateState) {
return `${JSON.stringify(state.columns)}`;
},

renderDataPanel(
domElement: Element,
props: DatasourceDataPanelProps<IndexPatternPrivateState>
) {
render(
<div>
Index Pattern Data Source
<div>
{props.state.currentIndexPattern &&
Object.keys(props.state.indexPatterns).map(key => (
<div key={key}>{props.state.indexPatterns[key].title}</div>
))}
</div>
</div>,
domElement
);
},

getPublicAPI(state, setState) {
return {
getTableSpec: () => {
return state.columnOrder.map(colId => ({ columnId: colId }));
},
getOperationForColumnId: (columnId: string) => {
const column = state.columns[columnId];
if (columnId) {
const { dataType, label, isBucketed, operationId } = column;
return {
id: operationId,
label,
dataType,
isBucketed,
};
}
return null;
},

renderDimensionPanel: (domElement: Element, props: DatasourceDimensionPanelProps) => {},

removeColumnInTableSpec: (columnId: string) => [],
moveColumnTo: (columnId: string, targetIndex: number) => {},
duplicateColumn: (columnId: string) => [],
};
},

getDatasourceSuggestionsForField() {
return [];
},

getDatasourceSuggestionsFromCurrentState() {
return [];
},
};

return indexPatternDatasource;
}
Loading