Skip to content

feat(site): add support for weekly data on template insights #9997

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

Merged
merged 20 commits into from
Oct 3, 2023
Merged

feat(site): add support for weekly data on template insights #9997

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a27af59
Add weekly control
BrunoQuaresma Oct 2, 2023
ad8a4ae
Interval menu position
BrunoQuaresma Oct 2, 2023
41cc638
Add weekly controls
BrunoQuaresma Oct 2, 2023
86fab98
Fix title and description
BrunoQuaresma Oct 2, 2023
78e6db0
Modify DAUChart to be agnostic to interval
BrunoQuaresma Oct 2, 2023
6b4e763
Update chart to support weekly data
BrunoQuaresma Oct 2, 2023
56b9484
Make default interval as week
BrunoQuaresma Oct 2, 2023
f1ea361
If template is created less than 5 weeks, show daily
BrunoQuaresma Oct 2, 2023
0c1ea95
Merge branch 'main' of https://github.com/coder/coder into bq/support…
BrunoQuaresma Oct 3, 2023
4cfba45
Update copy
BrunoQuaresma Oct 3, 2023
53c282d
Move queries to queries folder
BrunoQuaresma Oct 3, 2023
cf79978
Move weekly and interval to search params
BrunoQuaresma Oct 3, 2023
6d33f90
Move date range to search params
BrunoQuaresma Oct 3, 2023
2cf5fc2
Merge branch 'main' of https://github.com/coder/coder into bq/support…
BrunoQuaresma Oct 3, 2023
68b1067
Update site/src/pages/TemplatePage/TemplateInsightsPage/IntervalMenu.tsx
BrunoQuaresma Oct 3, 2023
8a8453c
Update site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsig…
BrunoQuaresma Oct 3, 2023
44f640b
Update site/src/pages/TemplatePage/TemplateInsightsPage/WeeklyPresets…
BrunoQuaresma Oct 3, 2023
579b093
Apply Kayla improvement
BrunoQuaresma Oct 3, 2023
0fe704e
Improve destructuring
BrunoQuaresma Oct 3, 2023
932672a
Centralize date range value
BrunoQuaresma Oct 3, 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
Prev Previous commit
Next Next commit
Update chart to support weekly data
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Oct 2, 2023
commit 6b4e763f3a912d4ff6cd6ec1618e8f2510c628dd
8 changes: 6 additions & 2 deletions site/src/components/ActiveUserChart/ActiveUserChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ ChartJS.register(

export interface ActiveUserChartProps {
data: { date: string; amount: number }[];
interval: "day" | "week";
}

export const ActiveUserChart: FC<ActiveUserChartProps> = ({ data }) => {
export const ActiveUserChart: FC<ActiveUserChartProps> = ({
data,
interval,
}) => {
const theme: Theme = useTheme();

const labels = data.map((val) => {
Expand Down Expand Up @@ -85,7 +89,7 @@ export const ActiveUserChart: FC<ActiveUserChartProps> = ({ data }) => {
},
type: "time",
time: {
unit: "day",
unit: interval,
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/DeploySettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const GeneralSettingsPageView = ({
{deploymentDAUs && (
<Box height={200} sx={{ mb: 3 }}>
<ChartSection title={<ActiveUsersTitle />}>
<ActiveUserChart data={deploymentDAUs.entries} />
<ActiveUserChart data={deploymentDAUs.entries} interval="day" />
</ChartSection>
</Box>
)}
Expand Down
7 changes: 7 additions & 0 deletions site/src/pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export default function TemplateInsightsPage() {
}
templateInsights={templateInsights}
userLatency={userLatency}
interval={interval}
/>
</>
);
Expand All @@ -121,10 +122,12 @@ export const TemplateInsightsPageView = ({
templateInsights,
userLatency,
controls,
interval,
}: {
templateInsights: TemplateInsightsResponse | undefined;
userLatency: UserLatencyInsightsResponse | undefined;
controls: ReactNode;
interval: InsightsInterval;
}) => {
return (
<>
Expand All @@ -148,6 +151,7 @@ export const TemplateInsightsPageView = ({
>
<ActiveUsersPanel
sx={{ gridColumn: "span 2" }}
interval={interval}
data={templateInsights?.interval_reports}
/>
<UserLatencyPanel data={userLatency} />
Expand All @@ -166,9 +170,11 @@ export const TemplateInsightsPageView = ({

const ActiveUsersPanel = ({
data,
interval,
...panelProps
}: PanelProps & {
data: TemplateInsightsResponse["interval_reports"] | undefined;
interval: InsightsInterval;
}) => {
return (
<Panel {...panelProps}>
Expand All @@ -182,6 +188,7 @@ const ActiveUsersPanel = ({
{data && data.length === 0 && <NoDataAvailable />}
{data && data.length > 0 && (
<ActiveUserChart
interval={interval}
data={data.map((d) => {
return {
amount: d.active_users,
Expand Down