Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-25 00:07:47 +01:00
Code Issues Projects Releases Wiki Activity

fix: improve traffic messaging summary (#6922)

Browse Source 
Minor tweaks to traffic messaging summary.
This commit is contained in:
Ivar Conradi Østhus 2024-04-24 15:59:18 +02:00 committed by GitHub
parent f5061bc3ff
commit 1b2f983974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx
View File

@ -85,7 +85,9 @@ const getSelectablePeriods = (): SelectablePeriod[] => {
current.getMonth() - subtractMonthCount,
1,
);
selectablePeriods.push(toSelectablePeriod(date));
if (date > new Date('2024-03-31')) {
selectablePeriods.push(toSelectablePeriod(date));
}
}
return selectablePeriods;
};
@ -357,7 +359,7 @@ export const NetworkTrafficUsage: VFC = () => {
return (
<ConditionallyRender
condition={isOss() || !flagEnabled}
show={<Alert severity='warning'>No data available.</Alert>}
show={<Alert severity='warning'>Not enabled.</Alert>}
elseShow={
<>
<StyledBox>

16
frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsagePlanSummary.tsx
View File

@ -53,6 +53,7 @@ export const NetworkTrafficUsagePlanSummary = ({
planIncludedRequests,
}: INetworkTrafficUsagePlanSummary) => {
const { isPro } = useUiConfig();
const overages = usageTotal - planIncludedRequests;
return (
<StyledContainer>
<Grid item>
@ -61,7 +62,7 @@ export const NetworkTrafficUsagePlanSummary = ({
</StyledCardTitleRow>
<StyledCardDescription>
<RowContainer>
Incoming requests for selection{' '}
Incoming requests selected month{' '}
<StyledNumbersDiv>
<ConditionallyRender
condition={isPro()}
@ -107,6 +108,19 @@ export const NetworkTrafficUsagePlanSummary = ({
</StyledCardDescription>
}
/>
<ConditionallyRender
condition={isPro() && overages > 0}
show={
<StyledCardDescription>
<RowContainer>
Requests overages this month
<StyledNumbersDiv>
{overages.toLocaleString()} requests
</StyledNumbersDiv>
</RowContainer>
</StyledCardDescription>
}
/>
</Grid>
</StyledContainer>
);