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.

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

Make Discover table keyboard accessible. #11604

Merged
merged 6 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
54 changes: 37 additions & 17 deletions src/core_plugins/kbn_doc_views/public/views/table.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,52 @@
</td>
<td width="1%" class="doc-viewer-buttons" ng-if="filter">
<span ng-if="mapping[field].filterable">
<i ng-click="filter(mapping[field], flattened[field], '+')"
tooltip="Filter for value"
tooltip-append-to-body="1"
class="fa fa-search-plus"></i>
<i ng-click="filter(mapping[field], flattened[field],'-')"
tooltip="Filter out value"
tooltip-append-to-body="1"
class="fa fa-search-minus"></i>
<button
class="doc-viewer-button"
ng-click="filter(mapping[field], flattened[field], '+')"
>
<i
tooltip="Filter for value"
tooltip-append-to-body="1"
class="fa fa-search-plus"></i>
</button>

<button
class="doc-viewer-button"
ng-click="filter(mapping[field], flattened[field],'-')"
>
<i
tooltip="Filter out value"
tooltip-append-to-body="1"
class="fa fa-search-minus"></i>
</button>
</span>
<span ng-if="!mapping[field].filterable" tooltip="Unindexed fields can not be searched">
<i class="fa fa-search-plus text-muted"></i>
<i class="fa fa-search-minus text-muted"></i>
</span>
<span ng-if="canToggleColumns()">
<i
class="fa fa-columns"
<button
class="doc-viewer-button"
ng-click="toggleColumn(field)"
tooltip-append-to-body="1"
tooltip="Toggle column in table"
></i>
>
<i
class="fa fa-columns"
tooltip-append-to-body="1"
tooltip="Toggle column in table"
></i>
</button>
</span>
<span ng-if="!indexPattern.metaFields.includes(field)">
<i ng-click="filter('_exists_', field, '+')"
tooltip="Filter for field present"
tooltip-append-to-body="1"
class="fa fa-asterisk"></i>
<button
class="doc-viewer-button"
ng-click="filter('_exists_', field, '+')"
>
<i
tooltip="Filter for field present"
tooltip-append-to-body="1"
class="fa fa-asterisk"></i>
</button>
</span>
<span ng-if="indexPattern.metaFields.includes(field)" tooltip="Unable to filter for presence of meta fields">
<i class="fa fa-asterisk text-muted"></i>
Expand Down
17 changes: 12 additions & 5 deletions src/core_plugins/kibana/public/discover/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,18 @@
white-space: nowrap;
}

.discover-table-open-icon {
// when switching between open and closed, the toggle changes size
// slightly which is a problem because it forces the entire table to
// re-render which is SLOW
width: 7px;
/**
* 1. When switching between open and closed, the toggle changes size
* slightly which is a problem because it forces the entire table to
* re-render which is SLOW.
*/
.discover-table-open-button {
appearance: none;
background-color: transparent;
padding: 0;
border: none;
width: 7px; /* 1 */
height: 7px;
}

.discover-field-filter {
Expand Down
12 changes: 6 additions & 6 deletions src/ui/public/doc_table/components/table_row/cell.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<%= formatted %>
<span class="table-cell-filter">
<% if (filterable) { %>
<span
<button
ng-click="inlineFilter($event, '+')"
class="fa fa-search-plus docTableRowFilterIcon"
class="fa fa-search-plus docTableRowFilterButton"
data-column="<%- column %>"
tooltip="Filter for value"
tooltip-append-to-body="1"
></span>
></button>

<span
<button
ng-click="inlineFilter($event, '-')"
class="fa fa-search-minus docTableRowFilterIcon"
class="fa fa-search-minus docTableRowFilterButton"
data-column="<%- column %>"
tooltip="Filter out value"
tooltip-append-to-body="1"
></span>
></button>
<% } %>
</span>
</td>
10 changes: 6 additions & 4 deletions src/ui/public/doc_table/components/table_row/open.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<td ng-click="toggleRow()" data-test-subj="docTableExpandToggleColumn">
<i
class="fa discover-table-open-icon"
ng-class="{ 'fa-caret-down': open, 'fa-caret-right': !open }">
</i>
<button class="discover-table-open-button">
<span
class="kuiIcon"
ng-class="{ 'fa-caret-down': open, 'fa-caret-right': !open }"
></span>
</button>
</td>
20 changes: 15 additions & 5 deletions src/ui/public/doc_table/doc_table.less
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@ doc-table {
background-color: @panel-bg;
white-space: nowrap;
right: 0;
display: none;
}

&:hover {
.table-cell-filter {
display: inline;
.docTableRowFilterButton {
opacity: 1;
}
}
}
Expand All @@ -70,13 +69,24 @@ doc-table {

/**
* 1. Align icon with text in cell.
* 2. Use opacity to make this element accessible to screen readers and keyboard.
* 3. Show on focus to enable keyboard accessibility.
*/
.docTableRowFilterIcon {
.docTableRowFilterButton {
appearance: none;
background-color: transparent;
border: none;
padding: 0;
font-size: 14px;
line-height: 1; /* 1 */
display: inline;
display: inline-block;
opacity: 0; /* 2 */

& + & {
margin-left: 5px;
}

&:focus {
opacity: 1; /* 3 */
}
}
16 changes: 13 additions & 3 deletions src/ui/public/doc_viewer/doc_viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,19 @@ uiModules.get('kibana')
$viewer.append($tabs);
$viewer.append($content);
docViews.inOrder.forEach(view => {
const $tab = $(`<li ng-show="docViews['${view.name}'].shouldShow(hit)" ng-class="{active: mode == '${view.name}'}">
<a ng-click="mode='${view.name}'">${view.title}</a>
</li>`);
const $tab = $(
`<li
ng-show="docViews['${view.name}'].shouldShow(hit)"
ng-class="{active: mode == '${view.name}'}"
>
<a
ng-click="mode='${view.name}'"
kbn-accessible-click
>
${view.title}
</a>
</li>`
);
$tabs.append($tab);
const $viewAttrs = `
hit="hit"
Expand Down
7 changes: 7 additions & 0 deletions src/ui/public/doc_viewer/doc_viewer.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@
white-space: nowrap;
}

.doc-viewer-button {
appearance: none;
background-color: transparent;
border: none;
padding: 0;
}

.doc-viewer-value {
display: inline-block;
word-break: break-all;
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/discover/_field_data.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default function ({ getService, getPageObjects }) {
it('doc view should show oldest time first', function () {
// Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
const ExpectedDoc =
'September 22nd 2015, 23:50:13.253 index:logstash-2015.09.22 @timestamp:September 22nd 2015, 23:50:13.253'
'September 22nd 2015, 23:50:13.253\nindex:logstash-2015.09.22 @timestamp:September 22nd 2015, 23:50:13.253'
+ ' ip:238.171.34.42 extension:jpg response:200 geo.coordinates:{ "lat": 38.66494528, "lon": -88.45299556'
+ ' } geo.src:FR geo.dest:KH geo.srcdest:FR:KH @tags:success, info utc_time:September 22nd 2015,'
+ ' 23:50:13.253 referer:http://twitter.com/success/nancy-currie agent:Mozilla/4.0 (compatible; MSIE 6.0;'
Expand Down Expand Up @@ -135,7 +135,7 @@ export default function ({ getService, getPageObjects }) {
it('doc view should sort ascending', function () {
// Note: Could just check the timestamp, but might as well check that the whole doc is as expected.
const ExpectedDoc =
'September 20th 2015, 00:00:00.000 index:logstash-2015.09.20 @timestamp:September 20th 2015, 00:00:00.000'
'September 20th 2015, 00:00:00.000\nindex:logstash-2015.09.20 @timestamp:September 20th 2015, 00:00:00.000'
+ ' ip:143.84.142.7 extension:jpg response:200 geo.coordinates:{ "lat": 38.68407028, "lon": -120.9871642 }'
+ ' geo.src:ES geo.dest:US geo.srcdest:ES:US @tags:error, info utc_time:September 20th 2015, 00:00:00.000'
+ ' referer:http://www.slate.com/success/vladimir-kovalyonok agent:Mozilla/4.0 (compatible; MSIE 6.0;'
Expand Down
10 changes: 5 additions & 5 deletions test/functional/apps/management/_scripted_fields.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.waitForVisualization();
await retry.try(async function() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be('September 18th 2015, 18:20:57.916 18');
expect(rowData).to.be('September 18th 2015, 18:20:57.916\n18');
});
});

Expand Down Expand Up @@ -139,7 +139,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.waitForVisualization();
await retry.try(async function() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be('September 18th 2015, 18:20:57.916 18');
expect(rowData).to.be('September 18th 2015, 18:20:57.916\n18');
});
});

Expand Down Expand Up @@ -207,7 +207,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.waitForVisualization();
await retry.try(async function() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be('September 18th 2015, 18:20:57.916 good');
expect(rowData).to.be('September 18th 2015, 18:20:57.916\ngood');

});
});
Expand Down Expand Up @@ -271,7 +271,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.waitForVisualization();
await retry.try(async function() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be('September 18th 2015, 18:20:57.916 true');
expect(rowData).to.be('September 18th 2015, 18:20:57.916\ntrue');

});
});
Expand Down Expand Up @@ -336,7 +336,7 @@ export default function ({ getService, getPageObjects }) {
await PageObjects.visualize.waitForVisualization();
await retry.try(async function() {
const rowData = await PageObjects.discover.getDocTableIndex(1);
expect(rowData).to.be('September 18th 2015, 06:52:55.953 2015-09-18 07:00');
expect(rowData).to.be('September 18th 2015, 06:52:55.953\n2015-09-18 07:00');
});
});

Expand Down