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

Re-enable the indexPattern:placeholder setting. Change its value to be an empty string. #20685

Merged
merged 2 commits into from
Jul 13, 2018
Merged

Re-enable the indexPattern:placeholder setting. Change its value to be an empty string. #20685

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
dc4f790
Re-enable the indexPattern:placeholder setting. Change its value to b…
cjcenizal Jul 11, 2018
1108c2b
Fix tests.
cjcenizal Jul 11, 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
6 changes: 6 additions & 0 deletions ...a/public/management/sections/indices/create_index_pattern_wizard/__tests__/render.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ const unmountComponentAtNode = jest.fn();

jest.doMock('react-dom', () => ({ render, unmountComponentAtNode }));

jest.mock('ui/chrome', () => ({
getUiSettingsClient: () => ({
get: () => '',
}),
}));

const { renderCreateIndexPatternWizard, destroyCreateIndexPatternWizard } = require('../render');

describe('CreateIndexPatternWizardRender', () => {
Expand Down
7 changes: 7 additions & 0 deletions ...e_index_pattern_wizard/components/step_index_pattern/__tests__/step_index_pattern.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import { StepIndexPattern } from '../step_index_pattern';
jest.mock('../../../lib/ensure_minimum_time', () => ({
ensureMinimumTime: async (promises) => Array.isArray(promises) ? await Promise.all(promises) : await promises
}));

jest.mock('ui/chrome', () => ({
getUiSettingsClient: () => ({
get: () => '',
}),
}));

jest.mock('../../../lib/get_indices', () => ({
getIndices: (service, query) => {
if (query.startsWith('e')) {
Expand Down
6 changes: 5 additions & 1 deletion ...s/indices/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ import {
EuiCallOut,
} from '@elastic/eui';

import chrome from 'ui/chrome';

const uiSettings = chrome.getUiSettingsClient();

export class StepIndexPattern extends Component {
static propTypes = {
allIndices: PropTypes.array.isRequired,
Expand All @@ -49,7 +53,7 @@ export class StepIndexPattern extends Component {
}

static defaultProps = {
initialQuery: '',
initialQuery: uiSettings.get('indexPattern:placeholder'),
}

constructor(props) {
Expand Down
4 changes: 2 additions & 2 deletions src/core_plugins/kibana/ui_setting_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ export function getUiSettingDefaults() {
},
'indexPattern:placeholder': {
name: 'Index pattern placeholder',
value: 'logstash-*',
description: `The placeholder for the field "Index name or pattern" in the "Settings > Indices" tab.`,
value: '',
description: `The placeholder for the "Index pattern name" field in "Management > Index Patterns > Create Index Pattern".`,
},
'context:defaultSize': {
name: 'Context size',
Expand Down