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

restore index pattern management data-test-subj's #64697

Merged
merged 8 commits into from
May 8, 2020
Merged

restore index pattern management data-test-subj's #64697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1c929f3
restore index pattern management data-test-subj's
mattkime Apr 28, 2020
d14d55d
Merge branch 'master' into restore-data-test-subj-index-pattern-tabs
mattkime May 4, 2020
bc2340e
fix data-test-subj and related test
mattkime May 4, 2020
f25dc5b
update parsing of scripted field count but not yet working
mattkime May 5, 2020
57b4996
Merge branch 'master' into restore-data-test-subj-index-pattern-tabs
mattkime May 5, 2020
fc7c3d2
Merge branch 'master' into restore-data-test-subj-index-pattern-tabs
elasticmachine May 8, 2020
ff5989a
Merge remote-tracking branch 'upstream/master' into restore-data-test…
alexwizp May 8, 2020
5f63f7b
fix CI
alexwizp May 8, 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
3 changes: 3 additions & 0 deletions ...plugins/kibana/public/management/sections/index_patterns/edit_index_pattern/tabs/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,21 @@ export function getTabs(
tabs.push({
name: getTitle('indexed', filteredCount, totalCount),
id: TAB_INDEXED_FIELDS,
'data-test-subj': 'tab-indexedFields',
});

if (indexPatternListProvider.areScriptedFieldsEnabled(indexPattern)) {
tabs.push({
name: getTitle('scripted', filteredCount, totalCount),
id: TAB_SCRIPTED_FIELDS,
'data-test-subj': 'tab-scriptedFields',
});
}

tabs.push({
name: getTitle('sourceFilters', filteredCount, totalCount),
id: TAB_SOURCE_FILTERS,
'data-test-subj': 'tab-sourceFilters',
});

return tabs;
Expand Down
16 changes: 7 additions & 9 deletions test/functional/page_objects/settings_page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,17 +206,15 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider

async getFieldsTabCount() {
return retry.try(async () => {
const indexedFieldsTab = await find.byCssSelector('#indexedFields .euiTab__content');
const text = await indexedFieldsTab.getVisibleText();
return text.split(/[()]/)[1];
const text = await testSubjects.getVisibleText('tab-indexedFields');
return text.split(' ')[1].replace(/\((.*)\)/, '$1');
});
}

async getScriptedFieldsTabCount() {
return await retry.try(async () => {
const scriptedFieldsTab = await find.byCssSelector('#scriptedFields .euiTab__content');
const text = await scriptedFieldsTab.getVisibleText();
return text.split(/[()]/)[1];
const text = await testSubjects.getVisibleText('tab-scriptedFields');
return text.split(' ')[2].replace(/\((.*)\)/, '$1');
});
}

Expand Down Expand Up @@ -431,17 +429,17 @@ export function SettingsPageProvider({ getService, getPageObjects }: FtrProvider

async clickFieldsTab() {
log.debug('click Fields tab');
await find.clickByCssSelector('#indexedFields');
await testSubjects.click('tab-indexedFields');
}

async clickScriptedFieldsTab() {
log.debug('click Scripted Fields tab');
await find.clickByCssSelector('#scriptedFields');
await testSubjects.click('tab-scriptedFields');
}

async clickSourceFiltersTab() {
log.debug('click Source Filters tab');
await find.clickByCssSelector('#sourceFilters');
await testSubjects.click('tab-sourceFilters');
}

async editScriptedField(name: string) {
Expand Down