yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-30 00:48:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(refactor): loader glitch (#5660)

Browse Source 
* (refactor): loader glitch

* (refactor): Code improvement
This commit is contained in:
Harsh Vador 2022-06-27 21:03:01 +05:30 committed by GitHub
parent bbf1fb8320
commit 72c7ffee13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
openmetadata-ui/src/main/resources/ui/src/pages/explore/ExplorePage.component.tsx
View File

@ -35,7 +35,6 @@ import {
ExploreSearchData,
UrlParams,
} from '../../components/Explore/explore.interface';
import Loader from '../../components/Loader/Loader';
import { getExplorePathWithSearch, PAGE_SIZE } from '../../constants/constants';
import {
emptyValue,
@ -66,8 +65,6 @@ const ExplorePage: FunctionComponent = () => {
() => getQueryParam(getSearchFilter(location.search)),
[location.search]
);
const [isLoading, setIsLoading] = useState(true);
const [isLoadingForData, setIsLoadingForData] = useState(true);
const [error, setError] = useState<string>('');
const { searchQuery, tab } = useParams<UrlParams>();
const [searchText, setSearchText] = useState<string>(searchQuery || '');
@ -209,9 +206,6 @@ const ExplorePage: FunctionComponent = () => {
err,
jsonData['api-error-messages']['fetch-entity-count-error']
);
})
.finally(() => {
setIsLoading(false);
});
};
@ -250,12 +244,10 @@ const ExplorePage: FunctionComponent = () => {
resAggDatabaseSchema,
resAggServiceName,
});
setIsLoadingForData(false);
}
)
.catch((err: AxiosError) => {
setError(err.response?.data?.responseMessage);
setIsLoadingForData(false);
});
};
@ -269,7 +261,6 @@ const ExplorePage: FunctionComponent = () => {
useEffect(() => {
setSearchResult(undefined);
setIsLoadingForData(true);
fetchData([
{
queryString: searchText,
@ -312,44 +303,40 @@ const ExplorePage: FunctionComponent = () => {
return (
<Fragment>
{isLoading || isLoadingForData ? (
<Loader />
) : (
<PageContainerV1>
<Explore
error={error}
fetchCount={fetchCounts}
fetchData={fetchData}
handleFilterChange={handleFilterChange}
handlePathChange={handlePathChange}
handleSearchText={handleSearchText}
initialFilter={initialFilter}
isFilterSelected={!isEmpty(searchFilter) || !isEmpty(initialFilter)}
searchFilter={searchFilter}
searchQuery={searchQuery}
searchResult={searchResult}
searchText={searchText}
showDeleted={showDeleted}
sortValue={initialSortField}
tab={tab}
tabCounts={{
table: tableCount,
topic: topicCount,
dashboard: dashboardCount,
pipeline: pipelineCount,
dbtModel: dbtModelCount,
mlModel: mlModelCount,
}}
updateDashboardCount={handleDashboardCount}
updateDbtModelCount={handleDbtModelCount}
updateMlModelCount={handleMlModelCount}
updatePipelineCount={handlePipelineCount}
updateTableCount={handleTableCount}
updateTopicCount={handleTopicCount}
onShowDeleted={(checked) => setShowDeleted(checked)}
/>
</PageContainerV1>
)}
<PageContainerV1>
<Explore
error={error}
fetchCount={fetchCounts}
fetchData={fetchData}
handleFilterChange={handleFilterChange}
handlePathChange={handlePathChange}
handleSearchText={handleSearchText}
initialFilter={initialFilter}
isFilterSelected={!isEmpty(searchFilter) || !isEmpty(initialFilter)}
searchFilter={searchFilter}
searchQuery={searchQuery}
searchResult={searchResult}
searchText={searchText}
showDeleted={showDeleted}
sortValue={initialSortField}
tab={tab}
tabCounts={{
table: tableCount,
topic: topicCount,
dashboard: dashboardCount,
pipeline: pipelineCount,
dbtModel: dbtModelCount,
mlModel: mlModelCount,
}}
updateDashboardCount={handleDashboardCount}
updateDbtModelCount={handleDbtModelCount}
updateMlModelCount={handleMlModelCount}
updatePipelineCount={handlePipelineCount}
updateTableCount={handleTableCount}
updateTopicCount={handleTopicCount}
onShowDeleted={(checked) => setShowDeleted(checked)}
/>
</PageContainerV1>
</Fragment>
);
};