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

Convert EuiTableOfRecords to simpler table component in scripted fields table. #16901

Merged
merged 4 commits into from
Mar 9, 2018
Merged

Convert EuiTableOfRecords to simpler table component in scripted fields table. #16901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63cb300
Convert EuiTableOfRecords to EuiBasicTable in scripted fields table.
cjcenizal Feb 23, 2018
ba7a279
Convert from EuiBasicTable to EuiInMemoryTable.
cjcenizal Feb 24, 2018
7c2b862
Fix bug with filtering and show 'no items' message when the filter do…
cjcenizal Mar 9, 2018
bc28cb3
Update snapshot.
cjcenizal Mar 9, 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
199 changes: 65 additions & 134 deletions ...x_pattern/scripted_fields_table/__tests__/__snapshots__/scripted_field_table.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

exports[`ScriptedFieldsTable should filter based on the lang filter 1`] = `
<div>
<header />
<header
addScriptedFieldUrl="#"
/>
<call-outs
deprecatedLangsInUse={
Array [
Expand All @@ -11,11 +13,6 @@ exports[`ScriptedFieldsTable should filter based on the lang filter 1`] = `
}
painlessDocLink="painlessDocs"
/>
<eui-button
data-test-subj="addScriptedFieldLink"
>
Add scripted field
</eui-button>
<eui-spacer
size="l"
/>
Expand All @@ -27,52 +24,33 @@ exports[`ScriptedFieldsTable should filter based on the lang filter 1`] = `
"getScriptedFields": [Function],
}
}
model={
Object {
"criteria": Object {
"page": Object {
"index": 0,
"size": 10,
},
"sort": Object {
"direction": "asc",
"field": "name",
},
items={
Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
"data": Object {
"records": Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
],
"totalRecordCount": 2,
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
}
]
}
onDataCriteriaChange={[Function]}
/>
</div>
`;

exports[`ScriptedFieldsTable should filter based on the query bar 1`] = `
<div>
<header />
<header
addScriptedFieldUrl="#"
/>
<call-outs
deprecatedLangsInUse={Array []}
painlessDocLink="painlessDocs"
/>
<eui-button
data-test-subj="addScriptedFieldLink"
>
Add scripted field
</eui-button>
<eui-spacer
size="l"
/>
Expand All @@ -84,65 +62,53 @@ exports[`ScriptedFieldsTable should filter based on the query bar 1`] = `
"getScriptedFields": [Function],
}
}
model={
Object {
"criteria": Object {
"page": Object {
"index": 0,
"size": 10,
},
"sort": Object {
"direction": "asc",
"field": "name",
},
},
"data": Object {
"records": Array [
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
],
"totalRecordCount": 1,
items={
Array [
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
}
]
}
onDataCriteriaChange={[Function]}
/>
</div>
`;

exports[`ScriptedFieldsTable should hide the table if there are no scripted fields 1`] = `
<div>
<header />
<header
addScriptedFieldUrl="#"
/>
<call-outs
deprecatedLangsInUse={Array []}
painlessDocLink="painlessDocs"
/>
<eui-button
data-test-subj="addScriptedFieldLink"
>
Add scripted field
</eui-button>
<eui-spacer
size="l"
/>
<Table
deleteField={[Function]}
editField={[Function]}
indexPattern={
Object {
"getScriptedFields": [Function],
}
}
items={Array []}
/>
</div>
`;

exports[`ScriptedFieldsTable should render normally 1`] = `
<div>
<header />
<header
addScriptedFieldUrl="#"
/>
<call-outs
deprecatedLangsInUse={Array []}
painlessDocLink="painlessDocs"
/>
<eui-button
data-test-subj="addScriptedFieldLink"
>
Add scripted field
</eui-button>
<eui-spacer
size="l"
/>
Expand All @@ -154,52 +120,33 @@ exports[`ScriptedFieldsTable should render normally 1`] = `
"getScriptedFields": [Function],
}
}
model={
Object {
"criteria": Object {
"page": Object {
"index": 0,
"size": 10,
},
"sort": Object {
"direction": "asc",
"field": "name",
},
items={
Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
"data": Object {
"records": Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
],
"totalRecordCount": 2,
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
}
]
}
onDataCriteriaChange={[Function]}
/>
</div>
`;

exports[`ScriptedFieldsTable should show a delete modal 1`] = `
<div>
<header />
<header
addScriptedFieldUrl="#"
/>
<call-outs
deprecatedLangsInUse={Array []}
painlessDocLink="painlessDocs"
/>
<eui-button
data-test-subj="addScriptedFieldLink"
>
Add scripted field
</eui-button>
<eui-spacer
size="l"
/>
Expand All @@ -211,36 +158,20 @@ exports[`ScriptedFieldsTable should show a delete modal 1`] = `
"getScriptedFields": [Function],
}
}
model={
Object {
"criteria": Object {
"page": Object {
"index": 0,
"size": 10,
},
"sort": Object {
"direction": "asc",
"field": "name",
},
items={
Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
"data": Object {
"records": Array [
Object {
"lang": "painless",
"name": "ScriptedField",
"script": "x++",
},
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
],
"totalRecordCount": 2,
Object {
"lang": "painless",
"name": "JustATest",
"script": "z++",
},
}
]
}
onDataCriteriaChange={[Function]}
/>
<eui-overlay-mask>
<eui-confirm-modal
Expand Down
5 changes: 1 addition & 4 deletions ...s/indices/edit_index_pattern/scripted_fields_table/__tests__/scripted_field_table.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import { shallow } from 'enzyme';
import { ScriptedFieldsTable } from '../scripted_fields_table';

jest.mock('@elastic/eui', () => ({
EuiButton: 'eui-button',
EuiTableOfRecords: 'eui-table-of-records',
EuiTitle: 'eui-title',
EuiText: 'eui-text',
EuiButton: 'eui-button',
EuiHorizontalRule: 'eui-horizontal-rule',
EuiSpacer: 'eui-spacer',
EuiCallOut: 'eui-call-out',
Expand Down Expand Up @@ -42,7 +39,7 @@ jest.mock('ui/documentation_links', () => ({

const helpers = {
redirectToRoute: () => {},
getRouteHref: () => {},
getRouteHref: () => '#',
};

const indexPattern = {
Expand Down
56 changes: 40 additions & 16 deletions ...ttern/scripted_fields_table/components/header/__tests__/__snapshots__/header.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,45 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Header should render normally 1`] = `
<div>
<EuiTitle
size="s"
<EuiFlexGroup
alignItems="center"
component="div"
gutterSize="l"
justifyContent="flexStart"
responsive={true}
wrap={false}
>
<EuiFlexItem
component="div"
grow={true}
>
<h3>
Scripted fields
</h3>
</EuiTitle>
<EuiText>
<p>
You can use scripted fields in visualizations and display them in your documents. However, you cannot search scripted fields.
</p>
</EuiText>
<EuiSpacer
size="s"
/>
</div>
<EuiTitle
size="s"
>
<h3>
Scripted fields
</h3>
</EuiTitle>
<EuiText>
<p>
You can use scripted fields in visualizations and display them in your documents. However, you cannot search scripted fields.
</p>
</EuiText>
</EuiFlexItem>
<EuiFlexItem
component="div"
grow={false}
>
<EuiButton
color="primary"
data-test-subj="addScriptedFieldLink"
fill={false}
href=""
iconSide="left"
type="button"
>
Add scripted field
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
`;
2 changes: 1 addition & 1 deletion ...dices/edit_index_pattern/scripted_fields_table/components/header/__tests__/header.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Header } from '../header';
describe('Header', () => {
it('should render normally', async () => {
const component = shallow(
<Header/>
<Header addScriptedFieldUrl="" />
);

expect(component).toMatchSnapshot();
Expand Down
Loading