Skip to content

Commit 11ce947

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Adjust charts
1 parent 39ee475 commit 11ce947

File tree

4 files changed

+27
-54
lines changed

4 files changed

+27
-54
lines changed

‎site/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPage.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const GeneralSettingsPage: FC = () => {
1414
const safeExperimentsQuery = useQuery(availableExperiments());
1515

1616
const { metadata } = useEmbeddedMetadata();
17-
const entitlementsQuery = useQuery(entitlements(metadata.entitlements));
1817
const enabledExperimentsQuery = useQuery(experiments(metadata.experiments));
1918

2019
const safeExperiments = safeExperimentsQuery.data?.safe ?? [];
@@ -33,7 +32,6 @@ const GeneralSettingsPage: FC = () => {
3332
<GeneralSettingsPageView
3433
deploymentOptions={deploymentConfig.options}
3534
dailyActiveUsers={dailyActiveUsers}
36-
entitlements={entitlementsQuery.data}
3735
invalidExperiments={invalidExperiments}
3836
safeExperiments={safeExperiments}
3937
/>

‎site/src/pages/DeploymentSettingsPage/GeneralSettingsPage/GeneralSettingsPageView.tsx

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import AlertTitle from "@mui/material/AlertTitle";
2-
import LinearProgress from "@mui/material/LinearProgress";
32
import type {
43
DAUsResponse,
54
Entitlements,
@@ -13,30 +12,21 @@ import { useDeploymentOptions } from "utils/deployOptions";
1312
import { docs } from "utils/docs";
1413
import { Alert } from "../../../components/Alert/Alert";
1514
import OptionsTable from "../OptionsTable";
16-
import { ChartSection } from "./ChartSection";
1715
import { UserEngagementChart } from "./UserEngagementChart";
1816

1917
export type GeneralSettingsPageViewProps = {
2018
deploymentOptions: SerpentOption[];
2119
dailyActiveUsers: DAUsResponse | undefined;
22-
entitlements: Entitlements | undefined;
2320
readonly invalidExperiments: Experiments | string[];
2421
readonly safeExperiments: Experiments | string[];
2522
};
2623

2724
export const GeneralSettingsPageView: FC<GeneralSettingsPageViewProps> = ({
2825
deploymentOptions,
2926
dailyActiveUsers,
30-
entitlements,
3127
safeExperiments,
3228
invalidExperiments,
3329
}) => {
34-
const licenseUtilizationPercentage =
35-
entitlements?.features?.user_limit?.actual &&
36-
entitlements?.features?.user_limit?.limit
37-
? entitlements.features.user_limit.actual /
38-
entitlements.features.user_limit.limit
39-
: undefined;
4030
return (
4131
<>
4232
<SettingsHeader
@@ -51,37 +41,6 @@ export const GeneralSettingsPageView: FC<GeneralSettingsPageViewProps> = ({
5141
users: i.amount,
5242
}))}
5343
/>
54-
{licenseUtilizationPercentage && (
55-
<ChartSection title="License Utilization">
56-
<LinearProgress
57-
variant="determinate"
58-
value={Math.min(licenseUtilizationPercentage * 100, 100)}
59-
color={
60-
licenseUtilizationPercentage < 0.9
61-
? "primary"
62-
: licenseUtilizationPercentage < 1
63-
? "warning"
64-
: "error"
65-
}
66-
css={{
67-
height: 24,
68-
borderRadius: 4,
69-
marginBottom: 8,
70-
}}
71-
/>
72-
<span
73-
css={{
74-
fontSize: "0.75rem",
75-
display: "block",
76-
textAlign: "right",
77-
}}
78-
>
79-
{Math.round(licenseUtilizationPercentage * 100)}% used (
80-
{entitlements!.features.user_limit.actual}/
81-
{entitlements!.features.user_limit.limit} users)
82-
</span>
83-
</ChartSection>
84-
)}
8544
{invalidExperiments.length > 0 && (
8645
<Alert severity="warning">
8746
<AlertTitle>Invalid experiments in use:</AlertTitle>

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicenseSeatConsumptionChart.tsx

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
XAxis,
2424
YAxis,
2525
} from "recharts";
26+
import { docs } from "utils/docs";
2627

2728
const chartConfig = {
2829
users: {
@@ -101,13 +102,25 @@ export const LicenseSeatConsumptionChart: FC<
101102
You might also check:
102103
<ul>
103104
<li>
104-
<Link>Activity Audit</Link>
105+
<Link asChild>
106+
<RouterLink to="/audit">Activity Audit</RouterLink>
107+
</Link>
105108
</li>
106109
<li>
107-
<Link>Daily user activity</Link>
110+
<Link asChild>
111+
<RouterLink to="/deployment/general">
112+
Daily user activity
113+
</RouterLink>
114+
</Link>
108115
</li>
109116
<li>
110-
<Link>More details on user account statuses</Link>
117+
<Link
118+
href={docs("/admin/users#user-status")}
119+
target="_blank"
120+
rel="noreferrer"
121+
>
122+
More details on user account statuses
123+
</Link>
111124
</li>
112125
</ul>
113126
</div>

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/LicensesSettingsPageView.tsx

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import Confetti from "react-confetti";
1616
import { Link } from "react-router-dom";
1717
import { LicenseCard } from "./LicenseCard";
1818
import { LicenseSeatConsumptionChart } from "./LicenseSeatConsumptionChart";
19+
import { license } from "../../../../e2e/constants";
1920

2021
type Props = {
2122
showConfetti: boolean;
@@ -133,14 +134,16 @@ const LicensesSettingsPageView: FC<Props> = ({
133134
</div>
134135
)}
135136

136-
<LicenseSeatConsumptionChart
137-
limit={userLimitLimit}
138-
data={activeUsers?.map((i) => ({
139-
date: i.date,
140-
users: i.count,
141-
limit: 80,
142-
}))}
143-
/>
137+
{licenses && licenses.length > 0 && (
138+
<LicenseSeatConsumptionChart
139+
limit={userLimitLimit}
140+
data={activeUsers?.map((i) => ({
141+
date: i.date,
142+
users: i.count,
143+
limit: 80,
144+
}))}
145+
/>
146+
)}
144147
</div>
145148
</>
146149
);

0 commit comments

Comments
 (0)