yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-24 08:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(analytics): skip ListDomains if user cannot manage domains and have only one loading message (#6624)

Browse Source
This commit is contained in:
Aditya Radhakrishnan 2022-12-02 19:30:02 -08:00 committed by GitHub
parent c8d943acc9
commit 5e971ce71e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
datahub-web-react/src/app/analyticsDashboard/components/AnalyticsPage.tsx
View File

@ -10,6 +10,7 @@ import { Message } from '../../shared/Message';
import { useListDomainsQuery } from '../../../graphql/domain.generated';
import filterSearchQuery from '../../search/utils/filterSearchQuery';
import { ANTD_GRAY } from '../../entity/shared/constants';
import { useGetAuthenticatedUser } from '../../useGetAuthenticatedUser';
const HighlightGroup = styled.div`
display: flex;
@ -46,6 +47,8 @@ const StyledSearchBar = styled(Input)`
`;
export const AnalyticsPage = () => {
const me = useGetAuthenticatedUser();
const canManageDomains = me?.platformPrivileges?.createDomains;
const { data: chartData, loading: chartLoading, error: chartError } = useGetAnalyticsChartsQuery();
const { data: highlightData, loading: highlightLoading, error: highlightError } = useGetHighlightsQuery();
const {
@ -53,6 +56,7 @@ export const AnalyticsPage = () => {
error: domainError,
data: domainData,
} = useListDomainsQuery({
skip: !canManageDomains,
variables: {
input: {
start: 0,
@ -82,12 +86,11 @@ export const AnalyticsPage = () => {
skip: domain === '' && query === '',
});
const isLoading = highlightLoading || chartLoading || domainLoading || metadataAnalyticsLoading;
return (
<>
{isLoading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
<HighlightGroup>
{highlightLoading && (
<Message type="loading" content="Loading Highlights..." style={{ marginTop: '10%' }} />
)}
{highlightError && (
<Alert type="error" message={highlightError?.message || 'Highlights failed to load'} />
)}
@ -96,7 +99,6 @@ export const AnalyticsPage = () => {
))}
</HighlightGroup>
<>
{chartLoading && <Message type="loading" content="Loading Charts..." style={{ marginTop: '10%' }} />}
{chartError && (
<Alert type="error" message={metadataAnalyticsError?.message || 'Charts failed to load'} />
)}
@ -107,7 +109,6 @@ export const AnalyticsPage = () => {
))}
</>
<>
{domainLoading && <Message type="loading" content="Loading Domains..." style={{ marginTop: '10%' }} />}
{domainError && (
<Alert type="error" message={metadataAnalyticsError?.message || 'Domains failed to load'} />
)}
@ -148,9 +149,6 @@ export const AnalyticsPage = () => {
)}
</>
<>
{metadataAnalyticsLoading && (
<Message type="loading" content="Loading Charts..." style={{ marginTop: '10%' }} />
)}
{metadataAnalyticsError && (
<Alert type="error" message={metadataAnalyticsError?.message || 'Charts failed to load'} />
)}
@ -165,7 +163,6 @@ export const AnalyticsPage = () => {
))}
</>
<>
{chartLoading && <Message type="loading" content="Loading Charts..." style={{ marginTop: '10%' }} />}
{chartError && <Alert type="error" message={chartError?.message || 'Charts failed to load'} />}
{!chartLoading &&
chartData?.getAnalyticsCharts