Skip to content

[Maps] Quick design fixes for 7.3 #39429

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
nreese merged 9 commits into from
Jun 27, 2019
Merged

[Maps] Quick design fixes for 7.3 #39429

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
69d6cd4
Some fixes to the main listing screen
Jun 20, 2019
044c711
Updates to file upload layouts
Jun 20, 2019
81ec3dd
Better discard changes modal
Jun 21, 2019
bcce15f
Revert prettier auto-fixes in “Updates to file upload layouts"
Jun 21, 2019
c513238
Revert prettier auto-fixes from "Some fixes to the main listing screen"
Jun 21, 2019
43166b1
Missed a line
Jun 21, 2019
3a68e1d
Merge branch 'master' of github.com:elastic/kibana into maps-7.3-quic…
nreese Jun 26, 2019
5cb0b2c
fix margin-bottom console warning
nreese Jun 27, 2019
8a91835
clean up un-needed fileRef
nreese Jun 27, 2019
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
137 changes: 64 additions & 73 deletions x-pack/legacy/plugins/file_upload/public/components/index_settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,11 @@

import React, { Fragment, Component } from 'react';
import { i18n } from '@kbn/i18n';
import {
EuiFormRow,
EuiFieldText,
EuiSpacer,
EuiSelect,
EuiCallOut
} from '@elastic/eui';
import { EuiFormRow, EuiFieldText, EuiSelect, EuiCallOut } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import { getExistingIndices, getExistingIndexPatterns }
from '../util/indexing_service';
import { getExistingIndices, getExistingIndexPatterns } from '../util/indexing_service';

export class IndexSettings extends Component {

state = {
indexNameError: '',
indexDisabled: true,
Expand Down Expand Up @@ -47,9 +39,7 @@ export class IndexSettings extends Component {
return this.state.indexNames;
}
const indices = await getExistingIndices();
const indexNames = indices
? indices.map(({ name }) => name)
: [];
const indexNames = indices ? indices.map(({ name }) => name) : [];
this.setState({ indexNames });
return indexNames;
}
Expand All @@ -59,9 +49,7 @@ export class IndexSettings extends Component {
return this.state.indexPatterns;
}
const patterns = await getExistingIndexPatterns();
const indexPatterns = patterns
? patterns.map(({ name }) => name)
: [];
const indexPatterns = patterns ? patterns.map(({ name }) => name) : [];
this.setState({ indexPatterns });
return indexPatterns;
}
Expand All @@ -70,15 +58,15 @@ export class IndexSettings extends Component {
const errorMessage = await this._isIndexNameAndPatternValid(name);
return this.setState({
indexName: name,
indexNameError: errorMessage
indexNameError: errorMessage,
});
}
};

_onIndexChange = async ({ target }) => {
const name = target.value;
await this._setIndexName(name);
this.props.setIndexName(name);
}
};

_isIndexNameAndPatternValid = async name => {
const indexNames = await this._getIndexNames();
Expand All @@ -92,11 +80,11 @@ export class IndexSettings extends Component {
);
}

const reg = new RegExp('[\\\\/\*\?\"\<\>\|\\s\,\#]+');
const reg = new RegExp('[\\\\/*?"<>|\\s,#]+');
Comment thread
cchaos marked this conversation as resolved.
Outdated
if (
(name !== name.toLowerCase()) || // name should be lowercase
(name === '.' || name === '..') || // name can't be . or ..
name.match(/^[-_+]/) !== null || // name can't start with these chars
name !== name.toLowerCase() || // name should be lowercase
(name === '.' || name === '..') || // name can't be . or ..
name.match(/^[-_+]/) !== null || // name can't start with these chars
name.match(reg) !== null // name can't contain these chars
) {
return (
Expand All @@ -107,15 +95,14 @@ export class IndexSettings extends Component {
);
}
return '';
}
};

render() {
const { setSelectedIndexType, indexTypes } = this.props;
const { indexNameError, indexDisabled, indexName } = this.state;

return (
<Fragment>
<EuiSpacer size="m"/>
<EuiFormRow
label={
<FormattedMessage
Expand All @@ -133,46 +120,6 @@ export class IndexSettings extends Component {
onChange={({ target }) => setSelectedIndexType(target.value)}
/>
</EuiFormRow>
<EuiSpacer size="m"/>
{indexDisabled
? null
: (
<EuiCallOut
title={i18n.translate('xpack.fileUpload.indexSettings.indexNameGuidelines',
{ defaultMessage: 'Index name guidelines' })}
iconType="pin"
>
<div>
<ul>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.mustBeNewIndex',
{ defaultMessage: 'Must be a new index' })}
</li>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.lowercaseOnly',
{ defaultMessage: 'Lowercase only' })}
</li>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotInclude',
{ defaultMessage: 'Cannot include \\\\, /, *, ?, ", <, >, |, \
" " (space character), , (comma), #'
})}
</li>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotStartWith',
{ defaultMessage: 'Cannot start with -, _, +' })}
</li>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotBe',
{ defaultMessage: 'Cannot be . or ..' })}
</li>
<li>{i18n.translate('xpack.fileUpload.indexSettings.guidelines.length',
{ defaultMessage:
'Cannot be longer than 255 bytes (note it is bytes, \
so multi-byte characters will count towards the 255 \
limit faster)'
})}
</li>
</ul>
</div>
</EuiCallOut>
)}
<EuiSpacer size="s"/>
<EuiFormRow
label={
<FormattedMessage
Expand All @@ -185,20 +132,64 @@ export class IndexSettings extends Component {
>
<EuiFieldText
disabled={indexDisabled}
placeholder={i18n.translate('xpack.fileUpload.enterIndexName',
{ defaultMessage: 'Enter Index Name' })}
placeholder={i18n.translate('xpack.fileUpload.enterIndexName', {
defaultMessage: 'Enter Index Name',
})}
value={indexName}
onChange={this._onIndexChange}
isInvalid={indexNameError !== ''}
aria-label={i18n.translate('xpack.fileUpload.indexNameReqField',
{ defaultMessage: 'Index name, required field' })}
aria-label={i18n.translate('xpack.fileUpload.indexNameReqField', {
defaultMessage: 'Index name, required field',
})}
/>
</EuiFormRow>

<EuiSpacer size="s"/>

{indexDisabled ? null : (
<EuiCallOut
title={i18n.translate('xpack.fileUpload.indexSettings.indexNameGuidelines', {
defaultMessage: 'Index name guidelines',
})}
size="s"
>
<ul style={{ 'margin-bottom': 0 }}>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.mustBeNewIndex', {
defaultMessage: 'Must be a new index',
})}
</li>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.lowercaseOnly', {
defaultMessage: 'Lowercase only',
})}
</li>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotInclude', {
defaultMessage:
'Cannot include \\\\, /, *, ?, ", <, >, |, \
" " (space character), , (comma), #',
})}
</li>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotStartWith', {
defaultMessage: 'Cannot start with -, _, +',
})}
</li>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.cannotBe', {
defaultMessage: 'Cannot be . or ..',
})}
</li>
<li>
{i18n.translate('xpack.fileUpload.indexSettings.guidelines.length', {
defaultMessage:
'Cannot be longer than 255 bytes (note it is bytes, \
so multi-byte characters will count towards the 255 \
limit faster)',
})}
</li>
</ul>
</EuiCallOut>
)}
</Fragment>
);
}
}

Loading