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 all 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
109 changes: 53 additions & 56 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,13 +6,7 @@

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';
Expand Down Expand Up @@ -115,7 +109,6 @@ export class IndexSettings extends Component {

return (
<Fragment>
<EuiSpacer size="m"/>
<EuiFormRow
label={
<FormattedMessage
Expand All @@ -133,46 +126,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 +138,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={{ marginBottom: 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>
);
}
}

163 changes: 62 additions & 101 deletions x-pack/legacy/plugins/file_upload/public/components/json_import_progress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/


import React, { Fragment, Component } from 'react';
import { i18n } from '@kbn/i18n';
import {
EuiCodeBlock,
EuiSpacer,
EuiFormRow,
EuiText,
EuiProgress,
EuiFlexItem,
EuiCallOut,
} from '@elastic/eui';
import { EuiCodeBlock, EuiSpacer, EuiText, EuiTitle, EuiProgress, EuiCallOut } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n/react';
import chrome from 'ui/chrome';

Expand Down Expand Up @@ -70,101 +61,71 @@ export class JsonImportProgress extends Component {

return (
<Fragment>
{!complete ?
<EuiProgress size="xs" color="accent" position="absolute"/> : null}
<EuiSpacer size="m"/>
<EuiFormRow
label={
{!complete ? <EuiProgress size="xs" color="accent" position="absolute" /> : null}
<EuiTitle size="xs">
<h3>
<FormattedMessage
id="xpack.fileUpload.jsonImport.indexingStatus"
defaultMessage="Indexing status"
/>
}
>
<EuiText>
{importMessage}
</EuiText>
</EuiFormRow>
<EuiSpacer size="m"/>
{complete
? (
<Fragment>
{
indexDataJson
? (
<EuiFormRow
label={
<FormattedMessage
id="xpack.fileUpload.jsonImport.indexingResponse"
defaultMessage="Indexing response"
/>
}
>
<EuiCodeBlock
paddingSize="s"
overflowHeight={200}
>
{indexDataJson}
</EuiCodeBlock>
</EuiFormRow>
)
: null
}
{
indexPatternJson
? (
<EuiFormRow
label={
<FormattedMessage
id="xpack.fileUpload.jsonImport.indexPatternResponse"
defaultMessage="Index pattern response"
/>
}
>
<EuiCodeBlock
paddingSize="s"
overflowHeight={200}
>
{indexPatternJson}
</EuiCodeBlock>
</EuiFormRow>
)
: null
}
<EuiFormRow>
<EuiFlexItem>
<EuiCallOut
title={
i18n.translate('xpack.fileUpload.jsonImport.indexModsTitle',
{ defaultMessage: 'Index modifications' })}
iconType="pin"
>
<div>
{
i18n.translate('xpack.fileUpload.jsonImport.indexModsMsg',
{ defaultMessage: 'Further index modifications can be made using\n'
})
}
<a
target="_blank"
href={`${chrome.getBasePath()}/app/kibana#/
management/elasticsearch/index_management/indices/
filter/${indexName}`.replace(/\s/g, '')}
>
{
i18n.translate('xpack.fileUpload.jsonImport.indexMgmtLink',
{ defaultMessage: 'Index Management' })
}
</a>
</div>
</EuiCallOut>
</EuiFlexItem>
</EuiFormRow>
</Fragment>
)
: null
}
<EuiSpacer size="s"/>
</h3>
</EuiTitle>
<EuiText>{importMessage && <p>{importMessage}</p>}</EuiText>
<EuiSpacer size="m" />
{complete ? (
<Fragment>
{indexDataJson ? (
<Fragment>
<EuiTitle size="xxs">
<h4>
<FormattedMessage
id="xpack.fileUpload.jsonImport.indexingResponse"
defaultMessage="Indexing response"
/>
</h4>
</EuiTitle>
<EuiCodeBlock language="json" paddingSize="s" overflowHeight={200}>
{indexDataJson}
</EuiCodeBlock>
<EuiSpacer size="m" />
</Fragment>
) : null}
{indexPatternJson ? (
<Fragment>
<EuiTitle size="xxs">
<h4>
<FormattedMessage
id="xpack.fileUpload.jsonImport.indexPatternResponse"
defaultMessage="Index pattern response"
/>
</h4>
</EuiTitle>
<EuiCodeBlock language="json" paddingSize="s" overflowHeight={200}>
{indexPatternJson}
</EuiCodeBlock>
<EuiSpacer size="m" />
</Fragment>
) : null}
<EuiCallOut>
<div>
{i18n.translate('xpack.fileUpload.jsonImport.indexModsMsg', {
defaultMessage: 'Further index modifications can be made using\n',
})}
<a
target="_blank"
href={`${chrome.getBasePath()}/app/kibana#/
management/elasticsearch/index_management/indices/
filter/${indexName}`.replace(/\s/g, '')}
>
{i18n.translate('xpack.fileUpload.jsonImport.indexMgmtLink', {
defaultMessage: 'Index Management',
})}
</a>
.
</div>
</EuiCallOut>
</Fragment>
) : null}
</Fragment>
);
}
Expand Down
Loading