diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx index 01f23fad111..6880054fc1b 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.component.tsx @@ -19,6 +19,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { Space, Typography } from 'antd'; import { AxiosError } from 'axios'; import classNames from 'classnames'; +import { ROUTES } from 'constants/constants'; import { lowerCase } from 'lodash'; import React, { FunctionComponent, @@ -27,7 +28,7 @@ import React, { useRef, useState, } from 'react'; -import { Link } from 'react-router-dom'; +import { Link, useLocation } from 'react-router-dom'; import { getSampleDataByTableId } from 'rest/tableAPI'; import { WORKFLOWS_PROFILER_DOCS } from '../../constants/docs.constants'; import { Table, TableData } from '../../generated/entity/data/table'; @@ -55,6 +56,7 @@ interface Props { const SampleDataTable: FunctionComponent = ({ tableId }: Props) => { const tableRef = useRef(null); + const location = useLocation(); const [sampleData, setSampleData] = useState(); const [scrollOffset, setScrollOffSet] = useState(0); const [containerWidth, setContainerWidth] = useState(0); @@ -121,7 +123,7 @@ const SampleDataTable: FunctionComponent = ({ tableId }: Props) => { useEffect(() => { setIsLoading(true); - if (tableId) { + if (tableId && !location.pathname.includes(ROUTES.TOUR)) { fetchSampleData(); } else { setIsLoading(false); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx index 95b756017ed..3d018fb97bb 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/SampleDataTable/SampleDataTable.test.tsx @@ -18,6 +18,7 @@ import SampleDataTable from './SampleDataTable.component'; jest.mock('react-router-dom', () => ({ Link: jest.fn().mockImplementation(({ children }) => {children}), + useLocation: jest.fn().mockImplementation(() => ({ pathname: 'test' })), })); jest.mock('rest/tableAPI', () => ({ diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx index 123ca3e9135..e78fbe4f9e0 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/TableProfiler/Component/TableProfilerChart.tsx @@ -98,6 +98,8 @@ const TableProfilerChart = ({ selectedTimeRange }: TableProfilerChartProps) => { datasetFQN, PROFILER_FILTER_RANGE[selectedTimeRange].days ); + } else { + setIsLoading(false); } }, [datasetFQN, selectedTimeRange]); diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx index 27c29c5a6c8..6dba51a21b1 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/AddUsersModalV1.tsx @@ -88,7 +88,7 @@ const AddUsersModalV1 = ({ }); }; - const searchUsers = (text: string, page: number) => { + const searchUsers = (text: string, page = 1) => { searchData(text, page, PAGE_SIZE_MEDIUM, '', '', '', SearchIndex.USER) .then((res) => { const data = getFilterUserData( @@ -150,7 +150,7 @@ const AddUsersModalV1 = ({ setCurrentPage(1); setSearchText(searchValue); if (searchValue) { - searchUsers(searchValue, currentPage); + searchUsers(searchValue); } else { fetchAllUsers(); }