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

Improve Expanded Document flyout design #7

Merged
merged 2 commits into from
Sep 14, 2020
Merged

Improve Expanded Document flyout design #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a780b9
improve expanded doc flyout design
andreadelrio Aug 31, 2020
72bdf33
remove EuiLink
andreadelrio Aug 31, 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
56 changes: 30 additions & 26 deletions src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import {
EuiFlyoutBody,
EuiFlyoutHeader,
EuiIcon,
EuiLink,
EuiPortal,
EuiTitle,
EuiButtonEmpty,
} from '@elastic/eui';
import { DocViewer } from '../doc_viewer/doc_viewer';
import { IndexPattern } from '../../../kibana_services';
Expand Down Expand Up @@ -67,40 +67,44 @@ export const DiscoverGridFlyout = function DiscoverGridInner({
<EuiFlexItem>
<EuiTitle className="dscTable__flyoutHeader">
<h2>
<EuiIcon type="folderOpen" size="l" />{' '}
<EuiIcon type="expand" size="m" />{' '}
{i18n.translate('discover.grid.tableRow.detailHeading', {
defaultMessage: 'Expanded document',
})}
</h2>
</EuiTitle>
</EuiFlexItem>
<EuiFlexItem>
<EuiFlexGroup justifyContent="flexEnd">
{indexPattern.isTimeBased() && (
<EuiFlexItem grow={false}>
<EuiLink href={getContextAppHref ? getContextAppHref(hit._id) : ''}>
{i18n.translate('discover.grid.tableRow.viewSurroundingDocumentsLinkText', {
defaultMessage: 'View surrounding documents',
})}
</EuiLink>
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<EuiLink
href={`#/doc/${indexPattern.id}/${hit._index}?id=${encodeURIComponent(
hit._id as string
)}`}
>
{i18n.translate('discover.grid.tableRow.viewSingleDocumentLinkText', {
defaultMessage: 'View single document',
})}
</EuiLink>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlexItem>
</EuiFlexGroup>
</EuiFlyoutHeader>
<EuiFlyoutBody>
<EuiFlexGroup direction="column" gutterSize="none" alignItems="flexEnd">
{indexPattern.isTimeBased() && (
<EuiFlexItem grow={false}>
<EuiButtonEmpty
size="xs"
iconType="documents"
href={getContextAppHref ? getContextAppHref(hit._id) : ''}
>
{i18n.translate('discover.grid.tableRow.viewSurroundingDocumentsLinkText', {
defaultMessage: 'View surrounding documents',
})}
</EuiButtonEmpty>
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<EuiButtonEmpty
size="xs"
iconType="document"
href={`#/doc/${indexPattern.id}/${hit._index}?id=${encodeURIComponent(
hit._id as string
)}`}
>
{i18n.translate('discover.grid.tableRow.viewSingleDocumentLinkText', {
defaultMessage: 'View single document',
})}
</EuiButtonEmpty>
</EuiFlexItem>
</EuiFlexGroup>
<DocViewer
hit={hit}
columns={columns}
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/discover/public/application/components/discover_grid/discover_grid_view_button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const ViewButton = ({ rowIndex }: { rowIndex: number }) => {
onClick={() => setViewed(rowIndex)}
className="dscTable__buttonToggle"
>
<EuiIcon size="s" type={viewed === rowIndex ? 'eyeClosed' : 'eye'} />
<EuiIcon size="s" type={viewed === rowIndex ? 'expandMini' : 'expand'} />
</button>
);
};
40 changes: 20 additions & 20 deletions src/plugins/discover/public/application/components/table/table_row.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,26 +67,6 @@ export function DocViewTableRow({

return (
<tr key={field} data-test-subj={`tableDocViewRow-${field}`}>
{typeof onFilter === 'function' && (
<td className="kbnDocViewer__buttons">
<DocViewTableRowBtnFilterAdd
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter(fieldMapping, valueRaw, '+')}
/>
<DocViewTableRowBtnFilterRemove
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter(fieldMapping, valueRaw, '-')}
/>
{typeof onToggleColumn === 'function' && (
<DocViewTableRowBtnToggleColumn active={isColumnActive} onClick={onToggleColumn} />
)}
<DocViewTableRowBtnFilterExists
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter('_exists_', field, '+')}
scripted={fieldMapping && fieldMapping.scripted}
/>
</td>
)}
<td className="kbnDocViewer__field">
<FieldName
fieldName={field}
Expand All @@ -112,6 +92,26 @@ export function DocViewTableRow({
dangerouslySetInnerHTML={{ __html: value as string }}
/>
</td>
{typeof onFilter === 'function' && (
<td className="kbnDocViewer__buttons">
<DocViewTableRowBtnFilterAdd
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter(fieldMapping, valueRaw, '+')}
/>
<DocViewTableRowBtnFilterRemove
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter(fieldMapping, valueRaw, '-')}
/>
{typeof onToggleColumn === 'function' && (
<DocViewTableRowBtnToggleColumn active={isColumnActive} onClick={onToggleColumn} />
)}
<DocViewTableRowBtnFilterExists
disabled={!fieldMapping || !fieldMapping.filterable}
onClick={() => onFilter('_exists_', field, '+')}
scripted={fieldMapping && fieldMapping.scripted}
/>
</td>
)}
</tr>
);
}
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/components/table/table_row_btn_filter_add.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function DocViewTableRowBtnFilterAdd({ onClick, disabled = false }: Props
data-test-subj="addInclusiveFilterButton"
disabled={disabled}
onClick={onClick}
iconType={'magnifyWithPlus'}
iconType={'plusInCircle'}
iconSize={'s'}
/>
</EuiToolTip>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/components/table/table_row_btn_filter_exists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function DocViewTableRowBtnFilterExists({
className="kbnDocViewer__actionButton"
data-test-subj="addExistsFilterButton"
disabled={disabled}
iconType={'indexOpen'}
iconType={'filter'}
iconSize={'s'}
/>
</EuiToolTip>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/components/table/table_row_btn_filter_remove.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function DocViewTableRowBtnFilterRemove({ onClick, disabled = false }: Pr
data-test-subj="removeInclusiveFilterButton"
disabled={disabled}
onClick={onClick}
iconType={'magnifyWithMinus'}
iconType={'minusInCircle'}
iconSize={'s'}
/>
</EuiToolTip>
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/discover/public/application/components/table/table_row_btn_toggle_column.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
className="kbnDocViewer__actionButton"
data-test-subj="toggleColumnButton"
disabled
iconType={'tableOfContents'}
iconType={'listAdd'}
iconSize={'s'}
/>
);
Expand All @@ -59,7 +59,7 @@ export function DocViewTableRowBtnToggleColumn({ onClick, active, disabled = fal
onClick={onClick}
className="kbnDocViewer__actionButton"
data-test-subj="toggleColumnButton"
iconType={'tableOfContents'}
iconType={'listAdd'}
iconSize={'s'}
/>
</EuiToolTip>
Expand Down