Skip to content

Commit

Permalink
[Backport 2.x] Backport/backport 588 to 2.x (opensearch-project#600)
Browse files Browse the repository at this point in the history 
* Merge pull request opensearch-project#588 from mengweieric/feature/prerelease-code-cleanup

(cherry picked from commit a85b716)

* update snapshots

Signed-off-by: Eric Wei <menwe@amazon.com>

---------

Signed-off-by: Eric Wei <menwe@amazon.com>
Co-authored-by: Anirudha (Ani) Jadhav <anirudha@nyu.edu>
  • Loading branch information
@mengweieric @anirudha
mengweieric and anirudha committed Jul 5, 2023
1 parent 0c16b65 commit d329eff
Show file tree
Hide file tree
Showing 34 changed files with 3 additions and 455 deletions.
9 changes: 0 additions & 9 deletions public/components/custom_panels/helpers/__tests__/__snapshots__/utils.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -858,7 +857,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -1314,7 +1312,6 @@ exports[`Utils helper functions renders displayVisualization function 1`] = `
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -2015,7 +2012,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
],
},
"fulllabel": "Time series",
"icon": [Function],
"icontype": "visLine",
"id": "line",
"label": "Time series",
Expand Down Expand Up @@ -2532,7 +2528,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
],
},
"fulllabel": "Time series",
"icon": [Function],
"icontype": "visLine",
"id": "line",
"label": "Time series",
Expand Down Expand Up @@ -3063,7 +3058,6 @@ exports[`Utils helper functions renders displayVisualization function 2`] = `
],
},
"fulllabel": "Time series",
"icon": [Function],
"icontype": "visLine",
"id": "line",
"label": "Time series",
Expand Down Expand Up @@ -3739,7 +3733,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"fillopacity": 100,
"fulllabel": "Horizontal bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarHorizontalStacked",
"id": "horizontal_bar",
"label": "Horizontal bar",
Expand Down Expand Up @@ -4188,7 +4181,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"fillopacity": 100,
"fulllabel": "Horizontal bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarHorizontalStacked",
"id": "horizontal_bar",
"label": "Horizontal bar",
Expand Down Expand Up @@ -4644,7 +4636,6 @@ exports[`Utils helper functions renders displayVisualization function 3`] = `
"fillopacity": 100,
"fulllabel": "Horizontal bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarHorizontalStacked",
"id": "horizontal_bar",
"label": "Horizontal bar",
Expand Down
20 changes: 0 additions & 20 deletions ...s/explorer/visualizations/config_panel/__tests__/__snapshots__/config_panel.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -933,7 +932,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"iconType": "visBarVerticalStacked",
"icontype": "visBarVerticalStacked",
"id": "bar",
Expand Down Expand Up @@ -1232,7 +1230,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Horizontal bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarHorizontalStacked",
"id": "horizontal_bar",
"label": "Horizontal bar",
Expand Down Expand Up @@ -1560,7 +1557,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
],
},
"fulllabel": "Time series",
"icon": [Function],
"icontype": "visLine",
"id": "line",
"label": "Time series",
Expand Down Expand Up @@ -1801,7 +1797,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
],
},
"fulllabel": "Pie",
"icon": [Function],
"icontype": "visPie",
"id": "pie",
"label": "Pie",
Expand Down Expand Up @@ -2241,7 +2236,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
],
},
"fulllabel": "Hubble",
"icon": [Function],
"icontype": "heatmap",
"id": "heatmap",
"label": "Heatmap",
Expand Down Expand Up @@ -2294,7 +2288,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
],
},
"fulllabel": "Markdown",
"icon": [Function],
"icontype": "visText",
"id": "text",
"label": "Markdown",
Expand Down Expand Up @@ -2622,7 +2615,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"iconType": "visBarVerticalStacked",
"icontype": "visBarVerticalStacked",
"id": "bar",
Expand Down Expand Up @@ -2953,7 +2945,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"iconType": "visBarVerticalStacked",
"icontype": "visBarVerticalStacked",
"id": "bar",
Expand Down Expand Up @@ -3290,7 +3281,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
fillopacity={100}
fulllabel="Vertical bar"
groupwidth={0.7}
icon={[Function]}
iconType="visBarVerticalStacked"
icontype="visBarVerticalStacked"
id="bar"
Expand Down Expand Up @@ -3560,7 +3550,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"iconType": "visBarVerticalStacked",
"icontype": "visBarVerticalStacked",
"id": "bar",
Expand Down Expand Up @@ -3898,7 +3887,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
fillopacity={100}
fulllabel="Vertical bar"
groupwidth={0.7}
icon={[Function]}
iconType="visBarVerticalStacked"
icontype="visBarVerticalStacked"
id="bar"
Expand Down Expand Up @@ -4205,7 +4193,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
fillopacity={100}
fulllabel="Vertical bar"
groupwidth={0.7}
icon={[Function]}
icontype="visBarVerticalStacked"
id="bar"
labelangle={0}
Expand Down Expand Up @@ -5282,7 +5269,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -6211,7 +6197,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -7181,7 +7166,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -7886,7 +7870,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -8858,7 +8841,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -10329,7 +10311,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down Expand Up @@ -11821,7 +11802,6 @@ exports[`Config panel component Renders config panel with visualization data 1`]
"fillopacity": 100,
"fulllabel": "Vertical bar",
"groupwidth": 0.7,
"icon": [Function],
"icontype": "visBarVerticalStacked",
"id": "bar",
"label": "Vertical bar",
Expand Down
90 changes: 0 additions & 90 deletions .../visualizations/shared_components/__tests__/__snapshots__/shared_components.test.tsx.snap
View file
Original file line number Diff line number Diff line change
@@ -1,95 +1,5 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`Shared components Renders empty placeholder component 1`] = `
<Component
icon={[Function]}
>
<EuiText
className="lnsChart__empty"
color="subdued"
data-test-subj="vizWorkspace__noData"
size="xs"
textAlign="center"
>
<div
className="euiText euiText--extraSmall lnsChart__empty"
data-test-subj="vizWorkspace__noData"
>
<EuiTextAlign
textAlign="center"
>
<div
className="euiTextAlign euiTextAlign--center"
>
<EuiTextColor
color="subdued"
component="div"
>
<div
className="euiTextColor euiTextColor--subdued"
>
<EuiIcon
color="subdued"
size="xxl"
type={[Function]}
>
<Component
aria-hidden={true}
className="euiIcon euiIcon--xxLarge euiIcon--subdued"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--xxLarge euiIcon--subdued"
fill="none"
focusable="false"
height={22}
role="img"
style={null}
viewBox="0 0 30 22"
width={30}
xmlns="http://www.w3.org/2000/svg"
>
<path
className="lensChartIcon__subdued"
d="M5 7a1 1 0 011 1v13a1 1 0 01-1 1H1a1 1 0 01-1-1V8a1 1 0 011-1h4zm16-7a1 1 0 011 1v20a1 1 0 01-1 1h-4a1 1 0 01-1-1V1a1 1 0 011-1h4z"
/>
<path
className="lensChartIcon__accent"
d="M13 11a1 1 0 011 1v9a1 1 0 01-1 1H9a1 1 0 01-1-1v-9a1 1 0 011-1h4zm16-7a1 1 0 011 1v16a1 1 0 01-1 1h-4a1 1 0 01-1-1V5a1 1 0 011-1h4z"
/>
</svg>
</Component>
</EuiIcon>
<EuiSpacer
size="l"
>
<div
className="euiSpacer euiSpacer--l"
/>
</EuiSpacer>
<p>
<FormattedMessage
defaultMessage="No data found"
id="visualization_noData"
values={Object {}}
>
<span>
No data found
</span>
</FormattedMessage>
</p>
</div>
</EuiTextColor>
</div>
</EuiTextAlign>
</div>
</EuiText>
</Component>
`;

exports[`Shared components Renders tool bar button component 1`] = `
<Component
fontWeight="bold"
Expand Down
12 changes: 0 additions & 12 deletions ..._analytics/explorer/visualizations/shared_components/__tests__/shared_components.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,11 @@ import { configure, mount } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import React from 'react';
import { waitFor } from '@testing-library/react';
import { EmptyPlaceholder } from '../empty_placeholder';
import { LensIconChartBar } from '../../../../../visualizations/assets/chart_bar';
import { ToolbarButton } from '../toolbar_button';

describe('Shared components', () => {
configure({ adapter: new Adapter() });

it('Renders empty placeholder component', async () => {
const wrapper = mount(<EmptyPlaceholder icon={LensIconChartBar} />);

wrapper.update();

await waitFor(() => {
expect(wrapper).toMatchSnapshot();
});
});

it('Renders tool bar button component', async () => {
const handleClick = jest.fn();
const WrappedComponent = () => <div>testing</div>;
Expand Down
1 change: 1 addition & 0 deletions ...nts/event_analytics/explorer/visualizations/shared_components/plotly_viz_editor/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export { PlotlyVizEditor } from './plotly_viz_editor';
export { PlotlyEditorActionsMenu } from './plotly_actions';
2 changes: 0 additions & 2 deletions ...ic/components/event_analytics/explorer/visualizations/visualization_specs/default_spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
// @ts-ignore

import hjson from 'hjson';
import defaultLayoutSpec from '!!raw-loader!./default.layout.spec.hjson';
import defaultDataSpec from '!!raw-loader!./default.data.spec.hjson';

Expand Down
Loading

0 comments on commit d329eff

Please sign in to comment.