-
Notifications
You must be signed in to change notification settings - Fork 3k
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.
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
feat(ui): Adding Statistics Summary to Dataset + Dashboard Profiles #5440
Merged
jjoyce0510
merged 4 commits into
datahub-project:master
from
jjoyce0510:jj--adding-stats-summary-to-profiles
Jul 19, 2022
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
datahub-web-react/src/app/entity/dashboard/profile/DashboardStatsSummarySubHeader.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import React from 'react'; | ||
import { DashboardStatsSummary as DashboardStatsSummaryObj } from '../../../../types.generated'; | ||
import { useBaseEntity } from '../../shared/EntityContext'; | ||
import { GetDashboardQuery } from '../../../../graphql/dashboard.generated'; | ||
import { DashboardStatsSummary } from '../shared/DashboardStatsSummary'; | ||
|
||
export const DashboardStatsSummarySubHeader = () => { | ||
const result = useBaseEntity<GetDashboardQuery>(); | ||
const dashboard = result?.dashboard; | ||
const maybeStatsSummary = dashboard?.statsSummary as DashboardStatsSummaryObj; | ||
const chartCount = dashboard?.charts?.total; | ||
const viewCount = maybeStatsSummary?.viewCount; | ||
const uniqueUserCountLast30Days = maybeStatsSummary?.uniqueUserCountLast30Days; | ||
const lastUpdatedMs = dashboard?.properties?.lastModified?.time; | ||
const createdMs = dashboard?.properties?.created?.time; | ||
|
||
return ( | ||
<DashboardStatsSummary | ||
chartCount={chartCount} | ||
viewCount={viewCount} | ||
uniqueUserCountLast30Days={uniqueUserCountLast30Days} | ||
lastUpdatedMs={lastUpdatedMs} | ||
createdMs={createdMs} | ||
/> | ||
); | ||
}; |
79 changes: 79 additions & 0 deletions
79
datahub-web-react/src/app/entity/dashboard/shared/DashboardStatsSummary.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
import React from 'react'; | ||
import styled from 'styled-components'; | ||
import { Popover, Tooltip } from 'antd'; | ||
import { ClockCircleOutlined, EyeOutlined, TeamOutlined, QuestionCircleOutlined } from '@ant-design/icons'; | ||
import { formatNumberWithoutAbbreviation } from '../../../shared/formatNumber'; | ||
import { ANTD_GRAY } from '../../shared/constants'; | ||
import { toLocalDateTimeString, toRelativeTimeString } from '../../../shared/time/timeUtils'; | ||
import { StatsSummary } from '../../shared/components/styled/StatsSummary'; | ||
|
||
const StatText = styled.span` | ||
color: ${ANTD_GRAY[8]}; | ||
`; | ||
|
||
const HelpIcon = styled(QuestionCircleOutlined)` | ||
color: ${ANTD_GRAY[7]}; | ||
padding-left: 4px; | ||
`; | ||
|
||
type Props = { | ||
chartCount?: number | null; | ||
viewCount?: number | null; | ||
uniqueUserCountLast30Days?: number | null; | ||
lastUpdatedMs?: number | null; | ||
createdMs?: number | null; | ||
}; | ||
|
||
export const DashboardStatsSummary = ({ | ||
chartCount, | ||
viewCount, | ||
uniqueUserCountLast30Days, | ||
lastUpdatedMs, | ||
createdMs, | ||
}: Props) => { | ||
const statsViews = [ | ||
(!!chartCount && ( | ||
<StatText> | ||
<b>{chartCount}</b> charts | ||
</StatText> | ||
)) || | ||
undefined, | ||
(!!viewCount && ( | ||
<StatText> | ||
<EyeOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} /> | ||
<b>{formatNumberWithoutAbbreviation(viewCount)}</b> views | ||
</StatText> | ||
)) || | ||
undefined, | ||
(!!uniqueUserCountLast30Days && ( | ||
<StatText> | ||
<TeamOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} /> | ||
<b>{formatNumberWithoutAbbreviation(uniqueUserCountLast30Days)}</b> unique users | ||
</StatText> | ||
)) || | ||
undefined, | ||
(!!lastUpdatedMs && ( | ||
<Popover | ||
content={ | ||
<> | ||
{createdMs && <div>Created on {toLocalDateTimeString(createdMs)}.</div>} | ||
<div> | ||
Changed on {toLocalDateTimeString(lastUpdatedMs)}.{' '} | ||
<Tooltip title="The time at which the dashboard was last changed in the source platform"> | ||
<HelpIcon /> | ||
</Tooltip> | ||
</div> | ||
</> | ||
} | ||
> | ||
<StatText> | ||
<ClockCircleOutlined style={{ marginRight: 8, color: ANTD_GRAY[7] }} /> | ||
Changed {toRelativeTimeString(lastUpdatedMs)} | ||
</StatText> | ||
</Popover> | ||
)) || | ||
undefined, | ||
].filter((stat) => stat !== undefined); | ||
|
||
return <>{statsViews.length > 0 && <StatsSummary stats={statsViews} />}</>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
look at this container/view situation we have going on here!