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

Jump to bottom

Replace deprecated usage of ant-design Tabs component from SearchTracePage #1857

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Replace deprecated usage of ant-design Tabs component from SearchTracePage #1857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a213bc7
fix antd tabs component
anshgoyalevil Oct 9, 2023
85360b7
remove lambda func
anshgoyalevil Oct 9, 2023
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
30 changes: 14 additions & 16 deletions packages/jaeger-ui/src/components/SearchTracePage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ import './index.css';
import JaegerLogo from '../../img/jaeger-logo.svg';
import withRouteProps from '../../utils/withRouteProps';

const TabPane = Tabs.TabPane;

// export for tests
export class SearchTracePageImpl extends Component {
componentDidMount() {
Expand Down Expand Up @@ -100,25 +98,25 @@ export class SearchTracePageImpl extends Component {
const hasTraceResults = traceResults && traceResults.length > 0;
const showErrors = errors && !loadingTraces;
const showLogo = isHomepage && !hasTraceResults && !loadingTraces && !errors;
const tabItems = [];
if (!loadingServices && services) {
tabItems.push({ label: 'Search', key: 'searchForm', children: <SearchForm services={services} /> });
} else {
tabItems.push({ label: 'Search', key: 'searchForm', children: <LoadingIndicator /> });
}
if (!disableFileUploadControl) {
tabItems.push({
label: 'Upload',
key: 'fileLoader',
children: <FileLoader loadJsonTraces={loadJsonTraces} />,
});
}
return (
<Row className="SearchTracePage--row">
{!embedded && (
<Col span={6} className="SearchTracePage--column">
<div className="SearchTracePage--find">
<Tabs size="large">
<TabPane tab="Search" key="searchForm">
{!loadingServices && services ? <SearchForm services={services} /> : <LoadingIndicator />}
</TabPane>
{!disableFileUploadControl && (
<TabPane tab="Upload" key="fileLoader">
<FileLoader
loadJsonTraces={fileList => {
loadJsonTraces(fileList);
}}
/>
</TabPane>
)}
</Tabs>
<Tabs size="large" items={tabItems} />
</div>
</Col>
)}
Expand Down
21 changes: 15 additions & 6 deletions packages/jaeger-ui/src/components/SearchTracePage/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

import { MemoryRouter } from 'react-router-dom';
import { BrowserRouter, MemoryRouter } from 'react-router-dom';

jest.mock('redux-form', () => {
function reduxForm() {
Expand All @@ -29,17 +29,26 @@ jest.mock('store');

/* eslint-disable import/first */
import React from 'react';
import { shallow, mount } from 'enzyme';
import { mount } from 'enzyme';
import store from 'store';

import { Provider } from 'react-redux';
import { SearchTracePageImpl as SearchTracePage, mapStateToProps } from './index';
import FileLoader from './FileLoader';
import SearchForm from './SearchForm';
import LoadingIndicator from '../common/LoadingIndicator';
import { fetchedState } from '../../constants';
import traceGenerator from '../../demo/trace-generators';
import { MOST_RECENT } from '../../model/order-by';
import transformTraceData from '../../model/transform-trace-data';
import { store as globalStore } from '../../utils/configure-store';

const AllProvider = ({ children }) => (
<BrowserRouter>
<Provider store={globalStore}>
<MemoryRouter>{children}</MemoryRouter>
</Provider>
</BrowserRouter>
);

describe('<SearchTracePage>', () => {
const queryOfResults = {};
Expand Down Expand Up @@ -76,7 +85,7 @@ describe('<SearchTracePage>', () => {
fetchServices: jest.fn(),
searchTraces: jest.fn(),
};
wrapper = shallow(<SearchTracePage {...props} />);
wrapper = mount(<SearchTracePage {...props} />, { wrappingComponent: AllProvider });
});

it('searches for traces if `service` or `traceID` are in the query string', () => {
Expand Down Expand Up @@ -166,12 +175,12 @@ describe('<SearchTracePage>', () => {
});

it('shows Upload tab by default', () => {
expect(wrapper.find(FileLoader).length).toBe(1);
expect(wrapper.find({ 'data-node-key': 'fileLoader' }).length).toBe(1);
});

it('hides Upload tab if it is disabled via config', () => {
wrapper.setProps({ disableFileUploadControl: true });
expect(wrapper.find(FileLoader).length).toBe(0);
expect(wrapper.find({ 'data-node-key': 'fileLoader' }).length).toBe(0);
});
});

Expand Down