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
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ export class FileDataVisualizerView extends Component {
fileContents={fileContents}
fileSize={fileSize}
indexPatterns={this.props.indexPatterns}
kibanaConfig={this.props.kibanaConfig}
showBottomBar={this.showBottomBar}
hideBottomBar={this.hideBottomBar}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,11 @@ export class ImportView extends Component {
if (success && createIndexPattern) {
const indexPatternName = (indexPattern === '') ? index : indexPattern;

const indexPatternResp = await createKibanaIndexPattern(indexPatternName, this.props.indexPatterns);
const indexPatternResp = await createKibanaIndexPattern(
indexPatternName,
this.props.indexPatterns,
this.props.kibanaConfig,
);
success = indexPatternResp.success;
this.setState({
indexPatternCreatedStatus: indexPatternResp.success ? IMPORT_STATUS.COMPLETE : IMPORT_STATUS.FAILED,
Expand Down Expand Up @@ -427,7 +431,7 @@ export class ImportView extends Component {
}
}

async function createKibanaIndexPattern(indexPatternName, indexPatterns, timeFieldName = DEFAULT_TIME_FIELD) {
async function createKibanaIndexPattern(indexPatternName, indexPatterns, kibanaConfig, timeFieldName = DEFAULT_TIME_FIELD) {
try {
const emptyPattern = await indexPatterns.get();

Expand All @@ -438,6 +442,13 @@ async function createKibanaIndexPattern(indexPatternName, indexPatterns, timeFie
});

const id = await emptyPattern.create();

// check if there's a default index pattern, if not,
// set the newly created one as the default index pattern.
if (!kibanaConfig.get('defaultIndex')) {
await kibanaConfig.set('defaultIndex', id);
}

return {
success: true,
id,
Expand Down Expand Up @@ -503,5 +514,3 @@ function isIndexPatternNameValid(name, indexPatternNames, index) {

return '';
}


Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { FileDataVisualizerView } from './components/file_datavisualizer_view';

import React from 'react';

export function FileDataVisualizerPage({ indexPatterns }) {
export function FileDataVisualizerPage({ indexPatterns, kibanaConfig }) {
return (
<div className="file-datavisualizer-container">
<FileDataVisualizerView indexPatterns={indexPatterns} />
<FileDataVisualizerView indexPatterns={indexPatterns} kibanaConfig={kibanaConfig} />
</div>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import { FileDataVisualizerPage } from './file_datavisualizer';
module.directive('fileDatavisualizerPage', function ($injector) {
const reactDirective = $injector.get('reactDirective');
const indexPatterns = $injector.get('indexPatterns');
const kibanaConfig = $injector.get('config');

return reactDirective(FileDataVisualizerPage, undefined, { restrict: 'E' }, { indexPatterns });
return reactDirective(FileDataVisualizerPage, undefined, { restrict: 'E' }, { indexPatterns, kibanaConfig });
});