mirror of
https://github.com/Unleash/unleash.git
synced 2025-01-31 00:16:47 +01:00
[Gitar] Cleaning up stale flag: displayTrafficDataUsage with value true (#8481)
This commit is contained in:
parent
f9a01c4831
commit
589d9f1af7
@ -17,7 +17,6 @@ import { GridCol } from 'component/common/GridCol/GridCol';
|
||||
import { Badge } from 'component/common/Badge/Badge';
|
||||
import { GridColLink } from './GridColLink/GridColLink';
|
||||
import { useTrafficDataEstimation } from 'hooks/useTrafficData';
|
||||
import { useUiFlag } from 'hooks/useUiFlag';
|
||||
import { useInstanceTrafficMetrics } from 'hooks/api/getters/useInstanceTrafficMetrics/useInstanceTrafficMetrics';
|
||||
|
||||
const StyledPlanBox = styled('aside')(({ theme }) => ({
|
||||
@ -108,13 +107,11 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
|
||||
const freeAssigned = Math.min(eligibleUsers.length, seats);
|
||||
const paidAssigned = eligibleUsers.length - freeAssigned;
|
||||
const paidAssignedPrice = price.user * paidAssigned;
|
||||
|
||||
const displayTrafficDataUsageEnabled = useUiFlag('displayTrafficDataUsage');
|
||||
const includedTraffic = isPro() ? proPlanIncludedRequests : 0;
|
||||
const traffic = useInstanceTrafficMetrics(currentPeriod.key);
|
||||
|
||||
const overageCost = useMemo(() => {
|
||||
if (!displayTrafficDataUsageEnabled || !includedTraffic) {
|
||||
if (!includedTraffic) {
|
||||
return 0;
|
||||
}
|
||||
const trafficData = toChartData(
|
||||
@ -124,13 +121,7 @@ export const BillingPlan: FC<IBillingPlanProps> = ({ instanceStatus }) => {
|
||||
);
|
||||
const totalTraffic = toTrafficUsageSum(trafficData);
|
||||
return calculateOverageCost(totalTraffic, includedTraffic);
|
||||
}, [
|
||||
displayTrafficDataUsageEnabled,
|
||||
includedTraffic,
|
||||
traffic,
|
||||
currentPeriod,
|
||||
endpointsInfo,
|
||||
]);
|
||||
}, [includedTraffic, traffic, currentPeriod, endpointsInfo]);
|
||||
|
||||
const totalCost = planPrice + paidAssignedPrice + overageCost;
|
||||
|
||||
|
@ -23,7 +23,6 @@ import { Bar } from 'react-chartjs-2';
|
||||
import { useInstanceTrafficMetrics } from 'hooks/api/getters/useInstanceTrafficMetrics/useInstanceTrafficMetrics';
|
||||
import type { Theme } from '@mui/material/styles/createTheme';
|
||||
import Grid from '@mui/material/Grid';
|
||||
import { useUiFlag } from 'hooks/useUiFlag';
|
||||
import { NetworkTrafficUsagePlanSummary } from './NetworkTrafficUsagePlanSummary';
|
||||
import annotationPlugin from 'chartjs-plugin-annotation';
|
||||
import {
|
||||
@ -197,8 +196,6 @@ export const NetworkTrafficUsage: VFC = () => {
|
||||
datasets,
|
||||
};
|
||||
|
||||
const flagEnabled = useUiFlag('displayTrafficDataUsage');
|
||||
|
||||
useEffect(() => {
|
||||
setDatasets(toChartData(labels, traffic, endpointsInfo));
|
||||
}, [labels, traffic]);
|
||||
@ -235,7 +232,7 @@ export const NetworkTrafficUsage: VFC = () => {
|
||||
|
||||
return (
|
||||
<ConditionallyRender
|
||||
condition={isOss() || !flagEnabled}
|
||||
condition={isOss()}
|
||||
show={<Alert severity='warning'>Not enabled.</Alert>}
|
||||
elseShow={
|
||||
<>
|
||||
|
@ -78,7 +78,6 @@ export type UiFlags = {
|
||||
featureSearchFeedbackPosting?: boolean;
|
||||
userAccessUIEnabled?: boolean;
|
||||
outdatedSdksBanner?: boolean;
|
||||
displayTrafficDataUsage?: boolean;
|
||||
estimateTrafficDataCost?: boolean;
|
||||
disableShowContextFieldSelectionValues?: boolean;
|
||||
projectOverviewRefactorFeedback?: boolean;
|
||||
|
@ -35,7 +35,6 @@ export type IFlagKey =
|
||||
| 'feedbackComments'
|
||||
| 'showInactiveUsers'
|
||||
| 'killScheduledChangeRequestCache'
|
||||
| 'displayTrafficDataUsage'
|
||||
| 'estimateTrafficDataCost'
|
||||
| 'useMemoizedActiveTokens'
|
||||
| 'queryMissingTokens'
|
||||
@ -207,10 +206,6 @@ const flags: IFlags = {
|
||||
process.env.UNLEASH_EXPERIMENTAL_KILL_SCHEDULED_CHANGE_REQUEST_CACHE,
|
||||
false,
|
||||
),
|
||||
displayTrafficDataUsage: parseEnvVarBoolean(
|
||||
process.env.UNLEASH_EXPERIMENTAL_DISPLAY_TRAFFIC_DATA_USAGE,
|
||||
false,
|
||||
),
|
||||
estimateTrafficDataCost: parseEnvVarBoolean(
|
||||
process.env.UNLEASH_EXPERIMENTAL_ESTIMATE_TRAFFIC_DATA_COST,
|
||||
false,
|
||||
|
Loading…
Reference in New Issue
Block a user