From e29eb51f3cc1eb2f4942ad96b2ffd09b45b3e17a Mon Sep 17 00:00:00 2001 From: Mateusz Kwasniewski Date: Thu, 27 Feb 2025 09:45:07 +0100 Subject: [PATCH] chore: consumption model flag (#9379) --- .../NetworkTrafficUsage/NetworkTrafficUsage.tsx | 4 ++-- frontend/src/interfaces/uiConfig.ts | 2 +- package.json | 2 +- src/lib/types/experimental.ts | 6 +++--- yarn.lock | 10 +++++----- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx b/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx index 6d5e442b55..54d931d54a 100644 --- a/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx +++ b/frontend/src/component/admin/network/NetworkTrafficUsage/NetworkTrafficUsage.tsx @@ -183,7 +183,7 @@ const useTrafficStats = ( includedTraffic: number, chartDataSelection: ChartDataSelection, ) => { - const connectionCountEnabled = useUiFlag('connectionCount'); + const consumptionModelEnabled = useUiFlag('consumptionModel'); const { result } = useTrafficSearch( chartDataSelection.grouping, toDateRange(chartDataSelection, currentDate), @@ -200,7 +200,7 @@ const useTrafficStats = ( } const traffic = result.data; - const chartData = connectionCountEnabled + const chartData = consumptionModelEnabled ? toConnectionChartData(traffic) : newToChartData(traffic); const usageTotal = calculateTotalUsage(traffic); diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 79b0ad11f1..51d82c16a8 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -92,7 +92,7 @@ export type UiFlags = { granularAdminPermissions?: boolean; frontendHeaderRedesign?: boolean; dataUsageMultiMonthView?: boolean; - connectionCount?: boolean; + consumptionModel?: boolean; edgeObservability?: boolean; }; diff --git a/package.json b/package.json index 0e2b3e4685..75a77ab884 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "stoppable": "^1.1.0", "ts-toolbelt": "^9.6.0", "type-is": "^1.6.18", - "unleash-client": "^6.5.0", + "unleash-client": "^6.6.0", "uuid": "^9.0.0" }, "devDependencies": { diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 14ecd4a73e..2e97f6c50f 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -64,7 +64,7 @@ export type IFlagKey = | 'uniqueSdkTracking' | 'frontendHeaderRedesign' | 'dataUsageMultiMonthView' - | 'connectionCount' + | 'consumptionModel' | 'teamsIntegrationChangeRequests' | 'edgeObservability'; @@ -307,8 +307,8 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_DATA_USAGE_MULTI_MONTH_VIEW, false, ), - connectionCount: parseEnvVarBoolean( - process.env.EXPERIMENTAL_CONNECTION_COUNT, + consumptionModel: parseEnvVarBoolean( + process.env.EXPERIMENTAL_CONSUMPTION_MODEL, false, ), teamsIntegrationChangeRequests: parseEnvVarBoolean( diff --git a/yarn.lock b/yarn.lock index 8e408970f5..1a635e4687 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9281,9 +9281,9 @@ __metadata: languageName: node linkType: hard -"unleash-client@npm:^6.5.0": - version: 6.5.0 - resolution: "unleash-client@npm:6.5.0" +"unleash-client@npm:^6.6.0": + version: 6.6.0 + resolution: "unleash-client@npm:6.6.0" dependencies: http-proxy-agent: "npm:^7.0.2" https-proxy-agent: "npm:^7.0.5" @@ -9293,7 +9293,7 @@ __metadata: murmurhash3js: "npm:^3.0.1" proxy-from-env: "npm:^1.1.0" semver: "npm:^7.6.2" - checksum: 10c0/766f7285a6e3847c5ed60a2c303092be657221a41743a9047f0a09423cff8d82b3e834a1e6f2b7a02f777cb94e7219653d36d2469ba9355b9245e945701dfa92 + checksum: 10c0/d97805744874a0dd66af7304142c40e0c5eea1958b4a3ebbeb29fdbc0d4a1e9d8bde2f713ffa972d825cd80f11958f19d5bcf97503857a2692c542755ede01ff languageName: node linkType: hard @@ -9409,7 +9409,7 @@ __metadata: tsc-watch: "npm:6.2.1" type-is: "npm:^1.6.18" typescript: "npm:5.4.5" - unleash-client: "npm:^6.5.0" + unleash-client: "npm:^6.6.0" uuid: "npm:^9.0.0" wait-on: "npm:^7.2.0" languageName: unknown