diff --git a/public/components/event_analytics/explorer/visualizations/_mixins.scss b/public/components/event_analytics/explorer/visualizations/_mixins.scss index ae22f3905..c30d4dec1 100644 --- a/public/components/event_analytics/explorer/visualizations/_mixins.scss +++ b/public/components/event_analytics/explorer/visualizations/_mixins.scss @@ -6,7 +6,7 @@ // sass-lint:disable-block indentation, no-color-keywords // SASSTODO: Create this in EUI -@mixin lnsOverflowShadowHorizontal { +@mixin vizOverflowShadowHorizontal { $hideHeight: $euiScrollBarCorner * 1.25; mask-image: linear-gradient( to right, @@ -18,7 +18,7 @@ } // Static styles for a draggable item -@mixin lnsDraggable { +@mixin vizDraggable { @include euiSlightShadow; background: lightOrDarkTheme($euiColorEmptyShade, $euiColorLightestShade); border: $euiBorderWidthThin dashed transparent; @@ -26,29 +26,29 @@ } // Static styles for a drop area -@mixin lnsDroppable { +@mixin vizDroppable { border: $euiBorderWidthThin dashed $euiBorderColor; } // Hovering state for drag item and drop area -@mixin lnsDragDropHover { +@mixin vizDragDropHover { &:hover { border: $euiBorderWidthThin dashed $euiColorMediumShade; } } // Style for drop area when there's an item being dragged -@mixin lnsDroppableActive { +@mixin vizDroppableActive { background-color: transparentize($euiColorVis0, .9); } // Style for drop area while hovering with item -@mixin lnsDroppableActiveHover { +@mixin vizDroppableActiveHover { background-color: transparentize($euiColorVis0, .75); border: $euiBorderWidthThin dashed $euiColorVis0; } // Style for drop area that is not allowed for current item -@mixin lnsDroppableNotAllowed { +@mixin vizDroppableNotAllowed { opacity: .5; } diff --git a/public/components/event_analytics/explorer/visualizations/_variables.scss b/public/components/event_analytics/explorer/visualizations/_variables.scss index a4248f814..e62f5a76a 100644 --- a/public/components/event_analytics/explorer/visualizations/_variables.scss +++ b/public/components/event_analytics/explorer/visualizations/_variables.scss @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -$lnsPanelMinWidth: $euiSize * 18; +$vizPanelMinWidth: $euiSize * 18; // These sizes also match canvas' page thumbnails for consistency -$lnsSuggestionHeight: 100px; -$lnsSuggestionWidth: 150px; +$vizSuggestionHeight: 100px; +$vizSuggestionWidth: 150px; diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap b/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap index 4fde463e5..d658b56a4 100644 --- a/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap +++ b/public/components/event_analytics/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap @@ -11,6 +11,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -4511,6 +4516,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -5287,6 +5297,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -5825,6 +5840,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -6645,6 +6665,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -7197,6 +7222,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -8016,6 +8046,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -9334,6 +9369,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { @@ -10673,6 +10713,11 @@ exports[`Config panel component Renders config panel with visualization data 1`] "fromApp": false, }, "defaultAxes": Object {}, + "explorer": Object { + "explorerData": Object { + "jsonData": Array [], + }, + }, "indexFields": Object { "availableFields": Array [ Object { diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss index 816934a1f..b24f0b51d 100644 --- a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss +++ b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.scss @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -.lnsConfigPanel__addLayerBtn { +.vizConfigPanel__addLayerBtn { color: transparentize($euiColorMediumShade, 0.3); // Remove EuiButton's default shadow to make button more subtle // sass-lint:disable-block no-important diff --git a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx index d00bb9c29..6b2497372 100644 --- a/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx +++ b/public/components/event_analytics/explorer/visualizations/config_panel/config_panel.tsx @@ -185,7 +185,7 @@ export const ConfigPanel = ({ visualizations, setCurVisId, callback }: any) => { return (
- +    {label}
diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap b/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap deleted file mode 100644 index 52c143da6..000000000 --- a/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap +++ /dev/null @@ -1,117 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Shared components Renders tool bar button component 1`] = ` - - - - - - - -`; diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx b/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx deleted file mode 100644 index 8b5405906..000000000 --- a/public/components/event_analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - */ - -import { configure, mount } from 'enzyme'; -import Adapter from 'enzyme-adapter-react-16'; -import React from 'react'; -import { waitFor } from '@testing-library/react'; -import { ToolbarButton } from '../toolbar_button'; - -describe('Shared components', () => { - configure({ adapter: new Adapter() }); - - it('Renders tool bar button component', async () => { - const handleClick = jest.fn(); - const WrappedComponent = () =>
testing
; - - const wrapper = mount( - - - - ); - - wrapper.update(); - - await waitFor(() => { - expect(wrapper).toMatchSnapshot(); - }); - }); -}); diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss b/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss index be379ecec..9dfd2c7e7 100644 --- a/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss +++ b/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.scss @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ - .lnsChart__empty { + .vizChart__empty { display: flex; justify-content: center; align-items: center; diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx b/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx index 56b8886fe..18af24737 100644 --- a/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx +++ b/public/components/event_analytics/explorer/visualizations/shared_components/empty_placeholder.tsx @@ -11,7 +11,7 @@ import './empty_placeholder.scss'; export const EmptyPlaceholder = (props: { icon: string }) => ( <> svg { - margin-top: -1px; // Just some weird alignment issue when icon is the child not the `iconType` - } - - .lnsToolbarButton__text:empty { - margin: 0; - } - - // Toolbar buttons don't look good with centered text when fullWidth - &[class*='fullWidth'] { - text-align: left; - - .lnsToolbarButton__content { - justify-content: space-between; - } - } - -} - -.lnsToolbarButton--groupLeft { - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -.lnsToolbarButton--groupCenter { - border-radius: 0; - border-left: none; -} - -.lnsToolbarButton--groupRight { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-left: none; -} - -.lnsToolbarButton--bold { - font-weight: $euiFontWeightBold; -} - -.lnsToolbarButton--s { - box-shadow: none !important; // sass-lint:disable-line no-important - font-size: $euiFontSizeS; -} diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/toolbar_button.tsx b/public/components/event_analytics/explorer/visualizations/shared_components/toolbar_button.tsx deleted file mode 100644 index 99d0aca64..000000000 --- a/public/components/event_analytics/explorer/visualizations/shared_components/toolbar_button.tsx +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - */ - -import './toolbar_button.scss'; -import React from 'react'; -import classNames from 'classnames'; -import { EuiButton, PropsOf, EuiButtonProps } from '@elastic/eui'; - -const groupPositionToClassMap = { - none: null, - left: 'lnsToolbarButton--groupLeft', - center: 'lnsToolbarButton--groupCenter', - right: 'lnsToolbarButton--groupRight', -}; - -export type ToolbarButtonProps = PropsOf & { - /** - * Determines prominence - */ - fontWeight?: 'normal' | 'bold'; - /** - * Smaller buttons also remove extra shadow for less prominence - */ - size?: EuiButtonProps['size']; - /** - * Determines if the button will have a down arrow or not - */ - hasArrow?: boolean; - /** - * Adjusts the borders for groupings - */ - groupPosition?: 'none' | 'left' | 'center' | 'right'; - dataTestSubj?: string; -}; - -export const ToolbarButton: React.FunctionComponent = ({ - children, - className, - fontWeight = 'normal', - size = 's', - hasArrow = true, - groupPosition = 'none', - dataTestSubj = '', - ...rest -}) => { - const classes = classNames( - 'lnsToolbarButton', - groupPositionToClassMap[groupPosition], - [`lnsToolbarButton--${fontWeight}`, `lnsToolbarButton--${size}`], - className - ); - return ( - - {children} - - ); -}; diff --git a/public/components/event_analytics/explorer/visualizations/shared_components/vis_canvass_placeholder.tsx b/public/components/event_analytics/explorer/visualizations/shared_components/vis_canvass_placeholder.tsx index 5ebede43e..6898d1b2b 100644 --- a/public/components/event_analytics/explorer/visualizations/shared_components/vis_canvass_placeholder.tsx +++ b/public/components/event_analytics/explorer/visualizations/shared_components/vis_canvass_placeholder.tsx @@ -10,7 +10,7 @@ import './empty_placeholder.scss'; export const VisCanvassPlaceholder = (props: { message: string; icon: string }) => ( <>