From e31ba87f2d694b05a00faeb215f87b568a6626c9 Mon Sep 17 00:00:00 2001 From: Shenoy Pratik Date: Mon, 29 Jul 2024 12:52:20 -0700 Subject: [PATCH] [Backport 2.16] [Bug] Remove ag grid package (#2001) (#2003) * [Bug] Remove ag grid package (#2001) * remove ag grid Signed-off-by: Adam Tackett * update yarn lock Signed-off-by: Adam Tackett * update release notes Signed-off-by: Adam Tackett --------- Signed-off-by: Adam Tackett Co-authored-by: Adam Tackett (cherry picked from commit 805c54f771d1a963dc9f50407889c9674b5f03f9) * updated snapshots Signed-off-by: Shenoy Pratik --------- Signed-off-by: Shenoy Pratik Co-authored-by: Adam Tackett <105462877+TackAdam@users.noreply.github.com> --- package.json | 2 - .../__snapshots__/search.test.tsx.snap | 2 +- .../custom_panel_view.test.tsx.snap | 4 +- .../workspace_panel/workspace_panel.tsx | 15 - .../__snapshots__/top_menu.test.tsx.snap | 2 +- .../__snapshots__/search_bar.test.tsx.snap | 4 +- .../__snapshots__/services.test.tsx.snap | 6 +- .../__snapshots__/traces.test.tsx.snap | 6 +- .../__snapshots__/data_table.test.tsx.snap | 320 ------------------ .../charts/__tests__/data_table.test.tsx | 26 -- .../charts/data_table/data_table.tsx | 38 --- ...ds-observability.release-notes-2.16.0.0.md | 3 +- yarn.lock | 18 - 13 files changed, 14 insertions(+), 432 deletions(-) delete mode 100644 public/components/visualizations/charts/__tests__/__snapshots__/data_table.test.tsx.snap delete mode 100644 public/components/visualizations/charts/__tests__/data_table.test.tsx diff --git a/package.json b/package.json index 64951aa72..876aa05a0 100644 --- a/package.json +++ b/package.json @@ -16,13 +16,11 @@ "cypress:parallel": "cypress-parallel -s cypress:run -t 2 -d .cypress/integration" }, "dependencies": { - "@ag-grid-community/styles": "^31.3.4", "@algolia/autocomplete-core": "^1.4.1", "@algolia/autocomplete-theme-classic": "^1.2.1", "@nteract/outputs": "^3.0.11", "@nteract/presentational-components": "^3.4.3", "@reduxjs/toolkit": "^1.6.1", - "ag-grid-react": "^31.3.4", "ajv": "^8.11.0", "antlr4": "4.8.0", "antlr4ts": "^0.5.0-alpha.4", diff --git a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap index 56ae657ba..ef20b9054 100644 --- a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap +++ b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap @@ -571,7 +571,7 @@ exports[`Explorer Search component renders basic component 1`] = ` hasArrow={true} isOpen={false} ownFocus={true} - panelPaddingSize="m" + panelPaddingSize="s" >
- - { - setIsTableViewOn((staleState) => !staleState); - }} - aria-describedby="table view switcher" - data-test-subj="workspace__dataTableViewSwitch" - compressed - /> -
- - -`; diff --git a/public/components/visualizations/charts/__tests__/data_table.test.tsx b/public/components/visualizations/charts/__tests__/data_table.test.tsx deleted file mode 100644 index 216a3fa29..000000000 --- a/public/components/visualizations/charts/__tests__/data_table.test.tsx +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright OpenSearch Contributors - * SPDX-License-Identifier: Apache-2.0 - */ - -import { configure, mount, shallow } from 'enzyme'; -import Adapter from 'enzyme-adapter-react-16'; -import React from 'react'; -import { waitFor } from '@testing-library/react'; -import { DataTable } from '../data_table/data_table'; -import { TEST_VISUALIZATIONS_DATA } from '../../../../../test/event_analytics_constants'; -import { AgGridReact } from 'ag-grid-react'; - -describe('Data table component', () => { - configure({ adapter: new Adapter() }); - - it('Renders data table component', async () => { - const gridWrapper = shallow(); - const agGridReactObj = gridWrapper.find(AgGridReact); - agGridReactObj.simulate('gridReady'); - expect(agGridReactObj).toBeTruthy(); - await waitFor(() => { - expect(gridWrapper).toMatchSnapshot(); - }); - }); -}); diff --git a/public/components/visualizations/charts/data_table/data_table.tsx b/public/components/visualizations/charts/data_table/data_table.tsx index 232339790..e0af6a7d2 100644 --- a/public/components/visualizations/charts/data_table/data_table.tsx +++ b/public/components/visualizations/charts/data_table/data_table.tsx @@ -6,11 +6,6 @@ import React, { useState, useMemo, useCallback, useRef, useEffect } from 'react'; import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; -// ag-data-grid -import { AgGridReact } from 'ag-grid-react'; -import '@ag-grid-community/styles/ag-grid.css'; -import '@ag-grid-community/styles/ag-theme-alpine.css'; - // grid elements import { CustomOverlay, RowConfigType, GridHeader } from './data_table_header'; import { GridFooter } from './data_table_footer'; @@ -196,22 +191,6 @@ export const DataTable = ({ visualizations, layout, config }: any) => { columnVisibility={columnVisibility} /> )} - { - gridRef?.current?.api.setHeaderHeight(HEADER_HEIGHT); - }} - suppressFieldDotNotation // added for key contains dot operator - /> {enablePagination && ( { - { - gridRefFullScreen?.current?.api.setHeaderHeight(HEADER_HEIGHT); - }} - // added for key contains dot operator - suppressFieldDotNotation - />