From 1b0e3ee1cc06a07f2765877ca6d317bf3287510a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20St=C3=BCrmer?= Date: Wed, 11 Mar 2020 12:55:22 +0100 Subject: [PATCH] Rename 'original' to 'pre-wrapped' wrap mode --- .../logging/log_text_stream/log_entry_field_column.test.tsx | 6 +++--- .../logging/log_text_stream/log_entry_field_column.tsx | 6 +++--- .../logging/log_text_stream/log_entry_message_column.tsx | 6 +++--- .../components/logging/log_text_stream/log_entry_row.tsx | 4 ++-- .../components/logging/log_text_stream/text_styles.tsx | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx index 3ecb4222a022a..5d295ca7e4817 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.test.tsx @@ -26,7 +26,7 @@ describe('LogEntryFieldColumn', () => { isActiveHighlight={false} isHighlighted={false} isHovered={false} - wrapMode="original" + wrapMode="pre-wrapped" />, { wrappingComponent: EuiThemeProvider } as any // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/36075 ); @@ -58,7 +58,7 @@ describe('LogEntryFieldColumn', () => { isActiveHighlight={false} isHighlighted={false} isHovered={false} - wrapMode="original" + wrapMode="pre-wrapped" />, { wrappingComponent: EuiThemeProvider } as any // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/36075 ); @@ -80,7 +80,7 @@ describe('LogEntryFieldColumn', () => { isActiveHighlight={false} isHighlighted={false} isHovered={false} - wrapMode="original" + wrapMode="pre-wrapped" />, { wrappingComponent: EuiThemeProvider } as any // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/36075 ); diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx index a5e9acd63b5d2..c6584f2fdbb6d 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_field_column.tsx @@ -19,7 +19,7 @@ import { LogEntryColumnContent } from './log_entry_column'; import { hoveredContentStyle, longWrappedContentStyle, - originalWrappedContentStyle, + preWrappedContentStyle, unwrappedContentStyle, WrapMode, } from './text_styles'; @@ -94,7 +94,7 @@ const FieldColumnContent = euiStyled(LogEntryColumnContent) props.wrapMode === 'long' ? longWrappedContentStyle - : props.wrapMode === 'original' - ? originalWrappedContentStyle + : props.wrapMode === 'pre-wrapped' + ? preWrappedContentStyle : unwrappedContentStyle}; `; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx index 488de905cddcc..122f0fe472c6e 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_message_column.tsx @@ -21,7 +21,7 @@ import { LogEntryColumnContent } from './log_entry_column'; import { hoveredContentStyle, longWrappedContentStyle, - originalWrappedContentStyle, + preWrappedContentStyle, unwrappedContentStyle, WrapMode, } from './text_styles'; @@ -66,8 +66,8 @@ const MessageColumnContent = euiStyled(LogEntryColumnContent) props.wrapMode === 'long' ? longWrappedContentStyle - : props.wrapMode === 'original' - ? originalWrappedContentStyle + : props.wrapMode === 'pre-wrapped' + ? preWrappedContentStyle : unwrappedContentStyle}; `; diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx index ee9623bc07da5..e5e3740f420e8 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/log_entry_row.tsx @@ -148,7 +148,7 @@ export const LogEntryRow = memo( isHighlighted={isHighlighted} isActiveHighlight={isActiveHighlight} isHovered={isHovered} - wrapMode={wrap ? 'long' : 'original'} + wrapMode={wrap ? 'long' : 'pre-wrapped'} /> ) : null} @@ -170,7 +170,7 @@ export const LogEntryRow = memo( isActiveHighlight={isActiveHighlight} isHighlighted={isHighlighted} isHovered={isHovered} - wrapMode={wrap ? 'long' : 'original'} + wrapMode={wrap ? 'long' : 'pre-wrapped'} /> ) : null} diff --git a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx index c99eda30db011..434258343eefb 100644 --- a/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx +++ b/x-pack/plugins/infra/public/components/logging/log_text_stream/text_styles.tsx @@ -10,7 +10,7 @@ import React, { useMemo, useState, useCallback } from 'react'; import { euiStyled, css } from '../../../../../observability/public'; import { TextScale } from '../../../../common/log_text_scale'; -export type WrapMode = 'none' | 'original' | 'long'; +export type WrapMode = 'none' | 'pre-wrapped' | 'long'; export const monospaceTextStyle = (scale: TextScale) => css` font-family: ${props => props.theme.eui.euiCodeFontFamily}; @@ -42,7 +42,7 @@ export const longWrappedContentStyle = css` word-break: break-all; `; -export const originalWrappedContentStyle = css` +export const preWrappedContentStyle = css` overflow: hidden; white-space: pre; `;