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

Use EuiTokens for ES field types #57911

Merged
merged 17 commits into from
Feb 21, 2020
Merged

Use EuiTokens for ES field types #57911

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
58ab090
[FieldIcon] Refactor to extend EuiToken and props
Jan 13, 2020
5a3d595
[Add to FieldIcon] Export props
Jan 13, 2020
9b0e856
[Graph] Updated instances of FieldIcon
Jan 13, 2020
c00d1fb
[Maps] Update FieldIcon instance
Jan 13, 2020
626b8b0
[Lens] Update FieldIcon usage
Jan 13, 2020
8752c1d
[Discover] Update FieldIcon usage
Jan 13, 2020
10e6525
Remove comment
Feb 18, 2020
f3da3a1
[Lens] Delete unused files
Feb 19, 2020
7fa6d90
[Graph] Fix alignments
Feb 19, 2020
f75bb81
More cleanup
Feb 19, 2020
f8e827b
Fixing snaps
Feb 19, 2020
a89d7fb
[Lens] Removing method `getColorForDataType`
Feb 19, 2020
c555652
[Maps] Fixing implementations of FieldIcon
Feb 19, 2020
f0e70fa
[Graph] Using css utility class instead of custom class
Feb 19, 2020
51abef4
Snap
Feb 19, 2020
5f2bbb0
Merge branch 'master' into working/tokens_for_field_types
elasticmachine Feb 21, 2020
9d42fb8
Fix css to use var
Feb 21, 2020
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
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/kibana/public/discover/np_ready/_discover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ discover-app {
background-color: transparent;
}

.dscField--noResults {
.dscFieldName--noResults {
color: $euiColorDarkShade;
}

Expand Down
150 changes: 93 additions & 57 deletions ...ic/discover/np_ready/angular/directives/field_name/__snapshots__/field_name.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 22 additions & 10 deletions ...core_plugins/kibana/public/discover/np_ready/angular/directives/field_name/field_name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
*/
import React from 'react';
import classNames from 'classnames';
import { FieldIcon } from '../../../../../../../../../plugins/kibana_react/public';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';

import { FieldIcon, FieldIconProps } from '../../../../../../../../../plugins/kibana_react/public';
import { shortenDottedString } from '../../../../../../../../../plugins/data/common/utils';
import { getFieldTypeName } from './field_type_name';

Expand All @@ -35,25 +37,35 @@ interface Props {
fieldName?: string;
fieldType?: string;
useShortDots?: boolean;
fieldIconProps?: Omit<FieldIconProps, 'type'>;
}

export function FieldName({ field, fieldName, fieldType, useShortDots }: Props) {
export function FieldName({ field, fieldName, fieldType, useShortDots, fieldIconProps }: Props) {
const type = field ? String(field.type) : String(fieldType);
const typeName = getFieldTypeName(type);

const name = field ? String(field.name) : String(fieldName);
const displayName = useShortDots ? shortenDottedString(name) : name;

const className = classNames({
'dscField--noResults': field ? !field.rowCount && !field.scripted : false,
// this is currently not styled, should display an icon
scripted: field ? field.scripted : false,
const noResults = field ? !field.rowCount && !field.scripted : false;

const className = classNames('dscFieldName', {
'dscFieldName--noResults': noResults,
});

return (
<span className={className} title={typeName}>
<FieldIcon type={type} label={typeName} />
<span className="dscFieldName">{displayName}</span>
</span>
<EuiFlexGroup className={className} alignItems="center" gutterSize="s" responsive={false}>
<EuiFlexItem grow={false}>
<FieldIcon
type={type}
label={typeName}
scripted={field ? field.scripted : false}
{...fieldIconProps}
/>
</EuiFlexItem>
<EuiFlexItem className="eui-textTruncate">
<span className="dscFieldName__displayName eui-textTruncate">{displayName}</span>
</EuiFlexItem>
</EuiFlexGroup>
);
}
1 change: 0 additions & 1 deletion ...core_plugins/kibana/public/discover/np_ready/components/field_chooser/_field_chooser.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

.dscFieldName {
color: $euiColorDarkShade;
padding-left: $euiSizeS;
}


Expand Down
7 changes: 6 additions & 1 deletion src/legacy/core_plugins/kibana/public/discover/np_ready/components/table/table_row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ export function DocViewTableRow({
</td>
)}
<td className="kbnDocViewer__field">
<FieldName field={fieldMapping} fieldName={field} fieldType={fieldType} />
<FieldName
field={fieldMapping}
fieldName={field}
fieldType={fieldType}
fieldIconProps={{ fill: 'none', color: 'gray' }}
/>
</td>
<td>
{isCollapsible && (
Expand Down
Loading