- Notifications
You must be signed in to change notification settings - Fork921
feat: improve metrics and UI for user engagement on the platform#16134
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
18 commits Select commitHold shift + click to select a range
899e88f
WIP: Setup base users count chart
BrunoQuaresma3d652ee
Merge branch 'main' of https://github.com/coder/coder into bq/user-eg…
BrunoQuaresma034c359
Implement User Engagement component
BrunoQuaresma8eba4d4
Integrate chart with API data
BrunoQuaresma2238590
Run lint and format
BrunoQuaresma8373732
Update story to show active data
BrunoQuaresmadc0261f
Merge branch 'main' of https://github.com/coder/coder into bq/user-eg…
BrunoQuaresma090230d
Adjust a few design topics from Chrsitin
BrunoQuaresmac454eba
Use DAU for user engagement chart
BrunoQuaresmae2cf922
Merge branch 'main' of https://github.com/coder/coder into bq/user-eg…
BrunoQuaresma4b7bf9f
Adjust engagement chart
BrunoQuaresmae036f94
Add license consumption chart
BrunoQuaresma372649b
Add storybook for license chart
BrunoQuaresmaa88da96
Remove text-ms
BrunoQuaresma39ee475
Run make fmt
BrunoQuaresma11ce947
Adjust charts
BrunoQuaresmac2e7b95
Fix format
BrunoQuaresmaf38361e
Fix stories
BrunoQuaresmaFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
13 changes: 13 additions & 0 deletionssite/src/api/api.ts
This file contains hidden or 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
14 changes: 14 additions & 0 deletionssite/src/api/queries/insights.ts
This file contains hidden or 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
2 changes: 1 addition & 1 deletionsite/src/components/Chart/Chart.stories.tsx
This file contains hidden or 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
4 changes: 3 additions & 1 deletionsite/src/components/Chart/Chart.tsx
This file contains hidden or 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
4 changes: 2 additions & 2 deletionssite/src/components/Link/Link.tsx
This file contains hidden or 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
14 changes: 4 additions & 10 deletionssite/src/index.css
This file contains hidden or 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
8 changes: 3 additions & 5 deletionssite/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx
This file contains hidden or 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
95 changes: 2 additions & 93 deletions.../src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPageView.stories.tsx
This file contains hidden or 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
69 changes: 9 additions & 60 deletionssite/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx
This file contains hidden or 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 |
---|---|---|
@@ -1,48 +1,32 @@ | ||
import AlertTitle from "@mui/material/AlertTitle"; | ||
import type { | ||
DAUsResponse, | ||
Entitlements, | ||
Experiments, | ||
SerpentOption, | ||
} from "api/typesGenerated"; | ||
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader"; | ||
import { Stack } from "components/Stack/Stack"; | ||
import type { FC } from "react"; | ||
import { useDeploymentOptions } from "utils/deployOptions"; | ||
import { docs } from "utils/docs"; | ||
import { Alert } from "../../../components/Alert/Alert"; | ||
import OptionsTable from "../OptionsTable"; | ||
import {UserEngagementChart } from "./UserEngagementChart"; | ||
export type GeneralSettingsPageViewProps = { | ||
deploymentOptions: SerpentOption[]; | ||
dailyActiveUsers: DAUsResponse | undefined; | ||
readonly invalidExperiments: Experiments | string[]; | ||
readonly safeExperiments: Experiments | string[]; | ||
}; | ||
export const GeneralSettingsPageView: FC<GeneralSettingsPageViewProps> = ({ | ||
deploymentOptions, | ||
dailyActiveUsers, | ||
safeExperiments, | ||
invalidExperiments, | ||
}) => { | ||
return ( | ||
<> | ||
<SettingsHeader | ||
@@ -51,47 +35,12 @@ export const GeneralSettingsPageView: FC<GeneralSettingsPageViewProps> = ({ | ||
docsHref={docs("/admin/setup")} | ||
/> | ||
<Stack spacing={4}> | ||
<UserEngagementChart | ||
SasSwart marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
data={dailyActiveUsers?.entries.map((i) => ({ | ||
date: i.date, | ||
users: i.amount, | ||
}))} | ||
/> | ||
{invalidExperiments.length > 0 && ( | ||
<Alert severity="warning"> | ||
<AlertTitle>Invalid experiments in use:</AlertTitle> | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.