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

Look and feel enhancements - Batch 1 #5766

Closed
wants to merge 8 commits into from
Closed

Look and feel enhancements - Batch 1 #5766

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
588f502
Vertically align the text in osdQueryBar with other elements on the page
AMoo-Miki Jan 31, 2024
9cdb5fc
Revert the breadcrumb of Discover to be a link rather than a button
AMoo-Miki Jan 31, 2024
0ae6b58
[Discover] Vertically align source cells with others
AMoo-Miki Jan 31, 2024
56639a8
Use `ouiCodeFont` in Discover and reduce text size
AMoo-Miki Jan 31, 2024
b008ad2
[Discover] Prevent wrapping of date fields
AMoo-Miki Jan 31, 2024
ea965f2
[Discover] Display filter buttons at top right of the cell
AMoo-Miki Jan 31, 2024
9043f9c
[Discover] Clamp the amount of data shown in a row
AMoo-Miki Jan 31, 2024
95bcdd4
[Discover] Vertically align expansion arrows
AMoo-Miki Jan 31, 2024
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/core/server/core_app/assets/legacy_dark_theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@
width: 100%;
max-width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 12px;
}
.table thead {
font-size: 12px;
Expand Down
2 changes: 1 addition & 1 deletion src/core/server/core_app/assets/legacy_light_theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@
width: 100%;
max-width: 100%;
margin-bottom: 20px;
font-size: 14px;
font-size: 12px;
}
.table thead {
font-size: 12px;
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/data/public/ui/query_string_input/_query_bar.scss
View file
Open in desktop
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
// Unlike most inputs within layout control groups, the text area still needs a border.
// These adjusts help it sit above the control groups shadow to line up correctly.
padding: $euiSizeS;
padding-top: $euiSizeS + 3px;
transform: translateY(-1px) translateX(-1px);
padding-top: $euiSizeS + 2px;
transform: translateY(-2px) translateX(-1px);

&:not(:focus):not(:invalid) {
@include euiYScrollWithShadows;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/components/data_grid/data_grid_table_cell_value.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function fetchSourceTypeDataCell(
const keys = Object.keys(formattedRow);

return (
<EuiDescriptionList type="inline" compressed>
<EuiDescriptionList type="inline" compressed className="source">
{keys.map((key, index) => (
<Fragment key={key}>
<EuiDescriptionListTitle className="osdDescriptionListFieldTitle">
Expand Down
17 changes: 17 additions & 0 deletions src/plugins/discover/public/application/components/default_discover_table/_doc_table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,23 @@ doc-table {
}
}

.osdDiscoverTable {
@include ouiCodeFont;

& > tbody > tr:not(.osdDiscoverInViewRow):not(.osdDiscoverExpandedRow) {
visibility: hidden;
}
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved

.osdDiscoverExpandedRow {
background: $euiColorEmptyShade;
border-top: none !important;

& > td {
padding: 2em;
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

.osdDocTable__row {
td {
position: relative;
Expand Down
57 changes: 46 additions & 11 deletions src/plugins/discover/public/application/components/default_discover_table/_table_cell.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
.osdDocTable_expandedRow {
border-top: none !important;
}

.osdDocTableCell__toggleDetails {
padding: 4px 0 0 !important;
}

.osdDocTableCell__filter { // TODO: make them appear at top right corner
padding: 3px 0 0 !important;
}

/**
Expand All @@ -16,9 +9,18 @@
*/

.osdDocTableCell {
white-space: pre-wrap;
position: relative;

&__filterButton {
&__filter {
position: absolute;
white-space: nowrap;
right: 0;
top: 0.5em;
background: $ouiPageBackgroundColor;
}

&__filterButton,
&__filter {
opacity: 0;
transition: opacity $euiAnimSpeedFast;

Expand All @@ -28,7 +30,40 @@
}

&:hover &__filterButton,
&:focus &__filterButton {
&:focus &__filterButton,
&:hover &__filter,
&:focus &__filter {
opacity: 1;
}

.osdDescriptionListFieldTitle {
margin: 0 4px 0 0 !important;
}

/* stylelint-disable-next-line @osd/stylelint/no_modifying_global_selectors */
&.eui-textNoWrap {
width: 1%;
}
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
}

.osdDocTable__limitedHeight {
/* stylelint-disable-next-line value-no-vendor-prefix */
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
max-height: 10em;
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
overflow: hidden;
}

.osdDocTableCell__source {
.osdDocTable__limitedHeight {
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
transform: translateY(-3px);
max-height: calc(10em - 3px);
}

dd,
dl,
dt {
font-size: inherit !important;
}
}
24 changes: 18 additions & 6 deletions src/plugins/discover/public/application/components/default_discover_table/table_cell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { DocViewFilterFn } from '../../doc_views/doc_views_types';

export interface TableCellProps {
columnId: string;
columnType?: string;
onFilter: DocViewFilterFn;
filterable?: boolean;
fieldMapping?: any;
Expand All @@ -26,16 +27,14 @@ export interface TableCellProps {

export const TableCell = ({
columnId,
columnType,
onFilter,
fieldMapping,
sanitizedCellValue,
}: TableCellProps) => {
return (
// eslint-disable-next-line react/no-danger
<td
data-test-subj="docTableField"
className="osdDocTableCell eui-textBreakAll eui-textBreakWord"
>
const content = (
<>
{/* eslint-disable-next-line react/no-danger */}
<span dangerouslySetInnerHTML={{ __html: sanitizedCellValue }} />
<span className="osdDocTableCell__filter">
<EuiToolTip
Expand Down Expand Up @@ -69,6 +68,19 @@ export const TableCell = ({
/>
</EuiToolTip>
</span>
</>
);

return columnType === 'date' ? (
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
<td data-test-subj="docTableField" className="osdDocTableCell eui-textNoWrap">
{content}
</td>
) : (
<td
data-test-subj="docTableField"
className="osdDocTableCell eui-textBreakAll eui-textBreakWord"
>
<div className="osdDocTable__limitedHeight">{content}</div>
</td>
);
};
23 changes: 17 additions & 6 deletions src/plugins/discover/public/application/components/default_discover_table/table_rows.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const TableRow = ({
const flattened = indexPattern.flattenHit(row);
const [isExpanded, setIsExpanded] = useState(false);
const tableRow = (
<tr>
<tr key={row._id}>
<td data-test-subj="docTableExpandToggleColumn" className="osdDocTableCell__toggleDetails">
<EuiButtonIcon
color="text"
Expand All @@ -61,6 +61,7 @@ export const TableRow = ({
if (typeof row === 'undefined') {
return (
<td
key={columnId}
data-test-subj="docTableField"
className="osdDocTableCell eui-textBreakAll eui-textBreakWord"
>
Expand All @@ -71,8 +72,14 @@ export const TableRow = ({

if (fieldInfo?.type === '_source') {
return (
<td className="eui-textBreakAll eui-textBreakWord" data-test-subj="docTableField">
{fetchSourceTypeDataCell(indexPattern, row, columnId, false)}
<td
key={columnId}
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
className="osdDocTableCell eui-textBreakAll eui-textBreakWord osdDocTableCell__source"
data-test-subj="docTableField"
>
<div className="osdDocTable__limitedHeight">
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
{fetchSourceTypeDataCell(indexPattern, row, columnId, false)}
</div>
</td>
);
}
Expand All @@ -82,6 +89,7 @@ export const TableRow = ({
if (typeof formattedValue === 'undefined') {
return (
<td
key={columnId}
data-test-subj="docTableField"
className="osdDocTableCell eui-textBreakAll eui-textBreakWord"
>
Expand All @@ -95,6 +103,7 @@ export const TableRow = ({
if (!fieldInfo?.filterable) {
return (
<td
key={columnId}
data-test-subj="docTableField"
className="osdDocTableCell eui-textBreakAll eui-textBreakWord"
>
Expand All @@ -106,7 +115,9 @@ export const TableRow = ({

return (
<TableCell
key={columnId}
columnId={columnId}
columnType={fieldInfo?.type}
onFilter={onFilter}
fieldMapping={fieldMapping}
sanitizedCellValue={sanitizedCellValue}
Expand All @@ -117,9 +128,9 @@ export const TableRow = ({
);

const expandedTableRow = (
<tr>
<td className="osdDocTable_expandedRow" colSpan={columnIds.length + 1}>
<EuiFlexGroup justifyContent="center" alignItems="center">
<tr className="osdDiscoverExpandedRow" key={'x' + row._id}>
<td colSpan={columnIds.length + 2}>
<EuiFlexGroup>
<EuiFlexItem grow={false}>
<EuiIcon type="folderOpen" />
</EuiFlexItem>
Expand Down
4 changes: 1 addition & 3 deletions src/plugins/discover/public/application/helpers/breadcrumbs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,14 @@

import { i18n } from '@osd/i18n';
import { EuiBreadcrumb } from '@elastic/eui';
import { getServices } from '../../opensearch_dashboards_services';

export function getRootBreadcrumbs(): EuiBreadcrumb[] {
const { core } = getServices();
return [
{
text: i18n.translate('discover.rootBreadcrumb', {
defaultMessage: 'Discover',
}),
onClick: () => core.application.navigateToApp('discover'),
href: '#/',
AMoo-Miki marked this conversation as resolved.
Show resolved Hide resolved
},
];
}
Loading