diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.test.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.test.tsx index 8a84e515e1..711c9f5795 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.test.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.test.tsx @@ -9,7 +9,7 @@ const server = testServerSetup(); test('Display extended daily metrics', async () => { testServerRoute(server, '/api/admin/ui-config', { flags: { - extendedUsageMetrics: true, + extendedUsageMetricsUI: true, }, versionInfo: { current: { oss: 'irrelevant', enterprise: 'some value' }, diff --git a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx index 4482320920..229bf65d81 100644 --- a/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureMetrics/FeatureMetricsHours/FeatureMetricsHours.tsx @@ -29,7 +29,7 @@ export const FeatureMetricsHours = ({ setHoursBack(parseInt(key)); }; const { isEnterprise } = useUiConfig(); - const extendedUsageMetrics = useUiFlag('extendedUsageMetrics'); + const extendedUsageMetrics = useUiFlag('extendedUsageMetricsUI'); const extendedOptions = isEnterprise() && extendedUsageMetrics; const options = extendedOptions ? [...hourOptions, ...daysOptions] diff --git a/frontend/src/interfaces/uiConfig.ts b/frontend/src/interfaces/uiConfig.ts index 332d563223..8d17e61916 100644 --- a/frontend/src/interfaces/uiConfig.ts +++ b/frontend/src/interfaces/uiConfig.ts @@ -73,7 +73,7 @@ export type UiFlags = { featureSearchFeedback?: boolean; enableLicense?: boolean; newStrategyConfigurationFeedback?: boolean; - extendedUsageMetrics?: boolean; + extendedUsageMetricsUI?: boolean; }; export interface IVersionInfo { diff --git a/src/lib/__snapshots__/create-config.test.ts.snap b/src/lib/__snapshots__/create-config.test.ts.snap index 5020b2bfec..1fc0fb1b3f 100644 --- a/src/lib/__snapshots__/create-config.test.ts.snap +++ b/src/lib/__snapshots__/create-config.test.ts.snap @@ -88,6 +88,7 @@ exports[`should create default config 1`] = ` "enableLicense": false, "encryptEmails": false, "extendedUsageMetrics": false, + "extendedUsageMetricsUI": false, "featureSearchAPI": false, "featureSearchFeedback": false, "featureSearchFeedbackPosting": false, diff --git a/src/lib/types/experimental.ts b/src/lib/types/experimental.ts index 1e440f833c..b4ad36a4e0 100644 --- a/src/lib/types/experimental.ts +++ b/src/lib/types/experimental.ts @@ -41,7 +41,8 @@ export type IFlagKey = | 'featureSearchFeedbackPosting' | 'newStrategyConfigurationFeedback' | 'edgeBulkMetricsKillSwitch' - | 'extendedUsageMetrics'; + | 'extendedUsageMetrics' + | 'extendedUsageMetricsUI'; export type IFlags = Partial<{ [key in IFlagKey]: boolean | Variant }>; @@ -188,6 +189,10 @@ const flags: IFlags = { process.env.UNLEASH_EXPERIMENTAL_EXTENDED_USAGE_METRICS, false, ), + extendedUsageMetricsUI: parseEnvVarBoolean( + process.env.UNLEASH_EXPERIMENTAL_EXTENDED_USAGE_METRICS_UI, + false, + ), }; export const defaultExperimentalOptions: IExperimentalOptions = { diff --git a/src/server-dev.ts b/src/server-dev.ts index 9f10ef8847..c4ed2e4a4b 100644 --- a/src/server-dev.ts +++ b/src/server-dev.ts @@ -49,6 +49,7 @@ process.nextTick(async () => { increaseUnleashWidth: true, featureSearchFeedback: true, newStrategyConfigurationFeedback: true, + extendedUsageMetricsUI: true, }, }, authentication: {